禅道bug修改，自助同步到UDI管理

public/config.json

@@ -1,7 +1,7 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.106:9995/",
-    "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
+    "BASE_URL":"http://192.168.0.106:9991",
-    "SERVER_IP": "http://139.9.178.73:8080/",
+    "SERVER_IP": "http://192.168.0.106:9991/",
-    "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/",
+    "WEBSOCKET_URL": "ws://192.168.0.106:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "平和县医院"
 }

src/views/basic/BasicEntrutsRece.vue

@@ -201,11 +201,20 @@ export default {
                 this.$message.error("请输入接受委托仓库！");
                 return;
             }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
+            if (this.$isBlank(this.inputQuery.entrustUser)) {
                 this.$message.error("请输入接受委托人！");
                 return;
             }
 
+            if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+                this.$message.error("请输入接受委托分库！");
+                return;
+            }
+
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;

src/views/basic/invWarehouse.vue

@@ -227,13 +227,13 @@
                         min-width="30%"
                     >
                         <template slot-scope="scope">
-                            <el-button
+                            <!--                            <el-button-->
-                                type="text"
+                            <!--                                type="text"-->
-                                size="small"
+                            <!--                                size="small"-->
-                                @click.native="updateDirector(scope.row)">
+                            <!--                                @click.native="updateDirector(scope.row)">-->
 
-                                {{ directorMap[scope.row.director] }}
+                            <!--                                {{ directorMap[scope.row.director] }}-->
-                            </el-button>
+                            <!--                            </el-button>-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -663,7 +663,7 @@ export default {
                 children: "children",
                 label: "name"
             },
-            setDictor: "设为主管",
+            // setDictor: "设为主管",
             fileList: [],
             pCodes: [],
             uploadData: {},
