9/10 优化

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -547,10 +547,10 @@ export default {
       // this.$router.push({ path: '/tagCodeBlank', query: { workplaceId: this.list[index].workPlaceCode , billNo: this.list[index].billNo }});
 
       let temp = this.list[index];
-      if (temp != null && temp.invAlert == 2) {
-        this.$message.warning("工位存量不足，请及时上货！");
-        return;
-      }
+      // if (temp != null && temp.invAlert == 2) {
+      //   this.$message.warning("工位存量不足，请及时上货！");
+      //   return;
+      // }
       this.$router.push({query: {...this.$route.query, billNo: this.list[index].billNo}, path: this.$route.path})
       this.callParentMethod(index)
     },

src/views/collect/IoDestroyLog.vue

@@ -660,9 +660,10 @@ import {isBlank} from "@/utils/strUtil";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import { desOrderPage,getBizDetailList,getCodeList } from '@/api/collect/IoDestroy'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
-  name: "IoDestroyLog",
+  name: "IoDestroyLog1",
   data() {
     return {
       busQuery: {
@@ -693,6 +694,7 @@ export default {
         getWorkPlaceList: [],
         getDeptList: [],
         getBusType: [],
+        findWorkPlace: [],
       },
       //界面配置---------------------end
 
@@ -1018,25 +1020,26 @@ export default {
         .catch(() => {
         });
     },
-    getWorkPlaceList(_this){
-      getUserBindWork({
-        autoUserId: 1,
-        page:  1,
-        limit: 200,
-      }).then((response) => {
-        let  getWorkPlaceList = []
-        if(response.code == 20000 && response.data.list.length > 0){
-          response.data.list.forEach( item => {
-            let post = {
-              code: item.workplaceId,
-                label: item.workplaceName
-            }
-            getWorkPlaceList.push(post)
-          })
-          _this.options.getWorkPlaceList = getWorkPlaceList
-        }
-      })
+    findWorkPlace(_this,val){
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
         .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
         });
     },
 
@@ -1190,7 +1193,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    this.getWorkPlaceList(this);
+    this.findWorkPlace(this,"");
 
 
     getHead("IoDestroyLog", "1").then((re) => {

src/views/collect/IoDestroyOrder.vue

@@ -250,6 +250,7 @@ import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {executeFuc, getHead} from '@/utils/customConfig'
 import {getSplitCode} from '@/api/collect/collectOrder'
 import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
   name: 'IoDestroyOrder',
@@ -279,6 +280,8 @@ export default {
       options: {
         getWorkPlaceList: [],
         getBusType: [],
+        findWorkPlace: [],
+
       },
       actDateRange: [],
       pickerOptions: {
@@ -365,27 +368,7 @@ export default {
       this.filterQuery.orderBy = column.prop;
       this.getList();
     },
-    getWorkPlaceList(_this) {
-      getUserBindWork({
-        autoUserId: 1,
-        page: 1,
-        limit: 200,
-      }).then((response) => {
-        let getWorkPlaceList = []
-        if (response.code == 20000 && response.data.list.length > 0) {
-          response.data.list.forEach(item => {
-            let post = {
-              code: item.workplaceId,
-              label: item.workplaceName
-            }
-            getWorkPlaceList.push(post)
-          })
-          _this.options.getWorkPlaceList = getWorkPlaceList
-        }
-      })
-        .catch(() => {
-        });
-    },
+
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -442,11 +425,30 @@ export default {
       this.destroyOutDialogVisible = false
       this.getList()
     },
+    findWorkPlace(_this,val){
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
+        });
+    },
   },
   filters: {},
-  mounted() {
-    this.getWorkPlaceList(this);
-  },
   created() {
 
     if (this.$route.query.workplaceId != null) {
@@ -454,6 +456,7 @@ export default {
       this.filterQuery.workPlaceCode = this.$route.query.workplaceId
       this.showType = 2
     }
+    this.findWorkPlace(this,"")
 
     getHead("ioSplitCode", "1").then((re) => {
       // 处理返回的数据

src/views/collect/IoSplitFifoCodePanel.vue

@@ -669,7 +669,7 @@ import {materialCodePage, materialPrescribePage, splitFifoDetail} from "@/api/in
 import {splitFifoPage} from "@/api/inout/splitInv";
 import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
 import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain'
-import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { filterWorkOptimize, listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
 import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue";
 import destroyOutDialog from "./destroyOutDialog.vue";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
@@ -845,7 +845,14 @@ export default {
       // this.filterQuery.fifoSplit = this.panelType
       splitFifoPage(this.filterQuery).then(res => {
         this.loading = false
-        this.list = res.data.list || []
+        let dataList = res.data.list
+        dataList.forEach(item => {
+          // 检查busName是否为null
+          if (item.busName === null) {
+            item.busName = "共享库存";
+          }
+        });
+        this.list = dataList || []
         this.total = res.data.total || 0
       }).catch(() => {
         this.loading = false
@@ -937,27 +944,27 @@ export default {
     enterKey(_this, event) {
       _this.onSubmit();
     },
-    findWorkPlace(_this, query){
-      let cQuery = {
-        key: query,
+    findWorkPlace(_this, val) {
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
         page: 1,
         limit: 10,
-      };
-      listPage(cQuery).then(res => {
-        if (res.code == 20000){
-          let workPlaces = res.data.list || [];
-          // _this.options.getWorkPlace = res.data.list || [];
-          let getWorkPlace = workPlaces.map(workplace => {
-            return {
-              code: workplace.workplaceId,
-              label: workplace.workplaceName
-            };
-          });
-          _this.options.findWorkPlace = getWorkPlace
-        }
-      }).catch(() => {
-        _this.options.findWorkPlace = [];
-      });
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
+        });
     },
 
     invRemindSet(_this,row) {

src/views/collect/IoSplitFifoRemind.vue

@@ -215,7 +215,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import {splitFifoPage} from "@/api/inout/splitInv";
 import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
-import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { filterWorkOptimize, listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
@@ -392,28 +392,28 @@ export default {
     enterKey(_this, event) {
       _this.onSubmit();
     },
-    findWorkPlace(_this, query){
-      let cQuery = {
-        key: query,
+    findWorkPlace(_this,val){
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
         page: 1,
         limit: 10,
-      };
-      listPage(cQuery).then(res => {
-        if (res.code == 20000){
-          let workPlaces = res.data.list || [];
-          let getWorkPlace = workPlaces.map(workplace => {
-            return {
-              code: workplace.workplaceId,
-              label: workplace.workplaceName
-            };
-          });
-          _this.options.findWorkPlace = getWorkPlace
-        }
-      }).catch(() => {
-        _this.options.findWorkPlace = [];
-      });
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
+        });
     },
-
   },
   created() {
     if (this.$route.query.workplaceId != null) {

src/views/collect/IoSplitFinishCode.vue

@@ -689,6 +689,7 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeList} from "@/api/inout/code";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
   name: "IoSplitFinishCode",
@@ -722,6 +723,7 @@ export default {
         getWorkPlaceList: [],
         getDeptList: [],
         getBusType: [],
+        findWorkPlace: [],
       },
       //界面配置---------------------end
 
@@ -1212,7 +1214,28 @@ export default {
         this.resultTotal = 0;
       });
     },
-
+    findWorkPlace(_this,val){
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
+        });
+    },
   },
   mounted() {
     document.body.ondrop = function (event) {
@@ -1223,7 +1246,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    this.getWorkPlaceList(this);
+    this.findWorkPlace(this,"");
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {

src/views/collect/IoSplitOperateCode.vue

@@ -691,6 +691,7 @@ import {getCodeList} from "@/api/inout/code";
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 import IoCreateOrder from '@/views/collect/IoCreateOrder.vue'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 
 export default {
   props:{
@@ -726,9 +727,10 @@ export default {
       defaultSort: {prop: 'createTime', order: 'desc'},
       options: {
         getInvList: [],
-        getWorkPlaceList: [],
         getDeptList: [],
         getBusType: [],
+        getWorkPlaceList: [],
+        findWorkPlace: [],
       },
       //界面配置---------------------end
 
@@ -753,7 +755,7 @@ export default {
         startTime: null,
         endTime: null,
         keyWords: null,
-        invCode: this.$store.getters.locInvCode,
+        // invCode: this.$store.getters.locInvCode,
         vueType: null,
       },
       fromOptions: [],
@@ -982,7 +984,11 @@ export default {
     //获取订单列表
     getList() {
       this.loading = true;
-      this.filterQuery.workPlaceCode = this.workplaceId
+        if (this.$route.query.workplaceId != null) {
+          this.isLinkDisabled = true
+          this.workplaceId = this.$route.query.workplaceId
+          this.filterQuery.workPlaceCode = this.workplaceId
+        }
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -1065,25 +1071,26 @@ export default {
         .catch(() => {
         });
     },
-    getWorkPlaceList(_this){
-      getUserBindWork({
-        autoUserId: 1,
-        page:  1,
-        limit: 200,
-      }).then((response) => {
-        let  getWorkPlaceList = []
-        if(response.code == 20000 && response.data.list.length > 0){
-          response.data.list.forEach( item => {
-            let post = {
-              code: item.workplaceId,
-                label: item.workplaceName
-            }
-            getWorkPlaceList.push(post)
-          })
-          _this.options.getWorkPlaceList = getWorkPlaceList
-        }
-      })
+    findWorkPlace(_this,val){
+      let query = {
+        // chargeUser: _this.$store.getters.userId,
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10,
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
         .catch(() => {
+          _this.loading = false;
+          _this.options.getWorkPlaceList = [];
         });
     },
 
@@ -1237,7 +1244,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    this.getWorkPlaceList(this);
+    this.findWorkPlace(this,"");
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {