检验记录执行和收件检验记录

src/api/qms/inspectionRecord/inspectionRecordMain/index.ts

@@ -46,7 +46,7 @@ export const createInspectionRecordMain = async (data: InspectionRecordMainVO) =
 
 // 修改检验申请
 export const updateInspectionRecordMain = async (data: InspectionRecordMainVO) => {
-  return await request.put({ url: `/qms/inspection-record-main/update`, data })
+  return await request.put({ url: `/qms/inspection-record-main/firstInspectionUpdate`, data })
 }
 
 // 删除检验申请

src/views/qms/inspectionJob/addForm.vue

@@ -681,8 +681,9 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     data.value = JSON.parse(JSON.stringify(row))
     //   await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
-    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
-    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
+    const masterId = row.jobId ||row.id
+    list = await InspectionJobDetailPageApi.getInspectionJobDetailList(masterId)
+    data.value.packageList = await InspectionJobPackageApi.getInspectionJobPackageList(masterId)
     list.forEach((item, index) => {
       editableTabsValue.value = 1
       item.name = index + 1
@@ -913,7 +914,6 @@ const submitForm = async () => {
     const valid = await elForm.validate()
     if (!valid) return
     // 校验包装列表
-
     if (data.value.packageList?.length > 0) {
       const validateForm1 = await tableFormRef.value.validateForm()
       if (!validateForm1) return
@@ -924,6 +924,7 @@ const submitForm = async () => {
         message.error(`采样数量不能大于数量`)
         return
       }
+
       // let number = 0
       // data.value.packageList.forEach(cur=>{
       //   number += parseFloat(cur.sampleAmount)
@@ -1024,6 +1025,7 @@ const submitForm = async () => {
       message.error('合格数量和不合格数量之和必须等于样品份数')
       return
     }
+    data.value.id = data.value.jobId
     if (formType.value == 'create') {
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)

src/views/qms/inspectionRecord/index.vue

@@ -32,11 +32,22 @@
     basicFormWidth="80"
     :tableAllSchemas="InspectionRecordPackage.allSchemas"
     :tableFormRules="InspectionRecordPackageRules"
-    :rules="InspectionRecordMainRules"
-    :formAllSchemas="InspectionRecordMain.allSchemas"
+    :rules="InspectionRecordUserRules"
+    :formAllSchemas="InspectionRecordUser.allSchemas"
     @submitForm="submitForm"
   />
 
+  <!-- 新增  -->
+     <AddForm
+    ref="basicFormRef"
+    basicFormWidth="80"
+    :formAllSchemas="InspectionRecordMain.allSchemas"
+    :tableAllSchemas="InspectionJobPackage.allSchemas"
+    :tableFormRules="InspectionJobPackageRules"
+    :rules="InspectionTemplateRules"
+    @submitForm="submitFormExecute"
+    
+  />
 
    <Detail
     ref="detailRef" :isBasic="false" :allSchemas="InspectionRecordMain.allSchemas"
@@ -47,14 +58,15 @@
     :apiDelete="InspectionRecordDetailApi.deleteInspectionRecordDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
     :isShowAddBtn="false" :detailButtonIsShow="true"
   /> 
-  <!-- 包装信息 --> <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionRecordMain.allSchemas"
+  <!-- 包装信息 --> 
+  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionRecordMain.allSchemas"
     :detailAllSchemas="InspectionRecordPackage.allSchemas" :detailAllSchemasRules="InspectionRecordPackageRules"
     :list="list"/>
 </template>
 
 <script setup lang="ts">
   import download from '@/utils/download'
-  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules,InspectionRecordPackage, InspectionRecordPackageRules} from './inspectionRecordMain.data'
+  import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules,InspectionRecordPackage, InspectionRecordPackageRules,InspectionRecordUser,InspectionRecordUserRules} from './inspectionRecordMain.data'
   // import { InspectionJobPackage,InspectionJobPackageRules} from '../inspectionJob/inspectionJobMain.data'
   import * as InspectionRecordPackageApi from '@/api/qms/inspectionRecord/InspectionRecordPackage/InspectionRecordPackage'
   import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
@@ -63,10 +75,18 @@
   import ListTable from '@/components/ListTable/src/ListTable.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
   import UseAddForm from './useAddForm.vue'
+  import AddForm from '../inspectionJob/addForm.vue'
   import Detail from './detail.vue'
+  import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
 
-import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
-
+import {
+  InspectionJobMain,
+  InspectionJobMainRules,
+  InspectionJobDetail,
+  InspectionJobDetailRules,
+  InspectionJobPackage,
+  InspectionJobPackageRules
+} from '../inspectionJob/inspectionJobMain.data'
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
@@ -149,6 +169,11 @@ const buttonBaseClick = (val, item) => {
       // defaultButtons.mainListDeleteBtn(null), // 删除
       defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, 'publish'), hasPermi:'qms:inspection-recode-main:pub'}), // 发布
       defaultButtons.mainListPackageBtn(null), // 包装
