优化

src/views/produce/components/picking/pickingList.vue

@@ -65,7 +65,7 @@
             </template>
 
             <template v-slot:code="{ row }">
-              {{ row.rootCategoryLevelId == 4 ? row.codeNumber : row.code }}
+          {{ row.rootCategoryLevelId == 4 ? row.codeNumber : row.code }}
             </template>
 
             <template v-slot:runStatus="{ row }">
@@ -78,7 +78,8 @@
             </template>
 
             <template v-slot:status="{ row }">
-              <span :style="{ color: row.status == 0 ? '#157A2C' : '#FFA929' }"
+              <span
+                :style="{ color: row.status == 0 ? '#157A2C' : '#FFA929' }"
                 >{{
                   row.status == 0 ? '空闲' : row.status == 1 ? '占用' : ''
                 }}</span
@@ -143,7 +144,11 @@
 <script>
   import AssetTree from '../../components/assetTree.vue';
   import pickingListSearch from './pickingListSearch.vue';
-  import { pageeLedgerMain, assetPage, listInProduct  } from '@/api/produce/workOrder';
+  import {
+    pageeLedgerMain,
+    assetPage,
+    listInProduct
+  } from '@/api/produce/workOrder';
 
   export default {
     components: { AssetTree, pickingListSearch },
@@ -385,7 +390,7 @@
     watch: {},
     methods: {
       /* 表格数据源 */
-      datasource({ page, where, limit }) {
+      async datasource({ page, where, limit }) {
         let URL;
 
         let param = {
@@ -415,13 +420,54 @@
         if (this.isCategory) {
           return URL(param);
         } else {
-          return URL({
+          const res = await URL({
             ...where,
             pageNum: page,
             categoryLevelId: this.categoryLevelId,
-            size: limit,
-        
+            size: limit
           });
+
+          if (this.rootCategoryLevelId == '11') {
+            let _res = res
+            let _list = []
+            _res.list.forEach(e => {
+							if (e.aridRegionList && e.aridRegionList.length != 0) {
+								e.aridRegionList.map(i => {
+									let obj = {
+										name: e.name,
+										region: e.extInfo.region,
+										rootCategoryLevelId: e.rootCategoryLevelId,
+										...i,
+										instanceId: i.id,
+									}
+									_list.push(obj)
+
+								})
+							}
+						})
+            res.list = _list
+            return res;
+
+          } else {
+            let _res = res
+            let _list = []
+
+            _list.push(
+							..._res.list.map(i => {
+								const warehouseId = i.pathIds && i.pathIds.split(',')[0]
+
+								return {
+									warehouseId,
+									...i,
+									instanceId: i.id,
+								}
+							})
+						)
+
+
+            res.list = _list
+            return res;
+          }
         }
       },