From 5fc50f56a890b5c90b51178ca0675c957c2da24f Mon Sep 17 00:00:00 2001 From: zhousq Date: Thu, 16 May 2024 14:34:56 +0800 Subject: [PATCH 01/13] =?UTF-8?q?2024-05-16=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrPersonAbility/hrPersonAbility.data.ts | 17 +++- src/views/mes/hrPersonAbility/index.vue | 16 +++- src/views/mes/opersteps/index.vue | 10 +++ src/views/mes/opersteps/opersteps.data.ts | 5 +- src/views/mes/operstepsType/index.vue | 9 +++ .../processroute/components/configDialog.vue | 30 ++++--- src/views/mes/processroute/index.vue | 19 +++-- .../mes/processroute/processroute.data.ts | 12 +-- .../components/qualifiedCheck.vue | 80 +++++++++++-------- 9 files changed, 131 insertions(+), 67 deletions(-) diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 81c779e86..614e2ef7f 100644 --- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts +++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts @@ -1,8 +1,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as AbilityInfoApi from '@/api/mes/abilityInfo' +import * as UserApi from "@/api/system/user"; import { AbilityInfo } from '../abilityInfo/abilityInfo.data' - +import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data"; // 表单校验 export const HrPersonAbilityRules = reactive({ @@ -116,6 +117,20 @@ export const HrPersonAbility = useCrudSchemas(reactive([ field: 'personCode', sort: 'custom', isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '人员信息', // 查询弹窗标题 + searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类 + searchField: 'username', // 查询弹窗赋值字段 + searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法 + searchCondition: [{ + action: "==", + column: 'userType', + value: 'WORKER' + }] + } + } }, { label: '能力编号', diff --git a/src/views/mes/hrPersonAbility/index.vue b/src/views/mes/hrPersonAbility/index.vue index f4b11845f..a4bc513f0 100644 --- a/src/views/mes/hrPersonAbility/index.vue +++ b/src/views/mes/hrPersonAbility/index.vue @@ -49,7 +49,7 @@ @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> - + @@ -80,9 +80,17 @@ const tableColumns = ref(HrPersonAbility.allSchemas.tableColumns) // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { - const setV = {} - setV[formField] = val[0][searchField] - formRef.setValues(setV) + if (formField === 'ablityCode') { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + if (formField === 'personCode') { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + }) } diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue index 4e2c1abc8..6250e6ef1 100644 --- a/src/views/mes/opersteps/index.vue +++ b/src/views/mes/opersteps/index.vue @@ -149,6 +149,16 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + Opersteps.allSchemas.formSchema.forEach(item => { + if (item.field == 'stepsCode') { + item.componentProps.disabled =disabledFlag + } + }) + basicFormRef.value.open(type, row) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/opersteps/opersteps.data.ts b/src/views/mes/opersteps/opersteps.data.ts index 96dc16c9d..6dc4c1f12 100644 --- a/src/views/mes/opersteps/opersteps.data.ts +++ b/src/views/mes/opersteps/opersteps.data.ts @@ -5,7 +5,10 @@ import { OperstepsType } from '../operstepsType/operstepsType.data' // 表单校验 export const OperstepsRules = reactive({ - concurrencyStamp: [required], + //concurrencyStamp: [required], + stepsCode: [required], + stepsName: [required], + collectCode: [required], }) export const Opersteps = useCrudSchemas(reactive([ diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue index 20c4d9940..761b74318 100644 --- a/src/views/mes/operstepsType/index.vue +++ b/src/views/mes/operstepsType/index.vue @@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + OperstepsType.allSchemas.formSchema.forEach(item => { + if (item.field == 'collectCode') { + item.componentProps.disabled =disabledFlag + } + }) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 589d36a19..08cdcd6bb 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -42,7 +42,7 @@ @@ -250,10 +250,16 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { }) } } -const deleteNode=(row)=>{ - processData.value.splice(processData.value.indexOf(row),1) +const deleteNode=(row,index:number)=>{ + //console.log('row------',index) + //showProcessNodeData.value.splice(index,1) + processData.value.splice((page.value.current-1)*page.value.size+index,1) page.value.total=processData.value.length page.value.current=1 + showProcessNodeData.value=processData.value.slice(1,1+page.value.size); + + //page.value.current=1 + //showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) graph.value.removeNode(row.code) } @@ -278,6 +284,9 @@ const openDetail = (row: any) => { materialData.value = [] mouldData.value = [] workStationList.value = [] + processData.value=[] + showProcessNodeData.value = [] + showMaterialsData.value = [] graph.value.on('node:dblclick', ({ e, x, y, node, view }) => { nodeClick(e, x, y, node, view) }) @@ -297,6 +306,7 @@ const handleDrawerClose = () => { //console.log(graph.value.toJSON()) rowData.value=null } + emit('close') } //**获取 工序信息 */ const getProcessInfo = async (id: any) => { @@ -440,15 +450,15 @@ const saveResult = async () => { processrouteId: processRouteId.value } - let res = ProcessrouteApi.saveGraphData(gdata) - if (res) { - message.success('保存成功！') - } else { - message.error('保存失败！') - } + await ProcessrouteApi.saveGraphData(gdata) + // if (res) { + // message.success('保存成功！') + // } else { + // message.error('保存失败！') + // } isShowDrawer.value = false handleDrawerClose() - emit('close') + //emit('close',) //return res } diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue index 45d4c879d..98b69f762 100644 --- a/src/views/mes/processroute/index.vue +++ b/src/views/mes/processroute/index.vue @@ -157,16 +157,25 @@ const buttonTableClick = async (val, row) => { openDetail(row) } } -const dailogClose=() => { - console.log('close'); - nextTick?.(()=>{ - getList() - }) +const dailogClose= () => { + //console.log('dailogClose--confge',getList()); + //nextTick?.(()=>{ + getList() + //}) } /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + Processroute.allSchemas.formSchema.forEach(item => { + if (item.field == 'processrouteCode') { + item.componentProps.disabled =disabledFlag + } + }) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index 077aecc88..c5640450b 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -7,8 +7,6 @@ export const ProcessrouteRules = reactive({ processrouteCode: [required], processName: [required], productCode: [required], - ablityCode: [required], - ablityCode: [required], }) export const Processroute = useCrudSchemas(reactive([ @@ -59,15 +57,7 @@ export const Processroute = useCrudSchemas(reactive([ field: 'processrouteCode', sort: 'custom', isSearch: true, - // form: { - // component: 'Input', - - // componentProps: { - // slots:{ - // default:} - // disabled: true - // } - // } + }, { diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue index bf2d7733e..0c58be7d7 100644 --- a/src/views/mes/workScheduling/components/qualifiedCheck.vue +++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue @@ -7,29 +7,29 @@ width="600px" > - - - + + + - - + + - - + + - + - - + + - - + + @@ -51,7 +51,8 @@ const formLoading = ref(false) const personOption=ref([]) const saveFlag=ref(false) const planDayCode=ref() -const form = reactive({ +const baseformRef=ref() +const baseform = reactive({ id:0, planDayCode: "", processCode:"", @@ -66,13 +67,13 @@ const openDetail = async (row: any, titleName: any,code:string) => { //console.log('row-68',row) dialogVisible.value = true dialogTitle.value = titleName - form.processCode=row.nodeCode - form.personSelected=[] - form.planDayCode=code - form.personSelected=[] - form.qualified=0 - form.unqualified=0 - form.id=row.id + baseform.processCode=row.nodeCode + baseform.personSelected=[] + baseform.planDayCode=code + baseform.personSelected=[] + baseform.qualified=0 + baseform.unqualified=0 + baseform.id=row.id planDayCode.value=code getCurrentWorkerList(row.nodeCode) @@ -92,30 +93,37 @@ const qcount=ref(0) //数量处理 const handleCount = () => { qcount.value++ - if (form.qualified> rowData.value.planCount - form.unqualified) { + if (baseform.qualified> rowData.value.planCount - baseform.unqualified) { message.alert('合格数量超限！计划总数【'+rowData.value.planCount+'】') - form.qualified =rowData.value.planCount - form.unqualified + baseform.qualified =rowData.value.planCount - baseform.unqualified return } - if (form.unqualified> rowData.value.planCount -form.qualified ) { + if (baseform.unqualified> rowData.value.planCount -baseform.qualified ) { message.alert('不合格数量超限！') - form.unqualified =rowData.value.planCount-form.qualified + baseform.unqualified =rowData.value.planCount-baseform.qualified return } } //提交质检 -const saveReport = async() => { - - saveFlag.value = true - try { - await workschedulingApi.processQualified(form) - }finally{ - saveFlag.value = false - dialogVisible.value = false - emit('close') - } +const saveReport = () => { + if (!baseformRef) return + baseformRef.value.validate((valid) => { + if (valid) { + saveFlag.value = true + try { + workschedulingApi.processQualified(baseform) + }finally{ + saveFlag.value = false + dialogVisible.value = false + emit('close') + } + } else { + console.log('请确认数据的正确！') + } + }) + //console.log("report-saveReport-82",data) //await workschedulingApi.reportWorkByProcess(data) @@ -124,4 +132,6 @@ const saveReport = async() => { const emit = defineEmits(['success', 'close']) defineOptions({ name: 'qualifiedCheck' }) defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗 + + From 3ed382f4a389baaf32d44227794e167c9614fdb2 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 16 May 2024 14:45:38 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 87eb4a851..1cfc8ba01 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -303,7 +303,7 @@
-
添加明细
+
{{t('ts.添加明细')}}
From 21cf53286f8241b82630b1517634c3ec3b59e976 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 16 May 2024 14:50:57 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.hella15 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.hella15 b/.env.hella15 index 15f726a54..ee35a6305 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='https://172.21.32.15:55563/api' +VITE_BASE_URL='https://scp.faway-hella.com/api' # 上传路径 -VITE_UPLOAD_URL='https://172.21.32.15:55563/api/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= From fc0b540c98e6b6f8582d7c2ba941312ca19eb4c0 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 16 May 2024 14:54:01 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/location/index.ts | 11 +++++++ .../saleShipmentMainRecord/index.vue | 21 ++++++++++---- .../saleShipmentMainRecord.data.ts | 29 +------------------ .../saleShipmentMainRequest/index.vue | 19 +++++++----- .../saleShipmentMain.data.ts | 13 ++++++--- 5 files changed, 48 insertions(+), 45 deletions(-) diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 183224ff5..ff0a8435c 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -94,4 +94,15 @@ export const selectPageItemAreaToLocation = async (params) => { } else { return request.get({ url: `/wms/location/pageItemAreaToLocation`, params }) } +} + + +export const selectConfigToLocation = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageConfigToLocationSenior', data }) + } else { + return request.get({ url: `/wms/location/pageConfigToLocation`, params }) + } } \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index e00bd5819..b8e1c3b9d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts new file mode 100644 index 000000000..1e310154e --- /dev/null +++ b/src/views/eam/inspectionItem/inspectionItem.data.ts @@ -0,0 +1,110 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import { handleTreeToComponentOptions } from '@/utils/tree' +import * as DeptApi from '@/api/system/dept' +const deptList = ref([]) // 树形结构 + +// 加载部门树（默认格式） +deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList()) + +// 表单校验 +export const InspectionItemRules = reactive({ + content: [required], + serialNumber: [required], + concurrencyStamp: [required], + type: [required], +}) + +export const InspectionItem = useCrudSchemas(reactive([ + + { + label: '巡检内容', + field: 'content', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type: 'textarea' + } + } + }, + { + label: '保养部位', + field: 'equipmentParts', + sort: 'custom', + isSearch: true + }, + { + label: '类别', + field: 'category', + sort: 'custom', + isSearch: true + }, + { + label: '序号', + field: 'serialNumber', + sort: 'custom', + isSearch: true, + fixed: 'left', + form: { + component:'InputNumber' + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, + form: { + component: 'TreeSelect', + componentProps: { // 假设deptList是部门数据列表 + data: deptList, + placeholder: "请选择部门", + filterable: true, + // multiple: true, + } + } + }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/spotCheckItem/index.vue b/src/views/eam/spotCheckItem/index.vue new file mode 100644 index 000000000..6fc7ba504 --- /dev/null +++ b/src/views/eam/spotCheckItem/index.vue @@ -0,0 +1,270 @@ + + + diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts new file mode 100644 index 000000000..67902adfb --- /dev/null +++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts @@ -0,0 +1,104 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import { handleTreeToComponentOptions } from '@/utils/tree' +import * as DeptApi from '@/api/system/dept' +const deptList = ref([]) // 树形结构 + +// 加载部门树（默认格式） +deptList.value = handleTreeToComponentOptions(await DeptApi.getSimpleDeptList()) + +// 表单校验 +export const SpotCheckItemRules = reactive({ + content: [required], + serialNumber: [required], + concurrencyStamp: [required], + type: [required], +}) + +export const SpotCheckItem = useCrudSchemas(reactive([ + + { + label: '点检内容', + field: 'content', + sort: 'custom', + isSearch: true, + form: { + component: 'Input', + componentProps: { + type: 'textarea' + } + } + }, + { + label: '点检部位', + field: 'equipmentParts', + sort: 'custom', + isSearch: true + }, + { + label: '序号', + field: 'serialNumber', + sort: 'custom', + isSearch: true, + fixed: 'left', + form: { + component:'InputNumber' + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'Select' + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isTable: false, + isDetail: false, + isSearch: false, + isTableForm: false, + form: { + component: 'TreeSelect', + componentProps: { // 假设deptList是部门数据列表 + data: deptList, + placeholder: "请选择部门", + filterable: true, + // multiple: true, + } + } + }, + { + label: '是否启用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isTable: true, + isDetail: false, + isSearch: false, + isTableForm: false, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue index 5e8a679c1..af6faa6f0 100644 --- a/src/views/home/components/supplierIndex.vue +++ b/src/views/home/components/supplierIndex.vue @@ -231,7 +231,8 @@ import { set } from 'lodash-es' import { EChartsOption } from 'echarts' import { lineOptions, pieOptions } from '../echarts-data' -import { formatDate } from '@/utils/formatTime' +import { formatDate,dateFormatter } from '@/utils/formatTime' + import * as NotifyMessageApi from '@/api/system/notify/message' import * as IndexApi from '@/api/home' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 9ac9b269e..eccbefcd7 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -201,7 +201,7 @@ @@ -471,20 +471,23 @@ const opensearchTable = ( ) } -const handleClose=()=>{ - dialogVisible.value = false, - emit('close') +const handleClose=(val)=>{ + dialogVisible.value = false + emit('close',val) } const publishPlan=()=>{ - message.confirm("确认发布当前计划？","question").then(async () => { + message.confirm("确认发布当前计划？","提示").then( () => { //isPublish.value=true //loading.value = true, - try{formLoading.value=true - doPublishPlan() }finally{ + try{ + formLoading.value=true + let promise = doPublishPlan(); + handleClose(promise) + }finally{ formLoading.value=false; - handleClose() + } - + }).catch(() => { message.info("已取消发布") }) @@ -517,12 +520,14 @@ const doPublishPlan= ()=>{ let res = OrderDayApi.publishPlan(data) - res.then(()=>{ - message.success("计划发布成功") - }).catch(()=>{ - //console.log("---doPublishPlan-- 458--",res.msg) - message.error("计划发布失败！") - }) + return res + + // res.then(()=>{ + // message.success("计划发布成功") + // }).catch(()=>{ + // //console.log("---doPublishPlan-- 458--",res.msg) + // message.error("计划发布失败！") + // }) } diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index edcb14390..98a405c6f 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -57,7 +57,7 @@ :isBusiness="false" :isSearchFilterButtonHide="true" @onChange="valueChange" - + /> @@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if(formField=='workroomCode'){ getProductlines(val[0][searchField]) } - + }) } @@ -156,9 +156,9 @@ const valueChange=(filed,cur)=>{ //item.componentProps.required = cur==='ENABLE'?false:true } }) - + } - + } // 字段设置 更新主列表字段 @@ -199,10 +199,12 @@ const buttonBaseClick = (val, item) => { console.log('其他按钮', item) } } -const publishClosed=()=>{ - //console.log('orderday-publishClosed-200') - getList() - +const publishClosed=(val)=>{ + console.log('orderday-publishClosed-200',val) + nextTick?.(()=>{ + getList() + }) + } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { @@ -227,7 +229,7 @@ const butttondata = (row) => { type: 'warning', icon: '', color: '', - hasPermi: 'mes:orderDay:update'}), // + hasPermi: 'mes:orderDay:update'}), // // defaultButtons.mainListHandleBtn({label: '发布', // name: 'publish', // hide: isShowMainButton(row,['2']), @@ -268,25 +270,24 @@ const openForm = (type: string, row?: any) => { // form表单提交 const formsSuccess = async (formType,data) => { - + if (formType === 'create') { - let ret= OrderDayApi.createOrderDay(data) - if(ret===undefined || ret===null){ - message.error(t('common.networkError')) - }else{ - message.success(t('common.createSuccess')) - } - + await OrderDayApi.createOrderDay(data) + // if(ret===undefined || ret===null){ + // message.error(t('common.networkError')) + // }else{ + // message.success(t('common.createSuccess')) + // } + } else { - let ret= OrderDayApi.updateOrderDay(data) - if(ret.code==0){ - message.success(t('common.updateSuccess')) - }else{ - message.error(t('common.networkError')) - } - + await OrderDayApi.updateOrderDay(data) + // if(ret.code==0){ + // message.success(t('common.updateSuccess')) + // }else{ + // message.error(t('common.networkError')) + // } + } - basicFormRef.value.dialogVisible = false await getList() } @@ -301,7 +302,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { //console.log('orderDay-openDetail-303',row) sDetailRef.value.open(row, titleName) } - + } /** 发布操作 */ const scheduleDetailRef = ref() @@ -336,9 +337,10 @@ const handleExport = async () => { exportLoading.value = false } } -const stopPlan = (id) => { - OrderDayApi.stopPlan(id) - +const stopPlan = async (id) => { + await OrderDayApi.stopPlan(id) + getList() + } /** 导入 */ const importFormRef = ref() diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index 43bed9d1e..d2d6a1109 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -49,6 +49,7 @@ export const OrderDay = useCrudSchemas(reactive([ field: 'id', sort: 'custom', isForm: false, + isTable: false, width: '60px', }, { @@ -365,7 +366,7 @@ export const OrderDay = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, - isTable:false, + // isTable:false, }, { label: '操作', diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue index 0c58be7d7..c091f1802 100644 --- a/src/views/mes/workScheduling/components/qualifiedCheck.vue +++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue @@ -32,13 +32,10 @@ - - +