Browse Source

修改bug

chenrui 1 year ago
parent
commit
d09f0a6129

+ 11 - 2
src/views/productManagement/productSourcePath/list.vue

@@ -165,7 +165,7 @@
         </s-table>
         </s-table>
       </a-spin>
       </a-spin>
       <!-- 质保信息-->
       <!-- 质保信息-->
-      <warranty-info-modal v-drag :openModal="openInfoModal" :itemSn="warrantyInfoId" @close="warrantyInfoId=null;openInfoModal = false" />
+      <warranty-info-modal v-drag :openModal="openInfoModal" :productCode="productCodeInfo" :itemSn="warrantyInfoId" @close="closeWarranty" />
       <!-- 导入轮胎唯一码 -->
       <!-- 导入轮胎唯一码 -->
       <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="handleGuideOk" />
       <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="handleGuideOk" />
     </a-card>
     </a-card>
@@ -245,7 +245,8 @@ export default {
       },
       },
       totalData: null,
       totalData: null,
       openGuideModal: false, // 导入弹窗
       openGuideModal: false, // 导入弹窗
-      warrantyInfoId: null
+      warrantyInfoId: null,
+      productCodeInfo: null
     }
     }
   },
   },
   watch: {
   watch: {
@@ -304,8 +305,16 @@ export default {
     // 质保信息
     // 质保信息
     handleInfoModal (row) {
     handleInfoModal (row) {
       this.warrantyInfoId = row.warrantyid
       this.warrantyInfoId = row.warrantyid
+      this.productCodeInfo = row.productCode
       this.openInfoModal = true
       this.openInfoModal = true
     },
     },
+    // 关闭质保信息弹窗
+    closeWarranty () {
+      this.warrantyInfoId = null
+      this.productCodeInfo = null
+      this.openInfoModal = false
+    },
+
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.time = [
       this.time = [

+ 7 - 0
src/views/productManagement/productSourcePath/warrantyInfoModal.vue

@@ -22,6 +22,9 @@
               </a-tooltip>
               </a-tooltip>
             </div>
             </div>
             <a-descriptions :column="1">
             <a-descriptions :column="1">
+              <a-descriptions-item label="产品编码">
+                {{ productCode || '--' }}
+              </a-descriptions-item>
               <a-descriptions-item label="轮胎唯一码">
               <a-descriptions-item label="轮胎唯一码">
                 {{ detailsData.traceCode || '--' }}
                 {{ detailsData.traceCode || '--' }}
               </a-descriptions-item>
               </a-descriptions-item>
@@ -117,6 +120,10 @@ export default {
     itemSn: {
     itemSn: {
       type: String,
       type: String,
       default: ''
       default: ''
+    },
+    productCode:{
+      type: String,
+      default: ''
     }
     }
   },
   },
   data () {
   data () {

+ 27 - 77
src/views/reportData/tireSalesReport/dealerList.vue

@@ -10,11 +10,6 @@
           layout="inline"
           layout="inline"
           :model="queryParam">
           :model="queryParam">
           <a-row :gutter="15">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="地区">
               <a-form-model-item label="地区">
                 <AreaList id="tireSalesDealerList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 <AreaList id="tireSalesDealerList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -25,23 +20,21 @@
                 <subarea id="tireSalesDealerList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 <subarea id="tireSalesDealerList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <a-input
-                    id="tireSalesDealerList-buyerName"
-                    v-model.trim="queryParam.buyerName"
-                    allowClear
-                    placeholder="请输入客户名称" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser v-model="queryParam.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
-            </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input
+                  id="tireSalesDealerList-dealerName"
+                  v-model.trim="queryParam.dealerName"
+                  allowClear
+                  placeholder="请输入客户名称" />
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="区域负责人">
+                <BizUser v-model="queryParam.bizUserSn"></BizUser>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="24" :sm="24" style="text-align:center;margin-bottom:10px;">
               <a-button
               <a-button
                 style="margin-left: 5px"
                 style="margin-left: 5px"
                 type="primary"
                 type="primary"
@@ -62,10 +55,6 @@
                 :loading="exportLoading"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_tireSalesDealerReportExport')"
                 v-if="$hasPermissions('B_tireSalesDealerReportExport')"
                 id="tireSalesDealerList-export">导出</a-button>
                 id="tireSalesDealerList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'" />
-              </a>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form-model>
         </a-form-model>
@@ -78,9 +67,9 @@
           class="sTable fixPagination"
           class="sTable fixPagination"
           ref="table"
           ref="table"
           size="small"
           size="small"
-          :rowKey="(record) => record.salesBillNo"
+          :rowKey="(record) => record.dealerSn"
           :style="{ height: tableHeight+70+'px' }"
           :style="{ height: tableHeight+70+'px' }"
-          rowKeyName="salesBillNo"
+          rowKeyName="dealerSn"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
           :scroll="{ y: tableHeight-30 }"
           :scroll="{ y: tableHeight-30 }"
@@ -93,7 +82,8 @@
             <a-row :gutter="15">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">采购数量:{{ (totalData && (totalData.totalbuyAmount || totalData.totalbuyAmount==0)) ? totalData.totalbuyAmount : '--' }}</a-col>
               <a-col :md="4" :sm="24">采购数量:{{ (totalData && (totalData.totalbuyAmount || totalData.totalbuyAmount==0)) ? totalData.totalbuyAmount : '--' }}</a-col>
               <a-col :md="4" :sm="24">库存数量:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ? totalData.totalstoreAmount: '--' }}</a-col>
               <a-col :md="4" :sm="24">库存数量:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ? totalData.totalstoreAmount: '--' }}</a-col>
-              <a-col :md="4" :sm="24">已售出数量:{{ (totalData && (totalData.totalsellAmount || totalData.totalsellAmount==0)) ?totalData.totalsellAmount: '--' }}</a-col>
+              <a-col :md="4" :sm="24">售出数量:{{ (totalData && (totalData.totalsellAmount || totalData.totalsellAmount==0)) ?totalData.totalsellAmount: '--' }}</a-col>
+              <a-col :md="4" :sm="24">已绑质保单数量:{{ (totalData && (totalData.totalwarrantyAmount || totalData.totalwarrantyAmount==0)) ?totalData.totalwarrantyAmount: '--' }}</a-col>
             </a-row>
             </a-row>
           </template>
           </template>
         </s-table>
         </s-table>
@@ -104,7 +94,6 @@
 
 
 <script>
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
-import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import subarea from '@/views/common/subarea.js'
@@ -119,19 +108,12 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
-      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       tableHeight: 0,
-      time: [
-        getDate.getThreeMonthDays().starttime,
-        getDate.getCurrMonthDays().endtime
-      ],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        beginDate: getDate.getThreeMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
         provinceSn: undefined,
         provinceSn: undefined,
         citySn: undefined,
         citySn: undefined,
         districtSn: undefined,
         districtSn: undefined,
-        buyerName: '',
+        dealerName: '',
         subareaSn: undefined,
         subareaSn: undefined,
         subareaAreaSn: undefined,
         subareaAreaSn: undefined,
         bizUserSn: undefined
         bizUserSn: undefined
@@ -165,26 +147,16 @@ export default {
         { title: '区域', dataIndex: 'subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户级别', dataIndex: 'dealerLevelDictValue ', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'buyAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'buyAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'storeAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'storeAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已售出数量', dataIndex: 'sellAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '售出数量', dataIndex: 'sellAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已绑质保单数量', dataIndex: 'warrantyAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       ]
     }
     }
   },
   },
