diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index 95da096..db5c925 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -740,34 +740,34 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
@@ -880,6 +880,7 @@ v-model="form.orderConnection" style="width: 200px" placeholder="请输入联系方式" + disabled /> @@ -960,7 +961,7 @@ > - + @@ -1170,12 +1171,6 @@ export default { orderTime: [ { required: true, message: "报修时间不能为空", trigger: "blur" }, ], - orderDesc: [ - { required: true, message: "故障描述不能为空", trigger: "blur" }, - ], - orderConnection: [ - { required: true, message: "联系方式不能为空", trigger: "blur" }, - ], }, }; }, @@ -1227,6 +1222,7 @@ export default { onItemSelectedPerson(obj) { this.form.orderRepairmanCode = obj[0].userName; this.form.orderRepairmanName = obj[0].nickName; + this.form.orderConnection = obj[0].phonenumber; }, //设备选择 onItemSelectedEquipment(obj) { @@ -1335,8 +1331,10 @@ export default { this.form = response.data; if (response.data.files != null) { var newFiles = []; + console.log("1",response.data.files) response.data.files.forEach((item) => { var newFile = {}; + console.log("2",response.data.files) newFile.name = item.fileName; newFile.url = item.fileAddress; newFiles.push(newFile); @@ -1349,7 +1347,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/faultReport/selectSinglePerson.vue b/src/views/device/faultReport/selectSinglePerson.vue index 99c4737..7009fba 100644 --- a/src/views/device/faultReport/selectSinglePerson.vue +++ b/src/views/device/faultReport/selectSinglePerson.vue @@ -85,6 +85,13 @@ v-if="columns[1].visible" :show-overflow-tooltip="true" /> + + + - - + +
确 定 - 取 消 + 取 消
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ +
@@ -411,7 +523,9 @@ export default { // 弹出层标题 title: "", // 是否显示弹出层 - open: false, + openAdd: false, + //是否显示更新弹出层 + openUpdate: false, // 查询参数 queryParams: { pageNum: 1, @@ -462,6 +576,10 @@ export default { this.getList(); }, methods: { + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, /** 查询委外工单列表 */ getList() { this.loading = true; @@ -471,9 +589,16 @@ export default { this.loading = false; }); }, - // 取消按钮 + + // 取消更新按钮 cancel() { - this.open = false; + this.openUpdate = false; + this.reset(); + }, + + // 取消更新按钮 + cancelAdd() { + this.openAdd = false; this.reset(); }, // 表单重置 @@ -530,7 +655,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); - this.open = true; + this.openAdd = true; this.title = "添加委外工单"; }, /** 修改按钮操作 */ @@ -539,7 +664,7 @@ export default { const workId = row.workId || this.ids; getOutsourceWorkOrder(workId).then((response) => { this.form = response.data; - this.open = true; + this.openUpdate = true; this.title = "修改委外工单"; }); }, @@ -550,13 +675,13 @@ export default { if (this.form.workId != null) { updateOutsourceWorkOrder(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); - this.open = false; + this.openUpdate = false; this.getList(); }); } else { addOutsourceWorkOrder(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); - this.open = false; + this.openAdd = false; this.getList(); }); } diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 3ee64d3..7e41bc9 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -262,6 +262,7 @@ align="center" prop="workCode" width="200" + fixed /> {{ - form.workConnection + form.outSourceConnection }} {{ form.outSourceReason @@ -1237,6 +1238,10 @@ export default { this.getTeamList(); }, methods: { + // 生成表头序号 + indexMethod(index) { + return index + 1; + }, //计算时间 结束维修时间-开始维修时间 listeningTime() { if (this.form.workEndTime != null && this.form.workStartTime != null) { @@ -1434,9 +1439,11 @@ export default { }); this.urlAfterLists = urlAfterLists; } + + //重置 this.detailList = null; this.detailList = response.data.detailList; - if (this.checkList != null) { + if (this.detailList != null) { //检查项遍历 var standards = []; this.detailList.forEach((item1) => { @@ -1457,6 +1464,7 @@ export default { }); }); this.detailList = standards; + console.log("111111111111",this.detailList); } this.openWrite = true; this.title = "填写维修记录";