lilei 3 éve
szülő
commit
d8ad7f22b2

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -73,7 +73,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return stockDetailList(Object.assign(parameter, { stockSn: this.itemId })).then(res => {
+        return stockDetailList(Object.assign(parameter, { stockSn: this.itemId, isSellOut: '0' })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -81,7 +81,7 @@ export default {
           }
           this.disabled = false
           // 总计
-          this.getTotal(Object.assign(parameter, { stockSn: this.itemId }))
+          this.getTotal(Object.assign(parameter, { stockSn: this.itemId, isSellOut: '0' }))
           return data
         })
       },

+ 11 - 1
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -198,7 +198,17 @@ export default {
       shippingAddressQuery({ defaultFlag: 1 }).then(res => {
         if (res.status == 200) {
           if (res.data.length == 1) {
-            res.data[0].address = res.data[0].provinceName + '-' + res.data[0].cityName + '-' + res.data[0].countyName + '-' + res.data[0].addr
+            res.data[0].address = ''
+            if (res.data[0].provinceName) {
+              res.data[0].address += res.data[0].provinceName + '-'
+            }
+            if (res.data[0].cityName) {
+              res.data[0].address += res.data[0].cityName + '-'
+            }
+            if (res.data[0].countyName) {
+              res.data[0].address += res.data[0].countyName + '-'
+            }
+            res.data[0].address += res.data[0].addr
             this.addressId = res.data[0].id || undefined
             this.handleOk(res.data[0])
           }