feat: 跳转禁止工位选择

1 year ago · 7a02984a5a
parent 1fbd67ef43
commit 7a02984a5a
4 changed files with 58 additions and 13 deletions
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@ -38,8 +38,8 @@
                  更多功能<i class="el-icon-arrow-down el-icon--right"></i>
                </el-button>
                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
+                  <el-dropdown-item  divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>
+                  <el-dropdown-item  divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
@ -211,6 +211,18 @@ export default {
      // this.$router.push( workplaceId)
      window.open(url, '_blank');
    },
+    handleClickOut(blankName) {
+      // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
+      let url = window.location.origin+`#/`+ blankName+`?splitType=out&workplaceId=`+ this.workplaceId
+      // this.$router.push( workplaceId)
+      window.open(url, '_blank');
+    },
+    handleClickReturn(blankName) {
+      // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
+      let url = window.location.origin+`#/`+ blankName+`?splitType=return&workplaceId=`+ this.workplaceId
+      // this.$router.push( workplaceId)
+      window.open(url, '_blank');
+    },
    //界面配置相关------------
    executeFuc(row, type, clickFuc, value) {
      return executeFuc(this, row, type, clickFuc, value);
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@ -38,8 +38,8 @@
                  更多功能<i class="el-icon-arrow-down el-icon--right"></i>
                </el-button>
                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
+                  <el-dropdown-item  divided @click.native="handleClickOut('IoCreateOrderBlank')">工位上货</el-dropdown-item>
+                  <el-dropdown-item  divided @click.native="handleClickReturn('IoCreateOrderBlank')">工位退货</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单</el-dropdown-item>
                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
@ -95,6 +95,7 @@
        <el-tab-pane label="手动扫码">
          <PannelOrderBiz
            v-if="panelALive"
+            :dealStatus="2"
            :prescribeData="curRow"
          ></PannelOrderBiz>

@ -150,7 +151,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import {materialPrescribePage} from "@/api/inout/splitCode";
 import {detail, page as prescribePage, tagCode} from "@/api/basic/sicker/prescribeApi";
-import selectPrescribeDialog from "@/views/collect/prescribe/selectPrescribeDialog";
+import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
 import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";

@ -210,6 +211,18 @@ export default {
      // this.$router.push( workplaceId)
      window.open(url, '_blank');
    },
+    handleClickOut(blankName) {
+      // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
+      let url = window.location.origin+`#/`+ blankName+`?splitType=out&workplaceId=`+ this.workplaceId
+      // this.$router.push( workplaceId)
+      window.open(url, '_blank');
+    },
+    handleClickReturn(blankName) {
+      // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
+      let url = window.location.origin+`#/`+ blankName+`?splitType=return&workplaceId=`+ this.workplaceId
+      // this.$router.push( workplaceId)
+      window.open(url, '_blank');
+    },
    //界面配置相关------------
    executeFuc(row, type, clickFuc, value) {
      return executeFuc(this, row, type, clickFuc, value);
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@ -310,6 +310,7 @@ export default {
  },
  data() {
    return {
+      workplaceId: null,
      //单据相关
      orderFormData: {
        billNo: null,
@ -1646,6 +1647,10 @@ export default {
  },
  created() {
    this.init();
+    if (this.$route.query.workplaceId != null){
+      this.corpOrderIdDisabled = true
+      this.workplaceId = this.$route.query.workplaceId
+    }

  },
 };
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@ -7,6 +7,14 @@
      label-width="110px"
    >
      <el-card style="margin: 5px;">
+
+
+        <el-alert
+          :title="msgTip"
+          :closable="false"
+          type="warning">
+        </el-alert>
+
        <el-row>
          <el-button-group
            style="display: flex; margin: 0px 0 15px 0; float: right"
@ -154,13 +162,13 @@

          </el-col>
        </el-row>
-        <el-row>
-          <div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}">
-            <p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{
-                result
-              }}</p>
-          </div>
-        </el-row>
+
+        <el-alert
+          title="扫码解析结果:"
+          :type="scanResultType"
+          :closable="false"
+          :description="result">
+        </el-alert>
        <el-row style="margin-top: 25px;margin-bottom: -15px">
          <div v-if="showSearch  && splitBusType!=null">
            <el-divider>
@ -302,6 +310,7 @@ export default {
  },
  data() {
    return {
+      workplaceId: null,
      //单据相关
      orderFormData: {
        billNo: null,
@ -444,7 +453,9 @@ export default {
      showSearch: false,
      scanCode: "",
      isSuccess: false,
-      result: "扫码解析结果："
+      result: "",
+      scanResultType: "success",
+      msgTip: "工位存量提醒：",
    };
  },
  components: {
@ -1636,6 +1647,10 @@ export default {
  },
  created() {
    this.init();
+    if (this.$route.query.workplaceId != null){
+      this.corpOrderIdDisabled = true
+      this.workplaceId = this.$route.query.workplaceId
+    }

  },
 };