fix: 提交

src/views/collect/IoCreateOrder.vue

@@ -132,15 +132,15 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6" v-if="!corpOrderIdDisabled">
-            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled">
+          <el-col :span="6" v-if="!isLinkDisabled">
+            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" >
               <el-select
                 v-model="orderFormData.workPlaceCode"
                 placeholder="当前工位"
                 style="width: 90%"
                 :disabled="corpOrderIdDisabled"
                 filterable
-                @change="changeInvRemind"
+                @change="changePlace"
               >
                 <el-option
                   v-for="item in curWorkPlaces"
@@ -157,6 +157,30 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="6" v-if="!isLinkDisabled">
+            <el-form-item prop="busType" class="query-form-item" label="业务类型:" >
+              <el-select
+                v-model="orderFormData.busType"
+                placeholder="业务类型"
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                filterable
+              >
+                <el-option
+                  v-for="item in busTypeList"
+                  :key="item.documentTypeCode"
+                  :label="item.busName"
+                  :value="item.documentTypeCode"
+                >
+                  <span style="float: left">{{ item.busName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.documentTypeCode
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6" v-if="splitType=='out'">
             <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
               <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
@@ -315,6 +339,7 @@ import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "ioCreateOrder",
@@ -376,6 +401,13 @@ export default {
   },
   data() {
     return {
+      busTypeList: [],
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
       isLinkDisabled: false,
       userInfo: {
         inv: this.$store.getters.locInvName,
@@ -408,6 +440,7 @@ export default {
         workPlaceCode: null,
         fifoSplit: 1,
         splitBusType: null,
+        busType: null,
       },
 
       detailList: [],
@@ -546,21 +579,24 @@ export default {
     DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
   },
   methods: {
-    changeInvRemind(val) {
-      let post = {
-        workPlaceCode: val
-      }
-      this.defaultSplitType()
-      findInvRemind(post).then((response) => {
-        if (response.code === 20000) {
-          this.msgTip = response.data
-          this.$refs.inputRef.focus();
+    changePlace(val) {
+      this.getWorkBindBusTypes(val)
+      this.$refs.inputRef.focus();
+    },
+    getWorkBindBusTypes(workplaceId) {
+      this.busQuery.workplaceCode = workplaceId
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          this.busTypeList  = res.data.list || []
+          if (this.busTypeList.length == 1) {
+            this.orderFormData.busType = this.busTypeList[0].documentTypeCode
+          } else {
+            this.orderFormData.busType = null
+          }
         }
-      }).catch(() => {
-      });
-
+        return
+      })
     },
-
     splitChange() {
       this.$refs.inputRef.focus();
     },
@@ -1809,8 +1845,8 @@ export default {
         this.findInvListByUser();
         this.showSearch = true
       }
+    },
 
-    }
   },
   filters: {},
   mounted() {

src/views/collect/IoSplitFifoCodePanel.vue

@@ -474,6 +474,7 @@ import { getBasicUnitMaintainsOptimize } from '@/api/basic/basicUnitMaintain'
 import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
 import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue";
 import destroyOutDialog from "./destroyOutDialog.vue";
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: "IoSplitFifoCodePanel",
@@ -491,7 +492,14 @@ export default {
   },
   data() {
     return {
-
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
+      viewType: null,
+      isLinkDisabled: false,
       //界面配置相关
       //扫码查询
       tableHeader: [],
@@ -519,6 +527,7 @@ export default {
         billNo: null,
         page: 1,
         limit: 10,
+        busType: null,
         // key: null
       },
 
@@ -546,7 +555,31 @@ export default {
 
   components: {ioSplitFifoCodeRemindSetDialog,destroyOutDialog},
   methods: {
-
+    changePlace(_this,query) {
+      _this.getWorkBindBusTypes(_this,query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType  = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
       return executeFuc(this, row, type, clickFuc, value);
@@ -706,6 +739,7 @@ export default {
     if (this.$route.query.workplaceId != null) {
       this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
       this.viewType = 1
+      this.isLinkDisabled = true
     }
     this.findWorkPlace(this,"")
     // console.log(this.panelType)

src/views/collect/IoSplitFifoRemind.vue

@@ -228,7 +228,8 @@ export default {
   },
   data() {
     return {
-
+      viewType: null,
+      isLinkDisabled: false,
       //界面配置相关
       //扫码查询
       tableHeader: [],
@@ -386,6 +387,7 @@ export default {
     if (this.$route.query.workplaceId != null) {
       this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
       this.viewType = 1
+      this.isLinkDisabled = true
     }
     this.findWorkPlace(this,"")
     getHead("ioSplitFifoRemind", "1").then((re) => {
@@ -395,7 +397,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
       this.getList();
-    });    
+    });
     this.filterQuery.workPlaceCode = this.workPlaceCode
   }