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

src/components/ImportForm/src/ImportCustomerStatementShareForm.vue

@@ -265,7 +265,7 @@ const verifyData = async () => {
   }else if(data.status==2){
     try {
     // 确认
-    await message.confirm('已存在相同客户代码及年月的客户对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
+    await message.confirm('已存在相同客户代码及年月的模具分摊对账单，是否确认导入？注意：如确认则上一版本对账单将自动作废。')
     //确定走的
     submitForm();
     // await PurchasepriceApi.deletePurchaseprice(id)
@@ -277,7 +277,7 @@ const verifyData = async () => {
     //取消走的
   }
   }else if(data.status==3){
-    await message.alertWarning('已存在相同客户代码及年月的客户对账单，且已确认分摊金额，无法导入')
+    await message.alertWarning('已存在相同客户代码及年月的模具分摊对账单，且已确认分摊金额，无法导入')
   }
 }
 

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1754,6 +1754,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
+      type:'Select',
       disabled: true
     },
     form: {