From 0fe3d0bdaba14e7cbe285a38a8055f996401efaf Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Mon, 20 Jan 2025 18:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/operation/hand.js | 8 +- src/option/system/dictbiz.js | 162 +++++++++--------- .../businessManagement/inspection/plan.vue | 7 + .../businessManagement/inspection/repair.vue | 110 ++++++------ .../businessManagement/inspection/task.vue | 9 +- src/views/components/requestSub.vue | 44 +---- .../labManagement/inspectionManagement.vue | 74 ++------ src/views/system/dictbiz.vue | 4 +- src/views/system/user.vue | 2 +- 9 files changed, 175 insertions(+), 245 deletions(-) diff --git a/src/api/operation/hand.js b/src/api/operation/hand.js index d1771a5..6041559 100644 --- a/src/api/operation/hand.js +++ b/src/api/operation/hand.js @@ -259,7 +259,13 @@ export const getAllUser = (query) =>{ params:query }) } - +export const getAllLab = (query) =>{ + return request({ + url:"/api/blade-system/dept/assLimsTree", + method:'get', + params:query + }) +} // 客服直接关闭接口 export const serviceSubmit = (data) =>{ diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js index 277f520..4bc1423 100644 --- a/src/option/system/dictbiz.js +++ b/src/option/system/dictbiz.js @@ -39,47 +39,47 @@ export const optionParent = { } ] }, - { - label: "字典排序", - prop: "sort", - type: "number", - align: "right", - width: 100, - hide: true, - rules: [ - { - required: true, - message: "请输入字典排序", - trigger: "blur" - } - ] - }, - { - label: "封存", - prop: "isSealed", - type: "switch", - align: "center", - width: 100, - dicData: [ - { - label: "否", - value: 0 - }, - { - label: "是", - value: 1 - } - ], - value: 0, - slot: true, - rules: [ - { - required: true, - message: "请选择封存", - trigger: "blur" - } - ] - }, + // { + // label: "字典排序", + // prop: "sort", + // type: "number", + // align: "right", + // width: 100, + // hide: true, + // rules: [ + // { + // required: true, + // message: "请输入字典排序", + // trigger: "blur" + // } + // ] + // }, + // { + // label: "封存", + // prop: "isSealed", + // type: "switch", + // align: "center", + // width: 100, + // dicData: [ + // { + // label: "否", + // value: 0 + // }, + // { + // label: "是", + // value: 1 + // } + // ], + // value: 0, + // slot: true, + // rules: [ + // { + // required: true, + // message: "请选择封存", + // trigger: "blur" + // } + // ] + // }, { label: "字典备注", prop: "remark", @@ -162,46 +162,46 @@ export const optionChild = { } ] }, - { - label: "字典排序", - prop: "sort", - type: "number", - align: "right", - hide: true, - rules: [ - { - required: true, - message: "请输入字典排序", - trigger: "blur" - } - ] - }, - { - label: "封存", - prop: "isSealed", - type: "switch", - align: "center", - width: 80, - dicData: [ - { - label: "否", - value: 0 - }, - { - label: "是", - value: 1 - } - ], - value: 0, - slot: true, - rules: [ - { - required: true, - message: "请选择封存", - trigger: "blur" - } - ] - }, + // { + // label: "字典排序", + // prop: "sort", + // type: "number", + // align: "right", + // hide: true, + // rules: [ + // { + // required: true, + // message: "请输入字典排序", + // trigger: "blur" + // } + // ] + // }, + // { + // label: "封存", + // prop: "isSealed", + // type: "switch", + // align: "center", + // width: 80, + // dicData: [ + // { + // label: "否", + // value: 0 + // }, + // { + // label: "是", + // value: 1 + // } + // ], + // value: 0, + // slot: true, + // rules: [ + // { + // required: true, + // message: "请选择封存", + // trigger: "blur" + // } + // ] + // }, { label: "字典备注", prop: "remark", diff --git a/src/views/businessManagement/inspection/plan.vue b/src/views/businessManagement/inspection/plan.vue index c6a7ab9..c2a0bb8 100644 --- a/src/views/businessManagement/inspection/plan.vue +++ b/src/views/businessManagement/inspection/plan.vue @@ -121,6 +121,13 @@ import { nextTick } from 'vue'; refreshBtn: false, columnBtn: false, menuWidth: 300, + searchShowBtn: false,   // 栏目折叠显隐 +        refreshBtn: false,      // 刷新 +        columnBtn: false,       // 操作列显隐 +        gridBtn:false, +        excelBtn: false,       // 导出Excel +        printBtn: false,       // 表格打印导出 +        filterBtn: false,      // 筛选 column: [ { label: "巡检单号", diff --git a/src/views/businessManagement/inspection/repair.vue b/src/views/businessManagement/inspection/repair.vue index bc609bd..6cee9b7 100644 --- a/src/views/businessManagement/inspection/repair.vue +++ b/src/views/businessManagement/inspection/repair.vue @@ -155,10 +155,21 @@ :disabled="(errorForm.repairStatus == 1 || errorForm.repairStatus == 101) && errorForm.approvePoint == '主管审核维修方案'"> - + +
+ + + + + + + + +
+ v-show="(errorForm.repairStatus == 5 || errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8)">
+
签名
-
- -
-
- -
-
- -
- - +
+ +
+
+
- - -
- - - - - - - - +
+
+
+
+
@@ -432,6 +421,7 @@ import routingInspection from '@/views/components/routingInspection.vue' import { getGoodsList } from '@/api/goodsManagement/goods' import { exportBlob1, zipDownload } from "@/api/common"; import { downloadXls } from "@/util/util"; +import moment from "moment"; export default { components: { routingInspection @@ -439,7 +429,6 @@ export default { data() { return { isClear: false, - nameImg: '', materialVisible: false, assignVisible: false, routingForm: {}, @@ -463,6 +452,13 @@ export default { refreshBtn: false, columnBtn: false, menuWidth: 300, + searchShowBtn: false,   // 栏目折叠显隐 + refreshBtn: false,      // 刷新 + columnBtn: false,       // 操作列显隐 + gridBtn: false, + excelBtn: false,       // 导出Excel + printBtn: false,       // 表格打印导出 + filterBtn: false,      // 筛选 column: [ { label: "任务单号", @@ -824,7 +820,12 @@ export default { this.errorForm.tableData.map(item => { item.price = item.price == -1 ? '' : item.price }) + // completeImgList + this.completeImgList = JSON.parse(this.errorForm.completeImgList) + this.errorForm.approveResult1 = this.errorForm.approveResult + this.nameImg = '' this.getSpanArr(this.errorForm.tableData) + } }) // this.errorForm = row @@ -843,6 +844,8 @@ export default { this.errorForm.isOkQuality = '' this.errorForm.isOkSecure = '' let data = this.checkDeepData(res.data.data.details) + this.completeImgList = this.errorForm.completeImgList==''?[]:JSON.parse(this.errorForm.completeImgList) + if (this.errorForm.repairStatus > 1) { data.forEach(item => { if (item.detailGoodsList.length > 0) { @@ -958,6 +961,10 @@ export default { // 评价并签字提交 handleConfirm() { if (this.errorForm.approveResult1 == 0) {//否 + if(this.errorForm.approveRemark ==''){ + this.$message.success('请输入原因！') + return false + } let query = { id: this.errorForm.id, approveResult: this.errorForm.approveResult1, @@ -976,6 +983,11 @@ export default { if (this.nameImg != '') { const formData = new FormData(); formData.append('file', this.base64toFile(this.nameImg)); + if(this.errorForm.isOkValidity==''||this.errorForm.isOkQuality==''||this.errorForm.isOkSecure==''){ + this.$message.error('请填写满意度') + return false + } + addFile(formData).then(res => { let query = { id: this.errorForm.id, @@ -995,8 +1007,6 @@ export default { } }) }) - - } else { this.$message.warning("请进行手写签名并点击确定按钮") } @@ -1221,23 +1231,15 @@ export default { } else if (this.viewType == 'repairupload') { // 维修完成 - let params={ - task: { - id: this.errorForm.id, - }, - completeImgList:JSON.stringify(this.completeImgList) - } - solutionSave(params).then(res => { + servicemanSubmit({ id: this.errorForm.id, completeImgList: JSON.stringify(this.completeImgList) }).then(res => { if (res.data.code == 200) { - // servicemanSubmit({ id: row.id }).then(res => { - // if (res.data.code == 200) { - // this.$message.success('维修完成') - // this.onLoad() - // } - // }) + this.$message.success('维修完成') + this.dialogerror = false + this.onLoad() } }) + } // this.$confirm('请确认提交保存当前数据?', '提示', { // confirmButtonText: '确定', diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue index 8c381a0..69cbb2e 100644 --- a/src/views/businessManagement/inspection/task.vue +++ b/src/views/businessManagement/inspection/task.vue @@ -458,6 +458,13 @@ export default { refreshBtn: false, columnBtn: false, menuWidth: 300, + searchShowBtn: false,   // 栏目折叠显隐 +        refreshBtn: false,      // 刷新 +        columnBtn: false,       // 操作列显隐 +        gridBtn:false, +        excelBtn: false,       // 导出Excel +        printBtn: false,       // 表格打印导出 +        filterBtn: false,      // 筛选 column: [ { label: "任务单号", @@ -1128,7 +1135,7 @@ export default { console.log('query=========>', query, this.addForm) taskSupervisorConfirm(query).then(res => { if (res.data.code == 200) { - this.$message.success('审核完成') + this.$message.success('操作成功') this.dialogVisible = false this.onLoad() } diff --git a/src/views/components/requestSub.vue b/src/views/components/requestSub.vue index 61b6821..17017c8 100644 --- a/src/views/components/requestSub.vue +++ b/src/views/components/requestSub.vue @@ -46,7 +46,7 @@