Merge branch 'dev6.1' into test6.1

@@ -13,7 +13,8 @@ module.exports={
                 {name: 'priority', type: 'Number'},
                 {name: 'priority', type: 'Number'},
                 {name: 'status', type: 'Number'},
                 {name: 'status', type: 'Number'},
                 {name: 'erpPromotionType', type: 'Number'},
                 {name: 'erpPromotionType', type: 'Number'},
-                {name: 'erpPromotionId', type: 'Number'}
+                {name: 'erpPromotionId', type: 'Number'},
+        		{name: 'showStatus', type: 'Number'}
             ]
             ]
         },
         },
         updatePromotionInfo:{
         updatePromotionInfo:{
@@ -29,7 +30,8 @@ module.exports={
                 {name: 'priority', type: 'Number'},
                 {name: 'priority', type: 'Number'},
                 {name: 'status', type: 'Number'},
                 {name: 'status', type: 'Number'},
                 {name: 'erpPromotionType', type: 'Number'},
                 {name: 'erpPromotionType', type: 'Number'},
-                {name: 'erpPromotionId', type: 'Number'}
+                {name: 'erpPromotionId', type: 'Number'},
+                {name: 'showStatus', type: 'Number'}
             ]
             ]
         },
         },
         getPromotionInfo:{
         getPromotionInfo:{

@@ -61,6 +61,17 @@
             <input type="hidden" id="status" name="status" value="" for="radio" required />
             <input type="hidden" id="status" name="status" value="" for="radio" required />
         </div>                                
         </div>                                
     </div> 
     </div> 
+    
+    <div class="form-group">
+        <label class="col-sm-2 control-label">展示状态 <span class="red">*</span></label>
+        <div class="col-sm-4">
+            <label class="radio-inline">
+                <input type="radio" name="showStatus" value="1">展示</label>
+            <label class="radio-inline">
+                <input type="radio" name="showStatus" value="0" selected="selected">不展示</label>                                    
+            <input type="hidden" id="showStatus" name="showStatus" value="" for="radio" required />
+        </div>                                
+    </div> 
 </form>
 </form>
 
 
 
 

@@ -63,6 +63,16 @@
                 <input type="hidden" id="status" name="status" value="[[status||'0']]" for="radio" required />
                 <input type="hidden" id="status" name="status" value="[[status||'0']]" for="radio" required />
             </div>                                
             </div>                                
         </div> 
         </div> 
+        <div class="form-group">
+            <label class="col-sm-2 control-label">展示状态 <span class="red">*</span></label>
+            <div class="col-sm-4">
+                <label class="radio-inline">
+                    <input type="radio" name="showStatus" value="1">展示</label>
+                <label class="radio-inline">
+                    <input type="radio" name="showStatus" value="0" selected="selected">不展示</label>                                    
+                <input type="hidden" id="showStatus" name="showStatus" value="[[showStatus||'0']]" for="radio" required />
+            </div>                                
+        </div>
 
 
     </div>
     </div>
 
 

@@ -54,6 +54,18 @@ var g = new common.grid({
             return name;
             return name;
         }
         }
     }, {
     }, {
+        display: '是否展示',
+        name: "showStatus",
+        render: function(item) {
+            var name;
+            if(item.showStatus===1){
+                name ="展示" ;
+            }else {
+                name ="不展示" ;
+            }
+            return name;
+        }
+    },  {
         display: '优惠券限制使用',
         display: '优惠券限制使用',
         name: "status",
         name: "status",
         render: function(item) {
         render: function(item) {