Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

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,

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

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>