feat: 工位上货页面控制

src/api/inout/splitCode.js

@@ -36,4 +36,13 @@ export function splitFifoDetail(query) {
 }
 
 
+export function findInvRemind(query) {
+  return axios({
+    url: "/udiwms/ioSplit/findInvRemind",
+    method: "get",
+    params: query
+  });
+}
+
+
 

src/views/basic/collectPoint/gatherOrderType.vue

@@ -46,6 +46,7 @@
         <el-table-column label="来源系统" prop="fromType"></el-table-column>
         <el-table-column label="来源单据类型" prop="fromDocumentType"></el-table-column>
         <el-table-column label="来源接口地址" prop="fromInterAddress"></el-table-column>
+        <el-table-column label="排序" prop="sortNumber" width="50"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
@@ -164,6 +165,18 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="排序:" prop="sortNumber" class="query-form-item">
+                <el-input-number
+                  :min="0"
+                  :max="999"
+                  :precision='0' :step='1'
+                  placeholder="数字越大字段排在越前面"
+                  v-model="formData.sortNumber" style="width: 80%"
+                  auto-complete="off"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
           </el-row>
             <el-row :gutter="24" class="el-row">
             <el-col :span="22" class="el-col">

src/views/basic/collectPoint/selectWorkplace.vue

@@ -46,11 +46,12 @@
         </el-table-column>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
-        <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
+        <el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
         <el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
         <el-table-column label="来源单据类型编号" prop="busTypeCode" width="150"></el-table-column>
         <el-table-column label="来源单据类型名称" prop="busTypeName" width="150"></el-table-column>
-        <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
+        <el-table-column label="所属部门" prop="deptCode" width="90"></el-table-column>
+        <el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>
         <el-table-column label="作业方式" prop="operationType" width="90">
           <template slot-scope="scope">
             <span>{{operationTypes[scope.row.operationType]}}</span>

src/views/basic/workplace/workplaceManage.vue

@@ -109,12 +109,13 @@
             >
               <el-table-column type="index" label="序号"></el-table-column>
               <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
-              <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
+              <el-table-column label="工位名称" prop="workplaceName" width="120"></el-table-column>
               <el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
               <el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>
               <el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>
               <el-table-column label="单据来源系统" prop="fromTypeName" width="100"></el-table-column>
-              <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
+              <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
+              <el-table-column label="默认仓库" prop="invName" width="90"></el-table-column>
               <el-table-column label="作业方式" prop="operationType" width="120">
                 <template slot-scope="scope">
                   <span>{{ operationTypes[scope.row.operationType] }}</span>
@@ -297,6 +298,18 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12" class="el-col">
+            <el-form-item label="存量提醒数:" prop="invRemindNumber" class="query-form-item">
+                <el-input-number
+                  :min="0"
+                  :precision='0' :step='1'
+                  placeholder="请输入工位存量提醒数"
+                  v-model="formData.invRemindNumber" style="width: 80%"
+                  auto-complete="off"
+                ></el-input-number>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12" class="el-col">
             <el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
               <el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
@@ -308,7 +321,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item prop="deptCode" label="当前部门:">
+            <el-form-item prop="deptCode" label="所属部门:">
               <el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
                          style="width: 80%"
                          @change="deptChange">
@@ -578,6 +591,9 @@ export default {
         checkInsert: [
           { required: true, message: '处理结果不能为空', trigger: 'blur' }
         ],
+        invRemindNumber: [
+          { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
+        ],
         warnType: [
           { required: true, message: '请选择提醒方式', trigger: 'blur' }
         ],

src/views/collect/IoCreateOrder.vue

@@ -37,6 +37,10 @@
           type="warning">
         </el-alert>
 
+        <div class="scroll-alert" style="margin-top: 15px;">
+          <div class="scroll-text">{{ msgTip }}</div>
+        </div>
+
         <el-row>
           <el-button-group
             style="display: flex; margin: 0px 0 15px 0; float: right"
@@ -129,12 +133,14 @@
                 style="width: 90%"
                 :disabled="corpOrderIdDisabled"
                 filterable
+                @change="changeInvRemind"
               >
                 <el-option
                   v-for="item in curWorkPlaces"
                   :key="item.workplaceId"
                   :label="item.workplaceName"
                   :value="item.workplaceId"
+
                 >
                   <span style="float: left">{{ item.workplaceName }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -283,6 +289,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";
 
 export default {
   name: "ioCreateOrder",
@@ -495,6 +502,21 @@ export default {
     DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
   },
   methods: {
+    changeInvRemind(val){
+      let post = {
+        workPlaceCode: val
+      }
+      findInvRemind(post).then((response) => {
+        if (response.code === 20000) {
+         this.msgTip = response.data
+        }else {
+
+        }
+      })
+    .catch(() => {
+
+      });
+    },
     successCloseData(){
       let workPlaceCode = this.orderFormData.workPlaceCode
       this.orderFormData ={
@@ -1744,6 +1766,32 @@ 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%);
+  }
+}
+
 .query-form-item {
   margin-right: 5px;
   margin-bottom: 6px;

src/views/collect/PanelOrderDeal.vue

@@ -303,6 +303,7 @@ export default {
       curRow: null,
       panelALive: false,
       multiplePreSelection: [],
+      timer: null, // 定时器
     }
   },
 
@@ -310,6 +311,17 @@ export default {
     addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
   },
   methods: {
+    //启动定时器
+    timerAuto(){
+      //启动定时器
+      this.timer = setInterval(() => {
+        //查询订单是否支付成功
+        this.getList()
+      }, 10000)
+
+      //清楚定时器的方法
+      // clearInterval(this.timer)
+    },
     linkPage(_this,row) {
 
       let url = window.location.origin + `#/tagCodeBlank` + `?billNo=` + row.billNo
@@ -445,7 +457,7 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
     });
-
+    this.timerAuto()
 
   }