+      // defaultButtons.mainListJobExeBtn({
+      // hide:row.useDecision,
+      // hasPermi: 'qms:inspection-recode-main:execute',
+      //  }), // 执行
+      defaultButtons.mainListEditBtn({ hide:row.useDecision }), // 编辑
     ]
   }
 
@@ -188,14 +213,17 @@ const buttonBaseClick = (val, item) => {
       handleDelete(row.id)
     }else if (val == 'mainOrderPub') { //发布
       handleOrderPub(row)
+    }else if (val == 'edit') { //修改
+       // 执行
+    execute('execute', row)
     }
   }
  /** 添加/修改操作 */
   const basicFormRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    basicFormRef.value.open(type, row)
-  }
+  // const openForm = async (type : string, row ?: number) => {
+  //   tableData.value = [] // 重置明细数据
+  //   basicFormRef.value.open(type, row)
+  // }
   /** 使用决策操作操作 */
   const formRef = ref()
   const openUseForm = async (type : string, row ?: number) => {
@@ -235,7 +263,11 @@ const buttonBaseClick = (val, item) => {
   }
 
   
+//执行
 
+const execute = async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
@@ -278,6 +310,26 @@ const buttonBaseClick = (val, item) => {
     } finally {
       formRef.value.formLoading = false
     }
+}
+  // 执行
+const submitFormExecute = async (formType, data) => {
+  // return
+  console.log(formType, data)
+  data.status = '2'
+  try {
+    if (formType === 'create') {
+      await InspectionJobMainApi.createInspectionJobMain(data)
+      message.success(t('common.createSuccess'))
+    } else if (formType === 'execute') {
+      await InspectionJobMainApi.executeInspectionJobMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
   }
 
   // 筛选提交
@@ -291,9 +343,9 @@ const buttonBaseClick = (val, item) => {
 
   /** 初始化 **/
 onMounted(async () => {
-      tableObject.params = {
-    available: true
-  }
+    tableObject.params = {
+      available: true
+    }
     getList()
   })
 </script>

src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@@ -15,10 +15,14 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'number',
       sort: 'custom',
       isSearch: true,
-      isForm: false,
       table: {
         width: 200,
         fixed: 'left'
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -26,9 +30,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'requestNumber',
       sort: 'custom',
       isSearch: true,
-      isForm: false,
       table: {
         width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -36,9 +44,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'jobNumber',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -46,6 +58,7 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'asnNumber',
       sort: 'custom',
       isSearch: true,
+      isForm:false,
       form: {
         componentProps: {
           disabled: true
@@ -60,9 +73,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'supplierCode',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -70,7 +87,6 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'supplierName',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 200
       },
@@ -85,7 +101,6 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'itemCode',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
       },
@@ -100,7 +115,6 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'itemName',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 200
       },
@@ -115,9 +129,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'batch',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -125,9 +143,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'supplierBatch',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -135,9 +157,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'inspectionSchemeCode',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 200
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -145,9 +171,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'inspectionBatch',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -155,9 +185,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'inspectionBatchAmount',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     // {
@@ -176,9 +210,11 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.INSPECTION_TYPE,
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       form: {
-        component: 'Select'
+        component: 'Select',
+        componentProps: {
+          disabled: true
+        }
       },
       table: {
         width: 150
@@ -189,9 +225,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'referenceOrderCode',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -199,10 +239,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'referenceOrderRow',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       form: {
         component: 'InputNumber',
-        value: 0
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+
       },
       table: {
         width: 150
@@ -213,9 +256,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'referenceCertificateCode',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -224,10 +271,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'referenceCertificateRow',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       form: {
         component: 'InputNumber',
-        value: 0
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+
       },
       table: {
         width: 150
@@ -238,10 +288,13 @@ export const InspectionRecordMain = useCrudSchemas(
       field: 'inspectionStage',
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       form: {
         component: 'InputNumber',
-        value: 0
+        value: 0,
+        componentProps: {
+          disabled: true
+        }
+
       },
       table: {
         width: 150
@@ -253,9 +306,13 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.INSPECTION_SEVERITY,
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -264,7 +321,6 @@ export const InspectionRecordMain = useCrudSchemas(
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
-      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -277,7 +333,8 @@ export const InspectionRecordMain = useCrudSchemas(
         component: 'DatePicker',
         componentProps: {
           type: 'datetime',
-          valueFormat: 'x'
+          valueFormat: 'x',
+          disabled: true
         }
       },
       detail: {
@@ -293,7 +350,6 @@ export const InspectionRecordMain = useCrudSchemas(
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
-      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -306,7 +362,8 @@ export const InspectionRecordMain = useCrudSchemas(
         component: 'DatePicker',
         componentProps: {
           type: 'datetime',
-          valueFormat: 'x'
+          valueFormat: 'x',
+          disabled: true
         }
       },
       detail: {
@@ -322,7 +379,6 @@ export const InspectionRecordMain = useCrudSchemas(
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
-      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -335,7 +391,8 @@ export const InspectionRecordMain = useCrudSchemas(
         component: 'DatePicker',
         componentProps: {
           type: 'datetime',
-          valueFormat: 'x'
+          valueFormat: 'x',
+          disabled: true
         }
       },
       detail: {
@@ -351,7 +408,6 @@ export const InspectionRecordMain = useCrudSchemas(
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
-      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -364,7 +420,8 @@ export const InspectionRecordMain = useCrudSchemas(
         component: 'DatePicker',
         componentProps: {
           type: 'datetime',
-          valueFormat: 'x'
+          valueFormat: 'x',
+              disabled: true
         }
       },
       detail: {
@@ -374,13 +431,13 @@ export const InspectionRecordMain = useCrudSchemas(
         width: 175
       }
     },
+
     {
       label: '收货时间',
       field: 'deliveryTime',
       sort: 'custom',
       formatter: dateFormatter,
       isSearch: false,
-      isForm: false,
       search: {
         component: 'DatePicker',
         componentProps: {
@@ -390,6 +447,7 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       },
       form: {
+        component: 'DatePicker',
         componentProps: {
           type: 'datetime',
           valueFormat: 'x'
@@ -408,9 +466,13 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.INSPECTION_LEVEL,
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -419,9 +481,13 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.BASIC_AQL,
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
       }
     },
     {
@@ -432,7 +498,8 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.USAGE_DECISION,
       table: {
         width: 150
-      }
+      },
+      isForm:false
     },
     {
       label: '执行结果',
@@ -440,31 +507,13 @@ export const InspectionRecordMain = useCrudSchemas(
       dictType: DICT_TYPE.EVALUATION_CODE,
       sort: 'custom',
       isSearch: false,
-      isForm: false,
       table: {
         width: 150
-      }
-    },
-    {
-      label: '是否可用',
-      field: 'available',
-      sort: 'custom',
-      isSearch: true,
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      search: {
-        value: 'TRUE'
       },
       form: {
-        component: 'Switch',
-        value: 'TRUE',
         componentProps: {
-          inactiveValue: 'FALSE',
-          activeValue: 'TRUE'
+          disabled: true
         }
-      },
-      table: {
-        width: 110
       }
     },
     {
@@ -537,7 +586,7 @@ export const InspectionRecordMain = useCrudSchemas(
       isForm: false,
       isDetail: false,
       table: {
-        width: 200,
+        width: 250,
         fixed: 'right'
       }
     }
@@ -859,3 +908,40 @@ export const InspectionRecordPackageRules = reactive({
     { validator: validateSixNum, message: '小数点后最多6位', trigger: 'blur' }
   ],
 })
+
+
+//表单校验
+export const InspectionRecordUserRules = reactive({
+  useDecision: [required],
+
+})
+
+/**
+ * @returns {Array} 检验任务子表
+ */
+export const InspectionRecordUser = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 180
+    }
+  },
+  {
+    label: '使用决策',
+    field: 'useDecision',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.USAGE_DECISION,
+    table: {
+      width: 150
+    }
+  },
+]))

src/views/qms/inspectionRecordFirst/addForm.vue

@@ -945,7 +945,6 @@ await formMainRef.value.validate()
       message.error(`模板中有检验工序和检验特性未填写完全`)
       return
     }
-    debugger
     // 判断数组是否有未填的选项
     let arrBol = []
     let isOutweigh = [] //结束时间是否大于开始时间

src/views/qms/inspectionRecordFirst/index.vue

@@ -60,7 +60,7 @@
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import ListTable from '@/components/ListTable/src/ListTable.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import AddForm from './addForm.vue'
+  import AddForm from '../inspectionRecordFirst/addForm.vue'
   import Detail from './detail.vue'
 
 import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../inspectionTemplate/inspectionTemplate.data'
@@ -129,14 +129,7 @@ const buttonBaseClick = (val, item) => {
   }
 
   const isShowMainButton = (row, val) => {
-    if(!row.callbackRequestNumber) {//callbackRequestNumber为空是手工创建订单，不需要使用决策和发布
-      return true;
-    }
-    if(row.useDecision) {
     return row.isPublished
-    } else {
-      return val ? true : false
-    }
   }
 
   // 列表-操作按钮
@@ -249,8 +242,8 @@ const buttonBaseClick = (val, item) => {
 const searchFormClick = (searchData) => {
   searchData.filters.push({
       action: "==",
-      column: "firstInspectionAdded",
-      value: "TRUE" 
+      column: "inspectionType",
+      value: "11" 
     })
     tableObject.params = {
       isSearch: true,
@@ -263,7 +256,7 @@ const searchFormClick = (searchData) => {
 onMounted(async () => {
     tableObject.params = {
       available: true,
-      firstInspectionAdded:'TRUE'
+      inspectionType:'11'
     }
     getList()
   })

src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts

@@ -52,16 +52,6 @@ export const InspectionRecordMain = useCrudSchemas(
         }
       }
     },
-    {
-      label: '批次',
-      field: 'batch',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-      table: {
-        width: 150
-      }
-    },
     {
       label: '检验批次',
       field: 'inspectionBatch',
@@ -72,16 +62,6 @@ export const InspectionRecordMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '检验批数量',
-      field: 'inspectionBatchAmount',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-      table: {
-        width: 150
-      }
-    },
     {
       label: '检验方案编码',
       field: 'inspectionSchemeCode',