Q1 Q2通知单表单增加字段，调整操作过程 HL-5387

src/views/qms/inspectionQ1/index.vue

@@ -74,12 +74,15 @@
 import download from '@/utils/download'
 import { Q1, Q1Rules } from './inspectionQ1.data'
 import * as Q1Api from '@/api/qms/inspectionQ1'
+import * as ItembasicApi from '@/api/wms/itembasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import * as CustomerApi from '@/api/wms/customer'
 
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -97,30 +100,64 @@ const tableColumns = ref(Q1.allSchemas.tableColumns)
 // 查询页面返回
 const priceObj = ref()
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-    nextTick(async () => {
+  nextTick(async () => {
     const setV = {}
-    if (formField == 'customerCode') {
-      setV['itemCode'] = ''
-    }
+    
     if (formField == 'itemCode') {
+      setV['customerCode'] = ''
+      setV['customerName'] = ''
+      setV['itemName'] = ''
+      setV['standardCostPrice'] = ''
+      setV['qty'] = ''
+      setV['claimAmount'] = ''
+
       setV['uom'] = val[0]['customerUom']
-      console.log(333,val[0].code)
-      const params = {
-        by: "ASC",
-        filters: [{column: "itemCode", action: "==", value: val[0].itemCode}],
+      CustomeritemApi.getCustomerItemListByCodes({
+        itemCodes: val[0].itemCode,
+        customerCode: ''
+      }).then((res) => {
+        if (res?.length > 0) {
+          formRef.formModel.customerCode = res[0].customerCode
+          formRef.formModel.customerName = res[0].customerName
+          Q1.allSchemas.formSchema.forEach((item) => {
+            if (item.field == 'customerCode') {
+              item.componentProps.options = res
+            }
+          })
+        }
+      })
+      const paramsItembasic = {
+        by: 'ASC',
+        filters: [{ column: 'code', action: '==', value: val[0].itemCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      paramsItembasic.isSearch = true
+      ItembasicApi.getItembasicPage(paramsItembasic).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+          formRef.setValues({
+            itemName: priceObj.value.name
+          })
+        }
+      })
+
+      const paramsStdcostprice = {
+        by: 'ASC',
+        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
         pageNo: 1,
         pageSize: 500,
-        sort: ""
+        sort: ''
       }
-      params.isSearch = true
-      StdcostpriceApi.getStdcostpricePage(params).then((res) => {
+      paramsStdcostprice.isSearch = true
+      StdcostpriceApi.getStdcostpricePage(paramsStdcostprice).then((res) => {
         if (res.list?.length > 0) {
           priceObj.value = res.list[0]
           formRef.setValues({
-            claimAmount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6)
+            standardCostPrice: priceObj.value.price
           })
         }
-        
       })
     }
     setV[formField] = val[0][searchField]
@@ -128,10 +165,28 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   })
 }
 
-const onChange =(field,e)=>{
+const onChange = (field, e) => {
   if (field == 'qty') {
-          basicFormRef.value.formRef.formModel.claimAmount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6)
-}
+    basicFormRef.value.formRef.formModel.claimAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice)
+    ).toFixed(6)
+  }
+  if (field == 'customerCode') {
+      basicFormRef.value.formRef.formModel.customerName = ''
+      const paramsCustomer = {
+        by: 'ASC',
+        filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.customerCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      paramsCustomer.isSearch = true
+      CustomerApi.getCustomerPage(paramsCustomer).then((res) => {
+        if (res.list?.length > 0) {
+            basicFormRef.value.formRef.formModel.customerName =  res.list[0].name
+        }
+      })
+    }
 }
 
 // 字段设置 更新主列表字段

src/views/qms/inspectionQ1/inspectionQ1.data.ts

@@ -15,16 +15,15 @@ const userStore = useUserStore()
 
 // 表单校验
 export const Q1Rules = reactive({
-  customerCode: [required],
-  costCode: [required],
-  itemCode: [required],
-  qty: [required],
-  code: [required],
-  priority: [required],
-  claimAmount: [required],
-  claimReason: [required],
-  claimTime: [required],
-  handleTime: [required]
+  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }],
+  qty: [{ required: true, message: '请输入数量', trigger: 'change' }],
+  claimAmount: [{ required: true, message: '请输入索赔金额', trigger: 'change' }],
+  code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }],
+  priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
+  costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }],
+  claimTime: [{ required: true, message: '请选择选择索赔日期', trigger: 'change' }],
+  handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }]
 })
 
 export const Q1 = useCrudSchemas(
@@ -40,62 +39,6 @@ export const Q1 = useCrudSchemas(
         fixed: 'left'
       }
     },
