Просмотр исходного кода

bug修复,仓库仓位应传对应sn,不应是id

chenrui 4 лет назад
Родитель
Сommit
5f7b143d03

+ 10 - 1
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -82,7 +82,7 @@
             expand-trigger="hover"
             :allowClear="false"
             :options="warehouseCascadeData"
-            :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+            :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
             id="chainTransferInEdit-warehouseCascade"
             placeholder="请选择仓库仓位"
             style="width: 100%;" />
@@ -290,7 +290,16 @@ export default {
     getWarehouseCascade () {
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
+          res.data.map(item => {
+            item.sn = item.warehouseSn
+            if (item.warehouseLocationList) {
+              item.warehouseLocationList.map(subItem => {
+                subItem.sn = subItem.warehouseLocationSn
+              })
+            }
+          })
           this.warehouseCascadeData = res.data
+          console.log(this.warehouseCascadeData)
         } else {
           this.warehouseCascadeData = []
         }

+ 11 - 3
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -124,7 +124,7 @@
                   expand-trigger="hover"
                   :allowClear="false"
                   :options="warehouseCascadeData"
-                  :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+                  :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
                   id="bulkWarehousingOrderEdit-warehouseCascade"
                   placeholder="请选择仓库仓位"
                   style="width: 100%;" />
@@ -195,7 +195,7 @@
                   expand-trigger="hover"
                   :allowClear="false"
                   :options="warehouseCascadeData"
-                  :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+                  :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
                   id="bulkWarehousingOrderEdit-choose-warehouseCascade"
                   placeholder="请选择仓库仓位"
                   style="width: 100%;" />
@@ -585,7 +585,6 @@ export default {
       const _this = this
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
-          this.warehouseCascadeData = res.data
           res.data.filter(item => {
             // 过滤默认仓库
             if (item.defaultFlag == 1 && item.wasteFlag == 0) { //  defaultFlag为1,且不是废品仓
@@ -600,6 +599,15 @@ export default {
               })
             }
           })
+          res.data.map(item => {
+            item.sn = item.warehouseSn
+            if (item.warehouseLocationList) {
+              item.warehouseLocationList.map(subItem => {
+                subItem.sn = subItem.warehouseLocationSn
+              })
+            }
+          })
+          this.warehouseCascadeData = res.data
         } else {
           this.warehouseCascadeData = []
         }