修复工单详情页问题

gassafety-web/src/views/deviceInspection/inspectionData/index.vue

-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="经度" prop="longitude">
-        <el-input
-          v-model="queryParams.longitude"
-          placeholder="请输入经度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="纬度" prop="latitude">
-        <el-input
-          v-model="queryParams.latitude"
-          placeholder="请输入纬度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>-->
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-		  :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['device:inspectionData:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="inspectionDataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" label="序号" align="center" />
-      <el-table-column label="巡检员" align="center" prop="inspectorId" />
-      <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="纬度" align="center" prop="latitude" />
-      <el-table-column label="备注" align="center" prop="remarks" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['device:inspectionData:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['device:inspectionData:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>-->
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改巡检记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="巡检员id" prop="inspectorId">
-          <el-input v-model="form.inspectorId" placeholder="请输入巡检员id" />
-        </el-form-item>
-        <el-form-item label="经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
-        <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入纬度" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listInspectionData, getInspectionData, delInspectionData, addInspectionData, updateInspectionData, exportInspectionData } from "@/api/deviceInspection/inspectionData";
-
-export default {
-  name: "InspectionData",
-  components: {
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 巡检记录表格数据
-      inspectionDataList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        inspectorId: null,
-        longitude: null,
-        latitude: null,
-        remarks: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询巡检记录列表 */
-    getList() {
-      this.loading = true;
-      listInspectionData(this.queryParams).then(response => {
-        this.inspectionDataList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dataId: null,
-        inspectorId: null,
-        longitude: null,
-        latitude: null,
-        createTime: null,
-        remarks: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dataId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加巡检记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const dataId = row.dataId || this.ids
-      getInspectionData(dataId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改巡检记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dataId != null) {
-            updateInspectionData(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addInspectionData(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dataIds = row.dataId || this.ids;
-      this.$confirm('是否确认删除巡检记录编号为"' + dataIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delInspectionData(dataIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有巡检记录数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportInspectionData(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
-    }
-  }
-};
-</script>

gassafety-web/src/views/workOrder/basicsInfo/detail.vue

@@ -103,7 +103,7 @@
         </div>
         <el-divider></el-divider>
         <!-- 反馈信息 -->
-        <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null"> 
+        <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>反馈信息</li></ul>
           </div>
@@ -168,12 +168,12 @@
                     <span style="text-decoration:underline">收起</span>
                   </i>
                 <!-- </el-button> -->
-                
+
               </div>
         </div>
 
         <!-- 归档 -->
-        
+
         <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
           <el-button
             type="primary"
@@ -198,7 +198,7 @@
                     <el-input v-model="form.orderName" placeholder="请输入工单名称" />
                   </el-form-item>
                   <el-form-item label="指定执行人员" prop="appointInspector">
-                    <el-select v-model="form.appointInspectorName" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
+                    <el-select v-model="form.appointInspector" placeholder="请选择执行人员" clearable size="small" @change="setUserId">
                       <el-option
                         v-for="item in inspector"
                         :key="item.userId"
@@ -469,45 +469,44 @@ export default {
         this.title = "添加工单基础信息";
       },
       /** 归档按钮操作 */
-    handleFinish(res) {
-      // this.reset();
-      getBasicsInfo(res).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "工单信息归档";
-      });
-    },
+      handleFinish(res) {
+        // this.reset();
+        getBasicsInfo(res).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "工单信息归档";
+        });
+      },
       /** 修改按钮操作 */
       handleUpdate(res) {
-      // this.reset();
-      this.getInspectorList();
-      getBasicsInfo(this.orderId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "工单信息修改";
-      });
-    },
-      /** 提交按钮 */
+        // this.reset();
+        this.getInspectorList();
+        getBasicsInfo(this.orderId).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "工单信息修改";
+        });
+      },
        /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.orderStatus == '0') {
-            updateBasicsInfo(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else if(this.form.orderStatus == '2'){
-            updateOrderStatus(this.form).then(response => {
-              this.msgSuccess("操作成功");
-              this.open = false;
-              this.getList();
-            });
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.orderStatus == '0') {
+              updateBasicsInfo(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                location.reload();
+              });
+            } else if(this.form.orderStatus == '2'){
+              updateOrderStatus(this.form).then(response => {
+                this.msgSuccess("操作成功");
+                this.open = false;
+                location.reload();
+              });
+            }
           }
-        }
-      });
-    },
+        });
+      },
       /** 删除按钮操作 */
       handleDelete(row) {
         const orderIds = row.orderId || this.ids;