From ff65dc6ca5723f810c101e28c4a66db4fd6a0df0 Mon Sep 17 00:00:00 2001 From: liugongyu <290219706@qq.com> Date: Thu, 18 Dec 2025 16:38:13 +0800 Subject: [PATCH] 快速工单 样式优化 --- pages-sub/daily/maintain-manage/add-record.vue | 62 +++++++++++++++++++++++++++++++------------------------------- pages-sub/daily/maintain-manage/pending-plan-detail.vue | 2 +- pages-sub/daily/maintain-manage/road-detail-list.vue | 8 ++++---- pages-sub/daily/patrol-manage/index.vue | 2 ++ pages-sub/problem/work-order-manage/add-order.vue | 48 ++++++++++++++++++++++++------------------------ pages-sub/problem/work-order-manage/index.vue | 195 ++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------- pages-sub/problem/work-order-manage/order-detail.vue | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages.json | 5 +++++ 8 files changed, 376 insertions(+), 217 deletions(-) create mode 100644 pages-sub/problem/work-order-manage/order-detail.vue diff --git a/pages-sub/daily/maintain-manage/add-record.vue b/pages-sub/daily/maintain-manage/add-record.vue index 262e54b..8abb417 100644 --- a/pages-sub/daily/maintain-manage/add-record.vue +++ b/pages-sub/daily/maintain-manage/add-record.vue @@ -13,8 +13,8 @@ class="form-item" > @@ -25,7 +25,7 @@ label="上传图片" prop="images" required - border-bottom + class="form-item" > - - + + + - class="form-item" - > - - - - + + + + + + + + + + + + + + + + @@ -94,7 +94,7 @@ export default { initProgress: 0, inspectForm: { remark: '', - progress: 0 + // progress: 0 }, paramsOptins: {}, inspectFormRules: { @@ -144,10 +144,10 @@ export default { onLoad(option) { console.log('页面参数：', option) this.paramsOptins = option - // 初始化初始进度 - this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0 - // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败 - this.inspectForm.progress = this.initProgress + // // 初始化初始进度 + // this.initProgress = option.finishPercent ? Number(option.finishPercent)+1 : 0 + // // 关键修复：初始进度值设为 初始进度+1，避免刚进入就触发校验失败 + // this.inspectForm.progress = this.initProgress console.log('初始进度值：', this.initProgress) }, onReady() { @@ -278,18 +278,18 @@ export default { * 提交巡查表单 */ async submitInspect() { - console.log('当前完成进度：', this.inspectForm.progress) + // console.log('当前完成进度：', this.inspectForm.progress) try { await this.$refs.inspectFormRef.validate() console.log('图片列表：', this.imagesList) const submitData = { - totalFinishPercent: this.inspectForm.progress, + totalFinishPercent: 100, "planNo": this.paramsOptins.planNo, "imgHost": "1", "beginImg": this.getImgUrlList(this.imagesList), "commonUserList": [], - "remark": this.inspectForm.remark + "remark": this.inspectForm.remark.trim() } uni.showLoading({ title: '提交中...' }) diff --git a/pages-sub/daily/maintain-manage/pending-plan-detail.vue b/pages-sub/daily/maintain-manage/pending-plan-detail.vue index 7590e54..8dd0b0f 100644 --- a/pages-sub/daily/maintain-manage/pending-plan-detail.vue +++ b/pages-sub/daily/maintain-manage/pending-plan-detail.vue @@ -40,7 +40,7 @@ - 已完成比例： {{ i.finishPercent || 0 }} % + 已完成次数： {{ i.planFinishNum || 0 }} 次 - - 已完成比例： - {{ item.finishPercent || 0 }}% - + + + + 计划有效期： diff --git a/pages-sub/daily/patrol-manage/index.vue b/pages-sub/daily/patrol-manage/index.vue index 7f69ae6..a0ba6b7 100644 --- a/pages-sub/daily/patrol-manage/index.vue +++ b/pages-sub/daily/patrol-manage/index.vue @@ -61,6 +61,8 @@ {{ item.roadName || '-' }} + + 所属街道： {{ item.streetName }} diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue index d709bd6..9e97683 100644 --- a/pages-sub/problem/work-order-manage/add-order.vue +++ b/pages-sub/problem/work-order-manage/add-order.vue @@ -5,7 +5,7 @@ label-position="left" :model="workOrderForm" ref="workOrderFormRef" - labelWidth="160rpx" + labelWidth="190rpx" > @@ -68,7 +68,7 @@ @@ -168,7 +168,7 @@ import { ref, reactive, watch } from 'vue' import { onReady, onShow } from '@dcloudio/uni-app'; import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入改造后的上传逻辑 import { getRoadListByLatLng } from '@/api/common' -import { createQuick } from '@/api/quick-order/quick-order' +import { workorderCreate } from '@/api/work-order-manage/work-order-manage' import { timeFormat } from '@/uni_modules/uview-plus' // ========== 表单Ref ========== @@ -199,7 +199,7 @@ const currentActionSheetData = reactive({ }) // 完成时间选择器控制 const show = ref(false) -const finishTime = ref(Date.now()) +const finishDate = ref(Date.now()) // ========== 下拉列表数据 ========== const roadNameList = ref([]) @@ -212,12 +212,12 @@ const workOrderForm = reactive({ roadName: '', // 道路名称 workLocation: '', // 工单位置 orderName: '', // 工单名称 - pressingType: 0, // 紧急程度值（提交接口用） + pressingType: '', // 紧急程度值（提交接口用） pressingTypeName: '', // 紧急程度名称（显示用） problemDesc: '', // 情况描述 lat: 0, // 纬度 lon: 0, // 经度 - finishTime: '', // 完成时间 + finishDate: '', // 完成时间 }) // ========== 表单校验规则 ========== @@ -231,8 +231,8 @@ const workOrderFormRules = reactive({ orderName: [ { type: 'string', required: true, message: '请选择工单名称', trigger: ['change', 'blur'] } ], - pressingType: [ - { type: 'number', required: true, message: '请选择紧急程度', trigger: ['change'] } + pressingTypeName: [ + { type: 'string', required: true, message: '请选择紧急程度', trigger: ['change'] } ], problemDesc: [ { type: 'string', required: true, message: '请输入情况描述', trigger: ['change', 'blur'] }, @@ -324,7 +324,8 @@ const handleActionSheetSelect = (e) => { workOrderFormRef.value?.validateField('orderName') break case 'pressingType': - workOrderForm.pressingType = Number(e.value) + console.log(e) + workOrderForm.pressingType =e.value workOrderForm.pressingTypeName = e.name workOrderFormRef.value?.validateField('pressingType') break @@ -393,9 +394,9 @@ const chooseWorkLocation = () => { /** * 完成时间确认 */ -const finishTimeConfirm = (e) => { +const finishDateConfirm = (e) => { console.log('选择的完成时间：', e) - workOrderForm.finishTime = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss') + workOrderForm.finishDate = timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss') show.value = false } @@ -418,17 +419,16 @@ const submitWorkOrder = async () => { roadId: workOrderForm.roadId, roadName: workOrderForm.roadName, imgs: problemImgs.getSuccessImgUrls(), // 复用上传逻辑的URL获取方法 - remark: workOrderForm.problemDesc, + remark: workOrderForm.problemDesc.trim(), latLonType: 2, lat: workOrderForm.lat, lon: workOrderForm.lon, lonLatAddress: workOrderForm.workLocation, pressingType: workOrderForm.pressingType, orderName: workOrderForm.orderName, - finishTime: workOrderForm.finishTime, + finishDate: workOrderForm.finishDate, sourceId: 1, sourceName: '园林', - thirdWorkNo: '', busiLine: 'yl' } @@ -436,7 +436,7 @@ const submitWorkOrder = async () => { uni.showLoading({ title: '提交中...' }) // 调用提交接口 - const res = await createQuick(submitData) + const res = await workorderCreate(submitData) uni.hideLoading() uni.showToast({ @@ -448,7 +448,7 @@ const submitWorkOrder = async () => { // 延迟跳转 setTimeout(() => { uni.redirectTo({ - url: '/pages-sub/daily/quick-order/index' + url: '/pages-sub/problem/work-order-manage/index' }) }, 1000) } catch (error) { diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue index 4694e05..4271ee0 100644 --- a/pages-sub/problem/work-order-manage/index.vue +++ b/pages-sub/problem/work-order-manage/index.vue @@ -11,13 +11,13 @@ inactive-color="#666" font-size="30rpx" - @change="handleTabChange" + @click="handleTabChange" /> - + - + 情况描述： {{ item.remark || '无' }} - + 紧急程度： - {{ item.urgencyLevel || '普通' }} + {{uni.$dict.getDictLabel('workorder_pressing_type',item.pressingType)}} @@ -109,9 +107,9 @@ - + 情况描述： {{ item.remark || '无' }} + + - - 紧急程度： - - {{ item.urgencyLevel || '普通' }} + 紧急程度： {{uni.$dict.getDictLabel('workorder_pressing_type',item.pressingType)}} + + 工单详情 - - 工单详情 提交时间： @@ -196,16 +193,21 @@ + + \ No newline at end of file diff --git a/pages.json b/pages.json index b99ec2d..e08c3cc 100644 --- a/pages.json +++ b/pages.json @@ -129,6 +129,11 @@ "style": { "navigationBarTitleText": "新增工单" } }, + { + "path": "work-order-manage/order-detail", + "style": { "navigationBarTitleText": "工单详情" } + }, + { "path": "problem-allot/index", -- libgit2 0.21.4