diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue index f213091..de940cd 100644 --- a/src/views/basic/BusTypeChange.vue +++ b/src/views/basic/BusTypeChange.vue @@ -44,7 +44,6 @@ 编辑 - @@ -74,6 +74,7 @@ diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue index 85fbea0..a54483a 100644 --- 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)" >提交审核 说明 diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue index 82f839c..f59c682 100644 --- a/src/views/purchase/supCompanyEditDialog.vue +++ b/src/views/purchase/supCompanyEditDialog.vue @@ -147,7 +147,7 @@ style="width: 100%"> - + diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue index e1de3c7..b1e4d6c 100644 --- a/src/views/purchase/supManufacturerEditDialog.vue +++ b/src/views/purchase/supManufacturerEditDialog.vue @@ -209,7 +209,7 @@ style="width: 100%;margin-top: 30px"> - + @@ -226,7 +226,7 @@ type="text" size="small" @click.native="addCert(scope.row)" - + >编辑 @@ -481,7 +481,7 @@ export default { if(this.inputQuery.productionAreaCode!="" && this.inputQuery.productionAreaCode!=null && this.inputQuery.productionAreaCode!=undefined){ this.selectedOptions2 = this.inputQuery.productionAreaCode.split(","); } - + } this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId; diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue index 4afcee2..32c09f6 100644 --- 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)" >提交审核 - + diff --git a/src/views/warehouse/stockOrder.vue b/src/views/warehouse/stockOrder.vue index 3cb9ab1..b1afe2d 100644 --- 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: "", diff --git a/src/views/warehouse/stockOrderChange.vue b/src/views/warehouse/stockOrderChange.vue index 9bcf653..5954b29 100644 --- 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平台", diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue index f4a2da7..5ac43a7 100644 --- 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, diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue index 426a246..3a7929e 100644 --- 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平台", diff --git a/src/views/warehouse/stockOrderEditor.vue b/src/views/warehouse/stockOrderEditor.vue index ae3c8eb..33fa953 100644 --- 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": "草稿", diff --git a/src/views/warehouse/stockOrderInCode.vue b/src/views/warehouse/stockOrderInCode.vue index 612d4f6..db03dae 100644 --- 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: "", diff --git a/src/views/warehouse/stockOrderInvSearch.vue b/src/views/warehouse/stockOrderInvSearch.vue index eb383f2..d8fcee0 100644 --- 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, diff --git a/src/views/warehouse/stockOrderNew.vue b/src/views/warehouse/stockOrderNew.vue index b89cd46..0e83e76 100644 --- 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: "预入库", diff --git a/src/views/warehouse/stockOrderNewSelectProduct.vue b/src/views/warehouse/stockOrderNewSelectProduct.vue index ce888b1..872ae51 100644 --- 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; diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index 2ea4ffc..7862399 100644 --- 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, diff --git a/src/views/warehouse/stockOrderWaitCheck.vue b/src/views/warehouse/stockOrderWaitCheck.vue index c191531..7c99517 100644 --- 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: "",