Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts: # src/views/collect/IoCreateOrder.vue # src/views/collect/IoCreateOrderBlank.vue
8 months ago · 9dbf996f51
parent 7ae5c17e35 4dc436eaf1
commit 9dbf996f51
3 changed files with 104 additions and 113 deletions
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@ -366,7 +366,7 @@ export default {
      let query = {
        key: val,
        status: 1,
-        invCode: this.formData.invCode,
+        // invCode: this.formData.invCode,
        page: 1,
        limit: 100,
      }
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@ -8,7 +8,7 @@
    >
      <el-card style="margin: 5px;">

-        <el-row :gutter="0" v-if="isLinkDisabled">
+        <el-row :gutter="0"  v-if="isLinkDisabled">
          <el-col :span="24" align="right">
            <div class="inv-hos-title">
            <span
@ -29,17 +29,13 @@
          </el-col>
        </el-row>

+          <el-alert
+            style="margin-top: 15px;font-size: 20px"
+            :title="msgTip"
+            :closable="false"
+            type="warning">
+          </el-alert>

-        <el-alert
-          style="margin-top: 15px"
-          :title="msgTip"
-          :closable="false"
-          type="warning">
-        </el-alert>
-
-        <div class="scroll-alert" style="margin-top: 15px;">
-          <div class="scroll-text">{{ msgTip }}</div>
-        </div>

        <el-row>
          <el-button-group
@ -289,7 +285,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
-import {findInvRemind} from "@/api/inout/splitCode";
+import { findInvRemind } from "@/api/inout/splitCode";

 export default {
  name: "ioCreateOrder",
@ -340,7 +336,7 @@ export default {
  data() {
    return {
      isLinkDisabled: false,
-      userInfo: {
+      userInfo:{
        inv: this.$store.getters.locInvName,
        deptName: this.$store.getters.locDeptName,
        userName: this.$store.getters.name,
@ -491,7 +487,7 @@ export default {
      isSuccess: false,
      result: "",
      scanResultType: "success",
-      msgTip: "工位存量提醒：",
+      msgTip: "当前工位存量提醒：",
      splitType: null,
    };
  },
@ -503,47 +499,47 @@ export default {
    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
  },
  methods: {
-    changeInvRemind(val) {
+    changeInvRemind(val){
      let post = {
        workPlaceCode: val
      }
      findInvRemind(post).then((response) => {
        if (response.code === 20000) {
-          this.msgTip = response.data
-        } else {
+         this.msgTip = response.data
+        }else {

        }
      })
-        .catch(() => {
+    .catch(() => {

-        });
+      });
    },
-    successCloseData() {
+    successCloseData(){
      let workPlaceCode = this.orderFormData.workPlaceCode
-      this.orderFormData = {
+      this.orderFormData ={
        billNo: null,
-        corpOrderId: null,
-        action: null,
-        invCode: null,
-        fromCorp: null,
-        fromCorpName: null,
-        fromName: null,
-        fromInvCode: null,
-        remark: null,
-        fromType: 2,
-        errMsg: null,
-        checkPreInOrders: null,
-        checkPreInInvCode: null,
-        checkPreInSpaceCode: null,
-        curSpaceCode: null,
-        preSpaceCode: null,
-        preCurSpaceCode: null,  //单据
-        sickerAdNum: null,
-        workPlaceCode: null,
-        fifoSplit: 1,
+          corpOrderId: null,
+          action: null,
+          invCode: null,
+          fromCorp: null,
+          fromCorpName: null,
+          fromName: null,
+          fromInvCode: null,
+          remark: null,
+          fromType: 2,
+          errMsg: null,
+          checkPreInOrders: null,
+          checkPreInInvCode: null,
+          checkPreInSpaceCode: null,
+          curSpaceCode: null,
+          preSpaceCode: null,
+          preCurSpaceCode: null,  //单据
+          sickerAdNum: null,
+          workPlaceCode: null,
+          fifoSplit: 1,
      }
      this.orderFormData.workPlaceCode = workPlaceCode
-      this.scanCode = "";
+      this.scanCode= "";
      this.corpOrderIdDisabled = false;
      this.refreshCodesPanel()
    },
@ -667,9 +663,9 @@ export default {
        if (response.code === 20000) {
          // this.$message.success("成功");
          const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
-          if (this.closeDialog != undefined) {
-            this.closeDialog();
-          }
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
          this.clearOrder();
        } else {
          // this.$message.error(response.message);
@ -1213,9 +1209,9 @@ export default {
              this.retractLoading = false
              if (response.code == 20000) {
                this.$message.success("撤回成功！");
-                if (this.closeDialog != undefined) {
-                  this.closeDialog();
-                }
+                  if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
              } else {
                this.$message.error(response.message);
              }
@ -1241,9 +1237,9 @@ export default {
        this.codeLoading = false
        if (response.code === 20000) {
          this.$message.success("提交成功");
-          if (this.closeDialog != undefined) {
-            this.closeDialog();
-          }
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
        } else {
          this.$message.error(response.message);
        }
@ -1256,9 +1252,9 @@ export default {
        this.checkLoading = false
        if (response.code === 20000) {
          this.$message.success("提交成功");
-          if (this.closeDialog != undefined) {
-            this.closeDialog();
-          }
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
        } else {
          this.$message.error(response.message);
        }
@ -1319,7 +1315,7 @@ export default {
            this.$message.success("提交成功,等待处理，请刷新后查看！");
            this.successCloseData()
            console.log(this.closeDialog())
-            if (this.closeDialog != undefined) {
+              if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1344,7 +1340,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+              if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1366,7 +1362,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+              if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1409,7 +1405,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+            if(this.closeDialog != undefined){
              this.closeDialog();
            }

@ -1434,9 +1430,9 @@ export default {
      saveOrderWeb(tQuery).then((response) => {
        this.saveLoading = false
        if (response.code === 20000) {
-          if (this.closeDialog != undefined) {
-            this.closeDialog();
-          }
+            if(this.closeDialog != undefined){
+              this.closeDialog();
+            }
        } else {
          this.$message.error(response.message);
        }
@ -1755,7 +1751,7 @@ export default {
  },
  created() {
    this.init();
-    if (this.$route.query.workplaceId != null) {
+    if (this.$route.query.workplaceId != null){
      this.corpOrderIdDisabled = true
      this.isLinkDisabled = true
      this.workplaceId = this.$route.query.workplaceId
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@ -8,7 +8,7 @@
    >
      <el-card style="margin: 5px;">

-        <el-row :gutter="0" v-if="isLinkDisabled">
+        <el-row :gutter="0"  v-if="isLinkDisabled">
          <el-col :span="24" align="right">
            <div class="inv-hos-title">
            <span
@ -29,17 +29,13 @@
          </el-col>
        </el-row>

-
        <el-alert
-          style="margin-top: 15px"
+          style="margin-top: 15px;font-size: 20px"
          :title="msgTip"
          :closable="false"
          type="warning">
        </el-alert>

-        <div class="scroll-alert" style="margin-top: 15px;">
-          <div class="scroll-text">{{ msgTip }}</div>
-        </div>

        <el-row>
          <el-button-group
@ -289,7 +285,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
-import {findInvRemind} from "@/api/inout/splitCode";
+import { findInvRemind } from "@/api/inout/splitCode";

 export default {
  name: "ioCreateOrder",
@ -340,7 +336,7 @@ export default {
  data() {
    return {
      isLinkDisabled: false,
-      userInfo: {
+      userInfo:{
        inv: this.$store.getters.locInvName,
        deptName: this.$store.getters.locDeptName,
        userName: this.$store.getters.name,
@ -491,8 +487,7 @@ export default {
      isSuccess: false,
      result: "",
      scanResultType: "success",
-      msgTip: "工位存量提醒：",
-      splitType: null,
+      msgTip: "当前工位存量提醒：",
    };
  },
  components: {
@ -503,14 +498,14 @@ export default {
    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
  },
  methods: {
-    changeInvRemind(val) {
+    changeInvRemind(val){
      let post = {
        workPlaceCode: val
      }
      findInvRemind(post).then((response) => {
        if (response.code === 20000) {
          this.msgTip = response.data
-        } else {
+        }else {

        }
      })
@ -518,9 +513,9 @@ export default {

        });
    },
-    successCloseData() {
+    successCloseData(){
      let workPlaceCode = this.orderFormData.workPlaceCode
-      this.orderFormData = {
+      this.orderFormData ={
        billNo: null,
        corpOrderId: null,
        action: null,
@ -543,7 +538,7 @@ export default {
        fifoSplit: 1,
      }
      this.orderFormData.workPlaceCode = workPlaceCode
-      this.scanCode = "";
+      this.scanCode= "";
      this.corpOrderIdDisabled = false;
      this.refreshCodesPanel()
    },
@ -667,7 +662,7 @@ export default {
        if (response.code === 20000) {
          // this.$message.success("成功");
          const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
-          if (this.closeDialog != undefined) {
+          if(this.closeDialog != undefined){
            this.closeDialog();
          }
          this.clearOrder();
@ -911,7 +906,7 @@ export default {
      let query = {
        key: val,
        status: 1,
-        invCode: this.orderFormData.invCode,
+        // invCode: this.orderFormData.invCode,
        page: 1,
        limit: 100,
      }
@ -1213,7 +1208,7 @@ export default {
              this.retractLoading = false
              if (response.code == 20000) {
                this.$message.success("撤回成功！");
-                if (this.closeDialog != undefined) {
+                if(this.closeDialog != undefined){
                  this.closeDialog();
                }
              } else {
@ -1241,7 +1236,7 @@ export default {
        this.codeLoading = false
        if (response.code === 20000) {
          this.$message.success("提交成功");
-          if (this.closeDialog != undefined) {
+          if(this.closeDialog != undefined){
            this.closeDialog();
          }
        } else {
@ -1256,7 +1251,7 @@ export default {
        this.checkLoading = false
        if (response.code === 20000) {
          this.$message.success("提交成功");
-          if (this.closeDialog != undefined) {
+          if(this.closeDialog != undefined){
            this.closeDialog();
          }
        } else {
@ -1319,7 +1314,7 @@ export default {
            this.$message.success("提交成功,等待处理，请刷新后查看！");
            this.successCloseData()
            console.log(this.closeDialog())
-            if (this.closeDialog != undefined) {
+            if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1344,7 +1339,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+            if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1366,7 +1361,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+            if(this.closeDialog != undefined){
              this.closeDialog();
            }
          } else {
@ -1409,7 +1404,7 @@ export default {
          if (response.code === 20000) {
            this.$message.success("提交成功");
            this.successCloseData()
-            if (this.closeDialog != undefined) {
+            if(this.closeDialog != undefined){
              this.closeDialog();
            }

@ -1434,7 +1429,7 @@ export default {
      saveOrderWeb(tQuery).then((response) => {
        this.saveLoading = false
        if (response.code === 20000) {
-          if (this.closeDialog != undefined) {
+          if(this.closeDialog != undefined){
            this.closeDialog();
          }
        } else {
@ -1755,7 +1750,7 @@ export default {
  },
  created() {
    this.init();
-    if (this.$route.query.workplaceId != null) {
+    if (this.$route.query.workplaceId != null){
      this.corpOrderIdDisabled = true
      this.isLinkDisabled = true
      this.workplaceId = this.$route.query.workplaceId
@ -1767,31 +1762,31 @@ export default {


 <style scoped>
-.scroll-alert {
-  width: 100%; /* 或者你需要的宽度 */
-  overflow: hidden;
-  white-space: nowrap;
-  box-sizing: border-box;
-  /*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
-  background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
-  padding: 10px;
-  position: relative;
-}
-
-.scroll-text {
-  display: inline-block;
-  padding-left: 100%; /* 初始位置在容器右侧 */
-  animation: scroll 10s linear infinite; /* 滚动动画 */
-}
-
-@keyframes scroll {
-  from {
-    transform: translateX(0);
-  }
-  to {
-    transform: translateX(-100%);
-  }
-}
+/*.scroll-alert {*/
+/*  width: 100%; !* 或者你需要的宽度 *!*/
+/*  overflow: hidden;*/
+/*  white-space: nowrap;*/
+/*  box-sizing: border-box;*/
+/*  !*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*!*/
+/*  background-color: rgba(255, 235, 59, 0.1); !* 类似于 Element UI 警告框的背景色 *!*/
+/*  padding: 10px;*/
+/*  position: relative;*/
+/*}*/
+
+/*.scroll-text {*/
+/*  display: inline-block;*/
+/*  padding-left: 100%; !* 初始位置在容器右侧 *!*/
+/*  animation: scroll 10s linear infinite; !* 滚动动画 *!*/
+/*}*/
+
+/*@keyframes scroll {*/
+/*  from {*/
+/*    transform: translateX(0);*/
+/*  }*/
+/*  to {*/
+/*    transform: translateX(-100%);*/
+/*  }*/
+/*}*/

 .query-form-item {
  margin-right: 5px;