From 56ddb245bfffa79352c9827fd9691583acca64db Mon Sep 17 00:00:00 2001 From: jiangrui <403209447@qq.com> Date: Mon, 12 Apr 2021 09:10:38 +0800 Subject: [PATCH 1/2] merge --- src/views/convenience/detail.vue | 1157 ++++++++++-------------------- 1 file changed, 390 insertions(+), 767 deletions(-) diff --git a/src/views/convenience/detail.vue b/src/views/convenience/detail.vue index fa9eefc..8062b11 100644 --- a/src/views/convenience/detail.vue +++ b/src/views/convenience/detail.vue @@ -1,44 +1,21 @@ @@ -962,65 +829,65 @@ import { communicationList, update, typeList -} from '@/api/convenience' -import { parseTime } from '@/utils' -import { staffList } from '@/api/staff' -import AliOss from '@/components/AliOSS/index.vue' +} from "@/api/convenience"; +import { parseTime } from "@/utils"; +import { staffList } from "@/api/staff"; +import AliOss from "@/components/AliOSS/index.vue"; export default { filters: { sponsorFilter(status) { const statusMap = { - SELF: '居民', - STAFF: '工作人员' - } - return statusMap[status] + SELF: "居民", + STAFF: "工作人员" + }; + return statusMap[status]; }, phaseFilter(status) { const statusMap = { - PENDING_ORDER: '待接单', - PREREQUISITES: '要件准备中', - PROCESSING: '办理中', - FINISH: '办结' - } - return statusMap[status] + PENDING_ORDER: "待接单", + PREREQUISITES: "要件准备中", + PROCESSING: "办理中", + FINISH: "办结" + }; + return statusMap[status]; }, statusFilter(status) { const statusMap = { - MINE: '待我处理', - FORWARDED: '已转交', - FORWARDED_APPLY: '转交超限审批中', - SUBMIT_APPLY: '已提交审批', - WAIT_APPLY: '待审核' - } - return statusMap[status] + MINE: "待我处理", + FORWARDED: "已转交", + FORWARDED_APPLY: "转交超限审批中", + SUBMIT_APPLY: "已提交审批", + WAIT_APPLY: "待审核" + }; + return statusMap[status]; }, typeFilter(status) { const statusMap = { - 1: '建立工单', - 2: '撤销工单', - 3: '沟通', - 4: '调整工单类别', - 5: '接单', - 6: '要件齐备', - 7: '办结', - 8: '转交超限审批提交', - 9: '转交超限审批撤销', - 10: '转交超限审批', - 11: '发起审批', - 12: '撤销审批', - 13: '审批操作', - 14: '转交' - } - return statusMap[status] + 1: "建立工单", + 2: "撤销工单", + 3: "沟通", + 4: "调整工单类别", + 5: "接单", + 6: "要件齐备", + 7: "办结", + 8: "转交超限审批提交", + 9: "转交超限审批撤销", + 10: "转交超限审批", + 11: "发起审批", + 12: "撤销审批", + 13: "审批操作", + 14: "转交" + }; + return statusMap[status]; }, evaluationFilter(status) { const statusMap = { - 1: '不满意', - 2: '满意', - 3: '非常满意' - } - return statusMap[status] + 1: "不满意", + 2: "满意", + 3: "非常满意" + }; + return statusMap[status]; } // 1 不满意, 2 满意, 3 非常满意 }, @@ -1044,7 +911,7 @@ export default { evaluation: undefined }, rules: { - ids: [{ required: true, message: '请选择操作对象', trigger: 'change' }] + ids: [{ required: true, message: "请选择操作对象", trigger: "change" }] // category: [{ required: true, message: '请选择栏目板块', trigger: 'change' }] }, updateType: undefined, @@ -1057,30 +924,30 @@ export default { prerequisitesInterval: undefined, preMsec: 0, prerequisitesTime: { - hour: '--', - minute: '--', - second: '--' + hour: "--", + minute: "--", + second: "--" }, finishTimeInterval: undefined, finishMsec: 0, finishTime: { - hour: '--', - minute: '--', - second: '--' + hour: "--", + minute: "--", + second: "--" }, acceptanceInterval: undefined, acceptanceMsec: 0, acceptanceTime: { - hour: '--', - minute: '--', - second: '--' + hour: "--", + minute: "--", + second: "--" }, totalTimeInterval: undefined, totalMsec: 0, totalTime: { - hour: '--', - minute: '--', - second: '--' + hour: "--", + minute: "--", + second: "--" }, dialogPreviewImg: false, dialogImageUrl: undefined, @@ -1088,69 +955,54 @@ export default { dialogEventType: false, typeOptions: [], eventTypeId: undefined, - applyDetail: false, - isEventTypeChange: false - } + applyDetail: false + }; }, created() { - this.getInfo() - this.getStaffList() - this.getCommunicationList() - this.getTypeList() + this.getInfo(); + this.getStaffList(); + this.getCommunicationList(); + this.getTypeList(); }, methods: { getInfo() { info({ id: this.id }).then(res => { - this.convenience = res.d - const tempData = Object.assign({}, this.convenience) - const now = Date.parse(new Date()).toString() / 1000 - clearInterval(this.acceptanceInterval) - clearInterval(this.prerequisitesInterval) - clearInterval(this.finishTimeInterval) - clearInterval(this.totalTimeInterval) + this.convenience = res.d; + const tempData = Object.assign({}, this.convenience); + const now = Date.parse(new Date()).toString() / 1000; + clearInterval(this.acceptanceInterval); + clearInterval(this.prerequisitesInterval); + clearInterval(this.finishTimeInterval); + clearInterval(this.totalTimeInterval); switch (tempData.phase) { // 待接单 - case 'PENDING_ORDER': + case "PENDING_ORDER": if (tempData.acceptanceTime === null) { - this.acceptanceMsec = now - this.convenience.createDate - this.countdown(tempData.phase) + this.acceptanceMsec = now - this.convenience.createDate; + this.countdown(tempData.phase); } - break + break; // 要件准备 - case 'PREREQUISITES': + case "PREREQUISITES": if (tempData.prerequisitesTime === null) { - this.preMsec = now - this.convenience.createDate - this.acceptanceMsec = tempData.acceptanceTime - this.timeFormat('acceptanceTime', this.acceptanceMsec) - this.countdown(tempData.phase) + this.preMsec = now - this.convenience.createDate; + this.acceptanceMsec = tempData.acceptanceTime; + this.timeFormat("acceptanceTime", this.acceptanceMsec); + this.countdown(tempData.phase); } - break - // 办理中 - case 'PROCESSING': + break; + // 办结 + case "PROCESSING": if (tempData.finishTime === null) { this.finishMsec = - now - this.preMsec - this.convenience.createDate - this.acceptanceMsec = tempData.acceptanceTime - this.preMsec = tempData.prerequisitesTime - this.timeFormat('acceptanceTime', this.acceptanceMsec) - this.timeFormat('prerequisitesTime', this.preMsec) - this.countdown(tempData.phase) + now - this.preMsec - this.convenience.createDate; + this.acceptanceMsec = tempData.acceptanceTime; + this.preMsec = tempData.prerequisitesTime; + this.timeFormat("acceptanceTime", this.acceptanceMsec); + this.timeFormat("prerequisitesTime", this.preMsec); + this.countdown(tempData.phase); } - break - // 办结 - case 'FINISH': - // console.log(123); - if (tempData.finishTime !== null) { - this.finishMsec = tempData.finishTime - this.acceptanceMsec = tempData.acceptanceTime - this.preMsec = tempData.prerequisitesTime - this.timeFormat('acceptanceTime', this.acceptanceMsec) - this.timeFormat('prerequisitesTime', this.preMsec) - this.timeFormat('finishTime', this.finishMsec) - - this.countdown(tempData.phase) - } - break + break; } // const now = Date.parse(new Date()).toString() / 1000; // switch (this.convenience.phase) { @@ -1186,199 +1038,73 @@ export default { // this.countdown(this.convenience.phase); // break; // } - }) + }); }, getTypeList() { typeList().then(res => { - this.typeOptions = [] + this.typeOptions = []; res.d.map(i => { - const children = [] + let children = []; i.eventTypesList.map(c => { - const level2 = { + let level2 = { label: c.eventName, value: c.id - } - children.push(level2) - }) - const level1 = { + }; + children.push(level2); + }); + let level1 = { label: i.eventName, children - } + }; - this.typeOptions.push(level1) - }) - }) + this.typeOptions.push(level1); + }); + }); }, countdown(phase) { - if (phase === 'PENDING_ORDER') { + if (phase === "PENDING_ORDER") { this.acceptanceInterval = setInterval(() => { - this.timeFormat('acceptanceTime', this.acceptanceMsec) - this.acceptanceMsec++ - }, 1000) + this.timeFormat("acceptanceTime", this.acceptanceMsec); + this.acceptanceMsec++; + }, 1000); // 当前阶段的时间加上 - this.totalMsec = this.acceptanceMsec + this.totalMsec = this.acceptanceMsec; this.totalTimeInterval = setInterval(() => { - this.timeFormat('totalTime', this.totalMsec) - this.totalMsec++ - }, 1000) - } else if (phase === 'PREREQUISITES') { + this.timeFormat("totalTime", this.totalMsec); + this.totalMsec++; + }, 1000); + } else if (phase === "PREREQUISITES") { this.prerequisitesInterval = setInterval(() => { - this.timeFormat('prerequisitesTime', this.preMsec) - this.preMsec++ - }, 1000) - this.totalMsec = this.convenience.acceptanceTime + this.preMsec + this.timeFormat("prerequisitesTime", this.preMsec); + this.preMsec++; + }, 1000); + this.totalMsec = this.convenience.acceptanceTime + this.preMsec; this.totalTimeInterval = setInterval(() => { - this.timeFormat('totalTime', this.totalMsec) - this.totalMsec++ - }, 1000) - } else if (phase === 'PROCESSING') { + this.timeFormat("totalTime", this.totalMsec); + this.totalMsec++; + }, 1000); + } else if (phase === "PROCESSING") { this.finishTimeInterval = setInterval(() => { - // console.log(233); - this.timeFormat('finishTime', this.finishMsec) - this.finishMsec++ - }, 1000) + this.timeFormat("finishTime", this.finishMsec); + this.finishMsec++; + }, 1000); this.totalMsec = this.convenience.acceptanceTime + this.convenience.prerequisitesTime + - this.finishMsec + this.finishMsec; this.totalTimeInterval = setInterval(() => { - this.timeFormat('totalTime', this.totalMsec) - this.totalMsec++ - }, 1000) - } else if (phase === 'FINISH') { - // console.log(233); - this.finishMsec - this.totalMsec = - this.convenience.acceptanceTime + - this.convenience.prerequisitesTime + - this.convenience.finishTime - this.timeFormat('totalTime', this.totalMsec) - // this.totalTimeInterval = setInterval(() => { - // this.totalMsec++; - // }, 1000); - } else { - // 除FINISH外total都要计时 - // this.totalTimeInterval = setInterval(() => { - // this.timeFormat(this.totalTime, this.totalMsec); - // this.totalMsec++; - // }, 1000); + this.timeFormat("totalTime", this.totalMsec); + this.totalMsec++; + }, 1000); + } else if (phase === "FINISH") { + this.finishMsec; } - - // if (phase === "PENDING_ORDER") { - // // 受理 - // if (this.convenience.acceptanceTime === null) { - // this.acceptanceInterval = setInterval(() => { - // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); - // this.acceptanceTime.minute = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) / 60 - // ); - // this.acceptanceTime.second = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) % 60 - // ); - // this.totalTime = this.acceptanceTime; - // this.acceptanceMsec++; - // }, 1000); - // } else { - // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); - // this.acceptanceTime.minute = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) / 60 - // ); - // this.acceptanceTime.second = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) % 60 - // ); - // } - // } else if (phase === "PREREQUISITES") { - // // 要件准备 - // if (this.convenience.prerequisitesTime === null) { - // this.prerequisitesInterval = setInterval(() => { - // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); - // this.prerequisitesTime.minute = Math.floor( - // ((this.preMsec % 86400) % 3600) / 60 - // ); - // this.prerequisitesTime.second = Math.floor( - // ((this.preMsec % 86400) % 3600) % 60 - // ); - // // this.totalTime = this.acceptanceTime; - // this.totalMsec = this.acceptanceMsec + this.preMsec; - // this.totalTime.hour = Math.floor(this.totalMsec / 3600); - // this.totalTime.minute = Math.floor( - // ((this.totalMsec % 86400) % 3600) / 60 - // ); - // this.totalTime.second = Math.floor( - // ((this.totalMsec % 86400) % 3600) % 60 - // ); - // this.preMsec++; - // }, 1000); - // } else { - // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); - // this.prerequisitesTime.minute = Math.floor( - // ((this.preMsec % 86400) % 3600) / 60 - // ); - // this.prerequisitesTime.second = Math.floor( - // ((this.preMsec % 86400) % 3600) % 60 - // ); - // } - // } else if (phase === "PROCESSING") { - // // 办结 - // if (this.convenience.finishTime === null) { - // this.finishTimeInterval = setInterval(() => { - // this.finishTime.hour = Math.floor(this.finishMsec / 3600); - // this.finishTime.minute = Math.floor( - // ((this.finishMsec % 86400) % 3600) / 60 - // ); - // this.finishTime.second = Math.floor( - // ((this.finishMsec % 86400) % 3600) % 60 - // ); - // this.finishMsec++; - // }, 1000); - // } else { - // this.finishTime.hour = Math.floor(this.finishMsec / 3600); - // this.finishTime.minute = Math.floor( - // ((this.finishMsec % 86400) % 3600) / 60 - // ); - // this.finishTime.second = Math.floor( - // ((this.finishMsec % 86400) % 3600) % 60 - // ); - // console.log(this.convenience.finishTime); - // } - // } else { - // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); - // this.acceptanceTime.minute = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) / 60 - // ); - // this.acceptanceTime.second = Math.floor( - // ((this.acceptanceMsec % 86400) % 3600) % 60 - // ); - // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); - // this.prerequisitesTime.minute = Math.floor( - // ((this.preMsec % 86400) % 3600) / 60 - // ); - // this.prerequisitesTime.second = Math.floor( - // ((this.preMsec % 86400) % 3600) % 60 - // ); - // this.finishTime.hour = Math.floor(this.finishMsec / 3600); - // this.finishTime.minute = Math.floor( - // ((this.finishMsec % 86400) % 3600) / 60 - // ); - // this.finishTime.second = Math.floor( - // ((this.finishMsec % 86400) % 3600) % 60 - // ); - // } }, timeFormat(obj, timeStamp) { - this[obj].hour = - Math.floor(timeStamp / 3600) < 9 - ? '0' + Math.floor(timeStamp / 3600) - : Math.floor(timeStamp / 3600) - this[obj].minute = - Math.floor(((timeStamp % 86400) % 3600) / 60) < 9 - ? '0' + Math.floor(((timeStamp % 86400) % 3600) / 60) - : Math.floor(((timeStamp % 86400) % 3600) / 60) - this[obj].second = - Math.floor(((timeStamp % 86400) % 3600) % 60) < 9 - ? '0' + Math.floor(((timeStamp % 86400) % 3600) % 60) - : Math.floor(((timeStamp % 86400) % 3600) % 60) + this[obj].hour = Math.floor(timeStamp / 3600); + this[obj].minute = Math.floor(((timeStamp % 86400) % 3600) / 60); + this[obj].second = Math.floor(((timeStamp % 86400) % 3600) % 60); }, getCommunicationList() { communicationList({ id: this.id }).then(res => { @@ -1386,10 +1112,10 @@ export default { const obj = { label: item.name, value: item.id - } - this.communicationOptions.push(obj) - }) - }) + }; + this.communicationOptions.push(obj); + }); + }); }, getStaffList() { staffList().then(res => { @@ -1397,10 +1123,10 @@ export default { const obj = { label: item.name, value: item.id - } - this.staffOptions.push(obj) - }) - }) + }; + this.staffOptions.push(obj); + }); + }); }, resetPayload() { this.payload = { @@ -1411,36 +1137,36 @@ export default { attachmentList: undefined, approve: undefined, evaluation: undefined - } - this.spr = [] - this.bzjr = undefined + }; + this.spr = []; + this.bzjr = undefined; }, handleRevoke() { const payload = { id: this.id, version: this.convenience.version, type: 2 - } + }; update(payload).then(res => { - // console.log(res); - this.$notify.success('撤销成功') - }) + console.log(res); + this.$notify.success("撤销成功"); + }); }, handleContact() { this.$nextTick(() => { - this.$refs.contractForm.clearValidate() - }) - this.contactDialog = true - this.payload.type = 3 - this.payload.id = this.id - this.payload.version = this.convenience.version + this.$refs.contractForm.clearValidate(); + }); + this.contactDialog = true; + this.payload.type = 3; + this.payload.id = this.id; + this.payload.version = this.convenience.version; }, getNames(arr) { - const temp = [] + let temp = []; arr.map(item => { - temp.push(item.name) - }) - return temp.join(',') + temp.push(item.name); + }); + return temp.join(","); }, handlePreview() {}, handleRemove() {}, @@ -1461,27 +1187,27 @@ export default { update(this.payload).then(res => { // console.log(res); if (res.c === 200) { - this.$notify.success('提交成功') + this.$notify.success("提交成功"); } - this.getInfo() - this.contactDialog = false - }) + this.getInfo(); + this.contactDialog = false; + }); } - }) + }); }, handleApprove(approve) { - const applyType = this.convenience.applyType - this.updateType = applyType === 'FORWARDED' ? 10 : 13 - this.payload.id = this.convenience.id - this.payload.version = this.convenience.version - this.payload.type = this.updateType - this.payload.approve = approve + const applyType = this.convenience.applyType; + this.updateType = applyType === "FORWARDED" ? 10 : 13; + this.payload.id = this.convenience.id; + this.payload.version = this.convenience.version; + this.payload.type = this.updateType; + this.payload.approve = approve; if (approve) { // console.log(this.payload); - this.updateData() + this.updateData(); } else { - this.applyDialog = true + this.applyDialog = true; } // id: this.id, // version: undefined, @@ -1492,51 +1218,51 @@ export default { // evaluation: undefined }, handleApprovalReminder() { - this.dialogApprovalReminder = true + this.dialogApprovalReminder = true; }, handleConfirmApprovalReminder() { - this.dialogApprovalReminder = false - this.handleUpdate(11) + this.dialogApprovalReminder = false; + this.handleUpdate(11); }, handleUpdate(type) { - // console.log(type); - this.resetPayload() - this.updateType = type - this.payload.id = this.convenience.id - this.payload.version = this.convenience.version - this.payload.type = type + console.log(type); + this.resetPayload(); + this.updateType = type; + this.payload.id = this.convenience.id; + this.payload.version = this.convenience.version; + this.payload.type = type; switch (type) { case 6: // 要件齐备 - this.applyDialog = true - break + this.applyDialog = true; + break; case 7: // 办结 - this.applyDialog = true - break + this.applyDialog = true; + break; case 10: // 转交超限审批 // this.approve; - break + break; case 11: // 发起审批 - this.applyDialog = true - break + this.applyDialog = true; + break; - // case 12: - // // 撤销审批 - // break; + // case 12: + // // 撤销审批 + // break; case 13: // 审批操作 - this.applyDialog = true - break + this.applyDialog = true; + break; case 14: // console.log("handle14"); // 转交 - const frequencys = this.convenience.records.filter( + let frequencys = this.convenience.records.filter( m => m.frequency !== null - ) + ); if ( frequencys.filter( item => @@ -1544,37 +1270,24 @@ export default { this.convenience.eventType.referralRestrictions ).length > 0 ) { - this.updateType = 8 - this.confirmDialog = true + this.updateType = 8; + this.confirmDialog = true; } else { - this.updateType = 14 - this.applyDialog = true + this.updateType = 14; + this.applyDialog = true; } - break + break; case 16: // 评价申诉 - this.applyDialog = true - break + this.applyDialog = true; + break; default: - this.updateData() - break + this.updateData(); + break; } }, - handleEventTypeChange(val) { - // console.log(val); - // handle - this.payload = { - id: this.id, - type: 4, - version: this.convenience.version, - remark: val - } - this.updateType = 4 - this.updateData() - // this.dialogEventType = false; - }, handleChange(val) { - // console.log(val); + console.log(val); }, apply() { // this.$refs.updateForm.validate(valid=>{ @@ -1582,48 +1295,45 @@ export default { // }) // console.log(this.payload); // console.log(this.payload.type); - this.updateData() - this.applyDialog = false + this.updateData(); + this.applyDialog = false; }, handleContinue() { setTimeout(() => { - this.confirmDialog = false - }, 100) - this.applyDialog = true + this.confirmDialog = false; + }, 100); + this.applyDialog = true; }, updateData() { // console.log(this.updateType); switch (this.updateType) { case 6: - break + break; case 8: - this.payload.ids.push(this.spr) - this.payload.ids.push(this.bzjr) - this.payload.type = 8 - break + this.payload.ids.push(this.spr); + this.payload.ids.push(this.bzjr); + this.payload.type = 8; + break; case 11: - this.payload.id = this.convenience.id - this.payload.version = this.convenience.version - this.payload.ids = this.spr - break + this.payload.id = this.convenience.id; + this.payload.version = this.convenience.version; + this.payload.ids = this.spr; + break; case 14: - this.payload.type = 14 - this.payload.ids.push(this.bzjr) - break + this.payload.type = 14; + this.payload.ids.push(this.bzjr); + break; } update(this.payload).then(res => { if (res.c === 200) { - this.$notify.success('操作成功') + this.$notify.success("操作成功"); if (this.updateType === 13) { - this.$router.push('/convenience/list') - return + this.$router.push("/convenience/list"); + return; } - if (this.updateType === 4) { - this.isEventTypeChange = false - } - this.getInfo() + this.getInfo(); } - }) + }); }, // handlePreviewAttachment(url) { // const fileType = url.substr(url.lastIndexOf(".") + 1); @@ -1635,15 +1345,15 @@ export default { // }, isAssetTypeAnImage(ext) { return ( - ['png', 'jpg', 'jpeg', 'bmp', 'gif'].indexOf(ext.toLowerCase()) !== -1 - ) + ["png", "jpg", "jpeg", "bmp", "gif"].indexOf(ext.toLowerCase()) !== -1 + ); }, handleSetPreviewImg(imgurl) { - this.dialogImageUrl = imgurl - this.dialogPreviewImg = true + this.dialogImageUrl = imgurl; + this.dialogPreviewImg = true; }, handleChangeEventType() { - this.dialogEventType = true + this.dialogEventType = true; }, eventTypeUpdate() { this.payload = { @@ -1651,41 +1361,24 @@ export default { type: 4, version: this.convenience.version, remark: this.eventTypeId - } - this.updateType = 4 - this.updateData() - this.dialogEventType = false + }; + this.updateType = 4; + this.updateData(); + this.dialogEventType = false; } }, beforeRouteLeave(to, from, next) { - clearInterval(this.acceptanceInterval) - clearInterval(this.prerequisitesInterval) - clearInterval(this.finishTimeInterval) - next() + clearInterval(this.acceptanceInterval); + clearInterval(this.prerequisitesInterval); + clearInterval(this.finishTimeInterval); + next(); } - // timeFormat(timeStamp) { - // const timeStr = `${ - // Math.floor(timeStamp / 3600) < 9 - // ? "0" + Math.floor(timeStamp / 3600) - // : Math.floor(timeStamp / 3600) - // }:${ - // Math.floor(((timeStamp % 86400) % 3600) / 60) < 9 - // ? "0" + Math.floor(((timeStamp % 86400) % 3600) / 60) - // : Math.floor(((timeStamp % 86400) % 3600) / 60) - // }:${ - // Math.floor(((timeStamp % 86400) % 3600) % 60) < 9 - // ? "0" + Math.floor(((timeStamp % 86400) % 3600) % 60) - // : Math.floor(((timeStamp % 86400) % 3600) % 60) - // }`; - // return timeStr; - // } -} +}; From 43554abf233b26085c98af4bac07f81aa9b96523 Mon Sep 17 00:00:00 2001 From: jiangrui <403209447@qq.com> Date: Tue, 13 Apr 2021 00:33:29 +0800 Subject: [PATCH 2/2] monday --- src/App.vue | 16 + src/components/AliOSS/index.vue | 14 +- src/components/Breadcrumb/index.vue | 62 +- src/layout/components/Sidebar/Link.vue | 1 + src/layout/components/Sidebar/index.vue | 1 + src/router/index.js | 2 +- src/views/convenience/add.vue | 95 +- src/views/convenience/detail.vue | 870 +++++++++++++++--- src/views/convenience/img/icon_acceptance.png | Bin 5467 -> 5398 bytes src/views/convenience/img/icon_finish.png | Bin 5434 -> 6012 bytes .../convenience/img/icon_fujian_self.png | Bin 0 -> 1471 bytes src/views/convenience/img/icon_jd.png | Bin 0 -> 1051 bytes src/views/convenience/img/icon_prepare.png | Bin 3143 -> 4666 bytes src/views/convenience/img/icon_yj.png | Bin 0 -> 770 bytes src/views/convenience/img/timeLine_self.png | Bin 0 -> 726 bytes src/views/convenience/img/timeLine_staff.png | Bin 0 -> 725 bytes src/views/convenience/list.vue | 55 +- src/views/login/img/login_titleLine_left.png | Bin 0 -> 427 bytes src/views/login/index.vue | 20 +- 19 files changed, 903 insertions(+), 233 deletions(-) create mode 100644 src/views/convenience/img/icon_fujian_self.png create mode 100644 src/views/convenience/img/icon_jd.png create mode 100644 src/views/convenience/img/icon_yj.png create mode 100644 src/views/convenience/img/timeLine_self.png create mode 100644 src/views/convenience/img/timeLine_staff.png create mode 100644 src/views/login/img/login_titleLine_left.png diff --git a/src/App.vue b/src/App.vue index 3b3a1c7..aec76a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,4 +32,20 @@ export default { font-size: 14px; border-radius: 15px; } +.appeal .el-button{ + padding: 7px 10px; + font-size: 14px; + border-radius: 15px; + width: 63px; +} +.el-button--text{ + padding: 5px 10px; +} +.el-loading-spinner { + top: 50%; + /* margin-top: -21px; */ + width: 90%; + text-align: center; + position: fixed; +} diff --git a/src/components/AliOSS/index.vue b/src/components/AliOSS/index.vue index f5f9df7..324f3f8 100644 --- a/src/components/AliOSS/index.vue +++ b/src/components/AliOSS/index.vue @@ -54,25 +54,29 @@ export default { console.log(fileList) fileList.forEach(item => { if (item.status === 'ready') { - const suffix = item.name.split('.')[1] + // const suffix = item.name.split('.')[1] + const suffix = item.name.substr(item.name.lastIndexOf('.')+1) const fileName = UUID.generate() + '.' + suffix item.name = fileName OSS(item.raw, fileName).then(res => { - this.$emit('input', res.url) - item.url = res.url + + this.$emit('input', 'http://storage.myntv.cn/'+res.name) + item.url = 'http://storage.myntv.cn/'+res.name item.status = 'success' const list = fileList.filter(item => item.status === 'success').map(item => item.url) + console.log(list); this.$emit('input', list) }) } }) } else { - const suffix = file.name.split('.')[0] + // const suffix = file.name.split('.')[0] + const suffix = item.name.substr(item.name.lastIndexOf('.')+1) const fileName = UUID.generate() + '.' + suffix file.name = fileName this.fileList = [file] OSS(file.raw, fileName).then(res => { - this.$emit('input', res.url) + this.$emit('input', 'http://storage.myntv.cn/'+res.name) }) } }, diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index a9cba01..4f2f359 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -1,8 +1,12 @@ diff --git a/src/views/convenience/detail.vue b/src/views/convenience/detail.vue index 8062b11..074ae32 100644 --- a/src/views/convenience/detail.vue +++ b/src/views/convenience/detail.vue @@ -1,21 +1,45 @@ @@ -838,7 +1084,7 @@ export default { filters: { sponsorFilter(status) { const statusMap = { - SELF: "居民", + SELF: "群众", STAFF: "工作人员" }; return statusMap[status]; @@ -854,7 +1100,7 @@ export default { }, statusFilter(status) { const statusMap = { - MINE: "待我处理", + MINE: "我处理", FORWARDED: "已转交", FORWARDED_APPLY: "转交超限审批中", SUBMIT_APPLY: "已提交审批", @@ -877,7 +1123,8 @@ export default { 11: "发起审批", 12: "撤销审批", 13: "审批操作", - 14: "转交" + 14: "转交", + 16: "提示" }; return statusMap[status]; }, @@ -955,7 +1202,9 @@ export default { dialogEventType: false, typeOptions: [], eventTypeId: undefined, - applyDetail: false + applyDetail: false, + isEventTypeChange: false, + cxPop: false }; }, created() { @@ -970,6 +1219,7 @@ export default { this.convenience = res.d; const tempData = Object.assign({}, this.convenience); const now = Date.parse(new Date()).toString() / 1000; + // console.log(now); clearInterval(this.acceptanceInterval); clearInterval(this.prerequisitesInterval); clearInterval(this.finishTimeInterval); @@ -985,17 +1235,21 @@ export default { // 要件准备 case "PREREQUISITES": if (tempData.prerequisitesTime === null) { - this.preMsec = now - this.convenience.createDate; + this.preMsec = + now - tempData.createDate - tempData.acceptanceTime; this.acceptanceMsec = tempData.acceptanceTime; this.timeFormat("acceptanceTime", this.acceptanceMsec); this.countdown(tempData.phase); } break; - // 办结 + // 办理中 case "PROCESSING": if (tempData.finishTime === null) { this.finishMsec = - now - this.preMsec - this.convenience.createDate; + now - + tempData.createDate - + tempData.acceptanceTime - + tempData.prerequisitesTime; this.acceptanceMsec = tempData.acceptanceTime; this.preMsec = tempData.prerequisitesTime; this.timeFormat("acceptanceTime", this.acceptanceMsec); @@ -1003,6 +1257,20 @@ export default { this.countdown(tempData.phase); } break; + // 办结 + case "FINISH": + // console.log(123); + if (tempData.finishTime !== null) { + this.finishMsec = tempData.finishTime; + this.acceptanceMsec = tempData.acceptanceTime; + this.preMsec = tempData.prerequisitesTime; + this.timeFormat("acceptanceTime", this.acceptanceMsec); + this.timeFormat("prerequisitesTime", this.preMsec); + this.timeFormat("finishTime", this.finishMsec); + + this.countdown(tempData.phase); + } + break; } // const now = Date.parse(new Date()).toString() / 1000; // switch (this.convenience.phase) { @@ -1044,16 +1312,16 @@ export default { typeList().then(res => { this.typeOptions = []; res.d.map(i => { - let children = []; + const children = []; i.eventTypesList.map(c => { - let level2 = { + const level2 = { label: c.eventName, value: c.id }; children.push(level2); }); - let level1 = { + const level1 = { label: i.eventName, children }; @@ -1086,6 +1354,7 @@ export default { }, 1000); } else if (phase === "PROCESSING") { this.finishTimeInterval = setInterval(() => { + // console.log(233); this.timeFormat("finishTime", this.finishMsec); this.finishMsec++; }, 1000); @@ -1093,18 +1362,144 @@ export default { this.convenience.acceptanceTime + this.convenience.prerequisitesTime + this.finishMsec; + console.log(this.totalMsec); this.totalTimeInterval = setInterval(() => { this.timeFormat("totalTime", this.totalMsec); this.totalMsec++; }, 1000); } else if (phase === "FINISH") { + // console.log(233); this.finishMsec; + this.totalMsec = + this.convenience.acceptanceTime + + this.convenience.prerequisitesTime + + this.convenience.finishTime; + this.timeFormat("totalTime", this.totalMsec); + // this.totalTimeInterval = setInterval(() => { + // this.totalMsec++; + // }, 1000); + } else { + // 除FINISH外total都要计时 + // this.totalTimeInterval = setInterval(() => { + // this.timeFormat(this.totalTime, this.totalMsec); + // this.totalMsec++; + // }, 1000); } + + // if (phase === "PENDING_ORDER") { + // // 受理 + // if (this.convenience.acceptanceTime === null) { + // this.acceptanceInterval = setInterval(() => { + // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); + // this.acceptanceTime.minute = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) / 60 + // ); + // this.acceptanceTime.second = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) % 60 + // ); + // this.totalTime = this.acceptanceTime; + // this.acceptanceMsec++; + // }, 1000); + // } else { + // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); + // this.acceptanceTime.minute = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) / 60 + // ); + // this.acceptanceTime.second = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) % 60 + // ); + // } + // } else if (phase === "PREREQUISITES") { + // // 要件准备 + // if (this.convenience.prerequisitesTime === null) { + // this.prerequisitesInterval = setInterval(() => { + // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); + // this.prerequisitesTime.minute = Math.floor( + // ((this.preMsec % 86400) % 3600) / 60 + // ); + // this.prerequisitesTime.second = Math.floor( + // ((this.preMsec % 86400) % 3600) % 60 + // ); + // // this.totalTime = this.acceptanceTime; + // this.totalMsec = this.acceptanceMsec + this.preMsec; + // this.totalTime.hour = Math.floor(this.totalMsec / 3600); + // this.totalTime.minute = Math.floor( + // ((this.totalMsec % 86400) % 3600) / 60 + // ); + // this.totalTime.second = Math.floor( + // ((this.totalMsec % 86400) % 3600) % 60 + // ); + // this.preMsec++; + // }, 1000); + // } else { + // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); + // this.prerequisitesTime.minute = Math.floor( + // ((this.preMsec % 86400) % 3600) / 60 + // ); + // this.prerequisitesTime.second = Math.floor( + // ((this.preMsec % 86400) % 3600) % 60 + // ); + // } + // } else if (phase === "PROCESSING") { + // // 办结 + // if (this.convenience.finishTime === null) { + // this.finishTimeInterval = setInterval(() => { + // this.finishTime.hour = Math.floor(this.finishMsec / 3600); + // this.finishTime.minute = Math.floor( + // ((this.finishMsec % 86400) % 3600) / 60 + // ); + // this.finishTime.second = Math.floor( + // ((this.finishMsec % 86400) % 3600) % 60 + // ); + // this.finishMsec++; + // }, 1000); + // } else { + // this.finishTime.hour = Math.floor(this.finishMsec / 3600); + // this.finishTime.minute = Math.floor( + // ((this.finishMsec % 86400) % 3600) / 60 + // ); + // this.finishTime.second = Math.floor( + // ((this.finishMsec % 86400) % 3600) % 60 + // ); + // console.log(this.convenience.finishTime); + // } + // } else { + // this.acceptanceTime.hour = Math.floor(this.acceptanceMsec / 3600); + // this.acceptanceTime.minute = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) / 60 + // ); + // this.acceptanceTime.second = Math.floor( + // ((this.acceptanceMsec % 86400) % 3600) % 60 + // ); + // this.prerequisitesTime.hour = Math.floor(this.preMsec / 3600); + // this.prerequisitesTime.minute = Math.floor( + // ((this.preMsec % 86400) % 3600) / 60 + // ); + // this.prerequisitesTime.second = Math.floor( + // ((this.preMsec % 86400) % 3600) % 60 + // ); + // this.finishTime.hour = Math.floor(this.finishMsec / 3600); + // this.finishTime.minute = Math.floor( + // ((this.finishMsec % 86400) % 3600) / 60 + // ); + // this.finishTime.second = Math.floor( + // ((this.finishMsec % 86400) % 3600) % 60 + // ); + // } }, timeFormat(obj, timeStamp) { - this[obj].hour = Math.floor(timeStamp / 3600); - this[obj].minute = Math.floor(((timeStamp % 86400) % 3600) / 60); - this[obj].second = Math.floor(((timeStamp % 86400) % 3600) % 60); + this[obj].hour = + Math.floor(timeStamp / 3600) < 9 + ? "0" + Math.floor(timeStamp / 3600) + : Math.floor(timeStamp / 3600); + this[obj].minute = + Math.floor(((timeStamp % 86400) % 3600) / 60) < 9 + ? "0" + Math.floor(((timeStamp % 86400) % 3600) / 60) + : Math.floor(((timeStamp % 86400) % 3600) / 60); + this[obj].second = + Math.floor(((timeStamp % 86400) % 3600) % 60) < 9 + ? "0" + Math.floor(((timeStamp % 86400) % 3600) % 60) + : Math.floor(((timeStamp % 86400) % 3600) % 60); }, getCommunicationList() { communicationList({ id: this.id }).then(res => { @@ -1148,11 +1543,12 @@ export default { type: 2 }; update(payload).then(res => { - console.log(res); + // console.log(res); this.$notify.success("撤销成功"); }); }, handleContact() { + this.resetPayload(); this.$nextTick(() => { this.$refs.contractForm.clearValidate(); }); @@ -1162,7 +1558,7 @@ export default { this.payload.version = this.convenience.version; }, getNames(arr) { - let temp = []; + const temp = []; arr.map(item => { temp.push(item.name); }); @@ -1225,7 +1621,7 @@ export default { this.handleUpdate(11); }, handleUpdate(type) { - console.log(type); + // console.log(type); this.resetPayload(); this.updateType = type; this.payload.id = this.convenience.id; @@ -1260,7 +1656,7 @@ export default { case 14: // console.log("handle14"); // 转交 - let frequencys = this.convenience.records.filter( + const frequencys = this.convenience.records.filter( m => m.frequency !== null ); if ( @@ -1286,8 +1682,21 @@ export default { break; } }, + handleEventTypeChange(val) { + // console.log(val); + // handle + this.payload = { + id: this.id, + type: 4, + version: this.convenience.version, + remark: val + }; + this.updateType = 4; + this.updateData(); + // this.dialogEventType = false; + }, handleChange(val) { - console.log(val); + // console.log(val); }, apply() { // this.$refs.updateForm.validate(valid=>{ @@ -1331,6 +1740,20 @@ export default { this.$router.push("/convenience/list"); return; } + if (this.updateType === 4) { + this.isEventTypeChange = false; + } + if (this.updateType === 12) { + this.cxPop = false; + } + // if (this.updateType===12){ + // this.$notify.success('撤销成功') + // } + // if(this.updateType===10||this.updateType===13){ + // if(this.payload.approve){ + // this.$notify.success('审批通过') + // } + // } this.getInfo(); } }); @@ -1365,6 +1788,15 @@ export default { this.updateType = 4; this.updateData(); this.dialogEventType = false; + }, + cascader() { + this.isEventTypeChange = !this.isEventTypeChange; + this.$nextTick(() => { + console.log(this.$refs.cascader) + const tempRef = this.$refs.cascader; + tempRef.$el.style.display='inline-block' + this.$refs.cascader.focusFirstNode() + }, 100); } }, beforeRouteLeave(to, from, next) { @@ -1373,12 +1805,29 @@ export default { clearInterval(this.finishTimeInterval); next(); } + // timeFormat(timeStamp) { + // const timeStr = `${ + // Math.floor(timeStamp / 3600) < 9 + // ? "0" + Math.floor(timeStamp / 3600) + // : Math.floor(timeStamp / 3600) + // }:${ + // Math.floor(((timeStamp % 86400) % 3600) / 60) < 9 + // ? "0" + Math.floor(((timeStamp % 86400) % 3600) / 60) + // : Math.floor(((timeStamp % 86400) % 3600) / 60) + // }:${ + // Math.floor(((timeStamp % 86400) % 3600) % 60) < 9 + // ? "0" + Math.floor(((timeStamp % 86400) % 3600) % 60) + // : Math.floor(((timeStamp % 86400) % 3600) % 60) + // }`; + // return timeStr; + // } }; diff --git a/src/views/convenience/img/icon_acceptance.png b/src/views/convenience/img/icon_acceptance.png index 0a8a0e689c88b8bcd6145e1b571ea14ee4b654ad..5eabe7e514c598af5b8976ab46d0cf0a179698dc 100644 GIT binary patch literal 5398 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 delta 5429 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 diff --git a/src/views/convenience/img/icon_finish.png b/src/views/convenience/img/icon_finish.png index 5ee0260af0f735dc4d411bf64f89a7a02c78dfa5..5bf54f6b193d8d75f1b50b73edef8af2710f311d 100644 GIT binary patch delta 5978 zcmW+)c|26_7alW0_9&U`d)aqG2q7Y5--eMbWQ(zdJ0trNQjA^prEC>7Stdnf`=U`A z##WZGO(bjlZofb7^11h(_nh~6pL@=EAH3wTtWb)D*$o!PON)9q{_2Y`W9Ma-e+sR0DSwP38TYaQ`@V$)0+ZA=r?JF5$YZ*BGP6yNJ$F&M6sV2Q*x;eP%6$6Wpmp@{hMB~J&*|Yt> z#nU8Cd20aHD&gE-_=a~4N1=AzrOT@~ysGh(7h$m>zJNNKl|e{z@HSFM^*{fY0`fgE zEcA4tkt|S23`g0w7!y~)(ZAtZ?9lHRI+Or4|L8mGI)s8j6EsYeDArqnS;na7O45=L zVQh14hmegBsxxwf4(~UXyJ`fT$OtHeVM8!X7-NrEDUPNK1Obe<%<#TF zT47ZW3R`J&fDA!p>8oiD>iupiZ9y`jz^KQOo0BcQVf!tXeYQD20*binfr&x97;!dH z%B_<%OnAXTnOiF(N6($+H+*V(q&pz`2Y)9XaJ1W3Te(Yl@J2dhILoL zS?be%ISIllNK5zT0#HvVj;-HV=YSwtcG_wavodG}sru2*SARUk@nbAkP(>A-$>!oh zk`Aq5`|t@N6C;)V;PR@k5cP%WmTuMw;T$_%JJMyijwjHpZafL zURr+@j^5D@%C3S7)XIKLOFs)jGJ%u zsa<~B&hH9#qzr7NRoT6eqBkxqkN3}|0s7!wM#&}5&s2l6P5CVR1YGCgn<(v|R&c7{ zNz6rFfKQ*V&6&$uNx@swa)v#^9dO2uM$(c(J)^}W=*}U7GgrihD5z+wB|kHsu4dKg zCWZ|TH0omHt-5n0%pL}-aV+@dBB@reeO+-zRVs*I{Bd)#zBNQ{wJm>qw&F?Kzc^rN znBcnUMut}!sPZbfpJhwSlQVsMe`9In)d3sQc?Wk`P_*RcMCFgHp_nK8!J^W_>b}@z zG)el_pF~SE>kjAK!g+rakD3;O=3a1CrEwGpatAjqXMKZ#W{8g8Xo>D|6e~y`d(>GA z+|UNY*f25IOS35bf`km{p7niXiKl&Qn~=VoWAI_I%7y6$Su-boS0V z*rVMC3nY)?5684;(<~YaM4f4=TA=9&A(DE7fhaz28nVFS$~G{)lM6s?>W)m~lWSqP zdp>;}*KC)Zm=?)J(adMljN~E-oOu5~yY8N`{Ev}XCGSf1RWI70ZUL$7pIN5u!}A15 zkLT{$WG}~p7QyTb`@|kiATHjZvit4kqFAsA0`%w-XR0owc%3EahOm^;%0D9-LQ=nn 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 LB#KM96P@!9BVZ|Y literal 0 HcmV?d00001 diff --git a/src/views/convenience/img/icon_jd.png b/src/views/convenience/img/icon_jd.png new file mode 100644 index 0000000000000000000000000000000000000000..88a697aba003e1fce394af96456d985cb48b899b GIT binary patch literal 1051 zcmV+$1mydPP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 AN&o-= literal 0 HcmV?d00001 diff --git a/src/views/convenience/img/timeLine_self.png b/src/views/convenience/img/timeLine_self.png new file mode 100644 index 0000000000000000000000000000000000000000..d8f5a41f301734937e3b0846ea94542d195e7ed1 GIT binary patch literal 726 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fg@i4$A#Pxr?1oct6^8e>| z|3AI?KTYX>hU)(pcmJm<{BQO94+Jf~|6Be4*E;{t)B8U$;s4r>|I6zB=j#4{{pkOt z{r}hZ{9ju8|I3H}Zyx{u_2d7ykN;ET|7WWGPnP}v{mcIZ$^WM||G$3h|A`I%w@v+j zc;)|ni~eV*{r~&tf0h0J60`r6cK_c$|NrR9|9}7fpIHC@$SR;O&rR-m1*D`)g8YIR z?E25VcxSJ=>669>#(fjcK00-7x|5^ku9r_v9!h#<22{qFQ&{+ZH8ocv&HlL z7-vY<%=_HKX|iM&eEJnG@-vOqw}x3euMEIfC4n$OFhN1vBAh_Y?2lU)-~Ih*VK3x6pqJ9+7x zs?CR91Sh%JFM8~exXI@KR)se~_1~*a6xl0hO=z#3m2i1|?5(498&17?psUV$rzpsv psr1;EwRaX;)s*DiTsHqN+ttGN((iYt76ZeQ!PC{xWt~$(69AI6R=fZJ literal 0 HcmV?d00001 diff --git a/src/views/convenience/img/timeLine_staff.png b/src/views/convenience/img/timeLine_staff.png new file mode 100644 index 0000000000000000000000000000000000000000..fdbc1727083ef1e355e83f06ba7da1b275dda3eb GIT binary patch literal 725 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)pT}UnMXwSj}Ky5HFasE6@fg@i4$A#8qO#f2t$pssHc3 z`+xK8f2FDaRj2*G`~JVel>dIK{sV#Us{j70|2r@JuQ%&|!lwTToBwwl`(JnPzwWI6 zk3Rn2|KNYmiT||+|9|-L|M92)KmPpx_~XC)|dHQPlaoFlHOGpN0kJDTj^4{i!WSMzxgwEVfDI;rd&^!RoC|3 zlQ-Wx!GI&3$KcS>r`IcfNhtR4esO>J>Q~yaxArqH-8Fb*cZ6%zO9pKdxn+lxe|ard zc$C@cs~;|5pWX9v{tNF#AFS;EfAfu4`tRNK3@6T0CJT99n;cwjzk5r2ZSusciJRtx u6rA=v8u+^Bb@fu;;)?9spYLk?=36x5{ruP83qycG$>8bg=d#Wzp$Pz9^k*9Y literal 0 HcmV?d00001 diff --git a/src/views/convenience/list.vue b/src/views/convenience/list.vue index dd4e21a..ad27b6c 100644 --- a/src/views/convenience/list.vue +++ b/src/views/convenience/list.vue @@ -3,7 +3,7 @@
直接建立工单 @@ -32,7 +32,7 @@
-
+
-
城乡养老保险个人变更登记
+
{{ item.eventType.eventName }}
{{ item.sponsor | sponsorFilter }}创建于{{ item.createDate | parseTime("{y}-{m}-{d} {h}:{i}:{s}") @@ -57,11 +57,14 @@

流水号：{{ item.serialNumber }}

阶段：{{ item.phase | phaseFilter }} - + {{ timers && timers[index].status === null ? "" - : timers&&timers[index].status + : timers && timers[index].status ? "已超时" : "即将超时" }} @@ -77,10 +80,12 @@

-

受理人：{{ item.currentResponsiblePerson.name }}

+

受理人：{{ item.firstResponsiblePerson.name }}

-
-

+

+ +
+ {{ + (timers && timeFormat(timers[index].time)) || "00:00:00" + }} +
+ 接单 +
+
@@ -200,7 +220,7 @@ export default { filters: { sponsorFilter(status) { const statusMap = { - SELF: "居民", + SELF: "群众", STAFF: "工作人员" }; return statusMap[status]; @@ -216,10 +236,10 @@ export default { }, statusFilter(status) { const statusMap = { - MINE: "待我处理", + MINE: "我处理", FORWARDED: "已转交", FORWARDED_APPLY: "转交超限审批中", - SUBMIT_APPLY: "提交申请", + SUBMIT_APPLY: "已提交审批", WAIT_APPLY: "待审核" }; return statusMap[status]; @@ -309,6 +329,7 @@ export default { clearInterval(this.timersInterval); const tempData = res.d.records; const now = Date.parse(new Date()).toString() / 1000; + // console.log(now); const arr = []; tempData.map((item, index) => { let msec = []; @@ -326,7 +347,7 @@ export default { break; case "PREREQUISITES": // 要件准备 - msec = now - item.createDate - item.acceptanceTime; + msec = now - item.createDate; obj = { time: msec, phase: item.phase, @@ -336,11 +357,7 @@ export default { break; case "PROCESSING": // 办理中 - msec = - now - - item.createDate - - item.acceptanceTime - - item.prerequisitesTime; + msec = now - item.createDate; obj = { time: msec, phase: item.phase, diff --git a/src/views/login/img/login_titleLine_left.png b/src/views/login/img/login_titleLine_left.png new file mode 100644 index 0000000000000000000000000000000000000000..455a760d30027dce609eacc25518e90c832707f2 GIT binary patch literal 427 zcmV;c0aX5pP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0063uBQgL000(qQO+^Rg1Pl@sHp{&XI{*Ly6-h)vR9M69SX&N*AQ0R!Jw)$+ zQTov~!oFC6qBcwdiNem#K3YYjC-nl^9N$ld)%#8&A`sX*3Jc3)LeWz)f9p;db#4Gti(pd7_``ZJ^rtLXO=x+d)ecRbb_p#>}{{6I`WQzutQ+Z zYt{BIRA05T(H6C@AyT!t{(e<+_zkwlQ2K?V7}MCJHJzjAYI&F)z5Yshj+S#&w02&a zs`9rPSokxnN9+QJezNW7xdvvu)YSO3^9j^bP>+Vzs@1-XTo3lQgcRO;k4P78hZg`> V1}oh0n^yn;002ovPDHLkV1mq>vX%e< literal 0 HcmV?d00001 diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 93ebb7e..a4d92fc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -2,8 +2,10 @@