chenrui 1 yıl önce
ebeveyn
işleme
059edc6bed

+ 3 - 4
src/views/allocationManagement/allocationList/list.vue

@@ -31,7 +31,7 @@
                   v-model="queryParam.state"
                   ref="state"
                   id="allocateBillList-state"
-                  code="ALLOCATE_STATUS"
+                  code="ALLOCATE_STATUS2"
                   placeholder="请选择业务状态"
                   allowClear
                 ></v-select>
@@ -216,7 +216,7 @@ export default {
         { title: '省份', dataIndex: 'provinceName', align: 'center', width: '80px', customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '120px', fixed: 'left' },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '120px', align: 'center' },
-        { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户类型', dataIndex: 'dealerInfo.dealerLevelDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -230,7 +230,7 @@ export default {
         { title: '业务状态', dataIndex: 'stateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货创建时间', dataIndex: 'sendBill.createDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
 
-        { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货状态', dataIndex: 'sendBill.sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendBill.sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'sendBill.customerCacateName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -305,7 +305,6 @@ export default {
       this.allocateTypeVal = []
       this.$refs.receiverSn.resetForm()
       this.$refs.table.refresh(true)
-      this.$refs.table.refresh()
     },
     pageInit () {
       const _this = this

+ 15 - 15
src/views/common/area.js

@@ -38,25 +38,25 @@ const Area = {
       default: ''
     }
   },
-  data() {
+  data () {
     return {
       defaultVal: this.value,
       list: []
-    };
+    }
   },
   watch: {
-    value(newValue, oldValue) {
+    value (newValue, oldValue) {
       console.log(newValue)
       this.defaultVal = newValue
     },
-    parentId(newValue,oldValue){
-      if(this.leve != 'province'&&newValue){
+    parentId (newValue, oldValue) {
+      if (this.leve != 'province' && newValue) {
         this.getList(this.leve)
       }
     }
   },
-  mounted() {
-    if(this.leve == 'province'){
+  mounted () {
+    if (this.leve == 'province') {
       this.getList(this.leve)
     }
   },
@@ -66,12 +66,12 @@ const Area = {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    handleChange(value) {
+    handleChange (value) {
       console.log(value)
-      this.defaultVal = value;
+      this.defaultVal = value
       const item = this.list.find(item => item[this.defValKey] == value)
-      this.$emit('change', this.value, item);
-      this.$emit('input', value);
+      this.$emit('change', value, item)
+      this.$emit('input', value)
     },
     //  省/市/区
     getList (leve) {
@@ -96,10 +96,10 @@ const Area = {
         }
       })
     },
-    clearData(){
+    clearData () {
       this.list = []
     }
-  },
-};
+  }
+}
 
-export default Area
+export default Area

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -248,7 +248,7 @@ export default {
         { title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'billStatus', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
         { title: '托运日期', dataIndex: 'sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },

+ 26 - 9
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -44,7 +44,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="salesReturn-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                  <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -89,7 +89,7 @@
           <template slot="tip" slot-scope="text, record">
             <a-tooltip placement="top" v-if="record.customerServiceConfirmOverDay && record.customerServiceConfirmOverDay*1>3">
               <template slot="title">
-                <span>已超时{{ record.dispatchOverDay }}天(要求提货后3-5天内完成清点)</span>
+                <span>已超时{{ record.customerServiceConfirmOverDay }}天(要求提货后3-5天内完成清点)</span>
               </template>
               <div>
                 <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
@@ -133,8 +133,10 @@ export default {
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
       ],
       queryParam: { //  查询条件
-        submitBeginDate: getDate.getCurrMonthDays().starttime,
-        submitEndDate: getDate.getCurrMonthDays().endtime,
+        beginSubmitDate: getDate.getCurrMonthDays().starttime,
+        endSubmitDate: getDate.getCurrMonthDays().endtime,
+        beginAuditDate: undefined,
+        endAuditDate: undefined,
         buyerSn: undefined,
         buyerName: undefined,
         subareaArea: {
@@ -144,6 +146,7 @@ export default {
         goodFlag: undefined,
         salesReturnBillNo: '', //  单号
         billStatus: undefined, //  业务状态
+        provinceName: undefined,
         provinceSn: undefined,
         salesReturnType: undefined// 退货类别
       },
@@ -188,7 +191,7 @@ export default {
         { title: '退货类型', dataIndex: 'salesReturnTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
 
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '申请退货金额', dataIndex: 'initialAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        // { title: '申请退货金额', dataIndex: 'initialAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '退货申请审核时间', dataIndex: 'updateDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提货审核时间', dataIndex: 'auditTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货时间', dataIndex: 'receiveTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
@@ -207,8 +210,13 @@ export default {
   methods: {
     //  提交时间  change
     dateChange (date) {
-      this.queryParam.submitBeginDate = date[0]
-      this.queryParam.submitEndDate = date[1]
+      this.queryParam.beginSubmitDate = date[0]
+      this.queryParam.endSubmitDate = date[1]
+    },
+    // 审核时间
+    dateExamineChange (date) {
+      this.queryParam.beginAuditDate = date[0]
+      this.queryParam.endAuditDate = date[1]
     },
     // 客户名称
     custChange (val) {
@@ -228,8 +236,11 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.submitBeginDate = getDate.getCurrMonthDays().starttime
-      this.queryParam.submitEndDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.beginSubmitDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.endSubmitDate = getDate.getCurrMonthDays().endtime
+
+      this.queryParam.beginAuditDate = undefined
+      this.queryParam.endAuditDate = undefined
 
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
@@ -239,6 +250,7 @@ export default {
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.billStatus = undefined
       this.queryParam.provinceSn = undefined
+      this.queryParam.provinceName = undefined
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
@@ -248,6 +260,11 @@ export default {
     handleDetail (row) {
       this.$router.push({ name: 'salesReturnDetail', params: { sn: row.salesReturnBillSn }, query: { path: 'returnSchedule' } })
     },
+    // 选择省份
+    chooseArea (con, item) {
+      this.queryParam.provinceSn = con
+      this.queryParam.provinceName = item.name
+    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调