From a8312071b4212ba2a8bf789f9f4690c656d1f8d3 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 22 Jul 2024 16:39:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=BC=8F=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=85=B6=E5=AE=83?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=8F=8A=E6=8F=8F=E8=BF=B0=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue  | 24 ++++++++++++++++---
 .../purchasePlanMain/index.vue                |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

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 @@
             <div class="">
               <div class="radio">
                 <el-radio-group v-model="mode">
-                  <el-radio :label="1" :disabled="updateIsDisable">{{ t('ts.更新')}}</el-radio>
-                  <el-radio :label="2" :disabled="appendIsDisable">{{ t('ts.追加') }}</el-radio>
-                  <el-radio :label="3" :disabled="coverIsDisable">{{ t('ts.覆盖') }}</el-radio>
+                  <el-radio :label="1" v-show="updateIsShow" :disabled="updateIsDisable">{{ t('ts.更新')}}</el-radio>
+                  <el-radio :label="2" v-show="appendIsShow" :disabled="appendIsDisable">{{ t('ts.追加') }}</el-radio>
+                  <el-radio :label="3" v-show="coverIsShow" :disabled="coverIsDisable">{{ t('ts.覆盖') }}</el-radio>
                 </el-radio-group>
               </div>
 
@@ -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/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 @@
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+    @success="importSuccess" :updateIsDisable="false" :appendIsDisable="true" :coverIsDisable="true" :mode="1" :coverIsShow="false" :appendIsShow="false"/>
   <!-- 创建供应商发货申请 -->
   <supplierdeliverBasicForm ref="supplierdeliverFormRef" @getList="getList" ></supplierdeliverBasicForm>
 </template>

From 343acdd6d92bea5b39366b4a4d2420317aa39929 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Mon, 22 Jul 2024 16:40:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E3=80=81=E5=A4=87=E6=B3=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueplan/preparetoissueMain/index.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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")
 }
 
 /** 删除按钮操作 */