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

4 months ago · a582ac14b0
4 changed files with 159 additions and 18 deletions
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@ -744,7 +744,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
 export const getListByBottonInput = async (headerItem, val, row, routeName, formRef, detailData, tableData, callback) => {
  let tableFormSchemaObj = headerItem?.tableForm
  console.log(333,tableFormSchemaObj)
-  if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) { 
+  if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) {
+    if (!val) return;
    let params = ref({})
    let list = ref([])
    console.log(3344)
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择车间',
        searchField: 'code',
@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择生产线',
        searchField: 'code',
@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          value: 'workshop',
          message: '请填写车间代码！',
          isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班组',
        searchField: 'code',
@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班次',
        searchField: 'code',
@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -671,7 +707,18 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }],
+        }],
+      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
    },
  },
  {
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择车间',
        searchField: 'code',
@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择生产线',
        searchField: 'code',
@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          value: 'workshop',
          message: '请填写车间代码！',
          isMainValue: true
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班组',
        searchField: 'code',
@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班次',
        searchField: 'code',
@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -643,18 +679,18 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }],
+          }]
      }
    },
    tableForm:{
      multiple:true,
-      enterSearch:true,
      // isInpuFocusShow: true,
      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
      searchField: 'itemCode', // 查询弹窗赋值字段
      searchTitle: '生产线物料关系信息', // 查询弹窗标题
      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      disabled:true,
      searchCondition: [{
        key:'productionLineCode',
        value:'productionLine',
@ -664,7 +700,17 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }],
+        }],
+        verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+        isShowTableFormSearch: true,
+        verificationParams: [{
+          key: 'itemCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
    },
  },
  {
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择车间',
        searchField: 'code',
@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择生产线',
        searchField: 'code',
@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          value: 'workshop',
          message: '请填写车间代码！',
          isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班组',
        searchField: 'code',
@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    form: {
      // labelMessage: '信息提示说明！！！',
      componentProps: {
+        enterSearch: true,
        isSearchList: true,
        searchListPlaceholder: '请选择班次',
        searchField: 'code',
@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
      }
    }
  },
@ -650,6 +686,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
      multiple:true,
      enterSearch:true,
      // isInpuFocusShow: true,
+      disabled:true,
      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
      searchField: 'itemCode', // 查询弹窗赋值字段
      searchTitle: '生产线物料关系信息', // 查询弹窗标题
@ -664,7 +701,17 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }],
+        }],
+      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
    },
  },
  {