Merge branch 'fengcang' into busUser

public/打包备份.txt

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

src/role.js

@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
                 })
                 .catch(() => {
                     store.dispatch("fedLogout").then(() => {
-                        Message.error("验证失败,请重新登录");
+                        Message.error("登录失效,请重新登录");
                         let redirect = to.fullPath;
                         store.dispatch("loginOut").then(() => {
                             next({

src/utils/axios.js

@@ -42,7 +42,7 @@ service.interceptors.response.use(
         if (data.code) {
             if (data.code === 2) {
                 store.dispatch("fedLogout").then(() => {
-                    Message.error("验证失败,请重新登录");
+                    Message.error("登录失效,请重新登录");
                     router.push({
                         path: "/login",
                         query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来

src/utils/axios2.js

@@ -21,7 +21,7 @@ service.interceptors.response.use(
         if (data.code) {
             if (data.code === 2) {
                 store.dispatch("fedLogout").then(() => {
-                    Message.error("验证失败,请重新登录");
+                    Message.error("登录失效,请重新登录");
                     router.push({
                         path: "/login",
                         query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来

src/views/basic/BasicEntrutsRece.vue

@@ -226,11 +226,20 @@ export default {
                 return;
             }
 
+            if (this.$isBlank(this.inputQuery.entrustAction)) {
+                this.$message.error("请输入生成单据类型！");
+                return;
+            }
+
             insertEntrustRece(this.inputQuery)
                 .then((response) => {
+                    if (response.code == 20000) {
                         this.loading = false;
                         this.cancelDialog();
                         this.getList();
+                    } else {
+                        this.$message.error(response.message);
+                    }
                 })
                 .catch(() => {
                     this.loading = false;
@@ -251,11 +260,25 @@ export default {
                 this.$message.error("请输入接受委托仓库！");
                 return;
             }
-      if (this.$isBlank(this.inputQuery.entrustInv)) {
+            if (this.$isBlank(this.inputQuery.entrustUser)) {
                 this.$message.error("请输入接受委托人！");
                 return;
             }
-      insertEntrustRece(this.inputQuery)
+
+            if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+                this.$message.error("当前分库不能为空！");
+                return;
+            }
+            if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+                this.$message.error("请输入接受委托分库！");
+                return;
+            }
+
+            if (this.$isBlank(this.inputQuery.entrustAction)) {
+                this.$message.error("请输入生成单据类型！");
+                return;
+            }
+            updateEntrustRece(this.inputQuery)
                 .then((response) => {
                     this.loading = false;
                     this.cancelDialog();

src/views/basic/UdiRlDetailDialog.vue

@@ -393,7 +393,7 @@ export default {
     methods: {
         getThirdSysDetail() {
             let query = {
-                id: this.editQuery.id,
+              id: this.editQuery.rlId,
             };
 
             thirdSysDetail(query)

src/views/business/stockOrder.vue

@@ -324,7 +324,7 @@
         </el-dialog>
 
         <el-dialog
-            title="码详情"
+            title="内部码详情"
             :visible.sync="qrcodeDetailVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
@@ -792,7 +792,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -813,6 +813,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/business/stockOrderDelSearch.vue

@@ -856,7 +856,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -877,6 +877,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/business/stockOrderEditDistribution.vue

@@ -135,6 +135,22 @@
                     </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" style="margin-right: 20px;"
+                                      v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
+                            <el-checkbox v-model="formData.noInvOut">允许无库存出库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
             </el-card>
 
             <el-card>
@@ -380,7 +396,21 @@ export default {
                 page: 1,
                 limit: 10,
             },
-            formData: {},
+            formData: {
+
+                noInvOut: false,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                fromSubInvCode: null,
+                billNo: null,
+                billdate: "",
+                customerId: store.getters.customerId,
+                billType: "",
+                type: null,
+                corpName: "",
+                corpId: "",
+
+            },
             formRules: {
                 corpName: [
                     {required: true, message: "请输入供应商", trigger: "blur"}
@@ -477,9 +507,9 @@ export default {
                             //         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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
                             if (this.$isBlank(this.codeArray[i].reCount) || this.codeArray[i].reCount < 1) {
                                 return this.$message.error('配货数量不能小于0');
                             }
@@ -1061,13 +1091,16 @@ export default {
             this.invChange();
         } else {
             this.formData = {
+                billNo: null,
                 billdate: "",
-                corpName: store.getters.companyName,
                 customerId: store.getters.customerId,
-                // billType: "deliveryNote",
                 billType: "",
-                type: "1",
-                // type: "",
+                type: "2",
+                corpName: "",
+                corpId: "",
+                noInvOut: "",
+                locStorageCode: store.getters.locInvCode,
+                invWarehouseCode: store.getters.locSubInvCode,
             };
             this.iCount = 0;
             this.orderEditor = false;

src/views/business/stockOrderEditor.vue

@@ -895,9 +895,9 @@ export default {
                     //         return this.$message.error('批次号不能为空');
                     //     }
                     // }
-                    if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
-                        return this.$message.error('生产日期与失效日期不能全部为空');
-                    }
+                    // if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
+                    //     return this.$message.error('生产日期与失效日期不能全部为空');
+                    // }
                     uploadStockOrderDetail(tQuery).then((response) => {
                         this.detailLoading = false;
                         if (response.code === 20000) {
@@ -952,7 +952,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -972,6 +972,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/business/stockOrderNew.vue

@@ -924,7 +924,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -944,6 +944,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/business/stockOrderNewDistribution.vue

@@ -602,9 +602,9 @@ export default {
                             //         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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
                             // if (this.$isBlank(this.codeArray[i].expireDate)) {
                             //     return this.$message.error('失效日期不能为空');
                             // }
@@ -796,7 +796,6 @@ export default {
         selectProductFunction(event) {
 
             if (event == null) {
-                // this.$refs.inputRef.focus();
             } else {
                 event.target.select();
             }
@@ -827,12 +826,14 @@ export default {
                 if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
                     this.invQueryData = {
                         locStorageCode: this.formData.locStorageCode,
+                        invWarehouseCode: this.formData.invWarehouseCode,
                     };
                     this.selectInvProductVisible = true;
                 } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) {
 
                     this.invQueryData = {
                         locStorageCode: this.formData.corpId,
+                        invWarehouseCode: this.formData.fromSubInvCode,
                     };
                     this.selectInvProductVisible = true;
                 } else {

src/views/business/stockOrderQRCodeDetail.vue

@@ -63,23 +63,10 @@
             </el-row>
 
 
-            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350" ref="multipleTable">
-<!--                <el-table-column-->
-<!--                    type="selection"-->
-<!--                    width="55">-->
-<!--                </el-table-column>-->
+            <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
+                      ref="multipleTable">
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="码" prop="udiCode"></el-table-column>
-                <!--<el-table-column label="订单数量">-->
-                    <!--<template slot-scope="scope">-->
-                        <!--<span>{{ scope.row.count }}</span>-->
-                    <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column label="实际数量">-->
-                    <!--<template slot-scope="scope">-->
-                        <!--<span>{{ scope.row.reCount }}</span>-->
-                    <!--</template>-->
-                <!--</el-table-column>-->
+                <el-table-column label="内部码" prop="udiCode"></el-table-column>
                 <el-table-column label="状态">
                     <template slot-scope="scope">
                         <span>{{ statusMap[scope.row.printStatus] }}</span>
@@ -95,17 +82,6 @@
                         <span>{{ scope.row.updateTime }}</span>
                     </template>
                 </el-table-column>
-<!--                <el-table-column label="操作" fixed="right" width="150">-->
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-button-->
-<!--                            type="text"-->
-<!--                            size="small"-->
-<!--                            @click.native="printStockOrderDetailPDF(scope.row)"-->
-<!--                        >打印-->
-<!--                        </el-button-->
-<!--                        >-->
-<!--                    </template>-->
-<!--                </el-table-column>-->
             </el-table>
 
             <div class="block">
@@ -123,8 +99,13 @@
 </template>
 
 <script>
-import {stockOrderDetail, submitStockOrder, submitStockOrderError, uploadStockOrderDetailCount} from "../../api/inout/stockOrder";
-import {stockQRCodeText,filterPrint} from "../../api/inout/stockQRCode";
+import {
+    stockOrderDetail,
+    submitStockOrder,
+    submitStockOrderError,
+    uploadStockOrderDetailCount
+} from "../../api/inout/stockOrder";
+import {stockQRCodeText, filterPrint} from "../../api/inout/stockQRCode";
 import {getLocalJoinBusType} from "../../api/basic/busLocalType";
 
 import draggable from "vuedraggable";
@@ -150,7 +131,7 @@ export default {
         return {
             code: "",
             query: {
-                sOrderId:null,
+                sOrderId: null,
                 orderIdFk: "",
                 page: 1,
                 limit: 10,
@@ -265,7 +246,7 @@ export default {
             if (row.count <= 0) {
                 return this.$message.error('数量错误');
             }
-            let tQuery = { queryId: row.id, }
+            let tQuery = {queryId: row.id,}
             this.loading = true;
             inspectionStockQRCodeTextPDFFromTemplateFile(tQuery).then((response) => {
                 if (response.code === 20000) {
@@ -332,8 +313,6 @@ export default {
         this.codeArray = [];
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData = this.idQuery.formData;
-            // this.query.orderIdFk = this.idQuery.id;
-            // this.getStockOrderDetailList();
             this.query.sOrderId = this.idQuery.id;
             this.getStockQRCodeTextList();
         }

src/views/business/stockOrderSearch.vue

@@ -350,7 +350,8 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true" type="number"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="true"
+                                      type="number"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -937,7 +938,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -958,6 +959,19 @@ export default {
                 });
         },
 
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
+
         subInvChange() {
             this.getBusType();
         },

src/views/business/stockOrderWaitCheck.vue

@@ -789,8 +789,8 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.query.locStorageCode = this.storageList[0].code;
-                        this.invChange();
+                        // this.query.locStorageCode = this.storageList[0].code;
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -810,6 +810,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.query.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/inout/DialogSelectErpOrder.vue

@@ -115,25 +115,30 @@
             >
                 <el-table-column label="序号" type="index"></el-table-column>
 
-                <el-table-column
-                    label="产品ID"
-                    prop="productId"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
 
                 <el-table-column
                     label="产品名称"
                     prop="productName"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
+                <el-table-column
+                    label="规格型号"
+                    prop="spec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
                 <el-table-column
                     label="批号"
                     prop="batchNo"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
-                    label="规格型号"
-                    prop="spec"
+                    label="生产日期"
+                    prop="productDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="失效日期"
+                    prop="expireDate"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column label="单据数量" prop="count"></el-table-column>

src/views/inout/DialogSelectUnit.vue

@@ -90,15 +90,15 @@ export default {
     },
     methods: {
         getUnitList() {
-            this.loading = true;
-            getBasicUnitMaintains(this.unitquery)
-                .then((response) => {
-                    this.loading = false;
-                    this.unitlist = response.data.page.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
+            // this.loading = true;
+            // getBasicUnitMaintains(this.unitquery)
+            //     .then((response) => {
+            //         this.loading = false;
+            //         this.unitlist = response.data.page.list || [];
+            //     })
+            //     .catch(() => {
+            //         this.loading = false;
+            //     });
         },
         getUnitListByCode(row) {
             let query = {

src/views/inout/IOAddOrder.vue

@@ -623,9 +623,9 @@ export default {
         },
         closeCodeDialog() {
             //编辑完，获取编辑之后的条码
-            this.getCodeList();
             this.editCodeVisible = false;
             this.editOriginCodeVisible = false;
+            this.getCodeList();
         },
         editCode(row) {
             this.codeDetail = row;
@@ -1210,7 +1210,7 @@ export default {
         this.codeArray = [];
         this.getBusType();
         this.getStorage(this.formData.action);
-        this.findSubInvByInv();
+
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData.actDate = new Date(this.idQuery.actDate);
             this.formData.corpOrderId = this.idQuery.corpOrderId;
@@ -1252,6 +1252,9 @@ export default {
         }
 
 
+        this.findSubInvByInv(this.formData.locStorageCode);
+
+
     }
     ,
 }

src/views/inout/IOAdditionalOrder.vue

@@ -241,7 +241,7 @@
         ></el-pagination>
 
         <el-dialog
-            title="新增订单"
+            title="单据编辑"
             :visible.sync="addOrderVisible"
             width="75%"
             :close-on-click-modal="false"
@@ -570,10 +570,7 @@ export default {
             }
         },
         addOrders(row) {
-            console.log(row)
-            this.idQuery.id = '';
-            this.idQuery.actDate = '';
-            this.idQuery.corpOrderId = '';
+            this.idQuery = row;
             this.idQuery.billType = row.action;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
                 this.idQuery.id = row.id;

src/views/inout/IOCheckErrorOrder.vue

@@ -1017,7 +1017,7 @@ export default {
           .then((response) => {
             this.storageList = response.data || [];
             if (this.storageList.length > 0) {
-                        this.invChange();
+              this.getSubInvList();
               this.getList();
             }
           })
@@ -1106,6 +1106,19 @@ export default {
           .catch(() => {
           });
     },
+
+    getSubInvList() {
+      let query = {
+        pcode: this.filterQuery.locStorageCode
+      };
+      filterSubByInv(query)
+          .then((response) => {
+            this.subInvList = response.data || [];
+          })
+          .catch(() => {
+          });
+    },
+
     subInvChange() {
       this.getBusType();
     },

src/views/inout/IOCheckWaitOrder.vue

@@ -842,7 +842,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -862,6 +862,20 @@ export default {
                 .catch(() => {
                 });
         },
+
+
+        getSubInvList() {
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/inout/IOFinishOrder.vue

@@ -80,7 +80,7 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>
+<!--                            <el-button type="primary" icon="search" @click="exportOrders">导出单据</el-button>-->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -601,8 +601,8 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.filterQuery.locStorageCode = this.storageList[0].code;
-                        this.invChange();
+                        // this.filterQuery.locStorageCode = this.storageList[0].code;
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -911,6 +911,19 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         subInvChange() {
             this.getBusType();
         },

src/views/inout/IONewOrder.vue

@@ -73,7 +73,7 @@
                         <el-form-item style="margin-right: 50px; margin-left: auto">
                             <el-button-group>
                                 <el-button type="primary" icon="search" @click="mergesOrders">合并单据</el-button>
-                                <el-button type="primary" icon="search" @click="addOrders">新增订单</el-button>
+                                <el-button type="primary" icon="search" @click="addOrders">新增单据</el-button>
                                 <el-button type="primary" icon="search" @click="errOrders">异常单据</el-button>
 
                             </el-button-group>
@@ -82,7 +82,7 @@
                 </el-row>
             </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%"
+            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                       @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
@@ -220,7 +220,7 @@
             </el-dialog>
 
             <el-dialog
-                title="新增订单"
+                title="新增单据"
                 :visible.sync="addOrderVisible"
                 width="75%" append-to-body
                 :close-on-click-modal="false"
@@ -426,7 +426,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.invChange();
+                        this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -540,17 +540,17 @@ export default {
             let unit = repeatData[0].fromCorp;
             let action = repeatData[0].action;
             let orderList = [];
-            repeatData.forEach((obj, index) => {
-                if (unit !== obj.fromCorp) {
-                    this.$message.warning("往来单位不一致！");
+            for (let index in repeatData) {
+                if (action !== repeatData[index].action) {
+                    this.$message.warning("业务类型不一致！");
                     return;
                 }
-                if (action !== obj.action) {
-                    this.$message.warning("业务类型不一致！");
+                if (unit !== repeatData[index].fromCorp) {
+                    this.$message.warning("往来单位不一致！");
                     return;
                 }
-                orderList.push(obj.id);
-            });
+                orderList.push(repeatData[index].id);
+            }
             let tquery = {
                 orderList: orderList,
                 type: 2,
@@ -668,6 +668,20 @@ export default {
                 .catch(() => {
                 });
         },
+
+        getSubInvList() {
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
+
         subInvChange() {
             this.getBusType();
         },

src/views/inout/errorCode.vue

@@ -118,7 +118,8 @@
         <el-dialog
             title="选择供应商"
             :visible.sync="dialogTableVisible"
-            v-if="dialogTableVisible"
+            v-if="dialogTableVisible" :close-on-click-modal="false"
+            :close-on-press-escape="false"
             width="70%"
             append-to-body
         >
@@ -132,7 +133,8 @@
             title="绑定产品ID"
             :visible.sync="selectRlVisible"
             width="80%"
-            v-if="selectRlVisible"
+            v-if="selectRlVisible" :close-on-click-modal="false"
+            :close-on-press-escape="false"
             append-to-body
         >
             <selectRlDialog
@@ -145,7 +147,8 @@
 
         <el-dialog
             :title="editTitle"
-            :visible.sync="editCodeVisible"
+            :visible.sync="editCodeVisible" :close-on-click-modal="false"
+            :close-on-press-escape="false"
             append-to-body width="70%"
             v-if="editCodeVisible"
         >
@@ -203,7 +206,7 @@ export default {
         };
     },
     components: {
-        draggable, DialogSelectUnit, selectRlDialog,editCodeDialog
+        draggable, DialogSelectUnit, selectRlDialog, editCodeDialog
     },
     methods: {
         handleSelectionChange(val) {
@@ -355,6 +358,7 @@ export default {
         },
         closeCodeDialog() {
             this.editCodeVisible = false;
+            this.getCodeList();
         },
         editCode(row) {
             this.codeDetail = row;

src/views/inventory/InvPreInProductsDetail.vue

@@ -43,12 +43,12 @@
 
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
-                <el-input v-model="query.code" placeholder="条码查询"></el-input>
+                <el-input v-model="query.code" placeholder="条码查询" clearable></el-input>
             </el-form-item>
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="onSubmit"
                     >查询
                     </el-button
                     >
@@ -106,6 +106,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
             :total="total"
+            :current-page="query.page"
         >
         </el-pagination>
     </div>

src/views/thrsys/thrOrderNew.vue

@@ -479,9 +479,9 @@ export default {
                             if (this.$isBlank(this.codeArray[i].batchNo)) {
                                 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].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
+                            //     return this.$message.error('生产日期与失效日期不能全部为空');
+                            // }
                             // if (this.$isBlank(this.codeArray[i].expireDate)) {
                             //     return this.$message.error('失效日期不能为空');
                             // }