-  watch: {
-    advanced (newValue, oldValue) {
-      const _this = this
-      this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
-      })
-    },
-    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.setTableH()
-    }
-  },
   methods: {
   methods: {
     // 统计
     // 统计
     getCount (params) {
     getCount (params) {
@@ -202,45 +174,23 @@ export default {
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.citySn = val[1] ? val[1] : ''
       this.queryParam.districtSn = val[2] ? val[2] : ''
       this.queryParam.districtSn = val[2] ? val[2] : ''
     },
     },
-    //  下推时间  change
-    dateChange (date) {
-      if (date[0] && date[1]) {
-        this.time = date
-      } else {
-        this.time = []
-      }
-      this.queryParam.beginDate = date[0] || ''
-      this.queryParam.endDate = date[1] || ''
-    },
-    custChange (val) {
-      this.queryParam.dealerSn = val.key
-    },
     subareaChange (val) {
     subareaChange (val) {
       this.queryParam.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
-      this.time = [
-        getDate.getThreeMonthDays().starttime,
-        getDate.getCurrMonthDays().endtime
-      ]
-      this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.provinceSn = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.citySn = undefined
       this.queryParam.districtSn = undefined
       this.queryParam.districtSn = undefined
-      this.queryParam.buyerName = ''
+      this.queryParam.dealerName = ''
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaAreaSn = undefined
       this.queryParam.subareaAreaSn = undefined
       this.queryParam.bizUserSn = undefined
       this.queryParam.bizUserSn = undefined
       this.totalData = null
       this.totalData = null
-      if (this.advanced) {
-        this.$refs.subarea.clearData()
-        this.$refs.areaList.clearData()
-      }
-      this.$refs.table.clearTable()
+      this.$refs.subarea.clearData()
+      this.$refs.areaList.clearData()
+      this.$refs.table.refresh()
     },
     },
     //  导出
     //  导出
     handleExport () {
     handleExport () {

+ 5 - 32
src/views/reportData/tireSalesReport/subareaList.vue

@@ -11,11 +11,6 @@
           :model="queryParam"
           :model="queryParam"
           @keyup.enter.native="handleSearch">
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="下推时间" prop="time">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="区域/分区">
               <a-form-item label="区域/分区">
                 <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -72,7 +67,8 @@
             <a-row :gutter="15">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">采购数量:{{ (totalData && (totalData.totalbuyAmount || totalData.totalbuyAmount==0)) ? totalData.totalbuyAmount : '--' }}</a-col>
               <a-col :md="4" :sm="24">采购数量:{{ (totalData && (totalData.totalbuyAmount || totalData.totalbuyAmount==0)) ? totalData.totalbuyAmount : '--' }}</a-col>
               <a-col :md="4" :sm="24">库存数量:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ? totalData.totalstoreAmount: '--' }}</a-col>
               <a-col :md="4" :sm="24">库存数量:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ? totalData.totalstoreAmount: '--' }}</a-col>
-              <a-col :md="4" :sm="24">已售出数量:{{ (totalData && (totalData.totalsellAmount || totalData.totalsellAmount==0)) ?totalData.totalsellAmount: '--' }}</a-col>
+              <a-col :md="4" :sm="24">售出数量:{{ (totalData && (totalData.totalsellAmount || totalData.totalsellAmount==0)) ?totalData.totalsellAmount: '--' }}</a-col>
+              <a-col :md="4" :sm="24">已绑质保单数量:{{ (totalData && (totalData.totalwarrantyAmount || totalData.totalwarrantyAmount==0)) ?totalData.totalwarrantyAmount: '--' }}</a-col>
             </a-row>
             </a-row>
           </template>
           </template>
         </s-table>
         </s-table>
@@ -83,7 +79,6 @@
 
 
 <script>
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
-import getDate from '@/libs/getDate.js'
 import { STable } from '@/components'
 import { STable } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import subarea from '@/views/common/subarea.js'
@@ -98,13 +93,7 @@ export default {
     return {
     return {
       spinning: false,
       spinning: false,
       tableHeight: 0,
       tableHeight: 0,
-      time: [
-        getDate.getThreeMonthDays().starttime,
-        getDate.getCurrMonthDays().endtime
-      ],
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        beginDate: getDate.getThreeMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
         subareaSn: undefined,
         subareaSn: undefined,
         subareaAreaSn: undefined,
         subareaAreaSn: undefined,
         bizUserSn: undefined
         bizUserSn: undefined
@@ -139,7 +128,8 @@ export default {
         { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '采购数量', dataIndex: 'buyAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'buyAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'storeAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'storeAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已售出数量', dataIndex: 'sellAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '售出数量', dataIndex: 'sellAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已绑质保单数量', dataIndex: 'warrantyAmount', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       ]
     }
     }
   },
   },
@@ -157,35 +147,18 @@ export default {
     handleSearch () {
     handleSearch () {
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
-    //  下推时间  change
-    dateChange (date) {
-      if (date[0] && date[1]) {
-        this.time = date
-      } else {
-        this.time = []
-      }
-      this.queryParam.beginDate = date[0] || ''
-      this.queryParam.endDate = date[1] || ''
-    },
     subareaChange (val) {
     subareaChange (val) {
       this.queryParam.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
       this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
-      this.time = [
-        getDate.getThreeMonthDays().starttime,
-        getDate.getCurrMonthDays().endtime
-      ]
-      this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaAreaSn = undefined
       this.queryParam.subareaAreaSn = undefined
       this.queryParam.bizUserSn = undefined
       this.queryParam.bizUserSn = undefined
       this.totalData = null
       this.totalData = null
       this.$refs.subarea.clearData()
       this.$refs.subarea.clearData()
-      this.$refs.table.clearTable()
+      this.$refs.table.refresh()
     },
     },
     //  导出
     //  导出
     handleExport () {
     handleExport () {