-    {
-      label: '状态',
-      field: 'status',
-      sort: 'custom',
-      dictType: DICT_TYPE.PUBLISHE_STATUS,
-      dictClass: 'string',
-      isForm: false,
-      isSearch: false,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '客户代码',
-      field: 'customerCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择客户代码', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '客户信息', // 查询弹窗标题
-          searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
-          searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      },
-      isSearch: true
-    },
     {
       label: '物料代码',
       field: 'itemCode',
@@ -119,12 +62,6 @@ export const Q1 = useCrudSchemas(
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-            },
-            {
-              key: 'customerCode',
-              value: 'customerCode',
-              message: '请填写客户代码！',
-              isMainValue: true
             }
           ],
           verificationParams: [
@@ -141,76 +78,107 @@ export const Q1 = useCrudSchemas(
       }
     },
     {
-      label: '数量',
-      field: 'qty',
+      label: '物料名称',
+      field: 'itemName',
       sort: 'custom',
-      isTable: true,
+      dictClass: 'string',
       isSearch: false,
-      table: {
-        width: 150
+      isTable: true,
+      tableForm: {
+        disabled: true
       },
       form: {
-        component: 'InputNumber',
         componentProps: {
-          min: 0,
-          precision: 2
+          disabled: true
         }
       }
     },
     {
-      label: '单位',
-      field: 'uom',
+      label: '客户代码',
+      field: 'customerCode',
       sort: 'custom',
-      dictType: DICT_TYPE.UOM,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
       tableForm: {
-        type: 'Select',
         disabled: true
       },
       form: {
+        component: 'Select',
         componentProps: {
-          disabled: true
+          options: [],
+          optionsAlias: {
+            labelField: 'customerCode',
+            valueField: 'customerCode'
+          },
+          filterable: true
         }
       }
     },
     {
-      label: '编码',
-      field: 'code',
+      label: '客户名称',
+      field: 'customerName',
       sort: 'custom',
-      dictType: DICT_TYPE.QMS_Q1_CODE,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom',
+      isTable: true,
+      isSearch: false,
       table: {
-        width: 180
+        width: 150
       },
-      tableForm: {
-        type: 'Select'
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 2
+        }
       }
     },
     {
-      label: '优先级',
-      field: 'priority',
+      label: '单位',
+      field: 'uom',
       sort: 'custom',
-      dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
+      dictType: DICT_TYPE.UOM,
       dictClass: 'string',
       isSearch: false,
-      isTable: false,
+      isTable: true,
       tableForm: {
-        type: 'Select'
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
-      label: '负责用户',
-      field: 'responUser',
+      label: '标准成本价格',
+      field: 'standardCostPrice',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
+      table: {
+        width: 150
+      },
       form: {
+        component: 'InputNumber',
         componentProps: {
-          value: userStore.getUser.nickname,
+          min: 0,
+          precision: 6,
           disabled: true
         }
       }
@@ -232,6 +200,33 @@ export const Q1 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '缺陷编码',
+      field: 'code',
+      sort: 'custom',
+      dictType: DICT_TYPE.QMS_Q1_CODE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      table: {
+        width: 180
+      },
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '优先级',
+      field: 'priority',
+      sort: 'custom',
+      dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      tableForm: {
+        type: 'Select'
+      }
+    },
 
     {
       label: '成本中心代码',
@@ -303,6 +298,19 @@ export const Q1 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '负责用户',
+      field: 'responUser',
+      sort: 'custom',
+      isSearch: false,
+      isForm: true,
+      form: {
+        componentProps: {
+          value: userStore.getUser.nickname,
+          disabled: true
+        }
+      }
+    },
     {
       label: '处理时间',
       field: 'handleTime',
@@ -325,6 +333,24 @@ export const Q1 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isSearch: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '描述',
       field: 'desc',
@@ -392,8 +418,17 @@ export const Q1 = useCrudSchemas(
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        },
+        }
+      }
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
       },
