检验记录，发布和使用决策，检验任务验证

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

@@ -63,3 +63,7 @@ export const exportInspectionRecordMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-record-main/get-import-template' })
 }
+// 发布
+export const publishInspectionRecordMain = async (data ) => {
+  return await request.put({ url: `/qms/inspection-record-main/publish`, data })
+}

src/locales/en-US.ts

@@ -313,7 +313,8 @@ export default {
     dataUpdate: 'Dict Data Eidt',
     fileUpload: 'File Upload',
     createLabel: 'create label',
-    viewDetail:'Detailed list'
+    viewDetail:'Detailed list',
+    updataRecode:'Updata recode'
   },
   dialog: {
     dialog: 'Dialog',

src/locales/zh-CN.ts

@@ -312,7 +312,8 @@ export default {
     dataCreate: '字典数据新增',
     dataUpdate: '字典数据编辑',
     createLabel: '创建标签',
-    viewDetail:'明细列表'
+    viewDetail:'明细列表',
+    updataRecode:'更新记录'
   },
   dialog: {
     dialog: '弹窗',

src/utils/disposition/defaultButtons.ts

@@ -811,7 +811,18 @@ export function mainThawRequesttBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 主列表-更新检验记录
+export function mainUpdataRecodeBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '更新检验记录',
+    name: 'updataRecode',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {

src/views/qms/basicDataManage/inspectionPlan/addForm.vue

@@ -886,8 +886,6 @@ const validateForm = (formRef) => {
 const submitForm = async () => {
   try {
     const validateForm1 = await validateForm(formProcessRef.value)
-    console.log(validateForm1)
-    console.log(data.value)
     await formMainRef.value.validate()
     if (!data.value.process || data.value.process.length == 0) {
       message.error(`请添加工序`)

src/views/qms/inspection/inspectionJob/addForm.vue

@@ -515,11 +515,11 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       editableTabsValue.value = index + 1
       item.name = index + 1
       item.inspectionJobCharacteristicsUpdateReqVO = item.inspectionJobCharacteristicsRespVO
-      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
       // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
       if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
         // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        for (let i = 0; i < data.value.sampleTotalAmount; i++) {
+      item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
+        for (let i = 0; i < parseInt(data.value.sampleTotalAmount); i++) {
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
             inspectionValue: '', //检验值
             qualitativeCode: '', //定性字典项值
@@ -530,17 +530,17 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
           })
         }
       } else {
+        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
         // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
-        item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [
-          {
-            inspectionValue: '', //检验值
-            qualitativeCode: '', //定性字典项值
-            estimateCode: '', //评估代码
-            defectLevel: '', //缺陷级别
-            qualifiedQuantity: '', //合格数量
-            unqualifiedQuantity: '' //不合格数量
-          }
-        ]
+        // item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
+        //     inspectionValue: '', //检验值
+        //     qualitativeCode: '', //定性字典项值
+        //     estimateCode: '', //评估代码
+        //     defectLevel: '', //缺陷级别
+        //     qualifiedQuantity: '', //合格数量
+        //     unqualifiedQuantity: '' //不合格数量
+        //   }
+        // )
       }
       // 编辑判断上限下限目标值是否必填
       if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
@@ -700,10 +700,11 @@ const submitForm = async () => {
       return
     }
     // 判断附加费用数组是否有未填的选项
-    let arrBol = data.value.subList.map((item, index) => {
-      let arr1 = []
+    let arrBol = []
+    let isOutweigh = []//结束时间是否大于开始时间
+    data.value.subList.forEach((item, index) => {
       if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
-        arr1.push(
+        arrBol.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
             (cur, key) => {
               return !cur.qualifiedQuantity || !cur.unqualifiedQuantity
@@ -712,7 +713,7 @@ const submitForm = async () => {
         )
       }
       if (item.samplingProcessRespVO.evaluationMode == 1) {
-        arr1.push(
+        arrBol.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
             (cur, key) => {
               return !cur.estimateCode || !cur.defectLevel
@@ -721,7 +722,7 @@ const submitForm = async () => {
         )
       }
       if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0) {
-        arr1.push(
+        arrBol.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
             (cur, key) => {
               return !cur.inspectionValue
@@ -730,7 +731,7 @@ const submitForm = async () => {
         )
       }
       if (item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1) {
-        arr1.push(
+        arrBol.push(
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
             (cur, key) => {
               return !cur.qualitativeCode
@@ -738,17 +739,21 @@ const submitForm = async () => {
           )
         )
       }
-      return arr1
+      // 开始时间大于结束时间放入数组中
+      if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) {
+        isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
+      }
     })
-    //     console.log(arrBol)
-    //     let isEmpty1 = arrBol.filter(item=>item == true)
-    //     arrBol.forEach(item=>{
-    // console.log('1q1q')
-    // console.log(typeof item)
-    //     })
-    // setTimeout(()=>{
-    // console.log(arrBol.includes(true))
-    // },2000)
+    let isEmpty1 = arrBol.some(item=>item == true)
+    if(isEmpty1){
+      message.error('检验工序和检验特性有字段未填写完全')
+      return;
+    }
+    if(isOutweigh.length>0){
+      message.error('检验特性中有开始时间大于结束时间')
+      return;
+    }
+    return;
     if (formType.value == 'create') {
       // 主子表——提交请求
       emit('submitForm', formType.value, data.value)

src/views/qms/inspection/inspectionRecord/index.vue

@@ -58,7 +58,7 @@
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionRecordMain, InspectionRecordMainRules, InspectionRecordDetail, InspectionRecordDetailRules } from './inspectionRecordMain.data'
-  import { InspectionJobPackage} from './inspectionJobMain.data'
+  import { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
   import * as InspectionRecordMainApi from '@/api/qms/inspectionRecord/inspectionRecordMain'
   import * as InspectionRecordDetailApi from '@/api/qms/inspectionRecord/inspectionRecordDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -171,8 +171,9 @@
   const butttondata = (row) => {
     return [
       // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-      // defaultButtons.mainListEditBtn(null), // 编辑
+      defaultButtons.mainListEditBtn(null), // 编辑
       // defaultButtons.mainListDeleteBtn(null), // 删除
+      defaultButtons.mainListOrderPubBtn(null), // 发布
     ]
   }
 
@@ -180,13 +181,28 @@
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
+      // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
+      if(row.estimateCode == 1){
+        InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{
+          if(itemColumn.field == "useDecision"){
+            itemColumn.componentProps.options=itemColumn.componentProps.options?.filter(item=>item.value==1)
+          }
+        })
+      }else if(row.estimateCode == 2){
+        InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{
+          if(itemColumn.field == "useDecision"){
+            itemColumn.componentProps.options=itemColumn.componentProps.options?.filter(item=>item.value!=1)
+          }
+        })
+      }
       openForm('update', row)
     }else if (val == 'mainPackage') { // 包装
       const list = await InspectionJobPackageApi.getInspectionJobPackageList(row.id)
       listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
-    }
-    else if (val == 'delete') { // 删除
+    }else if (val == 'delete') { // 删除
       handleDelete(row.id)
+    }else if (val == 'mainOrderPub') { //发布
+      handleOrderPub(row)
     }
   }
 
@@ -215,6 +231,20 @@
       await getList()
     } catch { }
   }
+  /** 发布按钮操作 */
+  const handleOrderPub = async (row : object) => {
+    try {
+      // 删除的二次确认
+      await message.confirm('是否发布所选数据')
+      // 发起删除
+      await InspectionRecordMainApi.publishInspectionRecordMain(row)
+      message.success('发布成功')
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  
 
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
@@ -257,7 +287,7 @@
       if (formType === 'create') {
         await InspectionRecordMainApi.createInspectionRecordMain(data)
         message.success(t('common.createSuccess'))
-      } else {
+      }else {
         await InspectionRecordMainApi.updateInspectionRecordMain(data)
         message.success(t('common.updateSuccess'))
       }
@@ -298,6 +328,5 @@
   /** 初始化 **/
   onMounted(async () => {
     getList()
-    importTemplateData.templateUrl = await InspectionRecordMainApi.importTemplate()
   })
 </script>

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

@@ -13,72 +13,84 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    isForm:false
   },
   {
     label: '申请编码',
     field: 'applicationCode',
     sort: 'custom',
     isSearch: true,
+    isForm:false
   },
   {
     label: '任务编码',
     field: 'taskCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '供应商编码',
     field: 'supplierCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '物料编码',
     field: 'materialCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '批次',
     field: 'batch',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '检验方案编码',
     field: 'inspectionSchemeCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '检验方案Json',
     field: 'inspectionSchemeJson',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '检验批次',
     field: 'inspectionBatch',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '检验批数量',
     field: 'inspectionBatchAmount',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '采样总数量',
     field: 'sampleTatalAmount',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '检验类型',
     field: 'inspectionType',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
     form: {
       component: 'Select'
     },
@@ -88,18 +100,21 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionBatchSource',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '订单号',
     field: 'orderCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '订单行',
     field: 'orderRow',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -110,12 +125,14 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'certificateCode',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '凭证行',
     field: 'certificateRow',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -126,6 +143,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionStage',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -136,12 +154,14 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionStringency',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
   },
   {
     label: '使用决策',
     field: 'useDecision',
     sort: 'custom',
     isSearch: false,
+    isForm:false
   },
   {
     label: '计划开始时间',
@@ -149,6 +169,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isForm:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -171,6 +192,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isForm:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -193,6 +215,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isForm:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -215,6 +238,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isForm:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -236,18 +260,29 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'inspectionLevel',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
   },
   {
     label: 'AQL值',
     field: 'aqlValue',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
   },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
     isSearch: false,
+    isForm:false,
+  },
+  {
+    label: '使用决策',
+    field: 'useDecision',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.USAGE_DECISION,
+
   },
   {
     label: '创建时间',