Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/categoryEdit-form.vue

@@ -135,6 +135,18 @@
             </div>
           </div>
         </template>
+        <div class="row wrap">
+            <div class="col-12">
+              <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RebateRate" ref="RebateRate"
+                class="col-12 q-pb-lg" label="返佣比例%" />
+            </div>
+          </div>
+          <div class="row wrap">
+            <div class="col-12">
+              <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RebateMoney" ref="RebateMoney"
+                class="col-12 q-pb-lg" label="返佣固定金额" />
+            </div>
+          </div>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
@@ -172,6 +184,8 @@
           CategoryId: 0,
           linkMan: "",
           linkTel: "",
+          RebateRate : 0,
+          RebateMoney : 0,
           IsContract: 0, //是否签约
           ContractUrl: "", //合同信息
         },
@@ -207,6 +221,8 @@
               this.objOption.CategoryId = tempData.CategoryId;
               this.objOption.IsContract = tempData.IsContract;
               this.objOption.ContractUrl = tempData.ContractUrl;
+              this.objOption.RebateRate = tempData.RebateRate;
+              this.objOption.RebateMoney = tempData.RebateMoney;
             }
           })
           this.optionTitle = "修改客户信息"
@@ -216,6 +232,8 @@
           this.objOption.CategoryId = 0;
           this.objOption.linkMan = '';
           this.objOption.linkTel = '';
+          this.objOption.RebateRate = 0;
+          this.objOption.RebateMoney = 0;
           this.objOption.IsContract = 0;
           this.objOption.ContractUrl = '';
           this.optionTitle = "新增客户信息"

src/components/sale/customcategorylist.vue

@@ -132,6 +132,18 @@
             field: "OrderCount",
             align: "left"
           },
+          {
+            name: "RebateRate",
+            label: "返佣比例%",
+            field: "RebateRate",
+            align: "left"
+          },
+          {
+            name: "RebateMoney",
+            label: "返佣固定金额",
+            field: "RebateMoney",
+            align: "left"
+          },
           {
             name: "CreateByName",
             label: "创建人",