From 07c0bb74b024b673bf54bf9d1ca6abfd9b027ac4 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 12 Apr 2024 08:44:10 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/sampleCode/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/qms/sampleCode/index.vue b/src/views/qms/sampleCode/index.vue index 2f7dae698..faa6d874c 100644 --- a/src/views/qms/sampleCode/index.vue +++ b/src/views/qms/sampleCode/index.vue @@ -156,6 +156,11 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { + if(data.batchLowLimiting >= data.batchUpperLimiting){ + message.alertWarning('批量上限须大于批量下限') + basicFormRef.value.formLoading = false + return + } var isHave =SampleCode.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); From 33367cf78c2f8540438dc84c98040895f6aef1ed Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 12 Apr 2024 09:01:10 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectionJob/inspectionJobMain.data.ts | 8 ++++- .../inspectionRecordMain.data.ts | 30 +++++++++++-------- .../inspectionRequest/inspectionMain.data.ts | 12 ++++++++ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts index f73d21094..c66932fea 100644 --- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts @@ -30,7 +30,7 @@ export const InspectionJobMain = useCrudSchemas(reactive([ } }, table: { - width: 150, + width: 165, fixed: 'left' } }, @@ -320,6 +320,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -346,6 +349,9 @@ export const InspectionJobMain = useCrudSchemas(reactive([ disabled:true } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts index c7e617e88..54cfb535e 100644 --- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts @@ -16,7 +16,7 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ isSearch: true, isForm:false, table: { - width: 150, + width: 165, fixed: 'left' } }, @@ -254,6 +254,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -280,6 +283,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -306,6 +312,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -332,6 +341,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -358,17 +370,6 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ width: 150 } }, - // { - // label: '是否可用', - // field: 'available', - // dictType: DICT_TYPE.TRUE_FALSE, - // sort: 'custom', - // isSearch: false, - // isForm:false, - // table: { - // width: 150 - // } - // }, { label: '使用决策', field: 'useDecision', @@ -395,8 +396,11 @@ export const InspectionRecordMain = useCrudSchemas(reactive([ } }, isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + width: 170 } }, diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts index 91b2828d0..d42f387df 100644 --- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts +++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts @@ -75,6 +75,9 @@ export const InspectionMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -100,6 +103,9 @@ export const InspectionMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -125,6 +131,9 @@ export const InspectionMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } @@ -150,6 +159,9 @@ export const InspectionMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 150 } From f200d748a0519d0865253fb45cf912dae802811e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 12 Apr 2024 09:05:04 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=A2=9E--=E5=88=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain.data.ts | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index a7f717be3..2985c7cc2 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -62,6 +62,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ { label: '申请时间', field: 'requestTime', + isForm:false, + isTable:false, + isTableForm:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -83,6 +86,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ { label: '截止时间', field: 'dueTime', + isForm:false, + isTable:false, + isTableForm:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -259,6 +265,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ { label: '备注', field: 'remark', + isForm:false, + isTable:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -341,12 +350,12 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ //表单校验 export const UnplannedissueRequestMainRules = reactive({ - requestTime: [ - { required: true, message: '请输入申请时间', trigger: 'blur' } - ], - dueTime: [ - { required: true, message: '请输入截止时间', trigger: 'blur' } - ], + // requestTime: [ + // { required: true, message: '请输入申请时间', trigger: 'blur' } + // ], + // dueTime: [ + // { required: true, message: '请输入截止时间', trigger: 'blur' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], From a143d47a724d38a27a24726083ccdcb00f048207 Mon Sep 17 00:00:00 2001 From: bjang03 Date: Fri, 12 Apr 2024 09:46:39 +0800 Subject: [PATCH 04/14] =?UTF-8?q?1=E3=80=81=E6=9C=88=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E7=BC=96=E7=A0=81=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/workstation/index.ts | 10 --- src/views/mes/ordermonthplan/index.vue | 22 +++++-- .../ordermonthplan/mesOrderMonthMain.data.ts | 37 +++++------ src/views/mes/workstation/index.vue | 63 +++---------------- src/views/mes/workstation/workstation.data.ts | 58 ++--------------- 5 files changed, 49 insertions(+), 141 deletions(-) diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts index 336c9714a..a3dfde12d 100644 --- a/src/api/mes/workstation/index.ts +++ b/src/api/mes/workstation/index.ts @@ -40,16 +40,6 @@ export const deleteWorkstation = async (id: number) => { return await request.delete({ url: `/mes/workstation/delete?id=` + id }) } -// 导出工位 Excel -export const exportWorkstation = async (params) => { - return await request.download({ url: `/mes/workstation/export-excel`, params }) -} - -// 下载用户导入模板 -export const importTemplate = () => { - return request.download({ url: '/mes/workstation/get-import-template' }) -} - export const getEquipmentPage = async (params) => { params.workstationCode = goalParams.workstationCode if (params.isSearch) { diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue index 8e5c97e9d..32805630a 100644 --- a/src/views/mes/ordermonthplan/index.vue +++ b/src/views/mes/ordermonthplan/index.vue @@ -44,9 +44,10 @@ @success="formsSuccess" :rules="MesOrderMonthMainRules" :formAllSchemas="MesOrderMonthMain.allSchemas" - :apiUpdate="MesOrderMonthApi.updateMesOrderMonthMain" - :apiCreate="MesOrderMonthApi.createMesOrderMonthMain" + :apiUpdate="updateMesOrderMonthMain" + :apiCreate="createMesOrderMonthMain" :apiDelete="MesOrderMonthApi.deleteMesOrderMonthMain" + @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> @@ -106,7 +107,11 @@ import { MesOrderMonthSubRules } from "@/views/mes/ordermonthplan/mesOrderMonthSub.data"; import * as OrderDayApi from "@/api/mes/orderDay"; -import {breakdown, MesOrderMonthSubVO} from "@/api/mes/ordermonthplan"; +import { + breakdown, + MesOrderMonthMainVO, + MesOrderMonthSubVO +} from "@/api/mes/ordermonthplan"; defineOptions({ name: 'MesOrderMonthMain' }) @@ -198,6 +203,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; + data.factoryName = factoryName if (formType === 'create') { await MesOrderMonthApi.createMesOrderMonthMain(data) message.success(t('common.createSuccess')) @@ -208,7 +214,6 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.dialogVisible = false getList() } - /** 详情操作 */ const detailRef = ref() let mainPlanId @@ -278,8 +283,10 @@ onMounted(async () => { const detailAllSchemas = ref(MesOrderMonthSub.allSchemas) // 查询页面返回 let productName +let factoryName const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { + const setV = {} setV[formField] = val[0][searchField] formRef.setValues(setV) @@ -289,6 +296,10 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { productName = val[0].name getBoms(val[0][searchField]) } + if(formField=='factoryCode'){ + factoryName = val[0].name + formRef.setValues({factoryCode:val[0]['id']}) + } // if(formField=='workroomCode'){ // getProductlines(val[0][searchField]) // } @@ -304,6 +315,8 @@ const getBoms = async (code: String) => { } }) } + + const createMesOrderMonthSub = async (data: MesOrderMonthSubVO) => { data.productName = productName return await MesOrderMonthApi.createMesOrderMonthSub(data) @@ -314,7 +327,6 @@ const updateMesOrderMonthSub = async (data: MesOrderMonthSubVO) => { } // 详情--头部按钮事件 const detailButtonBaseClick = async (val, item) => { - debugger try { // 二次确认 await message.confirm('确定要拆解成日计划吗?') diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts index 422b79c07..908906fb6 100644 --- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts +++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts @@ -1,5 +1,6 @@ import type {CrudSchema} from '@/hooks/web/useCrudSchemas' import {dateFormatter} from '@/utils/formatTime' +import * as TenantApi from '@/api/system/tenant' // 表单校验 export const MesOrderMonthMainRules = reactive({ @@ -35,24 +36,24 @@ export const MesOrderMonthMain = useCrudSchemas(reactive([ field: 'factoryCode', sort: 'custom', isTable: false, - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // isSearchList: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择工厂', // 输入框占位文本 - // searchField: 'id', // 查询弹窗赋值字段 - // searchTitle: '请选择工厂', // 查询弹窗标题 - // searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类 - // searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法 - // isHideFilterButton: true, - // searchCondition: [{ - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // } - // ] - // } - // } + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择工厂', // 输入框占位文本 + searchField: 'factoryCode', // 查询弹窗赋值字段 + searchTitle: '请选择工厂', // 查询弹窗标题 + searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类 + searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法 + isHideFilterButton: true, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + } }, { label: '工厂名称', diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue index 1e85ee1d4..092a7e41b 100644 --- a/src/views/mes/workstation/index.vue +++ b/src/views/mes/workstation/index.vue @@ -69,24 +69,19 @@ @detailOpenForm="detailOpenForm" /> - - diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts index 31278352b..6d405e1a9 100644 --- a/src/views/mes/workstation/workstation.data.ts +++ b/src/views/mes/workstation/workstation.data.ts @@ -19,10 +19,6 @@ export const TabsList = [{ label: "设备", prop: 'Equipment', }, - { - label: "工序", - prop: 'Process', - }, { label: "操作步骤", prop: 'Opersteps', @@ -95,13 +91,6 @@ export const Workstation = useCrudSchemas(reactive([ } } }, - { - label: '班组代码', - field: 'teamCode', - sort: 'custom', - isSearch: true, - isForm: false - }, { label: '生效时间', field: 'activeTime', @@ -161,13 +150,14 @@ export const Workstation = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isTable: true, table: { width: 150, fixed: 'right' } } ])) -export const Team = useCrudSchemas(reactive([ +export const select = useCrudSchemas(reactive([ { label: '代码', field: 'code', @@ -181,17 +171,6 @@ export const Team = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isForm: false - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, } ])) @@ -222,33 +201,6 @@ export const Equipment = useCrudSchemas(reactive([ isTableForm:true } ])) -export const Process = useCrudSchemas(reactive([ - { - label: '代码', - field: 'code', - sort: 'custom', - isSearch: true, - isForm: false - }, - { - label: '名称', - field: 'name', - sort: 'custom', - isSearch: true, - isForm: false - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } -])) export const Opersteps = useCrudSchemas(reactive([ { label: '代码', @@ -291,7 +243,7 @@ export const equipmentPopList = useCrudSchemas(reactive([ searchListPlaceholder: '选择设备', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '选择设备', // 查询弹窗标题 - searchAllSchemas: Team.allSchemas, // 查询弹窗所需类 + searchAllSchemas: select.allSchemas, // 查询弹窗所需类 searchPage: WorkstationApi.checkEquipmentPageList, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', @@ -316,7 +268,7 @@ export const processPopList = useCrudSchemas(reactive([ searchListPlaceholder: '选择工序', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '选择工序', // 查询弹窗标题 - searchAllSchemas: Team.allSchemas, // 查询弹窗所需类 + searchAllSchemas: select.allSchemas, // 查询弹窗所需类 searchPage: WorkstationApi.checkProcessPageList, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', @@ -341,7 +293,7 @@ export const stepPopList = useCrudSchemas(reactive([ searchListPlaceholder: '选择操作步骤', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '选择操作步骤', // 查询弹窗标题 - searchAllSchemas: Team.allSchemas, // 查询弹窗所需类 + searchAllSchemas: select.allSchemas, // 查询弹窗所需类 searchPage: WorkstationApi.checkOperstepsPageList, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', From 5e5b85b1e300bc912d737d76c1c1b49d74a56177 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 12 Apr 2024 10:01:59 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/inspectionTemplate/addForm.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue index a57e0d20b..931f8deab 100644 --- a/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue +++ b/src/views/qms/basicDataManage/inspectionTemplate/addForm.vue @@ -276,7 +276,19 @@ prop="inspectionCharacteristicsBaseVO.quantifyUom" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0" > - + + + From ab2c1e9e49e2ece4d780ea8f09a4cab2a5473aee Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 12 Apr 2024 10:21:36 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=BF=E6=8E=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspection/inspectionJob/addForm.vue | 10 ++++++---- src/views/qms/inspection/inspectionJob/index.vue | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index a7b6837fd..86f69f56c 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -296,7 +296,7 @@ { +const buttonBaseClick1 =async (val) => { // 保存 if (val == 'save') { if (!nameRef.value) return @@ -692,13 +693,14 @@ const buttonBaseClick1 = (val) => { dialogVisibleName.value = false } } -const buttonBaseClick = (val) => { +const buttonBaseClick =async(val) => { // 保存 if (val == 'save') { submitForm() } // 关闭 else if (val == 'close') { + await InspectionJobMainApi.abandonInspectionJobMain(data.value.id) dialogVisible.value = false } } diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue index 0413a48aa..680aa7eb7 100644 --- a/src/views/qms/inspection/inspectionJob/index.vue +++ b/src/views/qms/inspection/inspectionJob/index.vue @@ -161,10 +161,10 @@ // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接 + // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭 - defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行 + // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃 + defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行 defaultButtons.mainListPackageBtn(null), // 包装 ] } From b39ee6a2f824b1242f75b904f316dab2c127a586 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 12 Apr 2024 11:06:19 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspection/inspectionJob/detail.vue | 58 +------------------ .../samplingProcess/samplingProcess.data.ts | 23 +++++--- 2 files changed, 16 insertions(+), 65 deletions(-) diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspection/inspectionJob/detail.vue index cb2d9d51c..1a2673a19 100644 --- a/src/views/qms/inspection/inspectionJob/detail.vue +++ b/src/views/qms/inspection/inspectionJob/detail.vue @@ -46,18 +46,9 @@ - - - - - - + @@ -65,15 +56,6 @@ - - - - -
检验特性
@@ -121,20 +103,6 @@ - - - - - - - - - - - diff --git a/src/views/qms/samplingProcess/samplingProcess.data.ts b/src/views/qms/samplingProcess/samplingProcess.data.ts index 955a0e91d..8ee0c907c 100644 --- a/src/views/qms/samplingProcess/samplingProcess.data.ts +++ b/src/views/qms/samplingProcess/samplingProcess.data.ts @@ -1,12 +1,14 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import {getSamplingScheme} from "@/api/qms/samplingProcess"; +import { validateInteger } from '@/utils/validator' // 表单校验 export const SamplingProcessRules = reactive({ sampleType: [required], evaluationMode: [required], description: [required], + inspectionQty: [required, {validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}] }) const samplingSchemeList = await getSamplingScheme() export const SamplingProcess = useCrudSchemas(reactive([ @@ -30,12 +32,12 @@ export const SamplingProcess = useCrudSchemas(reactive([ label: '取样类型', field: 'sampleType', sort: 'custom', - dictType: DICT_TYPE.SAMPLING_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + dictType: DICT_TYPE.SAMPLING_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, - form: { - component: 'Select' - }, + form: { + component: 'Select' + }, }, { label: '评估模式', @@ -43,15 +45,20 @@ export const SamplingProcess = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.EVALUATION_MODE, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'Select' - }, + form: { + component: 'Select' + }, }, { label: '样品量', field: 'sampleSize', sort: 'custom', }, + { + label: '检验次数', + field: 'inspectionQty', + sort: 'custom', + }, { label: '采样方案编码', field: 'sampleProgCode', From 5278f3d0d4bc28ad7f0905c65a9f2160c2be34bd Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 12 Apr 2024 11:30:31 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=A8inspectionQty=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspection/inspectionJob/addForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 86f69f56c..15ff6b114 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -550,7 +550,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) { // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] - for (let i = 0; i < parseInt(data.value.sampleTotalAmount); i++) { + for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) { item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 From 74b353b6455c09fa79277b1ff58b3f3388305e5e Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 12 Apr 2024 11:46:00 +0800 Subject: [PATCH 09/14] =?UTF-8?q?2024-4-12=20=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20=E6=97=A5?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E5=92=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/orderDay/index.ts | 5 + src/api/mes/processroute/index.ts | 1 + .../mes/orderDay/components/orderDetail.vue | 32 +++--- .../mes/orderDay/components/schedule.vue | 102 +++--------------- src/views/mes/orderDay/index.vue | 29 ++--- src/views/mes/orderDay/orderDay.data.ts | 9 +- .../processroute/components/configDialog.vue | 78 +++++++++++--- src/views/mes/processroute/index.vue | 2 +- .../mes/processroute/processroute.data.ts | 12 ++- .../processSearch.data.ts | 0 10 files changed, 136 insertions(+), 134 deletions(-) rename src/views/mes/{orderDay/components => publicUtil}/processSearch.data.ts (100%) diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts index 0b88e4782..852c8f0e3 100644 --- a/src/api/mes/orderDay/index.ts +++ b/src/api/mes/orderDay/index.ts @@ -83,6 +83,11 @@ export const getProcessroutesDetail = async (code) => { export const getPlanBom = async (params) => { return await request.get({ url: `/mes/orderday/getBomInfo`,params }) } + +// 根据获取计划BOM信息 +export const getBomInfoTree = async (params) => { + return await request.get({ url: `/mes/orderday/getBomInfoTree`,params }) +} // 根据计划的车间、产线、计划时间 查询已经配置的人员 export const getPlanWorks = async (params) => { return await request.get({ url: `/mes/orderday/getWorkGroup`,params }) diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index be6648c4f..f80f4aab1 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -75,6 +75,7 @@ export const getProductInfo =async (code:String) => { // 获取设备列表-参数为工序编码 export const getDeviceList =async (code:String) => { //return request.get({ url: `/wms/itembasic/getProduct?code=`+code}) + return request.get({ url: `/wms/itembasic/getProduct?code=`+code}) return {code:0,data:[{name:"冲压设备1",code:"CY0001"},{name:"冲压设备2",code:"CY0002"}]} } // 获取工作人员信息--参数为工序编码 diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue index 9f7d56984..b2901483c 100644 --- a/src/views/mes/orderDay/components/orderDetail.vue +++ b/src/views/mes/orderDay/components/orderDetail.vue @@ -80,12 +80,13 @@ :data="bomInfoSchemaData" style="width: 100%" > - - - - - - + + + + + + @@ -111,11 +112,10 @@ const props = defineProps({ }) const detailData = ref(props.allSchemas) - const bomInfoSchemaData = ref( [{productItemCode:'----', - componentItemCode:'----', - componentUom:'----', - componentQty:'----', - version:'----'}]) + const bomInfoSchemaData = ref( [{srcMaterialCode:'----', + srcMaterialModel:'----', + srcMaterialCounts:'----', + processCode:'----',id:0}]) const processRouteInfoSchema = ref({ processrouteInfo: { processrouteCode: '', processName: '', routeVersion: '' }, @@ -158,6 +158,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: titleNameRef.value = titleName titleValueRef.value = titleValue isShowDrawer.value = true + processRouteInfoSchema.value={ processrouteInfo: { processrouteCode: '', processName: '', routeVersion: '' }, processrouteNodeDetailList: [] } + bomInfoSchemaData.value = [{srcMaterialCode:'', + srcMaterialModel:'', + srcMaterialCounts:'', + processCode:'',id:0}] + if (row) { detailLoading.value = true try { @@ -171,9 +177,11 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗 const getDetailData = async (row: any) => { processRouteInfoSchema.value = await OrderDayApi.getProcessroutesDetail(row.processrouteCode) - let pam={code:row.standardBom.slice(0,row.standardBom.lastIndexOf('-')),version:row.standardBom.slice(row.standardBom.lastIndexOf('-')+1)} + + let pam={planDayCode:row.planNoDay,productCode:row.productCode,planBatchCode:row.batchCode} //console.log(pam) bomInfoSchemaData.value = await OrderDayApi.getPlanBom(pam) + nodeData.value = processRouteInfoSchema.value.processrouteNodeDetailList } diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index be797d612..b32596eb5 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -50,28 +50,32 @@ > - + + - + + - + + @@ -97,7 +101,7 @@ import { getNewNode } from '@/views/mes/processroute/components/graphbase.data' import * as ProcessrouteApi from '@/api/mes/processroute' -import {ProcessSearch} from './processSearch.data' +import {ProcessSearch} from '../../publicUtil/processSearch.data' import * as ProcessApi from '@/api/wms/process' import { SearchTable } from '@/components/SearchTable' import { Graph } from '@antv/x6' @@ -143,86 +147,6 @@ const dialogWidth = ref() const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 let graphJson = { - cells: [ - { - position: { - x: 40, - y: 40 - }, - size: { - width: 100, - height: 40 - }, - attrs: { - text: { - text: 'Hello' - }, - body: { - stroke: '#8f8f8f', - strokeWidth: 1, - fill: '#fff', - rx: 6, - ry: 6 - } - }, - visible: true, - shape: 'rect', - id: 'adbc20c6-96e4-4792-9e5b-42df6066cff0', - zIndex: 1 - }, - { - position: { - x: 240, - y: 180 - }, - size: { - width: 100, - height: 40 - }, - attrs: { - text: { - text: 'World' - }, - body: { - stroke: '#8f8f8f', - strokeWidth: 1, - fill: '#fff', - rx: 6, - ry: 6 - } - }, - visible: true, - shape: 'ellipse', - id: '9b1f1e94-a01f-4902-bfae-4e6e81029261', - zIndex: 2 - }, - { - shape: 'edge', - attrs: { - line: { - stroke: '#8f8f8f', - strokeWidth: 1 - } - }, - id: '8fd50f13-22ba-41ff-b54a-eb6d8553c3d7', - source: { - cell: 'adbc20c6-96e4-4792-9e5b-42df6066cff0' - }, - target: { - cell: '9b1f1e94-a01f-4902-bfae-4e6e81029261' - }, - labels: [ - { - attrs: { - label: { - text: 'X6' - } - } - } - ], - zIndex: 3 - } - ] } /** 打开弹窗 */ const open = async (type: string, row?: any, titleName?: any) => { @@ -230,7 +154,7 @@ const open = async (type: string, row?: any, titleName?: any) => { detailData.value = row dialogWidth.value = props.basicFormWidth + '%' //获取配置的 - getProcessroute('001') + await ProcessrouteApi.getProcessroute(row.processrouteCode) if (titleName) { dialogTitle.value = t('action.' + titleName) } else { @@ -280,7 +204,7 @@ const searchTableRef = ref() const opensearchTable = ( ) => { - console.log("opensearchTable") + //console.log("opensearchTable") const _searchCondition = {} const _searchTableTitle = "工序查询" const _searchTableAllSchemas = ProcessSearch.allSchemas @@ -310,8 +234,6 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { processData.value.push({code:item.code,name:item.name})} }) } - - //emit('searchTableSuccess', formField, searchField, val, undefined, type, row) } const deleteNode=(row)=>{ diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index d258dbcbd..a241bf85b 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -81,7 +81,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import orderDetail from './components/orderDetail.vue' import scheduleDetail from './components/schedule.vue' -import { disabledTimeListsProps } from 'node_modules/element-plus/es/components/time-picker/src/props/shared' +import { Loading } from 'node_modules/element-plus/es/components/loading/src/service' +import { loadavg } from 'os' defineOptions({ name: 'MesOrderDay' }) const message = useMessage() // 消息弹窗 @@ -93,14 +94,14 @@ routeName.value = route.name const tableColumns = ref(OrderDay.allSchemas.tableColumns) const lineOptions=ref([]) const processRouteOptions=ref([]) -const bomOptions=ref([]) + //**获取 产品工艺路由列表 */ const getProcessroutes = async (code: String) => { processRouteOptions.value = await OrderDayApi.getProcessroutes(code) OrderDay.allSchemas.formSchema.forEach(item => { if (item.field == 'processrouteCode') { - console.log('processrouteCode',item.field) + //console.log('processrouteCode',item.field) item.componentProps.options = processRouteOptions.value } }) @@ -114,14 +115,15 @@ const getProductlines = async (code: String) => { } }) } -const getBoms = async (code: String) => { - bomOptions.value = await OrderDayApi.getBoms(code) - OrderDay.allSchemas.formSchema.forEach(item => { - if (item.field == 'standardBom') { - item.componentProps.options = bomOptions.value - } - }) -} +//跟现在情况需要填写BOM版本号即可，其他跟随产品编码 +// const getBoms = async (code: String) => { +// bomOptions.value = await OrderDayApi.getBoms(code) +// OrderDay.allSchemas.formSchema.forEach(item => { +// if (item.field == 'standardBom') { +// item.componentProps.options = bomOptions.value +// } +// }) +// } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { @@ -131,7 +133,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if(formField=='productCode'){ //formRef.setValues({standardBom:'bomddd'}) getProcessroutes(val[0][searchField]) - getBoms(val[0][searchField]) + //getBoms(val[0][searchField]) } if(formField=='workroomCode'){ getProductlines(val[0][searchField]) @@ -253,6 +255,7 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { + var isHave =OrderDay.allSchemas.formSchema.some(function (item) { return item.field === 'activeTime' || item.field === 'expireTime'; }); @@ -264,6 +267,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; + if (formType === 'create') { await OrderDayApi.createOrderDay(data) message.success(t('common.createSuccess')) @@ -271,6 +275,7 @@ const formsSuccess = async (formType,data) => { await OrderDayApi.updateOrderDay(data) message.success(t('common.updateSuccess')) } + basicFormRef.value.dialogVisible = false getList() } diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index a110b4bae..e7d0f5653 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -8,7 +8,7 @@ import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/w // 表单校验 export const OrderDayRules = reactive({ - // planNoDay: [ + // batchCode: [ // { required: false, message: '请输入一个日计划编号', trigger: 'blur' } // ], planNoMonth: [ @@ -85,6 +85,13 @@ export const OrderDay = useCrudSchemas(reactive([ } }, }, + { + label: '产品批次码', + field: 'batchCode', + sort: 'custom', + isSearch: true, + required: true, + }, { label: '月计划单号', field: 'planNoMonth', diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 931ac8f1b..8502fbcbf 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -26,22 +26,29 @@ - - @@ -130,9 +138,11 @@ import Annex from '@/components/Annex/src/Annex.vue' import Remarks from '@/components/Remarks/src/Remarks.vue' import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue' +import * as ProcessApi from '@/api/wms/process' import * as RemarkApi from '@/api/wms/remark' import * as FileApi from '@/api/wms/file' -import { start_node, end_node, createGraph, registerNodes, getNewNode } from './graphbase.data' +import { start_node, end_node, createGraph, getNewNode } from './graphbase.data' +import {ProcessSearch} from '../../publicUtil/processSearch.data' import * as ProcessrouteApi from '@/api/mes/processroute' import { Graph } from '@antv/x6' const graphContainer = ref(null) @@ -167,6 +177,42 @@ const remarksData = reactive({ data: {} }) const routeVersion=ref() +///工序查询选择 +const searchTableRef = ref() +const opensearchTable = ( +) => { + //console.log("opensearchTable") + const _searchCondition = {} + const _searchTableTitle = "工序查询" + const _searchTableAllSchemas = ProcessSearch.allSchemas + const _searchTablePage = ProcessApi.getProcessPage + searchTableRef.value.open( + _searchTableTitle, + _searchTableAllSchemas, + _searchTablePage, + undefined, + undefined, + true, + undefined, + undefined, + _searchCondition, + false, + true + ) +} +//查询工序 +const searchTableSuccess = (formField, searchField, val, type, row) => { + if(val.length>0){ + val.forEach(item=>{ + if(processData.value.find(obj=>obj.code==item.code)==undefined){ + processData.value.push({code:item.code,name:item.name})} + }) + } +} +const deleteNode=(row)=>{ + processData.value.splice(processData.value.indexOf(row),1) + graph.value.removeNode(row.code) + } //初始化图形组件 const graph = ref() const openDetail = async (rowData: any) => { diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue index 234a7c32b..bd258515b 100644 --- a/src/views/mes/processroute/index.vue +++ b/src/views/mes/processroute/index.vue @@ -66,7 +66,7 @@ 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 ProcessRouteConfig from './components/configDialog.vue' -import { async } from '@antv/x6/lib/registry/marker/async' + defineOptions({ name: 'Processroute' }) diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index 7eeefaeab..36a782b64 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -80,7 +80,7 @@ export const Processroute = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '产成品代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '产品信息', // 查询弹窗标题 searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 @@ -89,7 +89,15 @@ export const Processroute = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }, + { + key: 'type', + action: 'in', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + value: 'CCP,BCP',//,SEMI] + isMainValue: false + }, + ] } } }, diff --git a/src/views/mes/orderDay/components/processSearch.data.ts b/src/views/mes/publicUtil/processSearch.data.ts similarity index 100% rename from src/views/mes/orderDay/components/processSearch.data.ts rename to src/views/mes/publicUtil/processSearch.data.ts From 0a8f51e5df3ae85db45f3868d2419a0ffc7bd233 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 12 Apr 2024 11:47:52 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspection/inspectionRecord/index.vue | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue index cf2fd6be1..09b9009f3 100644 --- a/src/views/qms/inspection/inspectionRecord/index.vue +++ b/src/views/qms/inspection/inspectionRecord/index.vue @@ -112,15 +112,11 @@ } // 根据状态返回该按钮是否显示 - const isShowMainButton = (row, val) => { - if(val){ - if(row.useDecision){ - return false - }else{ - return true - } - }else{ - return !row.isPublished + const isShowPublishedButton = (row, val) => { + if(row.useDecision) { + return row.isPublished + } else { + return true } } @@ -128,9 +124,9 @@ const butttondata = (row) => { return [ // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 - defaultButtons.mainApplyDecisionBtn({ hide: isShowMainButton(row, null),hasPermi:'qms:inspection-recode-main:edit'}), // 使用决策 + defaultButtons.mainApplyDecisionBtn({ hide: row.isPublished, hasPermi:'qms:inspection-recode-main:edit'}), // 使用决策 // defaultButtons.mainListDeleteBtn(null), // 删除 - defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row,'pub'),hasPermi:'qms:inspection-recode-main:pub'}), // 发布 + defaultButtons.mainListOrderPubBtn({ hide: isShowPublishedButton(row,'pub'), hasPermi:'qms:inspection-recode-main:pub'}), // 发布 defaultButtons.mainListPackageBtn(null), // 包装 ] } From e8e5dc4543cd6135c311c84b65eb4e150e7e8044 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 12 Apr 2024 13:33:48 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/basicDataManage/dynamicRule/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/basicDataManage/dynamicRule/index.vue index 10c7bbe98..a13f755a1 100644 --- a/src/views/qms/basicDataManage/dynamicRule/index.vue +++ b/src/views/qms/basicDataManage/dynamicRule/index.vue @@ -172,7 +172,7 @@ const butttondata = [ // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 - openForm('update', row) + editForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) } @@ -184,7 +184,14 @@ const openForm = async (type: string, row?: any) => { tableData.value = [] basicFormRef.value.open(type, row) } - +const editForm = async (type: string, row?: any) => { + tableData.value = [] + detailMasterId.value = row.id + InspectionStageApi.getInspectionStageNoPage({masterId:row.id}).then(res=>{ + tableData.value = res + }) + basicFormRef.value.open(type, row) +} // form表单提交 const formsSuccess = async (formType,data) => { var isHave =DynamicRule.allSchemas.formSchema.some(function (item) { From 8c8e636c64e22a39cc02278337754040730d8193 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 12 Apr 2024 13:40:08 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/basicDataManage/selectedSet/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/qms/basicDataManage/selectedSet/index.vue b/src/views/qms/basicDataManage/selectedSet/index.vue index f7b5d24c2..2ac80a8ef 100644 --- a/src/views/qms/basicDataManage/selectedSet/index.vue +++ b/src/views/qms/basicDataManage/selectedSet/index.vue @@ -177,7 +177,7 @@ const butttondata = [ // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 - openForm('update', row) + editForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) } @@ -189,6 +189,13 @@ const openForm = (type: string, row?: any) => { tableData.value = [] basicFormRef.value.open(type, row) } +const editForm = async (type: string, row?: any) => { + tableData.value = [] + SelectedProjectApi.getSelectedProjectNoPage({masterId:row.id}).then(res=>{ + tableData.value = res + }) + basicFormRef.value.open(type, row) +} // form表单提交 const formsSuccess = async (formType,data) => { From 180ed7988c7cc462823a8b0e6fad78f3c1efe434 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 12 Apr 2024 13:49:52 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspection/inspectionJob/addForm.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue index 15ff6b114..267d771d5 100644 --- a/src/views/qms/inspection/inspectionJob/addForm.vue +++ b/src/views/qms/inspection/inspectionJob/addForm.vue @@ -1006,6 +1006,7 @@ const changeQualitativeCode = (e, item, cur) => { let obj = item.selectedProjectRespVOList.find((cur) => cur.dictionaryValue == e) console.log(obj) cur.defectLevel = obj.defectLevel + cur.estimateCode = obj.estimateCode } \ No newline at end of file + From 56eed12688049764c8f2ba8ec25e7d6dd774e632 Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 12 Apr 2024 13:54:39 +0800 Subject: [PATCH 14/14] =?UTF-8?q?2024-4-12=20=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/processroute/components/configDialog.vue | 7 +++++-- src/views/mes/processroute/index.vue | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 8502fbcbf..0b89f8423 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -145,6 +145,7 @@ import { start_node, end_node, createGraph, getNewNode } from './graphbase.data' import {ProcessSearch} from '../../publicUtil/processSearch.data' import * as ProcessrouteApi from '@/api/mes/processroute' import { Graph } from '@antv/x6' +import { get } from 'http' const graphContainer = ref(null) defineOptions({ name: 'ProcessRouteConfig' }) const isShowDrawer = ref(false) @@ -215,8 +216,9 @@ const deleteNode=(row)=>{ } //初始化图形组件 const graph = ref() -const openDetail = async (rowData: any) => { +const openDetail = (rowData: any) => { rowData.value = rowData + console.log('rowData',rowData.value) titleNameRef.value = rowData.value.processrouteCode titleValueRef.value = rowData.value.processName processRouteId.value = rowData.value.id @@ -351,7 +353,7 @@ const saveResult = async () => { return } if (graph.value.getNodes().length < 3) { - message.info('除了开始结束节点外至少需要设置一个节点！') + message.info('工艺至少配置一道工序！') return } let gdata = { @@ -418,6 +420,7 @@ const deleteAnnexSuccess = async () => { // 验证图形 onUnmounted(() => {}) const emit = defineEmits(['close']) +