From ce92f7e861eabce242b77ee1f7cac01240c02906 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 23 Nov 2023 07:15:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/equTeam/index.vue | 239 ++++++++++-------- src/views/device/faultReport/index.vue | 152 ++++++----- .../repairOrder/selectSparePartsLedger.vue | 3 +- 3 files changed, 228 insertions(+), 166 deletions(-) diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue index 038f1db..4162c24 100644 --- a/src/views/device/equTeam/index.vue +++ b/src/views/device/equTeam/index.vue @@ -117,7 +117,12 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
- +
+
确 定 @@ -258,7 +268,9 @@ export default { components: { ItemSelectPerson }, data() { return { - // 可选（左边） + //人员表 + // peopleList: [], + // 可选（左边） leftList: [], // 已选（右边，只需要key） rightList: [], @@ -325,17 +337,22 @@ export default { // 调用列表接口 this.queryParams.pageNum = 1; this.queryParams.pageSize = 2000; - listTeamMembers(this.queryParams).then(response => { - for(let i in response.rows){ - // 将返回的列表赋值于穿梭框左边列表 + listTeamMembers(this.queryParams).then((response) => { + for (let i in response.rows) { + // 将返回的列表赋值于穿梭框左边列表 this.leftList.push({ - key: response.rows[i].userId, - label: response.rows[i].teamUserName - }) + key: response.rows[i].userId, + label: response.rows[i].teamUserName, + }); + + // this.peopleList.push({ + // key: response.rows[i].userId, + // label: response.rows[i].nickName + // }) } - for(let i in response.selected){ - this.rightList.push(response.selected[i].key); - this.form.rightData = this.rightList; + for (let i in response.selected) { + this.rightList.push(response.selected[i].key); + this.form.rightData = this.rightList; } this.loading = false; }); @@ -407,24 +424,39 @@ export default { const id = row.id || this.ids; getEquTeam(id).then((response) => { this.form = response.data; - for(let i in response.data.selectedData){ + for (let i in response.data.selectedData) { // 将返回的列表赋值于穿梭框右边列表 - this.rightList.push( - response.data.selectedData[i].userId - ) - }; - console.log('response.data.selectedData',response.data.selectedData); + this.rightList.push(response.data.selectedData[i].userId); + } + console.log("response.data.selectedData", response.data.selectedData); this.open = true; this.title = "修改设备班组维护"; - }); + }); }, /** 提交按钮 */ submitForm() { this.$refs["form"].validate((valid) => { + var people = ""; if (valid) { if (this.form.id != null) { this.form.rightData = this.rightList; + + // if(this.form.rightData != null){ + // this.form.rightData.forEach((item) => { + // this.peopleList.forEach((item1) => { + // if(item1.key == item){ + // this.form.teamPerson = []; + // this.form.teamPerson.push(item1.label); + // } + // }); + // }); + // } + + // if (Array.isArray(this.form.teamPerson)) { + // this.form.teamPerson = this.listToString(this.form.teamPerson); + // } + updateEquTeam(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -474,6 +506,15 @@ export default { }) .catch(() => {}); }, + // 对象转成指定字符串分隔 + // listToString(list, separator) { + // let strs = ""; + // separator = separator || ","; + // for (let i in list) { + // strs += list[i].url + separator; + // } + // return strs != "" ? strs.substr(0, strs.length - 1) : ""; + // }, /** 导出按钮操作 */ handleExport() { this.download( @@ -489,11 +530,11 @@ export default { diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index db5c925..b43eada 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -316,9 +316,14 @@ append-to-body > - + - + {{ form.equipmentCode }} @@ -342,7 +347,11 @@ }} - + - + - + - + - + - + - + @@ -605,9 +614,14 @@ append-to-body > - + - + {{ form.equipmentCode }} @@ -645,8 +659,12 @@ form.orderDesc }} - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - -
@@ -917,7 +934,7 @@ append-to-body > - + - + - + - + - + @@ -1021,22 +1038,17 @@ export default { return { CS: { "text-align": "center", //文本居中 - "min-width": "100px", //最小宽度 - "word-break": "break-all", //过长时自动换行 }, - LS: { - color: "#000", - "text-align": "center", - - "font-weight": "600", - - height: "40px", - - "min-width": "110px", - - "word-break": "keep-all", + }, + LSP: { + "text-align": "center", + width: "110px", + }, + LSP2: { + "text-align": "center", + width: "120px", }, teamOption: [], //图片存储 @@ -1319,8 +1331,16 @@ export default { }); this.form.fileList = newFiles; } - this.open = true; - this.title = "修改故障报修"; + + if ( + this.form.orderSource == "点检" || + this.form.orderSource == "巡检" + ) { + Message.warning("点检、巡检报修信息自动生成,不可修改!"); + } else { + this.open = true; + this.title = "修改故障报修"; + } }); }, /** 查看按钮操作 */ @@ -1331,10 +1351,10 @@ export default { this.form = response.data; if (response.data.files != null) { var newFiles = []; - console.log("1",response.data.files) + console.log("1", response.data.files); response.data.files.forEach((item) => { var newFile = {}; - console.log("2",response.data.files) + console.log("2", response.data.files); newFile.name = item.fileName; newFile.url = item.fileAddress; newFiles.push(newFile); @@ -1347,7 +1367,7 @@ export default { }); this.urlLists = urlLists; console.log("2222222222", this.urlLists); - } else if(response.data.files == null) { + } else if (response.data.files == null) { this.urlLists = null; } this.checkList = null; diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue index 2cac4a5..9e366a2 100644 --- a/src/views/device/repairOrder/selectSparePartsLedger.vue +++ b/src/views/device/repairOrder/selectSparePartsLedger.vue @@ -32,7 +32,7 @@ - + @@ -186,6 +186,7 @@ export default { cancel() { this.showFlag = false; this.reset(); + this.getList(); }, // 表单重置 reset() {