diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue index 1fb69b804..a4cb50c64 100644 --- a/src/components/ImportForm/src/ImportForm.vue +++ b/src/components/ImportForm/src/ImportForm.vue @@ -43,9 +43,9 @@
- {{ t('ts.更新')}} - {{ t('ts.追加') }} - {{ t('ts.覆盖') }} + {{ t('ts.更新')}} + {{ t('ts.追加') }} + {{ t('ts.覆盖') }}
@@ -141,18 +141,36 @@ const props = defineProps({ required: false, default: false }, + // 更新是否展示 + updateIsShow: { + type: Boolean, + required: false, + default: true + }, // 追加是否禁用,默认值不禁用 appendIsDisable: { type: Boolean, required: false, default: false }, + // 追加是否展示 + appendIsShow: { + type: Boolean, + required: false, + default: true + }, // 覆盖是否禁用,默认值不禁用 coverIsDisable: { type: Boolean, required: false, default: false }, + // 覆盖是否展示 + coverIsShow: { + type: Boolean, + required: false, + default: true + }, // 是否部门保存,默认是 updatePart: { type: Boolean, diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 89feccd34..8a2b05fab 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(tableData.value.find(item1=>item1['itemCode'] == val[0]['componentItemCode'])){ message.warning(`物料${val[0]['componentItemCode']}已经存在`) return - } + } row['itemCode'] = val[0]['componentItemCode'] row['uom'] = val[0]['componentUom'] } else if(formField == 'workStation'){ @@ -419,7 +419,7 @@ const openForm =async (type: string, row?: number) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"planPreparetoissueMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index bb2c0a188..a4a050f5b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -80,7 +80,7 @@ /> + @success="importSuccess" :updateIsDisable="false" :appendIsDisable="true" :coverIsDisable="true" :mode="1" :coverIsShow="false" :appendIsShow="false"/>