1.修复部分页面数据未展示问题

3 years ago · e77e42a35c
parent 2cfc908404
commit e77e42a35c
5 changed files with 130 additions and 92 deletions
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@ -1021,15 +1021,10 @@ export default {
            let params = {id: row.id};
            updateDirector(params).then((res) => {
                this.$message.success("设置成功");
-                //重新加载表格数据
-                let loadParam = {
-                    code: this.currentCode
-                };
+                if (res.code === 20000) {
                    //重新加载数据
-                warehouseUserList(loadParam).then((res) => {
-                    this.userData = res.data;
-                }).catch((error) => {
-                });
+                    this.loadUserList();
+                }
            }).catch((error) => {
                this.$message.error("设置失败");
            });
--- a/src/views/product/udiRelevance.vue
+++ b/src/views/product/udiRelevance.vue
@ -297,6 +297,7 @@ export default {
                });
        },
        combineUdiAll() {
+            if (this.udidlList.length > 0) {
                this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
                    confirmButtonText: "确定",
                    cancelButtonText: "取消",
@ -318,8 +319,9 @@ export default {
                    })
                    .catch(() => {
                    });
-
-
+            } else {
+                this.$message.error("无数据可以选入！");
+            }
        },

        intentDetail(row) {
--- a/src/views/warehouse/ioErrorOrder.vue
+++ b/src/views/warehouse/ioErrorOrder.vue
@ -180,7 +180,7 @@
                ></el-table-column>
                <el-table-column
                    label="往来单位简写"
-                    prop="spell"
+                    prop="pinyinCode"
                    show-overflow-tooltip
                ></el-table-column>
                <el-table-column
@ -188,8 +188,12 @@
                    prop="addr"
                    show-overflow-tooltip
                ></el-table-column>
-                <el-table-column label="状态" prop="status"></el-table-column>
-                <el-table-column label="类型" prop="type"></el-table-column>
+            <!--<el-table-column label="状态" prop="status"></el-table-column>-->
+                <el-table-column label="类型" prop="corpType">
+                    <template slot-scope="scope">
+                        <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+                    </template>
+                </el-table-column>
            </el-table>

            <el-pagination
@ -256,7 +260,12 @@ export default {
                9: "异常"
            },
            curIndex: "",
-            unitquery: {key: "", page: 1, limit: 10},
+            unitquery: {
+                key: "",
+                corpType: null,
+                page: 1,
+                limit: 10
+            },
            unitTotal: 0,
            unitlist: [],
            unitUpdateQuery: {
@ -288,7 +297,13 @@ export default {
            formLoading: false,
            dialogVisible: false,
            formData: formJson,
-            deleteLoading: false
+            deleteLoading: false,
+            currentRowAction: null, //当前单据的单据类型
+            corpTypeMap: {
+                1: "客户",
+                2: "供应商",
+                4: "特殊往来"
+            }
        };
    },
    components: {
@ -332,19 +347,8 @@ export default {
            this.curIndex = row.id;
            this.dialogTableVisible = true;
            this.curOrderId = row.orderId;
-            getCorpType({action: row.action}).then((res) => {
-                if (res.code === 20000) {
-                    this.unitquery = {
-                        key: "",
-                        corpType: res.data,
-                        page: 1,
-                        limit: 10
-                    }
+            this.currentRowAction = row.action;
            this.getUnitList();
-                } else {
-                    this.$message.error("查询往来单位错误");
-                }
-            })
        },
        closeDetailDialog(val) {
            this.codeDetailVisible = false;
@ -358,14 +362,17 @@ export default {
        },
        resetUnitQuery() {
            this.unitlist = [];
-            this.unitquery = {key: "", page: 1, limit: 20};
-            this.getUnitList();
+            this.unitquery.key = "";
+            this.getUnitList(1);
        },
        getUnitList(page) {
            this.loading = true;
            if (page != null) {
                this.unitquery.page = 1;
            }
+            getCorpType({action: this.currentRowAction}).then((res) => {
+                if (res.code === 20000) {
+                    this.unitquery.corpType = res.data;
                    unitListBykey(this.unitquery)
                        .then((response) => {
                            this.loading = false;
@ -375,6 +382,10 @@ export default {
                        .catch(() => {
                            this.loading = false;
                        });
+                } else {
+                    this.$message.error("查询往来单位错误");
+                }
+            })
        },

        selectUnit(row) {
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@ -162,7 +162,7 @@
                ></el-table-column>
                <el-table-column
                    label="往来单位简写"
-                    prop="spell"
+                    prop="pinyinCode"
                    show-overflow-tooltip
                ></el-table-column>
                <el-table-column
@ -170,12 +170,16 @@
                    prop="addr"
                    show-overflow-tooltip
                ></el-table-column>
-                <el-table-column label="状态" prop="status">
+                <!--<el-table-column label="状态" prop="status">
                    <template slot-scope="scope">
                        <span>{{ orderStatus[scope.row.status] }}</span>
                    </template>
+                </el-table-column>-->
+                <el-table-column label="类型" prop="corpType">
+                    <template slot-scope="scope">
+                        <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+                    </template>
                </el-table-column>
-                <el-table-column label="类型" prop="type"></el-table-column>
            </el-table>
        </el-dialog>

@ -235,7 +239,12 @@ export default {
                limit: 20
            },
            curIndex: "",
-            unitquery: {key: "", page: 1, limit: 20},
+            unitquery: {
+                key: "",
+                corpType: null,
+                page: 1,
+                limit: 20
+            },
            unitlist: [],
            unitUpdateQuery: {
                id: "",
@ -270,6 +279,12 @@ export default {
                1: "等待处理",
                3: "校验失败",
                4: "已校验"
+            },
+            currentRowAction: null, //当前选中单据的单据类型
+            corpTypeMap: {
+                1: "客户",
+                2: "供应商",
+                4: "特殊往来"
            }
        };
    },
@ -306,29 +321,21 @@ export default {
            this.curIndex = row.id;
            this.dialogTableVisible = true;
            this.curOrderId = row.orderId;
-            getCorpType({action: row.action}).then((res) => {
-                if (res.code === 20000) {
-                    this.unitquery = {
-                        key: "",
-                        corpType: res.data,
-                        page: 1,
-                        limit: 10
-                    }
+            this.currentRowAction = row.action;
            this.getUnitList();
-                } else {
-                    this.$message.error("查询往来单位错误");
-                }
-            })
        },
        closeDetailDialog(val) {
            this.codeDetailVisible = false;
        },
        resetUnitQuery() {
-            this.unitquery = {key: "", page: 1, limit: 20};
-            this.getUnitList();
+            this.unitquery.key = "";
+            this.getUnitList(1);
        },
        getUnitList() {
            this.loading = true;
+            getCorpType({action: this.currentRowAction}).then((res) => {
+                if (res.code === 20000) {
+                    this.unitquery.corpType = res.data;
                    unitListBykey(this.unitquery)
                        .then((response) => {
                            this.loading = false;
@ -337,6 +344,10 @@ export default {
                        .catch(() => {
                            this.loading = false;
                        });
+                } else {
+                    this.$message.error("查询往来单位错误");
+                }
+            })
        },

        selectUnit(row) {
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@ -3,8 +3,10 @@
        <el-card class="el-card">
            <el-row style="margin-bottom: 20px;">
                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>
-                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票
+                </el-button>
+                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票
+                </el-button>
            </el-row>

            <el-table v-loading="detailLoading"
@ -83,7 +85,13 @@
            </el-pagination>
        </el-card>

-        <el-dialog v-bind:width="'25%'" :visible.sync="salesListNoFormVisible" append-to-body>
+        <el-dialog
+            v-bind:width="'25%'"
+            :visible.sync="salesListNoFormVisible"
+            append-to-body
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
            <el-form :model="batchForm">
                <label></label>
                <el-form-item label="销售清单：" :label-width="formLabelWidth">
@ -96,7 +104,12 @@
            </div>
        </el-dialog>

-        <el-dialog v-bind:width="'25%'" :visible.sync="firstSalesInvNoFormVisible" append-to-body>
+        <el-dialog v-bind:width="'25%'"
+                   :visible.sync="firstSalesInvNoFormVisible"
+                   append-to-body
+                   :close-on-click-modal="false"
+                   :close-on-press-escape="false"
+        >
            <el-form :model="batchForm">
                <label></label>
                <el-form-item label="销售发票第一票：" :label-width="formLabelWidth">
@ -109,7 +122,13 @@
            </div>
        </el-dialog>

-        <el-dialog v-bind:width="'25%'" :visible.sync="secSalesInvNoFormVisible" append-to-body>
+        <el-dialog
+            v-bind:width="'25%'"
+            :visible.sync="secSalesInvNoFormVisible"
+            append-to-body
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
            <el-form :model="batchForm">
                <label></label>
                <el-form-item label="销售发票第二票：" :label-width="formLabelWidth">