chenrui 1 éve
szülő
commit
2f090172a8

+ 9 - 22
src/views/reportData/productRebateReport/detailList.vue

@@ -35,13 +35,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="直接绑定客户名称">
-                <dealerSearchList ref="directDealer" id="srebateReport-buyerName" @change="directDealerChange" />
+              <a-form-model-item label="差价归属方">
+                <v-select code="REBATE_PARENT_TYPE" v-model="queryParam.parentDealerSn" allowClear placeholder="请选择差价归属方"></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="间接绑定客户名称">
-                <dealerSearchList ref="indirectDealer" id="srebateReport-buyerName" @change="indirectDealerChange" />
+              <a-form-model-item label="差价归属类型">
+                <v-select code="RELATION_REBATE_PARENT_TYPE" v-model="queryParam.rebateParentType" allowClear placeholder="请选择差价归属类型"></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -149,8 +149,8 @@ export default {
         bizNo: '', // 单号
         bizSubNo: '',
         bizType: undefined,
-        directDealerSn: undefined, // 直接经销商SN
-        indirectDealerSn: undefined, // 间接经销商SN
+        parentDealerSn: undefined,
+        rebateParentType: undefined,
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -259,26 +259,13 @@ export default {
       })
     },
     dealerChange (val) {
+      console.log('1111:', val)
       if (val.row) {
         this.queryParam.buyerSn = val.row.dealerSn
       } else {
         this.queryParam.buyerSn = undefined
       }
     },
-    directDealerChange (val) {
-      if (val.row) {
-        this.queryParam.directDealerSn = val.row.dealerSn
-      } else {
-        this.queryParam.directDealerSn = undefined
-      }
-    },
-    indirectDealerChange (val) {
-      if (val.row) {
-        this.queryParam.indirectDealerSn = val.row.dealerSn
-      } else {
-        this.queryParam.indirectDealerSn = undefined
-      }
-    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
@@ -289,8 +276,8 @@ export default {
       this.queryParam.bizSubNo = ''
       this.queryParam.bizType = undefined
       this.queryParam.buyerSn = undefined
-      this.queryParam.indirectDealerSn = undefined
-      this.queryParam.directDealerSn = undefined
+      this.queryParam.parentDealerSn = undefined
+      this.queryParam.rebateParentType = undefined
       this.$refs.dealer.resetForm()
       this.$refs.indirectDealer.resetForm()
       this.$refs.directDealer.resetForm()

+ 8 - 35
src/views/reportData/productRebateReport/list.vue

@@ -14,32 +14,22 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="日期" prop="time">
                 <rangeDate ref="rangeDate" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="订单号">
                 <a-input id="srebateReport-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入订单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="客户名称">
                 <dealerSearchList ref="dealer" id="srebateReport-buyerName" @change="dealerChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="直接绑定客户名称">
-                <dealerSearchList ref="directDealer" id="srebateReport-buyerName" @change="directDealerChange" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="间接绑定客户名称">
-                <dealerSearchList ref="indirectDealer" id="srebateReport-buyerName" @change="indirectDealerChange" />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="单据类型">
                 <v-select
                   v-model="queryParam.bizType"
@@ -50,7 +40,7 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="srebateReport-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="srebateReport-reset">重置</a-button>
               <!-- <a-button
@@ -89,7 +79,8 @@
           size="small"
           :style="{ height: tableHeight+75+'px' }"
           :scroll="{ y: tableHeight-20 }"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.bizNo"
+          rowKeyName="bizNo"
           :columns="columns"
           :data="loadData"
           :pageSize="30"
@@ -132,9 +123,7 @@ export default {
         endDate: '',
         buyerSn: undefined, // 客户sn
         bizNo: '', // 单号
-        bizType: undefined,
-        directDealerSn: undefined, // 直接经销商SN
-        indirectDealerSn: undefined // 间接经销商SN
+        bizType: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
@@ -244,20 +233,6 @@ export default {
         this.queryParam.buyerSn = undefined
       }
     },
-    directDealerChange (val) {
-      if (val.row) {
-        this.queryParam.directDealerSn = val.row.dealerSn
-      } else {
-        this.queryParam.directDealerSn = undefined
-      }
-    },
-    indirectDealerChange (val) {
-      if (val.row) {
-        this.queryParam.indirectDealerSn = val.row.dealerSn
-      } else {
-        this.queryParam.indirectDealerSn = undefined
-      }
-    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
@@ -267,8 +242,6 @@ export default {
       this.queryParam.bizNo = ''
       this.queryParam.bizType = undefined
       this.queryParam.buyerSn = undefined
-      this.queryParam.indirectDealerSn = undefined
-      this.queryParam.directDealerSn = undefined
       this.$refs.dealer.resetForm()
       this.$refs.indirectDealer.resetForm()
       this.$refs.directDealer.resetForm()