bug修改，业务单据修改

2 years ago · 96d66c4721
parent d936ea4fe6
commit 96d66c4721
20 changed files with 25 additions and 13 deletions
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@ -44,7 +44,6 @@
                        <el-button
                            type="text"
                            size="small"
-                            :disabled="scope.row.systemDefault"
                            @click.native.stop="handleModifyClick(scope.row)"
                        >编辑
                        </el-button
--- a/src/views/basic/BusTypeChangeModify.vue
+++ b/src/views/basic/BusTypeChangeModify.vue
@ -56,11 +56,11 @@
                    </div>
                    <el-select
                        size="small"
+                        :disabled="inputQuery.systemDefault"
                        v-model="inputQuery.type"
                        placeholder="设置类型"
                    >
                        <el-option label="耗材领用" :value="1"></el-option>
-                        <el-option label="产品申购" :value="2"></el-option>
                        <el-option label="采购计划" :value="3"></el-option>
                    </el-select>
                </div>
@ -74,6 +74,7 @@
                    </div>
                    <el-select
                        size="small"
+                        :disabled="inputQuery.systemDefault"
                        v-model="inputQuery.enable"
                        placeholder="启用状态"
                    >
--- a/src/views/basic/basicCompany.vue
+++ b/src/views/basic/basicCompany.vue
@ -43,7 +43,7 @@
                        type="primary"
                        size="mini"
                        icon="search"
-                        v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
+                        v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
                        @click="onModifySubmit(3)"
                    >提交审核
                    </el-button
@ -643,7 +643,7 @@ export default {
                0: "warning",
                1: "success",
                2: "danger",
-                4: "warning",
+                3: "warning",
                6: "warning",
            };
            return statusMap[status];
--- a/src/views/purchase/supCertAudit.vue
+++ b/src/views/purchase/supCertAudit.vue
@ -436,7 +436,7 @@ export default {
                1: "success",
                2: "danger",
                6: "warning",
-                4: "warning",
+                3: "warning",
            };
            return statusMap[status];
        },
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@ -319,7 +319,7 @@ export default {
                0: "warning",
                1: "success",
                2: "danger",
-                4: "warning",
+                3: "warning",
                6: "warning",
            };
            return statusMap[status];
--- a/src/views/purchase/supCompanyAdd.vue
+++ b/src/views/purchase/supCompanyAdd.vue
@ -92,7 +92,7 @@
                        <el-button
                            type="text"
                            size="small"
-                            v-if="scope.row.auditStatus === '2'"
+                            v-if="scope.row.auditStatus === 2"
                            @click.native.stop="rejectInfo(scope.row)"
                        >说明
                        </el-button>
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@ -147,7 +147,7 @@
                          style="width: 100%">
                    <el-table-column type="index" label="序号" width="50"></el-table-column>
                    <el-table-column label="证书名称" prop="name"></el-table-column>
-                    <el-table-column label="证书编号" prop="name"></el-table-column>
+                    <el-table-column label="证书编号" prop="code"></el-table-column>
                    <el-table-column label="有效期" prop="vailDate"></el-table-column>
                    <el-table-column label="失效期" prop="expireDate"></el-table-column>
                    <el-table-column label="审核状态" prop="auditStatus" width="120">
--- a/src/views/purchase/supManufacturerEditDialog.vue
+++ b/src/views/purchase/supManufacturerEditDialog.vue
@ -209,7 +209,7 @@
                          style="width: 100%;margin-top: 30px">
                    <el-table-column type="index" label="序号" width="50"></el-table-column>
                    <el-table-column label="证书名称" prop="name"></el-table-column>
-                    <el-table-column label="证书编号" prop="name"></el-table-column>
+                    <el-table-column label="证书编号" prop="code"></el-table-column>
                    <el-table-column label="有效期" prop="vailDate"></el-table-column>
                    <el-table-column label="失效期" prop="expireDate"></el-table-column>
                    <el-table-column label="审核状态" prop="auditStatus" width="120">
--- a/src/views/purchase/supProductEditDialog.vue
+++ b/src/views/purchase/supProductEditDialog.vue
@ -41,7 +41,7 @@
                        type="primary"
                        size="mini"
                        icon="search"
-                        v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
+                        v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
                        @click="onModifySubmit(3)"
                    >提交审核
                    </el-button
@ -255,7 +255,7 @@
                      style="width: 100%;margin-top: 30px">
                <el-table-column type="index" label="序号" width="50"></el-table-column>
                <el-table-column label="证书名称" prop="name"></el-table-column>
-                <el-table-column label="证书编号" prop="name"></el-table-column>
+                <el-table-column label="证书编号" prop="code"></el-table-column>
                <el-table-column label="有效期" prop="vailDate"></el-table-column>
                <el-table-column label="失效期" prop="expireDate"></el-table-column>
                <el-table-column label="审核状态" prop="auditStatus" width="120">
--- a/src/views/warehouse/stockOrder.vue
+++ b/src/views/warehouse/stockOrder.vue
@ -401,6 +401,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            idQuery: {
                id: "",
--- a/src/views/warehouse/stockOrderChange.vue
+++ b/src/views/warehouse/stockOrderChange.vue
@ -258,6 +258,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            fromTypeMap: {
                "1": "UDIMS平台",
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@ -404,6 +404,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            isSp: store.getters.customerId,
            detailFormVisible: false,
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@ -265,6 +265,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            fromTypeMap: {
                "1": "UDIMS平台",
--- a/src/views/warehouse/stockOrderEditor.vue
+++ b/src/views/warehouse/stockOrderEditor.vue
@ -531,6 +531,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            statusMap: {
                "1": "草稿",
--- a/src/views/warehouse/stockOrderInCode.vue
+++ b/src/views/warehouse/stockOrderInCode.vue
@ -329,6 +329,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            idQuery: {
                id: "",
--- a/src/views/warehouse/stockOrderInvSearch.vue
+++ b/src/views/warehouse/stockOrderInvSearch.vue
@ -394,6 +394,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            isSp: store.getters.customerId,
            detailFormVisible: false,
--- a/src/views/warehouse/stockOrderNew.vue
+++ b/src/views/warehouse/stockOrderNew.vue
@ -502,6 +502,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            typeMap: {
                1: "预入库",
--- a/src/views/warehouse/stockOrderNewSelectProduct.vue
+++ b/src/views/warehouse/stockOrderNewSelectProduct.vue
@ -334,6 +334,8 @@ export default {
            let ids = [];
            let data = {
                relId: this.multipleSelection.rlId,
+                supId: this.multipleSelection.customerId
+
            }
            ids.push(data);
            this.loading = true;
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@ -571,6 +571,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            isSp: store.getters.customerId,
            detailFormVisible: false,
--- a/src/views/warehouse/stockOrderWaitCheck.vue
+++ b/src/views/warehouse/stockOrderWaitCheck.vue
@ -385,6 +385,7 @@ export default {
                "1": "web端新增单据",
                "2": "第三方系统",
                "3": "扫码单据转换",
+                "4": "采购计划转换",
            },
            idQuery: {
                id: "",