工单归档、反馈

gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java

@@ -37,7 +37,7 @@ public class TOrderFeedback extends BaseEntity
     @Excel(name = "反馈时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date feedbackTime;
 
-    /** 是否存在隐患（0正常，1存在隐患） */
+    /** 是否存在隐患（1是，2否） */
     @Excel(name = "是否存在隐患", readConverterExp = "0=正常，1存在隐患")
     private String isHiddenDanger;
 

gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java

@@ -62,6 +62,11 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
     @Override
     public int insertTOrderFeedback(TOrderFeedback tOrderFeedback)
     {
+        if("2".equals(tOrderFeedback.getIsHiddenDanger())){
+            tOrderFeedback.setDealStatus("1");
+        }
+        tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
+
         String deviceCode = tOrderFeedback.getDeviceCode();
         String dealStatus = tOrderFeedback.getDealStatus();
 
@@ -90,7 +95,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
             order.setOrderStatus("2");
             tWorkOrderMapper.updateTWorkOrder(order);
         }
-        tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
+
         return tOrderFeedbackMapper.insertTOrderFeedback(tOrderFeedback);
     }
 

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

@@ -87,7 +87,7 @@
           <span>{{ parseTime(scope.row.actualTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="工单描述" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -141,10 +141,24 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="工单描述" prop="remarks">
+            <el-input v-model="form.remarks" type="textarea" placeholder="请输入工单描述" />
+          </el-form-item>
         </div>
         <div v-if="this.title == '工单信息归档'">
-          <el-form-item label="归档信息" prop="remarks">
-            <el-input v-model="form.remarks" type="textarea" placeholder="请输入归档信息" />
+          <el-form-item label="工单名称" prop="orderName">
+            <font>{{form.orderName}}</font>
+          </el-form-item>
+          <el-form-item label="工单类型" prop="orderType">
+            <span type="primary" v-if="form.orderType == 1">巡检信息</span>
+            <span type="primary" v-if="form.orderType == 2">隐患信息</span>
+            <span type="primary" v-if="form.orderType == 3">报警信息</span>
+          </el-form-item>
+          <el-form-item label="工单编号" prop="orderId">
+            <font>{{form.orderId}}</font>
+          </el-form-item>
+          <el-form-item label="归档信息" prop="archiving">
+            <el-input v-model="form.archiving" type="textarea" placeholder="请输入归档信息" />
           </el-form-item>
         </div>
       </el-form>

gassafety-web/src/views/workOrder/feedback/index.vue

@@ -85,7 +85,7 @@
           <span>{{ parseTime(scope.row.actualTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="工单描述" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -124,8 +124,19 @@
     <!-- 工单反馈对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="工单名称" prop="orderName">
+          <font>{{form.orderName}}</font>
+        </el-form-item>
+        <el-form-item label="工单类型" prop="orderType">
+          <span type="primary" v-if="form.orderType == 1">巡检信息</span>
+          <span type="primary" v-if="form.orderType == 2">隐患信息</span>
+          <span type="primary" v-if="form.orderType == 3">报警信息</span>
+        </el-form-item>
+        <el-form-item label="工单编号" prop="orderId">
+          <font>{{form.orderId}}</font>
+        </el-form-item>
         <el-form-item label="设备列表" prop="deviceCode" v-if="form.orderType == '1'">
-          <el-select v-model="form.deviceCode" placeholder="请选择设备" clearable size="small" >
+          <el-select v-model="form.deviceCode" placeholder="请选择设备" clearable size="small" filterable >
             <el-option
               v-for="device in form.deviceInfoList"
               :key="device.deviceCode"
@@ -143,12 +154,18 @@
           />
         </el-form-item>
         <el-form-item label="是否存在隐患" prop="isHiddenDanger">
-          <el-radio-group v-model="form.isHiddenDanger">
+          <!--<el-radio-group v-model="form.isHiddenDanger">
             <el-radio :label="1">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
+            <el-radio :label="2">否</el-radio>
+          </el-radio-group>-->
+          <el-switch
+            v-model="isHiddenDanger"
+            active-text="是"
+            inactive-text="否">
+          </el-switch>
         </el-form-item>
-        <el-form-item label="处理结果" prop="dealStatus">
+<!--        <el-form-item label="处理结果" prop="dealStatus">-->
+        <el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">
           <el-radio-group v-model="form.dealStatus">
             <el-radio :label="2">已处理完成</el-radio>
             <el-radio :label="3">未处理完成</el-radio>
@@ -180,6 +197,7 @@
     },
     data() {
       return {
+        isHiddenDanger: false,
         // 遮罩层
         loading: true,
         // 导出遮罩层
@@ -307,8 +325,9 @@
       /** 接单按钮操作 */
       handleReceive(row) {
         if (row.orderStatus == '0') {
-          const orderIds = row.orderId;
-          this.$confirm('是否确认接收工单' + orderIds, "操作提示", {
+          const orderIds = row.orderId,
+            orderName = roe.orderName;
+          this.$confirm('是否确认接收工单(' + orderName + orderIds + ")", "操作提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
@@ -346,6 +365,11 @@
       },
       /** 提交按钮 */
       submitForm() {
+        if(this.isHiddenDanger == false){
+          this.form.isHiddenDanger = "2";
+        } else {
+          this.form.isHiddenDanger = "1";
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
             if(this.form.orderStatus == '1' || this.form.orderStatus == '2'){