From aa9df7d4e059a85c6f266025f178626c69fb405d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 8 Apr 2024 16:34:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E4=BD=BF=E7=94=A8=E5=86=B3=E7=AD=96?= =?UTF-8?q?=EF=BC=8C=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionRecordMain/index.ts | 4 ++ src/locales/en-US.ts | 3 +- src/locales/zh-CN.ts | 3 +- src/utils/disposition/defaultButtons.ts | 13 +++- .../inspectionPlan/addForm.vue | 2 - .../qms/inspection/inspectionJob/addForm.vue | 61 ++++++++++--------- .../qms/inspection/inspectionRecord/index.vue | 41 +++++++++++-- .../inspectionRecordMain.data.ts | 35 +++++++++++ 8 files changed, 123 insertions(+), 39 deletions(-) diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index 02663e294..c04557bd6 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/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 }) +} diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 05d1cd48a..4590ca435 100644 --- a/src/locales/en-US.ts +++ b/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', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 979826038..37dc11cb8 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -312,7 +312,8 @@ export default { dataCreate: '字典数据新增', dataUpdate: '字典数据编辑', createLabel: '创建标签', - viewDetail:'明细列表' + viewDetail:'明细列表', + updataRecode:'更新记录' }, dialog: { dialog: '弹窗', diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 7f81426e2..998e0a9ac 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/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 { diff --git a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue b/src/views/qms/basicDataManage/inspectionPlan/addForm.vue index 8b584fb2c..967a5833b 100644 --- a/src/views/qms/basicDataManage/inspectionPlan/addForm.vue +++ b/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(`请添加工序`) diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 10fa03b5c..d562c7be1 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/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) diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue index 46d6b961c..ae0e3ab24 100644 --- a/src/views/qms/inspection/inspectionRecord/index.vue +++ b/src/views/qms/inspection/inspectionRecord/index.vue @@ -58,7 +58,7 @@ diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index 11ea76270..436752732 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -13,72 +13,84 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ 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([ 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([ 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([ field: 'inspectionStage', sort: 'custom', isSearch: false, + isForm:false, form: { component: 'InputNumber', value: 0 @@ -136,12 +154,14 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ 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([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isForm:false, search: { component: 'DatePicker', componentProps: { @@ -171,6 +192,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isForm:false, search: { component: 'DatePicker', componentProps: { @@ -193,6 +215,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isForm:false, search: { component: 'DatePicker', componentProps: { @@ -215,6 +238,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isForm:false, search: { component: 'DatePicker', componentProps: { @@ -236,18 +260,29 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ 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: '创建时间',