Browse Source

bug 修复

lilei 3 years ago
parent
commit
09434fb688

+ 9 - 7
src/views/salesManagement/receiptPrint/list.vue

@@ -21,7 +21,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客户名称">
                 <a-form-item label="客户名称">
-                  <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
+                  <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -37,7 +37,7 @@
                 </a-col>
                 </a-col>
                 <a-col :md="6" :sm="24">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="收货客户名称">
                   <a-form-item label="收货客户名称">
-                    <a-input id="salesCollectionList-receiverName" v-model.trim="queryParam.receiverName" allowClear placeholder="请输入收货客户名称"/>
+                    <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
                   </a-form-item>
                   </a-form-item>
                 </a-col>
                 </a-col>
                 <a-col :md="6" :sm="24">
                 <a-col :md="6" :sm="24">
@@ -266,10 +266,10 @@ export default {
       this.queryParam.endDate = date[1]
       this.queryParam.endDate = date[1]
     },
     },
     custChange (val) {
     custChange (val) {
-      this.queryParam.buyerSn = val.key
+      this.queryParam.settleClientName = val.name
     },
     },
-    shcustChange (val) {
-      this.queryParam.buyerSn = val.key
+    receiverChange (val) {
+      this.queryParam.receiverName = val.name
     },
     },
     // 销售单详情
     // 销售单详情
     handleDetail (row) {
     handleDetail (row) {
@@ -300,9 +300,11 @@ export default {
     // 重置
     // 重置
     resetSearchForm () {
     resetSearchForm () {
       this.time = []
       this.time = []
-      this.$nextTick(() => {
+      if (this.advanced) {
         this.$refs.rangeDate.resetDate(this.time)
         this.$refs.rangeDate.resetDate(this.time)
-      })
+        this.$refs.receiverName.resetForm()
+      }
+      this.$refs.settleClientName.resetForm()
       this.queryParam = {
       this.queryParam = {
         beginDate: '',
         beginDate: '',
         endDate: '',
         endDate: '',

+ 21 - 12
src/views/salesManagement/salesCollection/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="客户名称">
               <a-form-item label="客户名称">
-                <a-input id="salesCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入客户名称"/>
+                <dealerSubareaScopeList ref="settleClientName" id="salesCollectionList-settleClientName" @change="custChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
@@ -28,7 +28,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="收货客户名称">
                 <a-form-item label="收货客户名称">
-                  <a-input id="salesCollectionList-receiverName" v-model.trim="queryParam.receiverName" allowClear placeholder="请输入收货客户名称"/>
+                  <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -44,7 +44,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款时间">
                 <a-form-item label="收款时间">
-                  <rangeDate ref="rangeSettleDate" @change="dateSettleChange" />
+                  <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
@@ -210,12 +210,13 @@ import Area from '@/views/common/area.js'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import detailModal from './detailModal.vue'
 import detailModal from './detailModal.vue'
 import voucherModal from './voucherModal.vue'
 import voucherModal from './voucherModal.vue'
+import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
 import { settleReceiptList, settleReceiptBatch } from '@/api/settleReceipt'
 
 
 export default {
 export default {
   name: 'SalesCollectionList',
   name: 'SalesCollectionList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal },
+  components: { STable, VSelect, subarea, rangeDate, commonModal, detailModal, Area, voucherModal,dealerSubareaScopeList },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -224,8 +225,8 @@ export default {
       showVoucher: false,
       showVoucher: false,
       tableHeight: 0,
       tableHeight: 0,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
-        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDate: '',
+        endDate: '',
         bizNo: '',
         bizNo: '',
         dispatchBillNo: '',
         dispatchBillNo: '',
         beginDateSettle: '',
         beginDateSettle: '',
@@ -244,10 +245,8 @@ export default {
         dealerCountySn: undefined
         dealerCountySn: undefined
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
-      auditDate: [
-        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
-        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
-      ], //  审核时间
+      auditDate: [], //  审核时间
+      settleDate: [],
       advanced: false,
       advanced: false,
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -314,6 +313,12 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    custChange (val) {
+      this.queryParam.settleClientName = val.name
+    },
+    receiverChange(val){
+      this.queryParam.receiverName = val.name
+    },
     // 表格选中项
     // 表格选中项
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null
@@ -330,12 +335,16 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.auditDate = []
       this.$refs.rangeAuditDate.resetDate(this.auditDate)
       this.$refs.rangeAuditDate.resetDate(this.auditDate)
+      this.$refs.settleClientName.resetForm()
       if (this.advanced) { //  查询条件未展开时,该组件未渲染
       if (this.advanced) { //  查询条件未展开时,该组件未渲染
+        this.settleDate = []
         this.$refs.rangeSettleDate.resetDate()
         this.$refs.rangeSettleDate.resetDate()
+        this.$refs.receiverName.resetForm()
       }
       }
-      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
       this.queryParam.bizNo = ''
       this.queryParam.bizNo = ''
       this.queryParam.dispatchBillNo = ''
       this.queryParam.dispatchBillNo = ''
       this.queryParam.beginDateSettle = ''
       this.queryParam.beginDateSettle = ''

+ 1 - 2
src/views/salesManagement/waitDispatch/edit.vue

@@ -184,7 +184,6 @@ export default {
     // 已选产品  blur
     // 已选产品  blur
     onCellBlur (val, record) {
     onCellBlur (val, record) {
       const _this = this
       const _this = this
-      _this.dataSource = record
       if (val && val != record.qtyBackups) {
       if (val && val != record.qtyBackups) {
         _this.spinning = true
         _this.spinning = true
         updateQty({
         updateQty({
@@ -192,11 +191,11 @@ export default {
           qty: record.qty,
           qty: record.qty,
           salesBillSn: _this.salesBillSn
           salesBillSn: _this.salesBillSn
         }).then(res => {
         }).then(res => {
-          _this.resetSearchForm(true)
           if (res.status == 200) {
           if (res.status == 200) {
             _this.$refs.partQuery.resetCurForm()
             _this.$refs.partQuery.resetCurForm()
             _this.$message.success(res.message)
             _this.$message.success(res.message)
             _this.spinning = false
             _this.spinning = false
+            _this.resetSearchForm(true)
           } else {
           } else {
             _this.spinning = false
             _this.spinning = false
           }
           }