diff --git a/src/api/erf/erf.js b/src/api/erf/erf.js index bfc8f7e..6675dea 100644 --- a/src/api/erf/erf.js +++ b/src/api/erf/erf.js @@ -35,6 +35,11 @@ export const getSubmitApprovers = data => createAPI(`/erf/expApply/getSubmitAppr */ export const approveExpApply = data => createAPI(`/erf/expApply/approveExpApply`, 'post', data) +/** + * 获取当前流程节点编码 + */ +export const getCurrentNodeCode = data => createAPI(`/erf/expApply/getCurrentNodeCode`, 'post', data) + /** * 撤回申请单 */ @@ -101,3 +106,8 @@ export const saveTriConfirmProcess = data => createAPI(`/erf/triConfirm/saveTriC * 删除三方确认工序 */ export const deleteTriConfirmProcess = data => createAPI(`/erf/triConfirm/deleteTriConfirmProcess`, 'post', data) + +/** + * 批量更新工序顺序(用于拖拽排序) + */ +export const updateProcessSequence = data => createAPI(`/erf/triConfirm/updateProcessSequence`, 'post', data) diff --git a/src/views/modules/erf/components/erfAttachmentManager.vue b/src/views/modules/erf/components/erfAttachmentManager.vue index 4d197b4..b8e3fd2 100644 --- a/src/views/modules/erf/components/erfAttachmentManager.vue +++ b/src/views/modules/erf/components/erfAttachmentManager.vue @@ -4,14 +4,14 @@
上传附件 下载 @@ -534,4 +534,30 @@ export default { .el-table >>> .el-table__row td { padding: 8px 0; } + +/* 重置按钮 - 灰色扁平 */ +.erf-attachment-manager .reset-btn { + background-color: #F5F7FA; + border-color: #D3D4D6; + color: #606266; +} + +.erf-attachment-manager .reset-btn:hover { + background-color: #909399; + border-color: #909399; + color: #FFFFFF; +} + +/* 新增按钮 - 绿色扁平 */ +.erf-attachment-manager .add-btn { + background-color: #F0F9FF; + border-color: #C0E6C7; + color: #67C23A; +} + +.erf-attachment-manager .add-btn:hover { + background-color: #67C23A; + border-color: #67C23A; + color: #FFFFFF; +} diff --git a/src/views/modules/erf/components/expProjectDetail.vue b/src/views/modules/erf/components/expProjectDetail.vue index f77f48a..a7f1f9e 100644 --- a/src/views/modules/erf/components/expProjectDetail.vue +++ b/src/views/modules/erf/components/expProjectDetail.vue @@ -3,9 +3,8 @@
编辑 @@ -13,12 +12,12 @@ v-if="editing" @click="handleSave" type="primary" - size="small" + size="small" class="add-btn" :loading="saving"> 保存 取消 @@ -91,12 +90,12 @@ placeholder="请输入试验申请数量"> - + @@ -301,44 +300,131 @@ export default { } .toolbar { - margin-bottom: 5px; - padding-bottom: 5px; - border-bottom: 1px solid #EBEEF5; + margin-bottom: 2px; + padding-bottom: 2px; text-align: left; } +/* 表单容器增加卡片效果 */ +.el-form { + background-color: #fff; + padding: 10px; + border-radius: 4px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08); +} + .el-form-item { - margin-bottom: 15px; + margin-bottom: 16px; } -/* 只读状态的input样式 */ +/* 增强label样式 - 更明显的视觉层次 */ +.el-form-item >>> .el-form-item__label { + font-size: 13px; + color: #303133; + font-weight: 600; + padding-bottom: 8px; + line-height: 1.5; + display: block; +} + +/* 编辑状态的input样式 - 清晰的边框 */ +.el-input >>> input { + border: 1px solid #DCDFE6; + border-radius: 4px; + padding: 10px 12px; + font-size: 13px; + transition: all 0.3s; +} + +.el-input >>> input:focus { + border-color: #409EFF; + box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1); +} + +.el-input >>> textarea { + border: 1px solid #DCDFE6; + border-radius: 4px; + padding: 10px 12px; + font-size: 13px; + line-height: 1.6; + transition: all 0.3s; +} + +.el-input >>> textarea:focus { + border-color: #409EFF; + box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1); +} + +/* 只读状态的input样式 - 更明显的区分 */ .el-input >>> input[readonly] { - background-color: #F5F7FA; - border-color: #DCDFE6; + background-color: #FAFAFA; + border: 1px solid #E4E7ED; color: #606266; cursor: default; + font-size: 13px; } .el-input >>> textarea[readonly] { - background-color: #F5F7FA; - border-color: #DCDFE6; + background-color: #FAFAFA; + border: 1px solid #E4E7ED; color: #606266; cursor: default; + font-size: 13px; + line-height: 1.6; } /* 禁用状态的日期选择器样式 */ .el-date-editor.is-disabled >>> .el-input__inner { - background-color: #F5F7FA; - border-color: #DCDFE6; + background-color: #FAFAFA; + border: 1px solid #E4E7ED; color: #606266; cursor: default; + font-size: 13px; } -/* 调整label样式 */ -.el-form-item >>> .el-form-item__label { +.el-date-editor >>> .el-input__inner { + padding: 10px 12px; font-size: 13px; +} + +/* 重置按钮 - 灰色扁平 */ +.exp-project-detail .reset-btn { + background-color: #F5F7FA; + border-color: #D3D4D6; color: #606266; - font-weight: normal; - padding-bottom: 5px; + padding: 9px 15px; + font-size: 13px; +} + +.exp-project-detail .reset-btn:hover { + background-color: #909399; + border-color: #909399; + color: #FFFFFF; +} + +/* 新增按钮 - 绿色扁平 */ +.exp-project-detail .add-btn { + background-color: #F0F9FF; + border-color: #C0E6C7; + color: #67C23A; + padding: 9px 15px; + font-size: 13px; +} + +.exp-project-detail .add-btn:hover { + background-color: #67C23A; + border-color: #67C23A; + color: #FFFFFF; +} + +/* 增加行间距,让布局更舒适 */ +.el-row { + margin-bottom: 0; +} + +/* 调整列间距 */ +.el-col { + padding-left: 10px; + padding-right: 10px; } diff --git a/src/views/modules/erf/components/expTriConfirm.vue b/src/views/modules/erf/components/expTriConfirm.vue index b9d4fb4..f0d7612 100644 --- a/src/views/modules/erf/components/expTriConfirm.vue +++ b/src/views/modules/erf/components/expTriConfirm.vue @@ -2,15 +2,18 @@
- 新增 + 新增
@@ -249,9 +253,9 @@
取消 - 确认 @@ -262,7 +266,8 @@ diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue index 1fba138..cb2f2ac 100644 --- a/src/views/modules/erf/expApplyList.vue +++ b/src/views/modules/erf/expApplyList.vue @@ -1,7 +1,7 @@