9/14 判断当前工位是否已经处理单据

src/api/collect/collectOrder.js

@@ -244,3 +244,13 @@ export function findFromCorp(query) {
 }
 
 
+export function decideOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/decideOrder",
+    method: "post",
+    data: query
+  });
+}
+
+
+

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -416,8 +416,9 @@ import prescribeOriginPanel from "./PannelOrderBiz";
 import CollectOrderAllotDetail from "./CollectOrderAllotDetail";
 import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
 import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
-import {deleteByOrder, orderPage, orderTop} from "@/api/collect/collectOrder";
+import { decideOrder, deleteByOrder, orderPage, orderTop } from '@/api/collect/collectOrder'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   name: "prescribePanel",
@@ -581,22 +582,41 @@ export default {
       this.$emit('parent-method', "DealOrder", url); // someData 是你想要传递给父组件的数据
     },
     linkPage(_this, row) {
-      if (row != null && row.invAlert == 2) {
-        _this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
+      // if (isBlank(row.workPlaceCode)){
+      //   return _this.$message.error("请先绑定工位")
+      // }    2处理中
+      let query = {
+        workPlaceCode : row.workPlaceCode,
+        billNo: row.billNo,
+        tagStatus: 2
+      }
+      decideOrder(query).then(res => {
+        if (res.code == 20000){
+          //当前工位没有正在处理单据
+          if (row != null && row.invAlert == 2) {
+            _this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType
+                window.open(url, '_blank');
+              })
+              .catch(() => {
+              });
+          }else {
             let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType
             window.open(url, '_blank');
-          })
-          .catch(() => {
-          });
-      }else {
-        let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType
-        window.open(url, '_blank');
-      }
+          }
+        }else {
+          return _this.$message.error(res.message)
+        }
+      })
+        .catch()
+
+
+
 
     },
     //置顶

src/views/collect/CollectOrderNew.vue

@@ -92,8 +92,9 @@
                 class="query-form-item"
                 :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
+                  style="width: 265px"
                   v-model="filterQuery[item.columnName]"
-                  :placeholder="item.columnDesc"
+                  :placeholder="item.columnDesc == '关键字搜索' ? '单据号/往来单位/来源系统/发货方/收货方' : item.columnDesc"
                   :disabled="executeEval(null,item.disabledFuc,false)"
                   @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                   clearable
@@ -553,16 +554,21 @@ export default {
     },
     onReset() {
       this.filterQuery = {
-        tagStatus: String(this.tagStatus),
-        tagStatusList: this.tagStatusList,
+        tagStatusList: [0,1,2],
         billNo: null,
         busType: null,
         workPlaceCode: null,
         page: 1,
         limit: 10,
       };
+      this.errQuery =  {
+        tagStatusList: [4],    //
+        page: 1,
+        limit: 10,
+      },
       this.actDateRange = [];
       this.getList();
+      this.getErrorList(this);
     },
     downloadPrescription() {
       this.downloadPrescriptionVisible = true