+      isForm: false,
+      isTable: true
     },
     {
       label: '操作',

src/views/qms/inspectionQ2/index.vue

@@ -55,6 +55,7 @@
     :apiCreate="Q2Api.createQ2"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -77,7 +78,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import * as SupplierApi from '@/api/wms/supplier'
+import * as ItembasicApi from '@/api/wms/itembasic'
 
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -93,37 +98,126 @@ routeName.value = route.name
 const tableColumns = ref(Q2.allSchemas.tableColumns)
 
 // 查询页面返回
+const priceObj = ref()
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
+  nextTick(async () => {
     const setV = {}
     if (formField == 'supplierCode') {
-      setV['itemCode'] = ''
+      const supplierParams = {
+        by: 'ASC',
+        filters: [{ column: 'code', action: '==', value: val[0].supplierCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      supplierParams.isSearch = true
+      SupplierApi.getSupplierPage(supplierParams).then((res) => {
+        if (res.list?.length > 0) {
+          formRef.setValues({
+            supplierName: res.list[0].name
+          })
+        }
+      })
     }
     if (formField == 'itemCode') {
-      setV['uom'] = val[0]['supplierUom']
-    }
-    // if (formField == 'q1Number') {
-    //     console.log(123)
-    // setV['q1Number'] = val[0]['number']
-    // }
-    if (formField == 'purchaseReceiptNumber') {
-      setV['wmsQty'] = val[0]['qty']
-    }
-    if (formField == 'q1Number') {
-      //Q1通知单号
-      let list = []
-      val.forEach((item) => {
-        list.push(item[searchField])
+      setV['SupplierCode'] = ''
+      setV['SupplierName'] = ''
+      setV['itemName'] = ''
+      setV['standardCostPrice'] = ''
+      setV['qty'] = ''
+      setV['claimAmount'] = ''
+
+      setV['uom'] = val[0].supplierUom
+      const supplieritemParams = {
+        by: 'ASC',
+        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode}],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      supplieritemParams.isSearch = true
+      SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => {
+        if (res.list?.length > 0) {
+          formRef.formModel.supplierCode = res.list[0].supplierCode
+          formRef.formModel.supplierName = res.list[0].supplierName
+          Q2.allSchemas.formSchema.forEach((item) => {
+            if (item.field == 'supplierCode') {
+              item.componentProps.options = res.list
+            }
+          })
+        }
+      })
+      const itembasicParams = {
+        by: 'ASC',
+        filters: [{ column: 'code', action: '==', value: val[0].itemCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      itembasicParams.isSearch = true
+      ItembasicApi.getItembasicPage(itembasicParams).then((res) => {
+        if (res.list?.length > 0) {
+          formRef.setValues({
+            itemName: res.list[0].name
+          })
+        }
+      })
+
+      const params2 = {
+        by: 'ASC',
+        filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      params2.isSearch = true
+      StdcostpriceApi.getStdcostpricePage(params2).then((res) => {
+        if (res.list?.length > 0) {
+          priceObj.value = res.list[0]
+          formRef.setValues({
+            standardCostPrice: priceObj.value.price
+          })
+        }
       })
-      setV[formField] = list.join(',')
-      formRef.setValues(setV)
-    } else {
-      setV[formField] = val[0][searchField]
-      formRef.setValues(setV)
     }
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
   })
 }
 
+const onChange = (field, e) => {
+  if (field == 'qty') {
+    basicFormRef.value.formRef.formModel.claimAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice)
+    ).toFixed(6)
+     basicFormRef.value.formRef.formModel.summaryAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+    ).toFixed(6)
+  }
+  if (field == 'otherclaimAmount') {
+    basicFormRef.value.formRef.formModel.summaryAmount = (
+      parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount)
+      
+    ).toFixed(6)
+  }
+   if (field == 'supplierCode') {
+      basicFormRef.value.formRef.formModel.supplierName = ''
+      const paramsCustomer = {
+        by: 'ASC',
+        filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }],
+        pageNo: 1,
+        pageSize: 500,
+        sort: ''
+      }
+      paramsCustomer.isSearch = true
+      SupplierApi.getSupplierPage(paramsCustomer).then((res) => {
+        if (res.list?.length > 0) {
+            basicFormRef.value.formRef.formModel.supplierName =  res.list[0].name
+        }
+      })
+    }
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -49,70 +49,14 @@ export const Q2 = useCrudSchemas(
         fixed: 'left'
       }
     },
-
-    {
-      label: '状态',
-      field: 'status',
-      sort: 'custom',
-      dictType: DICT_TYPE.PUBLISHE_STATUS,
-      dictClass: 'string',
-      isForm: false,
-      isSearch: false,
-      tableForm: {
-        type: 'Select',
-        disabled: true
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
-    {
-      label: '供应商代码',
-      field: 'supplierCode',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 175
-      },
-      form: {
-        componentProps: {
-          enterSearch: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择供应商', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '供应商信息', // 查询弹窗标题
-          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-          searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'code',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
     {
       label: '物料代码',
       field: 'itemCode',
       sort: 'custom',
-      isSearch: true,
       table: {
-        width: 190
+        width: 150
       },
+      isSearch: true,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
@@ -124,12 +68,6 @@ export const Q2 = useCrudSchemas(
           searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
           searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
           searchCondition: [
-            {
-              key: 'supplierCode',
-              value: 'supplierCode',
-              message: '请填写供应商代码！',
-              isMainValue: true
-            },
             {
               key: 'available',
               value: 'TRUE',
@@ -150,32 +88,51 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '数量',
-      field: 'qty',
+      label: '物料名称',
+      field: 'itemName',
       sort: 'custom',
+      dictClass: 'string',
+      isSearch: false,
       isTable: true,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      dictClass: 'string',
       isSearch: false,
-      table: {
-        width: 150
+      isTable: true,
+      tableForm: {
+        disabled: true
       },
       form: {
-        component: 'InputNumber',
+        component: 'Select',
         componentProps: {
-          min: 0,
-          precision: 2
+          options: [],
+          optionsAlias: {
+            labelField: 'supplierCode',
+            valueField: 'supplierCode'
+          },
+          filterable: true
         }
       }
     },
     {
-      label: '单位',
-      field: 'uom',
+      label: '供应商名称',
+      field: 'supplierName',
       sort: 'custom',
-      dictType: DICT_TYPE.UOM,
       dictClass: 'string',
       isSearch: false,
       isTable: true,
       tableForm: {
-        type: 'Select',
         disabled: true
       },
       form: {
@@ -188,7 +145,7 @@ export const Q2 = useCrudSchemas(
       label: '采购收货单号',
       field: 'purchaseReceiptNumber',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
       table: {
         width: 180
       },
@@ -228,19 +185,99 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '索赔日期',
+      field: 'claimTime',
+      isTable: true,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
 
     {
-      label: '采购收货数量',
-      field: 'wmsQty',
+      label: '数量',
+      field: 'qty',
       sort: 'custom',
+      isTable: true,
       isSearch: false,
-      isForm: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 2
+        }
+      }
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '标准成本价格',
+      field: 'standardCostPrice',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 6,
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '索赔金额',
+      field: 'claimAmount',
+      sort: 'custom',
       isTable: false,
-      isDetail: false
+      isSearch: false,
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 0,
+          precision: 2
+        }
+      }
     },
-
     {
-      label: '编码',
+      label: '缺陷编码',
       field: 'code',
       sort: 'custom',
       dictType: DICT_TYPE.QMS_Q2_CODE,
@@ -254,7 +291,6 @@ export const Q2 = useCrudSchemas(
         type: 'Select'
       }
     },
-
     {
       label: '优先级',
       field: 'priority',
@@ -268,26 +304,38 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '负责用户',
-      field: 'responUser',
+      label: '其他索赔描述',
+      field: 'otherClaimDesc',
       sort: 'custom',
       isSearch: false,
-      isForm: true,
       table: {
-        width: 120
+        width: '150'
+      },
+      form: {
+        component: 'Input',
+        componentProps: {}
+      }
+    },
+    {
+      label: '其他索赔金额',
+      field: 'otherclaimAmount',
+      sort: 'custom',
+      isSearch: false,
+      table: {
+        width: 150
       },
       form: {
+        component: 'InputNumber',
         componentProps: {
-          value: userStore.getUser.nickname,
-          disabled: true
+          min: 0,
+          precision: 6,
         }
       }
     },
     {
-      label: '索赔金额',
-      field: 'claimAmount',
+      label: '汇总金额',
+      field: 'summaryAmount',
       sort: 'custom',
-      isTable: false,
       isSearch: false,
       table: {
         width: 150
@@ -296,7 +344,8 @@ export const Q2 = useCrudSchemas(
         component: 'InputNumber',
         componentProps: {
           min: 0,
-          precision: 2
+          precision: 6,
+          disabled: true
         }
       }
     },
@@ -337,49 +386,6 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
-
-    {
-      label: '索赔日期',
-      field: 'claimTime',
-      isTable: true,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
-    },
-    {
-      label: '处理时间',
-      field: 'handleTime',
-      isTable: false,
-      table: {
-        width: 180
-      },
-      formatter: dateFormatter,
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          style: { width: '100%' },
-          type: 'datetime',
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
-          valueFormat: 'x'
-        }
-      }
-    },
     {
       label: 'Q1通知单号',
       field: 'q1Number',
@@ -424,6 +430,62 @@ export const Q2 = useCrudSchemas(
       },
       isSearch: true
     },
+    {
+      label: '负责用户',
+      field: 'responUser',
+      sort: 'custom',
+      isSearch: false,
+      isForm: true,
+      table: {
+        width: 120
+      },
+      form: {
+        componentProps: {
+          value: userStore.getUser.nickname,
+          disabled: true
+        }
+      }
+    },
+    {
+      label: '处理时间',
+      field: 'handleTime',
+      isTable: false,
+      table: {
+        width: 180
+      },
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+
+    {
+      label: '状态',
+      field: 'status',
+      sort: 'custom',
+      dictType: DICT_TYPE.PUBLISHE_STATUS,
+      dictClass: 'string',
+      isForm: false,
+      isSearch: false,
+      tableForm: {
+        type: 'Select',
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: '描述',
       field: 'desc',
@@ -478,6 +540,15 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+    {
+      label: '创建者',
+      field: 'creator',
+      table: {
+        width: 130
+      },
+      isForm: false,
+      isTable: true
+    },
     {
       label: '操作',
       field: 'action',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -240,7 +240,7 @@ const clearSearchInput = (field) => {
   }
   if (field == 'q3Number') {
     ScrapRequestMain.allSchemas.formSchema.forEach((item) => {
-      if (item.field == 'q1Number' || item.field == 'q1Number') {
+      if (item.field == 'q1Number' || item.field == 'q2Number') {
         item.componentProps.enterSearch = true
         item.componentProps.isSearchList = true
         item.componentProps.disabled = false