优惠券管理

@@ -67,9 +67,7 @@ var g = new common.grid({
             return '<p style="max-width: 200px;word-wrap: break-word;">' + str + '</p>';
         }},
         {display:"优惠券说明", name:"explains"},
-        {display:"申请人",name:"creatorName", render: function(item) {
-            return item.creatorName + '<br>' + item.createTime;
-        }},
+        {display:"申请人",name:"proposer"},
         {display: '状态', render: function(item) {
             var html = ENUM.status[item.status]||'全部';
             if (item.reason) {

@@ -8,7 +8,6 @@ var couponBean = require('./partials/couponList-bean');
 var e = new common.edit2("#basicForm");
 var type = $("#basicForm").attr("role"),
     action = $("#basicForm").data("action");
-var isFirst = true;
 var startTimeObj;
 var endTimeObj;
 
@@ -28,10 +27,6 @@ var Bll = {
         //    $('input[name="skn_sku"]').prop('disabled', true);
         //    $(".noEdit").prop("disabled", true);
         //    $('input[name="userTypeLimit"]').prop('disabled', true);
-        //    if((new Date(editBean.limitDateFrom).getTime() <= new Date().getTime()) && isFirst) {
-        //        $("#limitDateFrom").prop("disabled", true);
-        //    }
-        //    isFirst = false;
         //}
         new common.dropDown({el: '#filter-couponType'});
         new common.dropDown({el: '#filter-department'});
@@ -80,6 +75,16 @@ $(document).on("change", ".observe", function () {
     //console.log(editBean);
 });
 
+$(document).on("change", "#useLimitType", function() {
+
+});
+
+$(document).on("change", "#useRange", function () {
+    if($(this).val() == 0) {
+
+    }
+});
+
 //输入限制
 $(document).on("keyup", ".number", function() {
     $(this).val($(this).val().replace(/\D/g, ''));

 
 {
   "name": "yohobuy-portal",
-  "version": "4.3.7",
+  "version": "0.3.5",
   "description": "yohobuy-portal",
   "keywords": [],
   "homepage": "",

@@ -117,7 +117,7 @@
 
         <div class="form-group">
             <label class="col-sm-2 control-label">优惠条件<i class="red">*</i></label>&emsp;
-            <select value="[[useLimitType]]" class="form-control input-form observe" data-field="useLimitType">
+            <select value="[[useLimitType]]" id="useLimitType" class="form-control input-form observe" data-field="useLimitType">
                 <option value="0">无限制</option>
                 <option value="1">件数</option>
                 <option value="2">金额</option>
@@ -141,6 +141,11 @@
             <label class="col-sm-2 control-label">适用范围</label>
             <div class="col-sm-4">
                 <div class="col-sm-10">
+                    <select value="[[useLimitType]]" id="useRange" class="form-control input-form">
+                        <option value="0">分类</option>
+                        <option value="1" checked>品牌</option>
+                    </select>&emsp;&emsp;
+                    <a class="btn btn-primary btn-xs" href="javascript:;">添加品牌</a>
                 </div>
             </div>
         </div>
@@ -173,13 +178,9 @@
         </div>
 
         <div class="panel-heading">
-            <h4 class="panel-title"></h4>
+            <h4 class="panel-title">优惠互斥</h4>
         </div>
 
-        <input type="hidden" value="[[status]]">
-        <input type="hidden" value="[[id]]">
-        <input type="hidden" value="[[batchNo]]">
-
         <div class="form-group">
             <label class="col-sm-2 control-label">申请人</label>
             <div class="col-sm-8">