diff --git a/fe/PC/src/components/importFile/index.vue b/fe/PC/src/components/importFile/index.vue index b5b916eef..8d08d5d83 100644 --- a/fe/PC/src/components/importFile/index.vue +++ b/fe/PC/src/components/importFile/index.vue @@ -23,8 +23,8 @@
导 入 模 式： - 更新式 追加式 + 更新式 覆盖式
@@ -125,7 +125,8 @@ export default { } }, methodValue:{ - type: String + type: String, + default:'1' }, isAllowPartImportValue:{ type: String @@ -143,7 +144,7 @@ export default { tableMaxHeight:null, // 临时存储提交数据 submitDataLS: null, - method: '0', + method: '1', isAllowPartImport: '1', editHandle: [ { label: "取消", name: "cancel" }, diff --git a/fe/PC/src/mixins/mixins.js b/fe/PC/src/mixins/mixins.js index f2a27299b..e37936f69 100644 --- a/fe/PC/src/mixins/mixins.js +++ b/fe/PC/src/mixins/mixins.js @@ -276,6 +276,7 @@ export const mixins = { that.displayDialog.importDialog = false; that.paging() }).catch(err => { + console.log('请联系管理员',err) that.$errorMsg('导入过程中发生错误！请联系管理员！') that.Loading.importLoading = false that.FormRemove(val[0]); diff --git a/fe/PC/src/views/basicData/BomManage/Bom.vue b/fe/PC/src/views/basicData/BomManage/Bom.vue index 557532d5f..f8af2812b 100644 --- a/fe/PC/src/views/basicData/BomManage/Bom.vue +++ b/fe/PC/src/views/basicData/BomManage/Bom.vue @@ -51,7 +51,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/CustomerManage/Customer.vue b/fe/PC/src/views/basicData/CustomerManage/Customer.vue index 356056187..e48a1d409 100644 --- a/fe/PC/src/views/basicData/CustomerManage/Customer.vue +++ b/fe/PC/src/views/basicData/CustomerManage/Customer.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue index a5b3b23c1..bcc004aea 100644 --- a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue +++ b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue index 89d857382..8c106a2e4 100644 --- a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue +++ b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/CustomerManage/Project.vue b/fe/PC/src/views/basicData/CustomerManage/Project.vue index 4c54760f2..24ba81246 100644 --- a/fe/PC/src/views/basicData/CustomerManage/Project.vue +++ b/fe/PC/src/views/basicData/CustomerManage/Project.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/DictionaryManage/Category.vue b/fe/PC/src/views/basicData/DictionaryManage/Category.vue index ac22264ae..4b4a70893 100644 --- a/fe/PC/src/views/basicData/DictionaryManage/Category.vue +++ b/fe/PC/src/views/basicData/DictionaryManage/Category.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/DictionaryManage/Dict.vue b/fe/PC/src/views/basicData/DictionaryManage/Dict.vue index a9a36519e..b6d99a646 100644 --- a/fe/PC/src/views/basicData/DictionaryManage/Dict.vue +++ b/fe/PC/src/views/basicData/DictionaryManage/Dict.vue @@ -33,7 +33,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/DictionaryManage/Uom.vue b/fe/PC/src/views/basicData/DictionaryManage/Uom.vue index b4ad31848..e6936a905 100644 --- a/fe/PC/src/views/basicData/DictionaryManage/Uom.vue +++ b/fe/PC/src/views/basicData/DictionaryManage/Uom.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue index 5c6bb8070..950833e3b 100644 --- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue +++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue @@ -51,7 +51,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue index a6d9086cb..55e99c5d6 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue @@ -75,7 +75,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue index 984a99b5b..9d3adef58 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index ce03fcb62..85d168426 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod={method1:false,method2:false,method3:false} :disabledIsAllowPartImport={isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue index 3f5b3743a..632326e04 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue @@ -51,7 +51,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue index 7d718c077..c2a9b078d 100644 --- a/fe/PC/src/views/basicData/SupplierManage/Supplier.vue +++ b/fe/PC/src/views/basicData/SupplierManage/Supplier.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue index 2c55bdcc6..890bbe13f 100644 --- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue +++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue index 89b691ad3..b0cce7f3a 100644 --- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue +++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue @@ -68,7 +68,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/Area.vue b/fe/PC/src/views/basicData/WarehouseManage/Area.vue index 5389b9c5a..2c883eabe 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Area.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Area.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue index 60f2ffd02..18ad66bd1 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue index ea2e1563c..e7ac1d76d 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue index ba13e0d81..c3754fb4e 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/Location.vue b/fe/PC/src/views/basicData/WarehouseManage/Location.vue index d294cb812..b5a276e11 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Location.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Location.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue index 768c3bad1..cdeb03678 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue b/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue index fb6e3c7b6..18dfe73c4 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue index fd2131378..c5fea9818 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue index 544f751c4..2e3ce8fca 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue index 5e8d99b06..2be330bbe 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/Shift.vue b/fe/PC/src/views/basicData/WorkshopManage/Shift.vue index a22ddad32..6346a623e 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/Shift.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/Shift.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/Team.vue b/fe/PC/src/views/basicData/WorkshopManage/Team.vue index bdc385cd3..324cfa678 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/Team.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/Team.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue index f3ce98d3d..3079ac40a 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue @@ -67,7 +67,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue b/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue index 7751e1b97..b666391e1 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/documentSetting/documentBasic.vue b/fe/PC/src/views/basicData/documentSetting/documentBasic.vue index 1dc8bbb45..2e93d60c6 100644 --- a/fe/PC/src/views/basicData/documentSetting/documentBasic.vue +++ b/fe/PC/src/views/basicData/documentSetting/documentBasic.vue @@ -51,7 +51,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/systemManage/Calendar.vue b/fe/PC/src/views/basicData/systemManage/Calendar.vue index b55f29384..7190fa3d5 100644 --- a/fe/PC/src/views/basicData/systemManage/Calendar.vue +++ b/fe/PC/src/views/basicData/systemManage/Calendar.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/basicData/systemManage/Configuration.vue b/fe/PC/src/views/basicData/systemManage/Configuration.vue index aecba8176..d15244073 100644 --- a/fe/PC/src/views/basicData/systemManage/Configuration.vue +++ b/fe/PC/src/views/basicData/systemManage/Configuration.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue b/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue index 73016d99f..ff8e6b812 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue @@ -43,7 +43,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/deliver/DeliverRequest.vue b/fe/PC/src/views/finishedProductManage/deliver/DeliverRequest.vue index 1132b48de..2d093ded4 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/DeliverRequest.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/DeliverRequest.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue index 5b483c775..984184f1f 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue @@ -50,7 +50,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue index 53642f87e..a5b3e4c27 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleRequest.vue @@ -30,7 +30,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue index b3aeefee9..361ec0756 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue +++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptRequest.vue @@ -34,7 +34,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue index ca3e48e44..bf9cee307 100644 --- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue +++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue @@ -34,7 +34,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/finishedProductManage/productionReturn/returnRequest.vue b/fe/PC/src/views/finishedProductManage/productionReturn/returnRequest.vue index 9c79436cd..1501245e9 100644 --- a/fe/PC/src/views/finishedProductManage/productionReturn/returnRequest.vue +++ b/fe/PC/src/views/finishedProductManage/productionReturn/returnRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue index fa47c4b1e..f4d4ef7ae 100644 --- a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue +++ b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue index 2c3dafad8..f71cb404c 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue @@ -49,7 +49,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryInitialNote.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryInitialNote.vue index 5eb6ac9ec..5e1a110ac 100644 --- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryInitialNote.vue +++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryInitialNote.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue index 90aa25ef3..0a11237c8 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue +++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue index 39073daad..ddd1106ba 100644 --- a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue +++ b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue index 534a5de09..e2534bb15 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue index 9ce112cbe..e844ca467 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue index a153e3e9e..897f22ad6 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehousePayment/lineSideWarehousePaymentRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue index df8ab0c2b..a79e54939 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue index 0f4d5736e..645ec13f4 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue +++ b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod="{ method1: false, method2: false, method3: false }" :disabledIsAllowPartImport="{ isAllowPartImport1: false, isAllowPartImport2: false, }" - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue index 2a6dc6f6b..a25b7f584 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue +++ b/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod="{method1: false, method2: false, method3: false}" :disabledIsAllowPartImport="{isAllowPartImport1: false,isAllowPartImport2: false,}" - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue index e66de7ce1..74df7326f 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod="{ method1: false, method2: false, method3: false }" :disabledIsAllowPartImport="{ isAllowPartImport1: false, isAllowPartImport2: false, }" - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/labelManage/labelsList.vue b/fe/PC/src/views/labelManage/labelsList.vue index e2f9fa787..145458518 100644 --- a/fe/PC/src/views/labelManage/labelsList.vue +++ b/fe/PC/src/views/labelManage/labelsList.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue index 3a296b007..08b50a98c 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallApply.vue @@ -35,7 +35,6 @@ isAllowPartImport1: false, isAllowPartImport2: false, }" - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue index 95ddfdc60..c5b852f75 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueRequest.vue @@ -35,7 +35,6 @@ isAllowPartImport1: false, isAllowPartImport2: false, }" - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue index 0456c4f31..a577fe0f0 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:true,method2:false,method3:true} :disabledIsAllowPartImport = {isAllowPartImport1:true,isAllowPartImport2:false} - methodValue="1" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue index 1340ec3ba..0916f7e74 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue index e44ee95d7..4b2b796a9 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue @@ -33,7 +33,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown" diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue index a5a55b631..b6b93b202 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnRequest.vue @@ -32,7 +32,6 @@ :URL="URL" :disabledMethod = {method1:false,method2:false,method3:false} :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} - methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @postImportDown="importDown"