Merge branch 'fencang' into busUser

# Conflicts:
#	src/views/warehouse/IOErrorOrder.vue

src/views/basic/UdiInfoRelevance.vue

@@ -15,9 +15,8 @@
 
         <el-card class="el-card" v-if="checked">
             <div>
-                <el-form :inline="true" :model="erpQuery" style="display: flex" size="mini">
-
-
+                <el-form :inline="true" :model="erpQuery" size="mini">
+                    <el-row>
                         <el-form-item class="query-form-item">
                             <el-input
                                 v-model="erpQuery.code"
@@ -41,6 +40,9 @@
                                       clearable="true"
                                       placeholder="生产厂家"></el-input>
                         </el-form-item>
+                    </el-row>
+
+                    <el-row>
                         <el-form-item class="query-form-item">
                             <el-input
                                 v-model="erpQuery.spec"
@@ -64,6 +66,7 @@
                         <el-form-item style="display: flex">
                             <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
                         </el-form-item>
+                    </el-row>
                 </el-form>
 
                 <el-table

src/views/basic/invWarehouse.vue

@@ -830,8 +830,8 @@ export default {
             pidData: {},
             deleteLoading: false,
             uploadFileUrl: null,
-            userData: null,
-            bussinessTypeData: null,
+            userData: [],
+            bussinessTypeData: [],
             userList: null,
             bussinessTypeList: null,
             userFormVisible: false,
@@ -1406,13 +1406,18 @@ export default {
                 if (res.code === 20000) {
                     this.userFormVisible = false;
                     this.$message.success("添加成功");
-                    let loadParam = {
-                        code: this.currentCode
-                    };
+                    this.userQuery = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
+                    }
                     //重新加载数据
-                    warehouseUserList(loadParam).then((res) => {
-                        this.userData = res.data;
+                    warehouseUserList(this.userQuery).then((res) => {
+                        this.userData = res.data.list;
+                        this.userTotal = res.data.total;
                     }).catch((error) => {
+                        this.userData = [];
+                        this.userTotal = 0;
                     });
                 } else {
                     this.$message.error(res.message);
@@ -1461,12 +1466,17 @@ export default {
                 saveWarehouseBussinessType(query).then((res) => {
                     this.$message.success("添加成功");
                     //重新加载数据表格
-                    let loadParam = {
-                        code: this.currentCode
+                    this.busQuery = {
+                        code: this.currentCode,
+                        page: 1,
+                        limit: 10
                     }
-                    warehouseBussinessTypeList(loadParam).then((res) => {
-                        this.bussinessTypeData = res.data;
+                    warehouseBussinessTypeList(this.busQuery).then((res) => {
+                        this.bussinessTypeData = res.data.list;
+                        this.busTotal = res.data.total;
                     }).catch((error) => {
+                        this.bussinessTypeData = [];
+                        this.busTotal = 0;
                     });
                 }).catch((error) => {
                 });

src/views/inventory/invUdiTraceOrder.vue

@@ -142,6 +142,7 @@
                 :page-size="filterQuery.limit"
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
+                :current-page="filterQuery.page"
                 :total="total"
             ></el-pagination>
         </el-card>
@@ -505,7 +506,6 @@ export default {
             this.getList();
         },
         handleSelectionChange(val) {
-            console.log(val);
             this.multipleSelection = val;
         },
 
@@ -515,7 +515,6 @@ export default {
             this.errDialogVisible = true;
         },
         findMethod(query) {
-            console.log(query);
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -584,7 +583,6 @@ export default {
             this.loading = true;
             this.filterQuery.customerId = store.getters.customerId;
             if (!this.$isBlank(this.filterQuery.code)) {
-                console.log(this.filterQuery.code)
                 let code = this.filterQuery.code;
                 this.filterQuery.code = code.replace("\r","")
             }
@@ -597,6 +595,9 @@ export default {
                         this.total = response.data.total || 0;
                     } else {
                         this.loading = false;
+                        this.list = [];
+                        this.detailList = [];
+                        this.total = 0;
                         this.$message.error(response.message);
                     }
 
@@ -685,7 +686,6 @@ export default {
             this.successOrderExportPDFSettingVisible = true;
         },
         successOrderExportPDF(row) {
-            console.log(row)
             let tQuery = {
                 orderId: row.id,
                 customerId: store.getters.customerId
@@ -720,7 +720,6 @@ export default {
         },
 
         selectUnit(row) {
-            console.log(row.id);
             this.unitUpdateQuery.id = this.curIndex;
             this.unitUpdateQuery.fromCorp = row.name;
             this.unitUpdateQuery.fromCorpId = row.unitid;
@@ -892,7 +891,6 @@ export default {
         },
 
         uploadOrderDialog(value) {
-            console.log(value.id + "---" + value.orderid);
             this.uploadQuery = {
                 orderId: value.id,
             };

src/views/warehouse/DialogSelectErpOrder.vue

@@ -56,10 +56,6 @@
                             >导入比对
                             </el-button
                             >
-
-                            <!-- <el-button type="primary" icon="search" @click="combineErps"
-                              >合并下载</el-button
-                            > -->
                         </el-button-group>
                     </el-form-item>
                 </el-row>

src/views/warehouse/DialogcChangeNewOrder.vue

@@ -226,6 +226,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {submitOrderWeb} from "@/api/warehouse/order";
 import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "DialogcChangeNewOrder",
@@ -432,7 +433,12 @@ export default {
         storageChange(row) {
             this.formData.fromCorpId = row.code;
             this.formData.fromCorp = row.name;
+            if (isBlank(this.formData.fromCorp)) {
+                this.fromSubStorageOptions = [];
+                this.formData.fromSubInvCode = null;
+            } else {
                 this.findSubStorageMethod();
+            }
         },
 
         unitChange(row) {
@@ -441,7 +447,8 @@ export default {
         },
         actionChange(item) {
             this.curAction = this.getActionItem(item);
-            // this.formData.locStorageCode = this.curAction.storageCode;
+            this.formData.fromCorp = null;
+            this.formData.fromSubInvCode = null;
             this.findMethod();
         },
         getActionItem(action) {

src/views/warehouse/IOWaitOrder.vue

@@ -947,7 +947,6 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.getSubInvList();
                         this.getList();
                     }
                 })

src/views/warehouse/addHosOrder.vue

@@ -821,12 +821,22 @@ export default {
 
                         });
                     } else if (response.code == 507) {
-                        this.editTitle = response.message;
                         this.editOriginCodeVisible = true;
+                        this.editTitle = response.message;
                         this.formData.produceDate = response.data.produceDate;
                         this.formData.expireDate = response.data.expireDate;
                         this.formData.batchNo = response.data.batchNo;
                         this.formData.serialNo = response.data.serialNo;
+
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
+                        });
+
+                        // this.$message.error("提交失败！" + this.editTitle);
+
+
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',
@@ -1051,6 +1061,7 @@ export default {
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.fromSubStorageOptions = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
                         this.getBusType();
@@ -1246,7 +1257,7 @@ export default {
             }
         }
         this.findSubInvByInv(this.formData.locStorageCode);
-        this.findSubStorageMethod();
+        // this.findSubStorageMethod();
         this.getBusType();
 
 
@@ -1256,6 +1267,9 @@ export default {
 
 
 <style>
+.messageIndex {
+    z-index: 9999 !important;
+}
 
 .ao-text {
     width: 100%;

src/views/warehouse/addOrder.vue

@@ -685,6 +685,13 @@ export default {
                         this.formData.expireDate = response.data.expireDate;
                         this.formData.batchNo = response.data.batchNo;
                         this.formData.serialNo = response.data.serialNo;
+
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
+                        });
+
                     } else {
                         this.$alert(response.message, '提示', {
                             confirmButtonText: '确定',

src/views/warehouse/errorCode.vue

@@ -52,7 +52,7 @@
             ></el-table-column>
             <el-table-column
                 label="供应商"
-                prop="supId"
+                prop="supName"
                 show-overflow-tooltip
             ></el-table-column>
             <el-table-column

src/views/warehouse/stockOrderDelete.vue

@@ -76,24 +76,24 @@
                         <span>{{ scope.row.actDate }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="审核时间"
-                    prop="actDate"
-                    width="150"
-                    show-overflow-tooltip="true"
-                >
-                    <template slot-scope="scope">
-                        <i class="el-icon-time"></i>
-                        <span>{{ scope.row.auditTime }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="校验状态" prop="contrastStatus" width="120">
-                    <template slot-scope="scope">
-                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">
-                            {{ erpCheckStatus[scope.row.contrastStatus] }}
-                        </el-tag>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column-->
+                <!--                    label="审核时间"-->
+                <!--                    prop="actDate"-->
+                <!--                    width="150"-->
+                <!--                    show-overflow-tooltip="true"-->
+                <!--                >-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        <i class="el-icon-time"></i>-->
+                <!--                        <span>{{ scope.row.auditTime }}</span>-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+                <!--                <el-table-column label="校验状态" prop="contrastStatus" width="120">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        <el-tag :type="(scope.row.contrastStatus === 1) | statusFilterType">-->
+                <!--                            {{ erpCheckStatus[scope.row.contrastStatus] }}-->
+                <!--                        </el-tag>-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="150">
                     <template slot-scope="scope">
                         <el-button
@@ -113,15 +113,6 @@
                     </template>
                 </el-table-column>
             </el-table>
-
-            <el-pagination
-                :page-size="query.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="query.page"
-            >
-            </el-pagination>
         </el-card>
 
         <el-card class="el-card" v-if="true">
@@ -302,9 +293,9 @@
                     "8": "平衡补录单据",
                 },
                 erpCheckStatus: {
-                    1: "已完成",
-                    0: "已完成",
-                    2: "已完成",
+                    0: "未校验",
+                    1: "失败",
+                    2: "成功",
                 },
                 isSp: store.getters.customerId,
                 detailFormData: {},

src/views/warehouse/stockOrderEditor.vue

@@ -526,18 +526,18 @@ export default {
             },
             distributionVisible: false,
             detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
+                // batchNo: [
+                //     {required: true, message: "请输入批次号", trigger: "blur"}
+                // ],
+                // productDate: [
+                //     {required: true, message: "请输入生产日期", trigger: "blur"}
+                // ],
+                // expireDate: [
+                //     {required: true, message: "请输入失效日期", trigger: "blur"}
+                // ],
+                // sweepCount: [
+                //     {required: true, message: "请输入扫码数量", trigger: "blur"}
+                // ]
             },
             detailFormVisible: false,
             detailFormData: {},

src/views/warehouse/stockOrderSearch.vue

@@ -469,10 +469,11 @@ import stockQRCodeExport from "./stockQRCodeExport";
 import draggable from "vuedraggable";
 import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
 import store from "../../store";
-import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
+import {getLocalJoinByUser} from "../../api/basic/busLocalType";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "stockOrderSearch",
@@ -950,7 +951,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.getSubInvList();
+                        // this.getSubInvList();
                         this.getList();
                     }
                 })
@@ -960,6 +961,8 @@ export default {
         invChange() {
             this.query.invWarehouseCode = "";
             this.subInvList = [];
+
+            if (!isBlank(this.query.locStorageCode)) {
                 let query = {
                     pcode: this.query.locStorageCode
                 };
@@ -969,6 +972,9 @@ export default {
                     })
                     .catch(() => {
                     });
+            } else {
+                this.subInvList = [];
+            }
         },
 
         getSubInvList() {