任务下发 gengdidi

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

@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTWorkOrderList" parameterType="TWorkOrder" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
         <where>  
-            <if test="workTitle != null  and workTitle != ''"> and work_title = #{workTitle}</if>
+            <if test="workTitle != null  and workTitle != ''"> and work_title like concat('%', #{workTitle}, '%')</if>
             <if test="workType != null  and workType != ''"> and work_type = #{workType}</if>
             <if test="workContent != null  and workContent != ''"> and work_content = #{workContent}</if>
             <if test="workCreateEnterpriseName != null  and workCreateEnterpriseName != ''"> and work_create_enterprise_name like concat('%', #{workCreateEnterpriseName}, '%')</if>

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

@@ -147,7 +147,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:order:remove']"
           >删除</el-button>
-          <el-button v-if="'inpector'!= roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null) && scope.row.workStatus == '0'"
+          <el-button v-if="(('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == null))) && scope.row.workStatus == '0'"
                      size="mini"
                      type="text"
                      icon="el-icon-edit"
@@ -184,7 +184,7 @@
     />
 
     <!-- 添加或修改燃气任务对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="900px" @closed="dialogClose" @open="dialogOpen">
+    <el-dialog :title="title" :visible.sync="open" width="900px" @closed="dialogClose" @open="dialogOpen" :close-on-click-modal="false">
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <el-col :span="12">
@@ -257,7 +257,7 @@
       <el-form-item label="巡检路线" prop="inspectionRoute" v-show="form.workType=='2'">
         <el-input v-model="form.inspectionRoute" type="textarea" placeholder="请输入巡检路线" :disabled="isDetail"/>
       </el-form-item>
-      <el-form-item label="问题描述" prop="problemDescription">
+      <el-form-item label="问题描述" prop="problemDescription" v-show="form.workType=='3'">
         <el-input v-model="form.problemDescription" type="textarea" placeholder="请输入问题描述" :disabled="isDetail"/>
       </el-form-item>
       <el-form-item label="整改方案" prop="rectificationPlan" v-show="form.workType=='3' && isDetail && (form.workStatus =='2' || form.workStatus =='3')">
@@ -626,9 +626,10 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改燃气任务";
+        this.getEnterpriseLists();
+        this.getInspectionUserList(response.data.workAssignEnterproseId);
       });
-      this.getEnterpriseLists();
-      this.getInspectionUserList(row.workAssignEnterproseId);
+
     },
     /** 提交按钮 */
     submitForm() {