委托验收,条码完整性

src/api/basic/invWarehouse.js

@@ -18,6 +18,16 @@ export function filterAll(query) {
         params: query
     });
 }
+
+export function filterNext(query) {
+    return axios({
+        url: "/spms/inv/warehouse/filterNext",
+        method: "get",
+        params: query
+    });
+}
+
+
 export function filterAllByLoc(query) {
     return axios({
         url: "/spms/inv/warehouse/filterAllLocInv",

src/views/basic/BasicEntrutsRece.vue

@@ -186,6 +186,24 @@ export default {
 
 
         onAddSubmit() {
+
+            if (this.$isBlank(this.inputQuery.action)) {
+                this.$message.error("单据类型不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.curInv)) {
+                this.$message.error("请输入委托仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人！");
+                return;
+            }
+
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
@@ -199,6 +217,22 @@ export default {
         },
 
         onModifySubmit() {
+            if (this.$isBlank(this.inputQuery.action)) {
+                this.$message.error("单据类型不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.curInv)) {
+                this.$message.error("请输入委托仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人仓库！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.$message.error("请输入委托验收人！");
+                return;
+            }
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;

src/views/basic/BasicEntrutsReceModify.vue

@@ -1,5 +1,7 @@
 <template>
     <div>
+        <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
+
 
             <el-row :gutter="20" class="el-row" type="flex">
                 <el-col :span="10" class="el-col">
@@ -21,7 +23,7 @@
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                        <span>当前仓库:&nbsp;</span>
+                            <span>委托仓库:&nbsp;</span>
                         </div>
                         <el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
                             <el-option
@@ -39,19 +41,18 @@
 
             </el-row>
             <el-row :gutter="20" class="el-row" type="flex">
-
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                        <span>委托验收人:&nbsp;</span>
+                            <span>委托验收人仓库:&nbsp;</span>
                         </div>
-                    <el-select v-model="inputQuery.entrustUser" placeholder="委托验收人">
+                        <el-select v-model="inputQuery.entrustInv" placeholder="委托验收人仓库" @change="entrustInvChange" clearable>
                             <el-option
-                            v-for="item in entrustUserArray"
+                                v-for="item in entrustStorageList"
-                            :key="item.userid"
+                                :key="item.code"
-                            :label="item.employeeName"
+                                :label="item.name"
-                            :value="item.userid">
+                                :value="item.code">
-                            <span style="float: left">{{ item.employeeName }}</span>
+                                <span style="float: left">{{ item.name }}</span>
                             </el-option>
 
                         </el-select>
@@ -61,15 +62,15 @@
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                        <span>委托验收人仓库:&nbsp;</span>
+                            <span>委托验收人:&nbsp;</span>
                         </div>
-                    <el-select v-model="inputQuery.entrustInv" placeholder="委托验收人仓库" @change="invChange">
+                        <el-select v-model="inputQuery.entrustUser" placeholder="委托验收人" clearable>
                             <el-option
-                            v-for="item in storageList"
+                                v-for="item in entrustUserArray"
-                            :key="item.code"
+                                :key="item.userid"
-                            :label="item.name"
+                                :label="item.employeeName"
-                            :value="item.code">
+                                :value="item.userid">
-                            <span style="float: left">{{ item.name }}</span>
+                                <span style="float: left">{{ item.employeeName }}</span>
                             </el-option>
 
                         </el-select>
@@ -87,7 +88,7 @@
                         <div class="itemTag">
                             <span>委托生成单据类型:&nbsp;</span>
                         </div>
-                    <el-select v-model="inputQuery.entrustAction" placeholder="单据类型">
+                        <el-select v-model="inputQuery.entrustAction" placeholder="单据类型" clearable>
                             <el-option
                                 v-for="item in entrustBusArray"
                                 :key="item.action"
@@ -95,9 +96,7 @@
                                 :value="item.action">
                                 <span style="float: left">{{ item.name }}</span>
                             </el-option>
-
                         </el-select>
-
                     </div>
                 </el-col>
                 <el-col :span="4" class="el-col">
@@ -107,7 +106,7 @@
                     </div>
                 </el-col>
             </el-row>
-
+        </el-form>
     </div>
 </template>
 
@@ -120,7 +119,7 @@ import {
 import {
     getLocalJoinNoUse
 } from "../../api/basic/busLocalType";
-import {filterAll, filterAllByUser, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
+import {filterAll, filterNext, warehouseBussinessTypeList, warehouseUserList} from "@/api/basic/invWarehouse";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterNoUseBusType} from "@/api/basic/EntrustRece";
 
@@ -142,12 +141,27 @@ export default {
                 isFilterBind: true,
             },
             storageList: [],
+            entrustStorageList: [],
             orderTypeList: [],
             fromSpecialOptions: [],
             thirdSys: [],
             busTypes: [],
             entrustBusArray: [],
             entrustUserArray: [],
+            formRules: {
+                action: [
+                    {required: true, message: "请输入扫码单据类型", trigger: "blur"}
+                ],
+                curInv: [
+                    {required: true, message: "请输入委托仓库", trigger: "blur"}
+                ],
+                entrustInv: [
+                    {required: true, message: "请输入委托验收人仓库", trigger: "blur"}
+                ],
+                entrustUser: [
+                    {required: true, message: "请输入委托验收人", trigger: "blur"}
+                ],
+            },
         }
     },
     methods: {
@@ -181,6 +195,17 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getEntrustStorage() {
+            this.entrustStorageList = [];
+            let nextQuery = {pcode: this.inputQuery.curInv};
+            filterNext(nextQuery)
+                .then((response) => {
+                    this.entrustStorageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         getOrderType() {
             filterNoUseBusType().then((response) => {
                 this.busTypes = response.data || [];
@@ -192,6 +217,8 @@ export default {
             let query = {
                 code: code
             }
+
+            this.inputQuery.entrustInv="";
             //加载用户数据
             warehouseUserList(query).then((res) => {
                 this.entrustUserArray = res.data;
@@ -205,10 +232,34 @@ export default {
             }).catch((error) => {
                 this.$message.error("单据类型数据加载失败")
             });
+            if (this.$isBlank(this.inputQuery.entrustInv)) {
+                this.inputQuery.entrustUser = null;
+            }
+            this.getEntrustStorage();
         },
 
-        actionChange(action){
+        entrustInvChange(code) {
+            let query = {
+                code: code
+            }
+
+            //加载用户数据
+            warehouseUserList(query).then((res) => {
+                this.entrustUserArray = res.data;
+            }).catch((error) => {
+                this.$message.error("用户数据加载失败")
+            });
+
+            //加载单据类型数据
+            warehouseBussinessTypeList(query).then((res) => {
+                this.entrustBusArray = res.data;
+            }).catch((error) => {
+                this.$message.error("单据类型数据加载失败")
+            });
+
+        },
 
+        actionChange(action) {
 
 
         }
@@ -224,9 +275,9 @@ export default {
         this.getOrderType();
         this.getList();
         this.getStorage();
-
+        this.getEntrustStorage();
         if (this.$isNotBlank(this.inputQuery.entrustInv)) {
-            this.invChange(this.inputQuery.entrustInv);
+            this.entrustInvChange(this.inputQuery.entrustInv);
         }
 
     },

src/views/thrsys/SysUdimsConfig.vue

@@ -42,6 +42,7 @@
                 <template slot="label">
                     基础信息
                 </template>
+                <el-checkbox v-model="configQuery.sysUser">用户信息</el-checkbox>
                 <el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
                 <el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
                 <el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
@@ -183,6 +184,7 @@ export default {
                 typeScan: null,
                 typeThird: null,
                 basicProducts: null,
+                sysUser: null,
                 basicCorp: null,
                 basicInv: null,
                 basicThirdProducts: null,
@@ -276,7 +278,7 @@ export default {
             this.multipleSelection = [];
         },
 
-    addBusType(){
+        addBusType() {
             var selectData = this.multipleSelection;
             selectData.forEach((obj) => {
                 this.checkedBusTypes.push(obj);
@@ -285,8 +287,8 @@ export default {
         },
 
 
-    remveBus(index,row){
+        remveBus(index, row) {
-      this.checkedBusTypes.splice(index,1);
+            this.checkedBusTypes.splice(index, 1);
         },
         checkSelectable(row) {
             return !row.isSelect;

src/views/warehouse/addHosOrder.vue

@@ -171,7 +171,7 @@
                         </el-checkbox>
 
                         <el-checkbox v-model="formData.preCheck"
-                                     :disabled="!curAction.changeEnable  ||corpOrderIdDisabled"
+                                     :disabled="corpOrderIdDisabled || curAction.corpType !=2"
                         >是否只采集预验收产品
                         </el-checkbox>
                     </div>