Browse Source

bug 修复

lilei 3 years ago
parent
commit
cdbabc6aeb

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1655455092213
+  "version": 1655707326996
 }
 }

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -138,7 +138,7 @@
             <a-badge count="急" v-if="record.oosFlag == 1">
             <a-badge count="急" v-if="record.oosFlag == 1">
               <div style="padding-right: 15px;">{{ text }}</div>
               <div style="padding-right: 15px;">{{ text }}</div>
             </a-badge>
             </a-badge>
-            <a-badge count="缺" v-else-if="record.currentStockQty < record.qty">
+            <a-badge count="缺" v-else-if="!record.currentStockQty || record.currentStockQty < record.qty">
               <div style="padding-right: 15px;">{{ text }}</div>
               <div style="padding-right: 15px;">{{ text }}</div>
             </a-badge>
             </a-badge>
             <span v-else>{{ text }}</span>
             <span v-else>{{ text }}</span>
@@ -629,7 +629,7 @@ export default {
             const vm = this
             const vm = this
             const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.salesBillSource && vm.detailData.salesBillSource == 'PURCHASE') ? '' : vm.detailData.buyerSn
             const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.salesBillSource && vm.detailData.salesBillSource == 'PURCHASE') ? '' : vm.detailData.buyerSn
             const priceType = vm.$route.params.priceType
             const priceType = vm.$route.params.priceType
-            vm.$refs.partQuery.pageInit(buyerSn, priceType)
+            vm.$refs.partQuery.pageInit(buyerSn, priceType, vm.salesBillSn)
           }
           }
         }
         }
       })
       })

+ 3 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -188,6 +188,7 @@ export default {
       defImg,
       defImg,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         customerSn: '',
         customerSn: '',
+        salesBillSn: '',
         salePriceType: '',
         salePriceType: '',
         productCode: '', //  产品编码
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productName: '', //  产品名称
@@ -379,9 +380,10 @@ export default {
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
       this.vinInfoData = null
       this.vinInfoData = null
     },
     },
-    pageInit (buyerSn, priceType) {
+    pageInit (buyerSn, priceType, salesBillSn) {
       this.priceType = priceType || ''
       this.priceType = priceType || ''
       this.buyerSn = buyerSn || ''
       this.buyerSn = buyerSn || ''
+      this.queryParam.salesBillSn = salesBillSn || ''
       if (this.onlyList) { // 不清空查询条件
       if (this.onlyList) { // 不清空查询条件
         this.$refs.table.refresh()
         this.$refs.table.refresh()
       } else {
       } else {