fix: 修改

src/views/collect/CollectOrderAllotBlank.vue

@@ -7,9 +7,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
+
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</span>

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -219,10 +219,10 @@
         <!-- 分割线 -->
         <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true"
                  style="margin-top: 15px">
-          <el-form-item prop="key" label="采集工位:">
+          <el-form-item prop="key" label="作业工位:">
             <el-select
               v-model="filterQuery.workPlaceCode"
-              placeholder="请选择采集工位"
+              placeholder="请选择作业工位"
               filterable
               remote
               clearable>

src/views/collect/CollectOrderEndBlank.vue

@@ -1,15 +1,19 @@
 <template>
   <div>
 
-    <el-row :gutter="0" v-if="isLinkDisabled">
+    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
       <el-col :span="24" align="right">
         <div class="inv-hos-title">
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
+
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
+              this.userInfo.companyName
+            }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
+          >({{
               this.userInfo.userName
             }})</span>
         </div>
@@ -18,10 +22,20 @@
 
 
 
-    <prescribePanel
+    <el-tabs type="border-card" style="margin: 15px">
-      :RowType="type"
 
+      <el-tab-pane label="已完成赋码单据">
+        <prescribePanel
+          style="margin: -15px"
         ></prescribePanel>
+      </el-tab-pane>
+
+      <el-tab-pane label="扫码查询">
+        <codePanel style="margin: -15px"
+        ></codePanel>
+      </el-tab-pane>
+
+    </el-tabs>
 
 
   </div>

src/views/collect/DealOrder.vue

@@ -412,17 +412,17 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo, workPlaceCode) {
+    getBillNo(billNo) {
       let post = {
         billNo: billNo,
-        workPlaceCode: workPlaceCode,
+        workPlaceCode: this.workplaceId,
         page: 1,
         limit: 10,
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0) {
+          if (res.data.billNo != null) {
-            this.formData = res.data.list[0]
+            this.formData = res.data
           }
         }
       })
@@ -440,8 +440,12 @@ export default {
         if (res.code == 20000) {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
-          if (this.busTypeList.length == 1) {
 
+          if (this.formData.billNo != null) {
+            this.getBillNo(this.formData.billNo)
+            this.startDeal();
+          } else {
+            if (this.busTypeList.length == 1) {
               let busType = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
               this.selectBusTypeDisabled = false
@@ -449,16 +453,12 @@ export default {
               if (this.formDataVisible.scanType == 1) {
                 this.findFromInvList("");
               }
-            if (this.formData.billNo != null) {
-              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
-              this.startDeal();
             } else {
+              this.formData.busType = null
+            }
             this.findCurOrder();
           }
 
-          } else {
-            this.formData.busType = null
-          }
         }
         return
       })
@@ -902,7 +902,9 @@ export default {
     }
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
+      if (this.$route.query.billNo == null) {
         this.selectBusTypeDisabled = true
+      }
       this.corpOrderIdDisabled = true
       this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);

src/views/collect/DealOrderBlank.vue

@@ -415,17 +415,17 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo, workPlaceCode) {
+    getBillNo(billNo) {
       let post = {
         billNo: billNo,
-        workPlaceCode: workPlaceCode,
+        workPlaceCode: this.workplaceId,
         page: 1,
         limit: 10,
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0) {
+          if (res.data.billNo != null) {
-            this.formData = res.data.list[0]
+            this.formData = res.data
           }
         }
       })
@@ -443,8 +443,12 @@ export default {
         if (res.code == 20000) {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
-          if (this.busTypeList.length == 1) {
 
+          if (this.formData.billNo != null) {
+            this.getBillNo(this.formData.billNo)
+            this.startDeal();
+          } else {
+            if (this.busTypeList.length == 1) {
               let busType = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
               this.selectBusTypeDisabled = false
@@ -452,16 +456,12 @@ export default {
               if (this.formDataVisible.scanType == 1) {
                 this.findFromInvList("");
               }
-            if (this.formData.billNo != null) {
-              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
-              this.startDeal();
             } else {
+              this.formData.busType = null
+            }
             this.findCurOrder();
           }
 
-          } else {
-            this.formData.busType = null
-          }
         }
         return
       })
@@ -905,7 +905,9 @@ export default {
     }
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
+      if (this.$route.query.billNo == null) {
         this.selectBusTypeDisabled = true
+      }
       this.corpOrderIdDisabled = true
       this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);

src/views/collect/IoCreateOrder.vue

@@ -14,9 +14,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
+
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
               <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
                   this.userInfo.companyName
                 }}</span>
@@ -313,6 +311,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
+import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: "ioCreateOrder",
@@ -367,6 +366,7 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
+        userId: this.$store.getters.userId,
         companyName: this.$store.getters.companyName,
       },
       workplaceId: null,
