反馈列表

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

@@ -141,7 +141,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
 
         List<TOrderFeedback> feedbackList = tOrderFeedbackMapper.selectTOrderFeedbackByOrderId(tWorkOrder.getOrderId());
         List<OrderFeedbackVo> feedbackVoList = new ArrayList<>();
-        OrderFeedbackVo feedbackVo = null;
+        OrderFeedbackVo feedbackVo = new OrderFeedbackVo();
         TDeviceInfo device = null;
 
         for(TOrderFeedback feedback : feedbackList){

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

@@ -154,18 +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="2">否</el-radio>
-          </el-radio-group>-->
-          <el-switch
+          </el-radio-group>
+          <!--<el-switch
             v-model="isHiddenDanger"
             active-text="是"
             inactive-text="否">
-          </el-switch>
+          </el-switch>-->
         </el-form-item>
-<!--        <el-form-item label="处理结果" prop="dealStatus">-->
-        <el-form-item label="处理结果" prop="dealStatus" v-if="isHiddenDanger == true">
+        <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>
@@ -369,11 +369,11 @@
       },
       /** 提交按钮 */
       submitForm() {
-        if(this.isHiddenDanger == false){
-          this.form.isHiddenDanger = "2";
-        } else {
-          this.form.isHiddenDanger = "1";
-        }
+        // 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'){