任务隐患问题修改 gengdidi

gassafetyprogress-system/src/main/resources/mapper/system/THiddenTroubleInfoMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTHiddenTroubleInfoVo">
-        select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks from t_hidden_trouble_info
+        select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks,beyond_enterprise_id from t_hidden_trouble_info
     </sql>
 
     <select id="selectTHiddenTroubleInfoList" parameterType="THiddenTroubleInfo" resultMap="THiddenTroubleInfoResult">

gassafetyprogress-web/src/views/inspectionWork/workOrder/components/HiddenFeedTrouble.vue

@@ -221,7 +221,6 @@ export default {
     this.getDicts("t_hidden_trouble_type").then(response => {
         this.hiddenTroubleOptions = response.data;
     });
-    console.log("fdafdsafds",this.workId)
     this.getHiddenInfoList({workId:this.workId});
   },
   methods: {
@@ -264,7 +263,6 @@ export default {
       this.reset();
       this.index = index;
       this.hiddenForm = {...row};
-      console.log(row,"ffffffffff",this.hiddenForm);
       this.title = "修改隐患信息"
       this.hiddenOpen = true;
       if (this.hiddenForm.pictureUrl) {
@@ -288,6 +286,7 @@ export default {
             this.hiddenForm.reportTime = moment().format("YYYY-MM-DD HH:mm:ss");
             this.hiddenForm.reportPersonName = this.$store.state.user.name;
             this.hiddenForm.reportPerson = this.$store.state.user.userId;
+            this.hiddenForm.beyondEnterpriseId = this.$store.state.user.enterpriseId;
             addHiddenInfo(this.hiddenForm).then(response => {
               this.msgSuccess("新增成功");
               this.hiddenOpen = false;

gassafetyprogress-web/src/views/inspectionWork/workOrder/components/HiddenTrouble.vue

@@ -93,16 +93,47 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="隐患类型" prop="hiddenTroubleType">
-          <el-select v-model="hiddenForm.hiddenTroubleType" placeholder="请选择隐患类型" style="width: 330px" :disabled="isView">
-            <el-option
-              v-for="dict in hiddenTroubleOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="隐患类型" prop="hiddenTroubleType">
+              <el-select v-model="hiddenForm.hiddenTroubleType" placeholder="请选择隐患类型" style="width: 330px" :disabled="isView">
+                <el-option
+                  v-for="dict in hiddenTroubleOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属企业" prop="beyondEnterpriseName" v-if="isView">
+              <el-input v-model="hiddenForm.beyondEnterpriseName" placeholder="请输入所属企业" :disabled="isView"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="处理状态" prop="hiddenTroubleDealStatus" v-if="isView">
+              <el-input  v-if="hiddenForm.hiddenTroubleDealStatus == '1'" value="待处理" :disabled="isView"/>
+              <el-input  v-if="hiddenForm.hiddenTroubleDealStatus == '2'" value="处理中" :disabled="isView"/>
+              <el-input  v-if="hiddenForm.hiddenTroubleDealStatus == '3'" value="已完成" :disabled="isView"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上报时间" prop="reportTime">
+              <el-date-picker clearable size="small"
+                              v-model="hiddenForm.reportTime"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择上报时间" style="width: 100%" :disabled="isView">
+              </el-date-picker>
+            </el-form-item>
+
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item label="经纬度坐标" prop="longitude">
@@ -152,6 +183,7 @@
 </template>
 
 <script>
+import { getInfo } from "@/api/regulation/info";
 import MyFileUpload from '@/components/MyFileUpload';
 import GetPos from '@/components/GetPos';
 import moment from "moment";
@@ -187,7 +219,8 @@ export default {
       hiddenOpen: false,
       // 表单参数
       hiddenForm: {
-        pictureUrl: ""
+        pictureUrl: "",
+        beyondEnterpriseName: "1233"
       },
       // 表单校验
       rules: {
@@ -237,7 +270,7 @@ export default {
       this.hiddenOpen = true;
     },
     /** 详情按钮操作 */
-    viewDetail(row,index) {
+     viewDetail(row,index) {
       this.reset();
       this.index = index;
       this.hiddenForm = {...row};
@@ -248,6 +281,13 @@ export default {
           url: this.hiddenForm.pictureUrl,
         });
       }
+      if(this.hiddenForm.beyondEnterpriseId && !this.hiddenForm.beyondEnterpriseName){
+         getInfo(this.hiddenForm.beyondEnterpriseId).then(res =>{
+          if(res.data){
+            this.$set(this.hiddenForm,"beyondEnterpriseName",res.data.enterpriseName);
+          }
+        })
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row,index) {

gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue

@@ -521,7 +521,8 @@
           <HiddenFeedTrouble
             :workId="hiddenFeedForm.workId"
             :isView="false"
-             ref="hiddenChild"/>
+             ref="hiddenChild"
+            v-if="hiddenFeedOpen"/>
         </el-form-item>
 
       </el-form>
@@ -1137,7 +1138,7 @@ export default {
     //隐患反馈取消
     cancelHiddenFeedForm(){
       this.hiddenFeedOpen = false;
-      this.hiddenFeedForm = {hiddenList:[]};
+      this.hiddenFeedForm = {};
       this.fileList = [];
     },
     //督办