Browse Source

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

chenrui 9 months ago
parent
commit
2af874013c

+ 41 - 8
src/views/reportData/tireSalesReport/detailList.vue

@@ -32,12 +32,12 @@
                 <subarea id="tireSalesReportList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户名称">
+                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
@@ -49,6 +49,21 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="轮胎省仓">
+                  <v-select
+                    v-model="queryParam.provinceFlag"
+                    id="tireSalesDealerList-provinceFlag"
+                    code="Flag"
+                    placeholder="请选择是否是轮胎省仓"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="轮胎省仓名称">
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-custProvinceName" @change="custProvinceChange" />
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
                   <BizUser id="tireSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
@@ -65,7 +80,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="6" :sm="24">
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -209,7 +224,12 @@ export default {
           bizUserSn: undefined // 区域负责人
         },
         productWord: '', // 产品编码/原厂编码
-        productName: '' // 产品名称
+        productName: '', // 产品名称
+        parentDealerSn: undefined, // 轮胎省仓sn
+        parentDealerEntity: {
+          dealerName: undefined // 轮胎省仓名称
+        },
+        provinceFlag: undefined// 是否是轮胎省仓 1是 0否
       },
       totalData: null, // 合计
       showOutDetail: false, // 出库明细弹窗
@@ -265,6 +285,8 @@ export default {
         { title: '区域负责人', dataIndex: 'bizUserName', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '80px', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
+        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品尺寸', dataIndex: 'productEntity.size', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -313,6 +335,11 @@ export default {
       this.queryParam.dealerName = val.name
       this.queryParam.dealerSn = val.key
     },
+    // 轮胎省仓客户名称 change
+    custProvinceChange (val) {
+      this.queryParam.parentDealerEntity.dealerName = val.name
+      this.queryParam.parentDealerSn = val.key
+    },
     // 统计
     getCount (params) {
       queryTireDetailCount(params).then(res => {
@@ -378,8 +405,14 @@ export default {
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.productWord = undefined
       this.queryParam.productName = undefined
+      this.queryParam.parentDealerSn = undefined
+      this.queryParam.parentDealerEntity.dealerName = undefined
+      this.queryParam.provinceFlag = undefined
       this.$refs.subarea.clearData()
-      this.$refs.dealerSubareaScopeList.resetForm()
+      if (this.advanced) {
+        this.$refs.dealerSubareaScopeList.resetForm()
+        this.$refs.provinceDealerList.resetForm()
+      }
       this.totalData = null
       this.$refs.areaList.clearData()
       this.$refs.table.clearTable()

+ 29 - 16
src/views/reportData/tireSalesReport/list.vue

@@ -39,30 +39,29 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealerLevel"
                     ref="dealerLevel"
                     id="tireSalesDealerList-dealerLevel"
                     code="DEALER_LEVEL"
-                    placeholder="请选择是否是轮胎省仓"
+                    placeholder="请选择客户级别"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓名称">
-                  <a-input id="tireSalesDealerList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入轮胎省仓名称"/>
+                <a-form-model-item label="轮胎省仓">
+                  <v-select
+                    v-model="queryParam.provinceFlag"
+                    id="tireSalesDealerList-provinceFlag"
+                    code="Flag"
+                    placeholder="请选择是否是轮胎省仓"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户级别">
-                  <v-select
-                    v-model="queryParam.dealerLevel"
-                    ref="dealerLevel"
-                    id="tireSalesDealerList-dealerLevel"
-                    code="DEALER_LEVEL"
-                    placeholder="请选择客户级别"
-                    allowClear></v-select>
+                <a-form-model-item label="轮胎省仓名称">
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-custProvinceName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -76,7 +75,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="isShowCustomerSearch?6:24" :sm="24" :style="{textAlign:isShowCustomerSearch?'left':'center'}">
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -196,7 +195,12 @@ export default {
           subareaSn: undefined, // 区域
           subareaAreaSn: undefined, // 分区
           bizUserSn: undefined // 区域负责人
-        }
+        },
+        parentDealerSn: undefined, // 轮胎省仓sn
+        parentDealerEntity: {
+          dealerName: undefined // 轮胎省仓名称
+        },
+        provinceFlag: undefined// 是否是轮胎省仓 1是 0否
       },
       rules: {
         'time': [{ required: true, message: '请选择日期', trigger: 'change' }]
@@ -252,8 +256,8 @@ export default {
         { title: '区域负责人', dataIndex: 'bizUserName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '轮胎省仓', dataIndex: 'dealerEntity.dealerLevelDictValue1', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '轮胎省仓名称', dataIndex: 'dealerEntity.dealerLevelDictValue2', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '轮胎省仓', dataIndex: 'provinceFlag', width: '8%', align: 'center', customRender: function (text) { return text == '1' ? '是' : '否' } },
+        { title: '轮胎省仓名称', dataIndex: 'parentDealerEntity.dealerName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '任务数量', dataIndex: 'dealerEntity.taskNum', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '授信金额', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '8%', align: 'right', customRender: function (text) { return text || '--' } },
         { title: '总部订货数量', dataIndex: 'sysOrderQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -309,6 +313,11 @@ export default {
       this.queryParam.dealerName = val.name
       this.queryParam.dealerSn = val.key
     },
+    // 轮胎省仓客户名称 change
+    custProvinceChange (val) {
+      this.queryParam.parentDealerEntity.dealerName = val.name
+      this.queryParam.parentDealerSn = val.key
+    },
     // 统计
     getCount (params) {
       queryTireCount(params).then(res => {
@@ -355,9 +364,13 @@ export default {
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.bizUserSn = undefined
       this.queryParam.dealerLevel = undefined
+      this.queryParam.parentDealerSn = undefined
+      this.queryParam.parentDealerEntity.dealerName = undefined
+      this.queryParam.provinceFlag = undefined
       this.totalData = null
       this.$refs.areaList.clearData()
       if (this.advanced) {
+        this.$refs.provinceDealerList.resetForm()
         this.$refs.dealerSubareaScopeList.resetForm()
       }