@@ -954,13 +954,13 @@ export default {
     //获取当前货位
     findCurWorkPlaces(val) {
       let query = {
-        key: val,
+        // key: val,
-        status: 1,
+        // status: 1,
-        // invCode: this.orderFormData.invCode,
+        userId: this.userInfo.userId,
         page: 1,
         limit: 100,
       }
-      listPage(query).then((res) => {
+      getUserBindWork(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
         if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
           this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;

src/views/collect/IoCreateOrderBlank.vue

@@ -14,9 +14,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
+
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
               <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
                   this.userInfo.companyName
                 }}</span>
@@ -157,7 +155,7 @@
           </el-col>
           <el-col :span="8" v-if="splitType=='out'">
             <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
-              <el-radio-group v-model="orderFormData.fifoSplit">
+              <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable">
                 <el-radio :label="1">拆零上货</el-radio>
                 <el-radio :label="2">整取上货</el-radio>
               </el-radio-group>
@@ -313,6 +311,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
+import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: "ioCreateOrder",
@@ -367,6 +366,7 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
+        userId: this.$store.getters.userId,
         companyName: this.$store.getters.companyName,
       },
       workplaceId: null,
@@ -517,7 +517,9 @@ export default {
       scanResultType: "success",
       msgTip: "当前工位存量提醒：",
       splitType: null,
-      rowData: {}
+      rowData: {},
+      curWorkPlace: null,
+      fifoSplitEnable: false,
     };
   },
   components: {
@@ -532,15 +534,12 @@ export default {
       let post = {
         workPlaceCode: val
       }
+      this.defaultSplitType()
       findInvRemind(post).then((response) => {
         if (response.code === 20000) {
           this.msgTip = response.data
-        } else {
-
         }
-      })
+      }).catch(() => {
-        .catch(() => {
-
       });
     },
     successCloseData() {
@@ -566,10 +565,21 @@ export default {
         sickerAdNum: null,
         workPlaceCode: null,
         fifoSplit: 1,
+
       }
       this.orderFormData.workPlaceCode = workPlaceCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
+
+
+      this.splitType = this.$route.query.splitType;
+      if (this.splitType == "search") {
+      } else if (this.splitType == "out") {
+        this.orderFormData.action = 'SC72197936495755';
+      } else if (this.splitType == "return") {
+        this.orderFormData.action = 'SC72249388338364';
+      }
+      this.orderFormData.fromCorp = "72198012799726";
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -592,6 +602,16 @@ export default {
         .catch(() => {
         });
     },
+    defaultSplitType() {
+      this.curWorkPlace = this.curWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode);
+      this.orderFormData.fifoSplit = this.curWorkPlace.workplaceType
+      if (this.curWorkPlace.workplaceType == 1 || this.curWorkPlace.workplaceType == 2) {
+        this.fifoSplitEnable = true;
+      } else {
+        this.orderFormData.fifoSplit = 1;
+        this.fifoSplitEnable = false;
+      }
+    },
     //仓库改变
     changeInv(row) {
       this.orderFormData.action = null;
@@ -934,16 +954,17 @@ export default {
     //获取当前货位
     findCurWorkPlaces(val) {
       let query = {
-        key: val,
+        // key: val,
-        status: 1,
+        // status: 1,
-        // invCode: this.orderFormData.invCode,
+        userId: this.userInfo.userId,
         page: 1,
         limit: 100,
       }
-      listPage(query).then((res) => {
+      getUserBindWork(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1) {
+        if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
           this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+          this.defaultSplitType()
         }
       })
     },
@@ -1220,6 +1241,10 @@ export default {
 
     refreshOrder(orderQuery) {
       this.orderFormData = orderQuery;
+      this.scanCode = "";
+      this.result = "";
+      this.refreshCodesPanel()
+      this.init();
     },
 
     //撤回单据
@@ -1456,9 +1481,9 @@ export default {
     closeChooseDialog() {
       this.chooseDraftOrderVisible = false
     },
-    handleChoose(billNo){
+    handleChoose(currentRow) {
-      this.orderFormData.billNo = billNo
+      this.orderQuery = currentRow
-      this.refreshCodesPanel();
+      this.refreshOrder(this.orderQuery)
     },
     draftOrder() {
       let tQuery = Object.assign(
@@ -1720,8 +1745,6 @@ export default {
     init() {
       //页面初始化
       this.codeFormData.code = "";
-
-      this.splitType = this.$route.query.splitType;
       if (this.splitType == "search") {
       } else if (this.splitType == "out") {
         this.orderFormData.action = 'SC72197936495755';
@@ -1795,6 +1818,7 @@ export default {
     inputer.focus();
   },
   created() {
+    this.splitType = this.$route.query.splitType;
     this.init();
     if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true

src/views/collect/ioSplitFifoCode.vue

@@ -1,11 +1,17 @@
 <template>
   <div>
-    <el-row :gutter="0" v-if="isLinkDisabled">
+
+
+    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
       <el-col :span="24" align="right">
         <div class="inv-hos-title">
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
+
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
+              this.userInfo.companyName
+            }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
           >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{

src/views/collect/ioSplitFifoCodeBlank.vue

@@ -8,9 +8,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
+
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</span>