From 21441afd3fa73346e2235d787789be69d41777d0 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Sat, 18 Apr 2026 11:23:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jh-select/index.vue | 9 +- src/option/system/user.js | 45 +- src/views/basicData/jobTransferManagement.vue | 1 + src/views/flowManagement/addDialog.vue | 45 +- .../flowManagement/managementOfKeyTasks.vue | 7 +- src/views/flowManagement/milestoneDialog.vue | 42 +- src/views/flowManagement/projectExecution.vue | 464 ++++++++++++++++++ .../components/exception/processMissing.vue | 2 +- .../components/mold/addMoldDailog.vue | 36 +- src/views/orderManagement/planYieIdOrder.vue | 39 +- src/views/orderManagement/plannedOrder.vue | 37 +- src/views/orderManagement/sinTerPlanOrder.vue | 37 +- .../orderManagement/sinTerYieIdOrder.vue | 39 +- .../components/inPlantMaintenance.vue | 5 +- .../processMainte/dsPartBasicInfo.vue | 30 +- .../components/processMainte/dsPartIndex.vue | 2 +- .../processManagement/procepssPlanning.vue | 47 +- .../processManagement/taskProcessing.vue | 13 +- 18 files changed, 709 insertions(+), 191 deletions(-) create mode 100644 src/views/flowManagement/projectExecution.vue diff --git a/src/components/jh-select/index.vue b/src/components/jh-select/index.vue index d65b7c0..806d28d 100644 --- a/src/components/jh-select/index.vue +++ b/src/components/jh-select/index.vue @@ -50,8 +50,12 @@ export default { echoMethod: { type: String, default: 'get' }, echoParamsKey: { type: String, - default: 'id', // 默认查询字段是 id,可自定义 + default: '', // 默认查询字段是 id,可自定义 }, + title:{ + type: String, + default: '新增' + } }, data() { return { @@ -226,7 +230,8 @@ export default { async initEcho() { const val = this.localValue; - if (!val || !this.echoApi) return; + // (!val || !this.echoApi)&& + if (this.title=='新增') return; // 处理多选(数组) if (this.multiple && Array.isArray(val)) { diff --git a/src/option/system/user.js b/src/option/system/user.js index 1f4e57c..2b4fb6c 100644 --- a/src/option/system/user.js +++ b/src/option/system/user.js @@ -57,7 +57,7 @@ export const userOption = safe => { }, { label: '用户工号', - prop: 'workNo', + prop: 'code', search: true, display: false, // sortable: true, @@ -266,13 +266,9 @@ export const userOption = safe => { prop: 'dutyInfo', icon: 'el-icon-s-custom', column: [ - { - label: '用户编号', - prop: 'code', - }, { label: '用户工号', - prop: 'workNo', + prop: 'code', rules: [ { required: true, @@ -281,6 +277,17 @@ export const userOption = safe => { }, ], }, + // { + // label: '用户工号', + // prop: 'workNo', + // rules: [ + // { + // required: true, + // message: '请输入用户工号', + // trigger: 'blur', + // }, + // ], + // }, { label: '所属角色', prop: 'roleId', @@ -383,19 +390,19 @@ export const platformOption = { dialogClickModal: false, menuWidth: 120, editBtnText: '配置', - searchLabelPosition:'left', -searchLabelPosition:'left', - searchGutter:24, - searchSpan:6, -menuAlign: 'left', -gridBtn:false, -searchMenuPosition:'right', -addBtnIcon: ' ', - viewBtnIcon: ' ', - delBtnIcon: ' ', - editBtnIcon: ' ', - searchShowBtn:false, - align: 'center', + searchLabelPosition: 'left', + searchLabelPosition: 'left', + searchGutter: 24, + searchSpan: 6, + menuAlign: 'left', + gridBtn: false, + searchMenuPosition: 'right', + addBtnIcon: ' ', + viewBtnIcon: ' ', + delBtnIcon: ' ', + editBtnIcon: ' ', + searchShowBtn: false, + align: 'center', column: [ { label: '登录账号', diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index 7e1e38e..7cbe35f 100644 --- a/src/views/basicData/jobTransferManagement.vue +++ b/src/views/basicData/jobTransferManagement.vue @@ -111,6 +111,7 @@ search-key="id" :debounce-time="500" @change="changeTeacher" + /> diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue index 2e036c5..fab57e9 100644 --- a/src/views/flowManagement/addDialog.vue +++ b/src/views/flowManagement/addDialog.vue @@ -8,7 +8,7 @@ fullscreen > - + @@ -29,7 +29,7 @@ - + - + - + - + - + - + 核准 @@ -193,7 +192,7 @@ export default { searchIndex: 3, tree: false, border: true, - index: false, + index: true, selection: false, viewBtn: false, delBtn: false, @@ -224,7 +223,7 @@ export default { column: [ { - label: '单据号', + label: '项目编号', prop: 'paCode', overflow: true, search: true, diff --git a/src/views/flowManagement/milestoneDialog.vue b/src/views/flowManagement/milestoneDialog.vue index 19a98ba..5d6b33c 100644 --- a/src/views/flowManagement/milestoneDialog.vue +++ b/src/views/flowManagement/milestoneDialog.vue @@ -1,48 +1,48 @@ + + + + diff --git a/src/views/orderManagement/components/exception/processMissing.vue b/src/views/orderManagement/components/exception/processMissing.vue index 360374e..a34766c 100644 --- a/src/views/orderManagement/components/exception/processMissing.vue +++ b/src/views/orderManagement/components/exception/processMissing.vue @@ -144,7 +144,7 @@ export default { prop: 'validationMomo', search: false, sortable: true, - width: 120, + width: 240, span: 12, headerAlign: 'center', align: 'center', diff --git a/src/views/orderManagement/components/mold/addMoldDailog.vue b/src/views/orderManagement/components/mold/addMoldDailog.vue index c74357b..f8714fd 100644 --- a/src/views/orderManagement/components/mold/addMoldDailog.vue +++ b/src/views/orderManagement/components/mold/addMoldDailog.vue @@ -20,13 +20,30 @@ - + @@ -201,6 +218,7 @@ diff --git a/src/views/processManagement/taskProcessing.vue b/src/views/processManagement/taskProcessing.vue index fc9468e..24376c2 100644 --- a/src/views/processManagement/taskProcessing.vue +++ b/src/views/processManagement/taskProcessing.vue @@ -61,8 +61,8 @@ -