@@ -671,7 +671,7 @@ export default {
             index: null,
             formName: null,
             formMap: {
-                addTop: "添加仓库",
+                addTop: "添加分库",
                 add: "添加货位",
                 edit: "编辑"
             },
@@ -826,6 +826,7 @@ export default {
             if (formName === "edit") {
                 this.subData = data;
             } else if (formName === "add") {
+                this.subData = {};
                 this.subData.parentId = data.code;
             }
             ;
@@ -881,6 +882,11 @@ export default {
 
         //添加分库
         forSubSubmit() {
+
+            if (this.$isBlank(this.subData.name)) {
+                this.$message.error("分库名称不能为空！");
+                return;
+            }
             saveSubWarehouse(this.subData, this.subFromName).then((response) => {
                 if (response.code == 20000) {
                     this.loadSubData(this.subData.parentId);
@@ -1022,7 +1028,6 @@ export default {
             if (response.code != 20000) {
                 this.$message.error(response.message);
             } else {
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                 this.$message.success(response.data);
                 this.getList();
             }

src/views/business/DialogcChangeNewOrder.vue

@@ -72,9 +72,6 @@
 
                 <el-col :span="8">
                     <el-form-item prop="locStorageCode">
-                        <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
-                        <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
-                        <!--</el-select>-->
                         <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
                             <el-option
                                 v-for="item in storageList"
@@ -99,7 +96,7 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item class="query-form-item" prop="fromCorp"
-                                  v-if="curAction.corpType ==0 || curAction.corpType == 3 || (curAction.corpType == 2 && !curAction.genUnit)">
+                                  v-if="curAction.corpType ==0 ">
                         <el-select
                             v-model="formData.fromCorp"
                             filterable
@@ -143,19 +140,53 @@
                                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
                             </el-option>
                         </el-select>
+
+                        <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+                        >
+                            <el-option
+                                v-for="item in fromSubStorageOptions"
+                                :key="item.code"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item class="query-form-item" prop="fromCorp"
-                                  v-if="curAction.corpType ==2 && curAction.genUnit">
+                                  v-if="curAction.corpType ==2">
                         <el-input v-model="formData.fromCorp" auto-complete="off"
                                   clearable
                                   placeholder="请输入病人住院号"
                         ></el-input>
                     </el-form-item>
                 </el-col>
+
+
+                <el-col :span="3">
+                    <div class="ao-text">
+                        <span>当前分库：</span>
+                    </div>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item prop="invWarehouseCode">
+                        <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                        >
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
 
-
         <el-table v-loading="detailLoading"
                   :data="detailList"
                   @selection-change="changeFun"
@@ -184,7 +215,6 @@
                 </template>
             </el-table-column>
         </el-table>
-
     </div>
 </template>
 
@@ -194,6 +224,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {parseTime} from "@/filtres";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {stockOrderChange, stockOrderDetail} from "@/api/inout/stockOrder";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
     name: "DialogcChangeNewOrder",
@@ -219,14 +250,23 @@ export default {
                 actDate: new Date(),
                 action: null,
                 locStorageCode: null,
+                fromSubInvCode: null,
+                invWarehouseCode: null,
+                mainAction: null
             },
             fromStorageOptions: [],
+            fromSubStorageOptions: [],
             curAction: {
                 corpType: 0,
                 genUnit: false,
             },
             busTypes: [],
             fromOptions: [],
+            loading: false,
+            detailList: [],
+            storageList: [],
+            detailLoading: false,
+            subInvList: [],
 
         }
     },
@@ -245,16 +285,38 @@ export default {
                 this.$message.error('当前往来单位不能为空');
                 return;
             }
+            if (this.detailList.length == 0) {
+                this.$message.error("产品列表不能为空");
+                return;
+            }
+            let products = [];
+            this.detailList.forEach(item => {
+                let product = {
+                    relId: item.relId,
+                    batchNo: item.batchNo
+                };
+                products.push(product);
+            });
+
+            this.busTypes.forEach(item => {
+                if (item.action === this.formData.action) {
+                    this.formData.mainAction = item.mainAction;
+                }
+            })
             let tQuery = {
                 stockOrderId: this.curRow.id,
                 locStorageCode: this.formData.locStorageCode,
                 action: this.formData.action,
+                mainAction: this.formData.mainAction,
                 fromCorp: this.formData.fromCorp,
                 fromCorpId: this.formData.fromCorpId,
-            }
+                invWarehouseCode: this.formData.invWarehouseCode,
+                fromSubInvCode: this.formData.fromSubInvCode,
+
+                products: products
+            };
             stockOrderChange(tQuery)
                 .then((response) => {
-                    console.log(response)
                     if (response.code === 20000) {
                         this.$message.success("提交成功");
                         this.closeDialog();
@@ -267,7 +329,26 @@ export default {
 
 
         locCHange() {
+
+            if (this.$isNotBlank(this.formData.invWarehouseCode)) {
+                this.formData.invWarehouseCode = "";
+            }
             this.findStorageMethod();
+            this.findSubInvByInv(this.formData.locStorageCode);
+        },
+
+
+        findSubInvByInv(invCode) {
+            this.subInvList = [];
+            let query = {
+                pcode: invCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
         },
 
         findStorageMethod(query) {
@@ -284,9 +365,19 @@ export default {
                 .catch(() => {
                 });
         },
-
+        findSubStorageMethod() {
+            let cQuery = {
+                pcode: this.formData.fromCorpId,
+                filter: 2,
+            };
+            filterSubByInv(cQuery)
+                .then((response) => {
+                    this.fromSubStorageOptions = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -326,10 +417,10 @@ export default {
         storageChange(row) {
             this.formData.fromCorpId = row.code;
             this.formData.fromCorp = row.name;
+            this.findSubStorageMethod();
         },
 
         unitChange(row) {
-            console.log(row);
             this.formData.fromCorpId = row.erpId;
             this.formData.fromCorp = row.name;
         },
@@ -338,6 +429,13 @@ export default {
             // this.formData.locStorageCode = this.curAction.storageCode;
             this.findMethod();
         },
+        getActionItem(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i];
+                }
+            }
+        },
         getBusType() {
             let query = {
                 enabled: true,
@@ -381,7 +479,6 @@ export default {
                 }
             }
         }
-
     },
     created() {
         if (this.$isBlank(this.formData.corpOrderId)) {

src/views/business/stockOrder.vue

@@ -124,6 +124,11 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -776,6 +781,16 @@ export default {
                 }
             }
         },
+
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -791,6 +806,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/business/stockOrderDelSearch.vue

@@ -102,11 +102,17 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -137,7 +143,6 @@
                         </el-button
                         >
                         <el-button
-                            v-if="isSp ==110"
                             type="text"
                             size="small"
                             @click.native="generOrder(scope.row)"
@@ -845,6 +850,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -860,6 +872,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/business/stockOrderEditDistribution.vue

@@ -40,6 +40,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billdate">
+                            <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
                             <el-date-picker
                                 v-model="formData.billdate"
                                 type="date"
@@ -70,6 +71,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billType">
+
                             <el-select v-model="formData.billType" placeholder="请选择业务类型" disabled>
                                 <el-option
                                     v-for="item in busTypes"
@@ -92,7 +94,9 @@
 
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
-                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" disabled>
+                            <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
+                                       @change="invChange"
+                                       disabled>
                                 <el-option
                                     v-for="item in storageList"
                                     :key="item.name"
@@ -103,6 +107,30 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+
+
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>当前分库：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="7">
+                        <el-form-item prop="invWarehouseCode">
+                            <el-select v-model="formData.invWarehouseCode" disabled
+                                       placeholder="当前分库信息"
+                                       clearable>
+                                <el-option
+                                    v-for="item in subInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
                 </el-row>
             </el-card>
 
@@ -290,6 +318,7 @@ import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/bas
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
     name: "idQuery",
@@ -366,6 +395,7 @@ export default {
             selectInvProductVisible: false,
             thisData: {},
             storageList: [],
+            subInvList: [],
         };
     },
     components: {
@@ -400,11 +430,11 @@ export default {
                         this.submitFunction(status);
                     } else {
                         for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
+                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                if (!this.codeArray[i].allowNoBatch) {
+                            //     if (!this.codeArray[i].allowNoBatch) {
-                                    return this.$message.error('批次号不能为空');
+                            //         return this.$message.error('批次号不能为空');
-                                }
+                            //     }
-                            }
+                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
@@ -629,37 +659,6 @@ export default {
 
                 // this.closeConfirmFunction(true);
             }
-            // if (this.orderEditor) {
-            //     this.getStockOrderDetailList();
-            //     if (this.$isNotBlank(rData)) {
-            //         this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-            //         this.currentRow = this.codeArray[0];
-            //         this.selectedIndex = 0;
-            //         this.focusNext('iCount');
-            //     }
-            // } else {
-            //     if (this.$isNotBlank(rData)) {
-            //         // for (let i = 0; i < this.codeArray.length; i++) {
-            //         //     if (this.codeArray[i].productId === rData.productId) {
-            //         //         this.$alert("已添加", '提示', {
-            //         //             confirmButtonText: '确定',
-            //         //             type: 'warning',
-            //         //             closeOnClickModal: true,
-            //         //             callback: action => {
-            //         //                 this.$refs.inputRef.focus();
-            //         //             }
-            //         //         });
-            //         //         break;
-            //         //     }
-            //         //     if (i + 1 === this.codeArray.length) {
-            //         //         this.codeArray.push(rData);
-            //         //         this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-            //         //         this.currentRow = this.codeArray[0];
-            //         //         this.selectedIndex = 0;
-            //         //     }
-            //         // }
-            //     }
-            // }
         },
         rowChange(val) {
             this.currentRow = val;
@@ -668,22 +667,8 @@ export default {
 
             this.focusNext('iCount');
 
-            // let sc = this.selectedIndex + 'reCount';
-            // const _this = this;
-            // this.$nextTick(() => {
-            //     setTimeout(function() {
-            //         console.log(sc);
-            //         console.log(_this.$refs[sc]);
-            //         console.log(_this.$refs[sc].focus());
-            //         _this.$refs[sc].focus();
-            //     }, 1)
-            //     // this.$refs['inputBatchNoRef'][0].focus()
-            // })
         },
         iCountChange() {
-            // console.log(this.iCount)
-            // this.currentRow.count = this.iCount;
-            // this.currentRow.reCount = this.iCount;
         },
         iCountEnterFunction() {
             if (this.$isNotBlank(this.currentRow)) {
@@ -755,7 +740,6 @@ export default {
                 code: this.code,
             };
 
-            //012693548470801311200226172302271020022632100025
             if (this.orderEditor) {
                 addStockOrderDetailFromCode(tQuery).then((response) => {
                     this.loading = false;
@@ -838,6 +822,36 @@ export default {
                 }
             });
         },
+        // saveCodeArray(index, row) {
+        //     if (this.$isBlank(row.batchNo)) {
+        //         return this.$message.error('批次号不能为空');
+        //     }
+        //     if (this.$isBlank(row.productDate)) {
+        //         return this.$message.error('生产日期不能为空');
+        //     }
+        //     if (this.$isBlank(row.expireDate)) {
+        //         return this.$message.error('失效日期不能为空');
+        //     }
+        //
+        //     this.$refs.multipleTable.setCurrentRow();
+        //     this.currentRow = {};
+        //     this.selectedIndex = "";
+        //     this.iCount = 0;
+        //
+        //     this.detailLoading = true;
+        //     // row.count = row.reCount;
+        //     let tQuery = row;
+        //     uploadStockOrderDetail(tQuery).then((response) => {
+        //         this.detailLoading = false;
+        //         if (response.code === 20000) {
+        //             this.$message.success("修改完成");
+        //             this.getStockOrderDetailList();
+        //             this.$refs.inputRef.focus();
+        //         } else {
+        //             this.$message.error(response.message);
+        //         }
+        //     });
+        // },
         deleteCodeArray(index, row) {
             this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
                 confirmButtonText: "确定",
@@ -988,6 +1002,19 @@ export default {
                 .catch(() => {
                 });
         },
+        invChange() {
+            // this.formData.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.formData.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         getActionName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
                 if (this.busTypes[i].action === action) {
@@ -1036,6 +1063,9 @@ export default {
             this.orderEditor = true;
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();
+
+
+            this.invChange();
         } else {
             this.formData = {
                 billdate: "",
@@ -1050,6 +1080,8 @@ export default {
             this.orderEditor = false;
             this.generateBillNo();
         }
+
+
     },
 };
 </script>

src/views/business/stockOrderEditor.vue

@@ -104,11 +104,18 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+
+
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <!--                <el-table-column label="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -385,10 +392,19 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="productDate">
+                            <!--              <el-input v-model="detailFormData.productDate" auto-complete="off"-->
+                            <!--                        :disabled="false"></el-input>-->
+                            <!--                            <el-date-picker-->
+                            <!--                                type="date"-->
+                            <!--                                size="small" v-model="detailFormData.productDate"-->
+                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
+                            <!--                                value-format="yyMMdd"-->
+                            <!--                                format="yyyy-MM-dd"-->
+                            <!--                            >-->
+                            <!--                            </el-date-picker>-->
                             <el-input v-model="detailFormData.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
-                                      clearable
                                       :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
@@ -407,6 +423,14 @@
                                       :disabled="false"></el-input>
 
 
+                            <!--                            <el-date-picker-->
+                            <!--                                type="date"-->
+                            <!--                                size="small" v-model="detailFormData.expireDate"-->
+                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
+                            <!--                                value-format="yyMMdd"-->
+                            <!--                                format="yyyy-MM-dd"-->
+                            <!--                            >-->
+                            <!--                            </el-date-picker>-->
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -435,6 +459,17 @@
                                       auto-complete="off" :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
+                    <!--                    <el-col :span="3">-->
+                    <!--                        <div class="ao-text">-->
+                    <!--                            <span>扫码数量：</span>-->
+                    <!--                        </div>-->
+                    <!--                    </el-col>-->
+                    <!--                    <el-col :span="7">-->
+                    <!--                        <el-form-item prop="sweepCount">-->
+                    <!--                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
+                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')" ></el-input>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -666,7 +701,6 @@ export default {
         },
         distributionForm(index, row) {
             this.idQuery.id = '';
-            console.log("row = " + row.id);
             if (this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
                 this.idQuery.formData = row;
@@ -912,6 +946,14 @@ export default {
                 }
             }
         },
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -927,6 +969,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.query.invWarehouseCode = "";
             let query = {
                 pcode: this.query.locStorageCode
             };

src/views/business/stockOrderNew.vue

@@ -118,6 +118,12 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <!--                <el-table-column label="采购类别" width="150">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -861,6 +867,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getBusType() {
             let query = {
                 enabled: true,
@@ -927,6 +940,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/business/stockOrderNewDistribution.vue

@@ -171,24 +171,37 @@
                     </el-col>
 
 
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>当前分库：</span>
+                        </div>
+                    </el-col>
+
+                    <el-col :span="7">
+                        <el-form-item prop="invWarehouseCode">
+                            <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
+                                       clearable>
+                                <el-option
+                                    v-for="item in subInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row :gutter="20" style="margin-top: -10px;">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span></span>
                         </div>
                     </el-col>
                     <el-col :span="7">
-                        <!--                        <el-form-item prop="type">-->
-                        <!--                            <el-select v-model="formData.type" style="width: 100%" placeholder="采购类型">-->
-                        <!--                                <el-option label="预入库" value="1"></el-option>-->
-                        <!--                                <el-option label="普通采购" value="2"></el-option>-->
-                        <!--                            </el-select>-->
-                        <!--                        </el-form-item>-->
-                        <!--                        <el-form-item prop="type">-->
-                        <!--                        </el-form-item>-->
-                        <!--                        <el-radio-group v-model="formData.noInvOut" style="margin-right: 20px;margin-left: 20px">-->
-                        <!--                            <el-radio-button :label="true" size="mini">允许</el-radio-button>-->
-                        <!--                            <el-radio-button :label="false" size="mini">禁用</el-radio-button>-->
-                        <!--                        </el-radio-group>-->
                         <el-form-item prop="type" style="margin-right: 20px;"
                                       v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
                             <el-checkbox v-model="formData.noInvOut">允许无库存出库</el-checkbox>
@@ -196,53 +209,9 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px;">
-
-                </el-row>
-
-                <!--                <el-row :gutter="20" style="margin-top: -10px;">-->
-                <!--                    <el-col :span="3">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>采购类别：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="7">-->
-                <!--                        <el-form-item prop="type">-->
-                <!--                            <el-select v-model="formData.type" style="width: 100%" placeholder="采购类型">-->
-                <!--                                <el-option label="预入库" value="1"></el-option>-->
-                <!--                                <el-option label="普通采购" value="2"></el-option>-->
-                <!--                            </el-select>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                </el-row>-->
             </el-card>
 
             <el-card>
-                <!--            <el-row :gutter="20" style="padding-bottom: 10px; margin-top: -10px">-->
-                <!--                <el-col :span="20">-->
-                <!--                    <el-button-->
-                <!--                        type="primary"-->
-                <!--                        size="small"-->
-                <!--                        @click.native.stop="addCode()"-->
-                <!--                        style="display: flex; height: 31px; margin-left: auto; margin-right: 0;"-->
-                <!--                        :loading="loading"-->
-                <!--                    >产品录入-->
-                <!--                    </el-button-->
-                <!--                    >-->
-                <!--                </el-col>-->
-                <!--            </el-row>-->
-
-                <!--                <el-button-group style="display: flex">-->
-                <!--                    <el-button-->
-                <!--                        type="primary"-->
-                <!--                        size="small"-->
-                <!--                        @click.native.stop="addCode()"-->
-                <!--                        style="margin: 0px 60px 10px auto; height: 35px"-->
-                <!--                        :loading="loading"-->
-                <!--                    >产品录入-->
-                <!--                    </el-button-->
-                <!--                    >-->
-                <!--                </el-button-group>-->
                 <el-button-group style="display: flex">
                     <el-button
                         type="primary"
@@ -255,47 +224,6 @@
                     >
                 </el-button-group>
 
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="3">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>扫码录入：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="10">-->
-                <!--                        <el-form-item prop="code">-->
-
-                <!--                            &lt;!&ndash;                            @keyup.native.enter="focusNext('iCount')"   @focus="getInputFocus($event)"-->
-                <!--                               @keypress.enter.native="selectProductFunction($event)"-->
-                <!--                            &ndash;&gt;-->
-                <!--                            <el-input-->
-
-                <!--                                @keyup.enter.native="selectProductFunction($event)"-->
-                <!--                                v-model="code"-->
-                <!--                                auto-complete="off"-->
-                <!--                                ref='inputRef'-->
-                <!--                                @focus="getInputFocus($event)"-->
-                <!--                            ></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    &lt;!&ndash;                    <el-col :span="3">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <div class="ao-text">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <span>数量：</span>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </div>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <el-form-item prop="iCount">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            &lt;!&ndash;                            @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @focus="getInputFocus($event)"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @input="iCountChange"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </el-form-item>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                </el-row>-->
-
-                <!--                highlight-current-row-->
-                <!--                @current-change="rowChange"-->
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
@@ -324,46 +252,22 @@
                     </el-table-column>
                     <el-table-column width="180" label="生产日期(yyMMdd)">
                         <template slot-scope="scope">
-                            <!--                            <el-input size="small" v-model="scope.row.productDate"-->
-                            <!--                                      :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                      placeholder="请输入生产日期" style="width: 80%"></el-input>-->
 
                             <el-input v-model="scope.row.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
                                       type="number"
                             ></el-input>
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.productDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </template>
                     </el-table-column>
                     <el-table-column width="180" label="失效日期(yyMMdd)">
                         <template slot-scope="scope">
-                            <!--                            <el-input size="small" v-model="scope.row.expireDate"-->
-                            <!--                                      :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                      placeholder="请输入失效日期" style="width: 80%"></el-input>-->
 
                             <el-input v-model="scope.row.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
                                       type="number"
                             ></el-input>
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.expireDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </template>
                     </el-table-column>
                     <el-table-column width="150" label="单据数量">
@@ -376,16 +280,6 @@
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </template>
                     </el-table-column>
-                    <!--                    <el-table-column width="150" label="实际数量">-->
-                    <!--                        <template slot-scope="scope">-->
-                    <!--                            <el-input size="small" v-model="scope.row.reCount"-->
-                    <!--                                      placeholder="请输入数量" style="width: 80%"-->
-                    <!--                                      type='number'-->
-                    <!--                                      @change="tableCountChange(scope.row)"-->
-                    <!--                                      :disabled="scope.row.index !== selectedIndex"-->
-                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
-                    <!--                        </template>-->
-                    <!--                    </el-table-column>-->
                     <el-table-column width="150" label="价格">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.price"
@@ -396,11 +290,6 @@
                         </template>
                     </el-table-column>
 
-                    <!--<el-table-column width="150"-->
-                    <!--label="单据数量"-->
-                    <!--prop="count"-->
-                    <!--show-overflow-tooltip-->
-                    <!--&gt;</el-table-column>-->
                     <el-table-column width="150"
                                      label="注册/备案凭证号"
                                      prop="zczbhhzbapzbh"
@@ -424,16 +313,6 @@
                             >编辑
                             </el-button
                             >
-                            <!--                            <el-button-->
-                            <!--                                type="text"-->
-                            <!--                                size="small"-->
-                            <!--                                v-if="orderEditor && scope.row.index === selectedIndex"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                @click.stop="true"-->
-                            <!--                                @click.native="saveCodeArray(scope.$index, scope.row)"-->
-                            <!--                            >保存-->
-                            <!--                            </el-button-->
-                            <!--                            >-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -521,6 +400,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
 import {filterAll, filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
 import dialogInvProduct from "../inventory/DialogInvProduct"
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
     name: "idQuery",
@@ -546,7 +426,7 @@ export default {
                 page: 1,
                 limit: 10,
             },
-            formData: {noInvOut: false, locStorageCode: null},
+            formData: {noInvOut: false, locStorageCode: null, invWarehouseCode: null},
             formRules: {
                 corpName: [
                     {required: true, message: "请输入供应商", trigger: "blur"}
@@ -603,6 +483,7 @@ export default {
             thisData: {},
             storageList: [],
             invQueryData: {},
+            subInvList: [],
         };
     },
     components: {
@@ -632,20 +513,27 @@ export default {
                         if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
                             return this.$message.error('失效日期格式错误');
                         }
+
                     }
+
                     if (status === '3') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
+                            // if (this.$isBlank(this.codeArray[i].batchNo)) {
-                              if (!this.codeArray[i].allowNoBatch) {
+                            //     if (!this.codeArray[i].allowNoBatch) {
-                                return this.$message.error('批次号不能为空');
+                            //         return this.$message.error('批次号不能为空');
-                              }
+                            //     }
-                            }
+                            // }
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
+                            // if (this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('失效日期不能为空');
+                            // }
+
+
                         }
                     }
                     if (status === '2') {
@@ -653,6 +541,14 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
+
+                            // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) {
+                            //     return this.$message.error('生产日期格式错误');
+                            // }
+                            // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) {
+                            //     return this.$message.error('失效日期不能为空');
+                            // }
+
                         }
                     }
 
@@ -696,6 +592,7 @@ export default {
             filterAllByUser()
                 .then((response) => {
                     this.storageList = response.data || [];
+                    this.invChange();
                 })
                 .catch(() => {
                 });
@@ -1278,8 +1175,24 @@ export default {
             this.formData.locStorageCode = item;
             this.$forceUpdate();
             this.getBusType(item);
+            this.invChange();
             this.findStorageMethod();
-        }
+        },
+        invChange() {
+
+            if (this.$isNotBlank(this.formData.invWarehouseCode))
+                this.formData.invWarehouseCode = null;
+            this.subInvList = [];
+            let query = {
+                pcode: this.formData.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
     filters: {},
     mounted() {
@@ -1291,7 +1204,7 @@ export default {
     created() {
         this.getBusType("NOCODE");
         this.getStorage();
-        this.formData = {};
+        this.formData = {noInvOut: false, locStorageCode: null, invWarehouseCode: null};
         this.codeArray = [];
         this.closeConfirmFunction(false);
         if (this.$isNotBlank(this.idQuery.id)) {

src/views/business/stockOrderSearch.vue

@@ -102,11 +102,16 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -925,6 +930,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -939,6 +951,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/home/index.vue

@@ -240,7 +240,7 @@
                 </el-row>
 
                 <div style="margin-top: 8px ;  color: #F71616;">
-                    <span>提示：进入系统必须选择您当前所在仓库与分库&nbsp;</span>
+                    <span>提示：进入系统请先选择您当前所在仓库与分库&nbsp;</span>
                 </div>
                 <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
                     <el-button type="primary" @click="submitInv">提交</el-button>
@@ -413,6 +413,9 @@ export default {
         },
 
         locCHange() {
+            if(this.$isNotBlank(this.userInfo.locSubInvCode)){
+                this.userInfo.locSubInvCode = "";
+            }
             this.findSubInvByInv();
         },
 
@@ -479,6 +482,16 @@ export default {
         },
 
         submitInv() {
+            if (this.$isBlank(this.userInfo.locInvCode)) {
+                this.$message.error("当前仓库不能为空！");
+                return;
+            }
+            if (this.userInfo.customerId == 110) {
+                if (this.$isBlank(this.userInfo.locSubInvCode)) {
+                    this.$message.error("当前分库不能为空！");
+                    return;
+                }
+            }
             updateInv(this.userInfo).then((res) => {
                 if (res.code == 20000) {
                     this.$message.success("设置成功!");

src/views/inout/IOAdditionalOrder.vue

@@ -27,6 +27,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invChange"
                                    size="mini">
                             <el-option
                                 v-for="item in storageList"
@@ -37,6 +38,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -68,13 +81,17 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
-
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -257,6 +274,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 const formJson = {
     site_id: "",
@@ -270,6 +288,8 @@ export default {
     data() {
         return {
             filterQuery: {
+                locStorageCode: null,
+                invWarehouseCode: null,
                 id: "",
                 mainAction: null,
                 action: null,
@@ -309,6 +329,7 @@ export default {
             },
             list: [],
             storageList: [],
+            subInvList: [],
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
             total: 0,
@@ -510,6 +531,21 @@ export default {
                 .catch(() => {
                 });
         },
+
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         getStorageName(code) {
             for (let i = 0; i < this.storageList.length; i++) {
                 if (this.storageList[i].code === code) {
@@ -517,6 +553,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';

src/views/inout/IOCheckErrorOrder.vue

@@ -117,11 +117,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -811,6 +816,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         repeatPrintCheckClick(row) {
             let tQuery = {
                 orderId: row.id,
@@ -1089,6 +1101,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/inout/IOCheckWaitOrder.vue

@@ -115,11 +115,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -342,6 +347,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
 const formJson = {
     site_id: "",
@@ -350,7 +356,6 @@ const formJson = {
     ads: [],
 };
 export default {
-    name: "IOCheckWaitOrder",
     props: {
         isSelect: {
             type: Boolean,
@@ -544,6 +549,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;
@@ -644,6 +656,17 @@ export default {
             this.curIndex = row.id;
             // this.dialogTableVisible = true;
         },
+        getUnitList() {
+            this.loading = true;
+            getBasicUnitMaintains(this.unitquery)
+                .then((response) => {
+                    this.loading = false;
+                    this.unitlist = response.data.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
         intentDetail(row) {
             // this.$router.push({
             //   path: "../inout/detail",
@@ -831,6 +854,7 @@ export default {
                 });
         },
         invChange() {
+            this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.filterQuery.locStorageCode

src/views/inout/IOErrorOrder.vue

@@ -570,6 +570,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/inout/IOFinishOrder.vue

@@ -114,11 +114,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -617,6 +622,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;
@@ -888,6 +900,7 @@ export default {
             }
         },
         invChange() {
+            this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.filterQuery.locStorageCode

src/views/inout/IONewOrder.vue

@@ -25,10 +25,12 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+
                     </el-col>
                     <el-col>
                         <el-form-item class="query-form-item">
                             <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                       @change="invChange"
                                        size="mini">
                                 <el-option
                                     v-for="item in storageList"
@@ -51,6 +53,8 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+
+
                         <el-form-item>
                             <el-button-group>
                                 <el-button
@@ -94,33 +98,20 @@
 
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
+
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
-                        {{ scope.row.fromCorp }}
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-                        <!--                    <p v-if="scope.row.fromCorp == null">-->
-                        <!--                        <el-button-->
-                        <!--                            type="primary"-->
-                        <!--                            size="mini"-->
-                        <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-                        <!--                        >选择往来单位-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-                        <!--                    </p>-->
-                        <!--                    <p v-if="scope.row.fromCorp !== null">-->
-                        <!--                        <el-button-->
-                        <!--                            type="primary"-->
-                        <!--                            size="mini"-->
-                        <!--                            @click.native.stop="handleUnitClick(scope.row)"-->
-                        <!--                        >{{ scope.row.fromCorp }}-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-                        <!--                    </p>-->
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
                     <template slot-scope="scope">
-                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
                     </template>
                 </el-table-column>
+
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -140,29 +131,10 @@
                         <el-button
                             type="text"
                             size="small"
-
                             @click.native.stop="addOrders(scope.row)"
                         >编辑
                         </el-button
                         >
-                        <!--                        v-if="scope.row.status === -1"-->
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            v-if="scope.row.status !== -1"-->
-                        <!--                            @click.native.stop="intentDetail(scope.row)"-->
-                        <!--                        >详情-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
-
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            v-if="scope.row.status !== -1"-->
-                        <!--                            @click.native.stop="handleErrorDetail(scope.$index)"-->
-                        <!--                        >错误详情-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
                         <el-button
                             type="text"
                             size="small"
@@ -305,7 +277,7 @@ import {
 } from "../../api/inout/order";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 import draggable from "vuedraggable";
-import codeDetail from "./IONewCode";
+import codeDetail from "./errorCode";
 
 import ioErrorOrder from "./IOErrorOrder";
 import addOrder from "./IOAddOrder";
@@ -355,7 +327,6 @@ export default {
             idQuery: {
                 id: "",
             },
-            uploadData: {},
             storageList: [],
             subInvList: [],
             errOrderVisible: false,
@@ -395,7 +366,6 @@ export default {
             formData: formJson,
             deleteLoading: false,
             busTypes: [],
-            uploadFileUrl: null,
         };
     },
     components: {
@@ -461,7 +431,6 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.filterQuery.locStorageCode = this.storageList[0].code;
                         this.invChange();
                         this.getList();
                     }
@@ -476,11 +445,19 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';
             this.idQuery.actDate = '';
             this.idQuery.corpOrderId = '';
+
             this.idQuery.outChangeEnable = row.outChangeEnable;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
                 this.idQuery.id = row.id;
@@ -488,6 +465,10 @@ export default {
                 this.idQuery.corpOrderId = row.corpOrderId;
                 this.idQuery.billType = row.action;
                 this.idQuery.locStorageCode = row.locStorageCode;
+                this.idQuery.invWarehouseCode = row.invWarehouseCode;
+                this.idQuery.fromSubInvCode = row.fromSubInvCode;
+
+
                 this.idQuery.preCheck = row.preCheck;
             }
             this.addOrderVisible = true;
@@ -501,6 +482,7 @@ export default {
         },
         closeDialog() {
             this.addOrderVisible = false;
+            this.addHosOrderVisible = false;
             this.getList();
         },
         getUnitList() {
@@ -662,9 +644,11 @@ export default {
         intentDetail(row) {
             this.codeDetailVisible = true;
             this.idQuery.id = row.id;
+
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/inventory/InvProductsDetail.vue

@@ -173,6 +173,8 @@ export default {
                 customerId: null,
                 page: 1,
                 limit: 20,
+                invStorageCode: null,
+                invWarehouseCode: null,
             },
             codeArry: [],
             total: 0,
@@ -224,6 +226,7 @@ export default {
             this.query.batchNo = this.idQuery.batchNo;
             this.query.supId = this.idQuery.supId;
             this.query.invStorageCode = this.idQuery.invStorageCode;
+            this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
             filterDetailProducts(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;

src/views/inventory/InvStatistics.vue

@@ -51,7 +51,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   size="mini">
+                                   @change="invChange" size="mini">
                             <el-option
                                 v-for="item in storageList"
                                 :key="item.name"
@@ -61,6 +61,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -135,12 +147,14 @@ import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 
 export default {
     data() {
         return {
             filterQuery: {
+                invWarehouseCode: null,
                 cpmctymc: null,
                 nameCode: null,
                 relIdFk: null,
@@ -175,6 +189,7 @@ export default {
             fromOptions: [],
             storageOptions: [],
             storageList: [],
+            subInvList: [],
         };
     },
     components: {
@@ -244,7 +259,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             stockStatistics(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.showSup = response.data.showSup;
                     this.loading = false;
                     this.list = response.data.list || [];
@@ -324,6 +338,20 @@ export default {
                 .catch(() => {
                 });
         },
+        invChange() {
+            // this.$set(this.filterQuery, "entrustUser", "");
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.invStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
     filters: {
         statusFilterType(status) {

src/views/inventory/invPreInProducts.vue

@@ -58,6 +58,10 @@
                             >查询
                             </el-button
                             >
+                            <el-button type="primary" icon="search" @click="clearAll"
+                            >清空库存
+                            </el-button
+                            >
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -88,6 +92,8 @@
                                  width="120"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -133,7 +139,7 @@
 <script>
 import {
     filterProducts,
-    deleteProducts,
+    deleteProducts,clearAllProducts
 } from "../../api/inventory/InvPreInProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvPreInProductsDetail";
@@ -270,6 +276,36 @@ export default {
                 .catch(() => {
                 });
         },
+
+
+        clearAll(){
+            this.$confirm("此操作将永久清空所有预验收库存信息, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let query={id:1};
+
+                    clearAllProducts(query)
+                        .then((response) => {
+                            if (response.code == 20000) {
+                                this.getList();
+                                this.$message({
+                                    type: "success",
+                                    message: "删除成功！",
+                                });
+                            } else {
+                                this.$message.error(response.message);
+                            }
+
+                        })
+
+
+                })
+                .catch(() => {
+                });
+        },
         findMethod(query) {
             console.log(query);
             this.fromOptions = [];
@@ -284,6 +320,7 @@ export default {
                     this.fromOptions = response.data.page.list || [];
                 })
                 .catch(() => {
+                    this.fromOptions = [];
                     this.loading = false;
                 });
         },

src/views/inventory/invPreProducts.vue

@@ -100,6 +100,8 @@
                                  width="120"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -304,10 +306,11 @@ export default {
                 });
             // filterCustomers(cQuery)
             //     .then((response) => {
-            //         this.fromOptions = response.data.list || [];
+            //         this.loading = false;
+            //         this.fromOptions = response.data.page.list || [];
             //     })
             //     .catch(() => {
-            //         this.fromOptions = [];
+            //         this.loading = false;
             //     });
         },