瀏覽代碼

Merge branch 'develop_yh39' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh39

chenrui 1 年之前
父節點
當前提交
4f3875eab9

+ 0 - 1
src/views/dealerManagement/rebateBinding/categoryList.vue

@@ -29,7 +29,6 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <ve-table
         border-y
-        v-show="!showEmpty"
         :scroll-width="0"
         :max-height="tableHeight"
         :row-style-option="{clickHighlight: true}"

+ 25 - 23
src/views/dealerManagement/rebateBinding/priceDiffModal.vue

@@ -19,15 +19,6 @@
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
         >
-          <a-form-model-item label="关联经销商">
-            <a-row :gutter="10">
-              <a-col :span="17">
-                <custList ref="custList" @change="custChange" placeholder="请输入经销商名称搜索"></custList>
-              </a-col>
-              <a-col :span="6">
-              </a-col>
-            </a-row>
-          </a-form-model-item>
           <a-form-model-item label="差价归属方" prop="cjgsf">
             <a-row :gutter="10">
               <a-col :span="17">
@@ -45,23 +36,29 @@
               </a-col>
             </a-row>
           </a-form-model-item>
-          <a-form-model-item label="已绑经销商" v-if="form.cjgsf.indexOf('0')>=0">
+          <a-form-model-item label="上级经销商" v-if="form.cjgsf.indexOf('0')>=0">
             <a-row :gutter="10">
-              <a-col :span="17">
-                <a-input v-model.trim="form.name" disabled />
+              <a-col :span="13">
+                <custList ref="custList" @change="custChange" placeholder="请输入经销商名称搜索"></custList>
               </a-col>
-              <a-col :span="6" v-if="showPercent">
-                <a-input-number :min="0" :max="100"/> %
+              <a-col :span="5">
+                <v-select code="DEALER_GOODS_TYPE" allowClear placeholder="请选择价格类型"></v-select>
+              </a-col>
+              <a-col :span="4" v-if="showPercent||showPercent1">
+                <a-input-number :min="0" :max="100" placeholder="请输入比例"/> %
               </a-col>
             </a-row>
           </a-form-model-item>
           <a-form-model-item label="指定经销商" v-if="form.cjgsf.indexOf('1')>=0">
             <a-row :gutter="10" v-for="(item,index) in zdDealearList" :key="item.id">
-              <a-col :span="17">
+              <a-col :span="13">
                 <custList ref="custList" @change="custChange" placeholder="请输入经销商名称搜索"></custList>
               </a-col>
-              <a-col :span="5" v-if="showPercent||showPercent1">
-                <a-input-number :min="0" :max="100"/> %
+              <a-col :span="5">
+                <v-select code="DEALER_GOODS_TYPE" allowClear placeholder="请选择价格类型"></v-select>
+              </a-col>
+              <a-col :span="4" v-if="showPercent||showPercent1">
+                <a-input-number :min="0" :max="100" placeholder="请输入比例"/> %
               </a-col>
               <a-col :span="2">
                 <a-button @click="addOrDel(item,index)" size="small" shape="circle" :icon="index==zdDealearList.length-1?'plus':'minus'" style="margin-left: 10px;" />
@@ -70,11 +67,14 @@
           </a-form-model-item>
           <a-form-model-item label="箭冠总公司" v-if="form.cjgsf.indexOf('2')>=0">
             <a-row :gutter="10">
-              <a-col :span="17">
-                <a-input v-model.trim="form.name" disabled />
+              <a-col :span="13">
+                <a-input value="箭冠总公司" disabled />
               </a-col>
-              <a-col :span="6" v-if="showPercent">
-                <a-input-number :min="0" :max="100"/> %
+              <a-col :span="5">
+                <v-select code="DEALER_GOODS_TYPE" allowClear placeholder="请选择价格类型"></v-select>
+              </a-col>
+              <a-col :span="4" v-if="showPercent">
+                <a-input-number :min="0" :max="100" placeholder="请输入比例"/> %
               </a-col>
             </a-row>
           </a-form-model-item>
@@ -130,7 +130,7 @@ export default {
         cjgsf: [{ required: true, message: '请选择差价归属方', trigger: 'change' }]
       },
       cjgsfList: [
-        { code: '0', name: '已绑经销商' },
+        { code: '0', name: '上级经销商' },
         { code: '1', name: '指定经销商' },
         { code: '2', name: '箭冠总公司' }
       ],
@@ -177,7 +177,9 @@ export default {
       this.form.dealerSn = undefined
       this.form.cjgsf = []
       this.zdDealearList = []
-      this.$refs.custList.resetForm()
+      if (this.$refs.custList) {
+        this.$refs.custList.resetForm()
+      }
     },
     // 保存
     handleSave () {

+ 2 - 1
src/views/promotionRulesManagement/dealerPromotions/chooseDealer.vue

@@ -53,6 +53,7 @@
       :columns="columns"
       :data-source="dealerList"
       @change="handlePage"
+      :loading="spinning"
     >
       <template slot="addressInfo" slot-scope="text, record">
         {{ record.provinceName }}{{ '-'+ record.cityName }}{{ '-'+ record.districtName }}
@@ -175,7 +176,7 @@ export default {
     },
     searchForm () {
       this.loadData()
-      this.spinning = false
+      // this.spinning = false
     },
     subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined