Merge remote-tracking branch 'origin/master'

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -491,8 +491,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const CustomerreturnRequestMainRules = reactive({
-  deliverRecordNumber: [
-    { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  // deliverRecordNumber: [
+  //   { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  // ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'blur' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -110,7 +110,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
-      setV[formField] = val[0][searchField]
+      setV[formField] = val[0][searchField]      
       if(formField == 'deliverPlanNumber') {
         setV['deliverPlanNumber'] = val[0]['number']
         setV['customerCode'] = val[0]['customerCode']
@@ -290,8 +290,16 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
-  console.log(9999,row)
-  console.log(996669,type)
+  if(type == "update"){
+    DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'deliverPlanNumber') {
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    item.componentProps.isSearchList = true,
+    item.componentProps.disabled = true
+  }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -39,6 +39,11 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        maxlength: 50
+      }
+    }
   },
   {
     label: '车间',
@@ -429,7 +434,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
 export const ProductionMainRules = reactive({
   displayOrder: [
     { required: true, message: '请输入顺序', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    // { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   workshop: [
     { required: true, message: '请选择车间', trigger: 'change' }

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -137,7 +137,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限
+  defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限
   // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -189,7 +189,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             // item.fromLocationGroupCode = item.fromLocationGroupCode
           })
           isShowButton.value = false
-
           PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'supplierCode') {
               item.componentProps.disabled = true

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
+  defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
   // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新