Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gassafetyprogress-system/src/main/resources/mapper/system/TComplainDealMapper.xml

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
-        ORDER BY create_time DESC
+        order by create_time desc
     </select>
     
     <select id="selectTComplainDealById" parameterType="Long" resultMap="TComplainDealResult">

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

@@ -133,6 +133,7 @@
             icon="el-icon-edit"
             @click="workDetail(scope.row)"
             v-hasPermi="['system:order:edit']"
+            key="detail"
           >详情</el-button>
           <el-button v-if="scope.row.workStatus == '0' || scope.row.workStatus == '1'" key="edit"
             size="mini"
@@ -147,6 +148,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:order:remove']"
+            key="detele"
           >删除</el-button>
           <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"
@@ -154,6 +156,7 @@
                      icon="el-icon-edit"
                      @click="workIssue(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="work"
           >任务下发</el-button>
           <el-button v-if=" 'inpector'== roleType && scope.row.workStatus == '0'"
                      size="mini"
@@ -161,6 +164,7 @@
                      icon="el-icon-edit"
                      @click="takingOrder(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="recieve"
           >接单</el-button>
           <el-button v-if="'zhengfu'!= roleType && (scope.row.workStatus == '0' || scope.row.workStatus == '1')"
                      size="mini"
@@ -168,6 +172,7 @@
                      icon="el-icon-edit"
                      @click="feedbookWork(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="feedbook"
           >反馈</el-button>
           <el-button v-if="'zhengfu'!= roleType && scope.row.workStatus == '2'"
                      size="mini"
@@ -175,6 +180,7 @@
                      icon="el-icon-edit"
                      @click="sortWork(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="sort"
           >归档</el-button>
         </template>
       </el-table-column>
@@ -659,7 +665,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const workIds = row.workId || this.ids;
-      this.$confirm('是否确认删除燃气任务编号为"' + workIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除燃气任务名称为"' + row.workTitle + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -770,7 +776,7 @@ export default {
         this.workForm.workAssignMan = row.workAssignMan;
       }*/
       //this.workForm = row;
-      this.workForm.workStatus = '1';
+      //this.workForm.workStatus = '1';
       this.workOpen = true;
       this.getEnterpriseLists();
       this.getInspectionUserList(row.workAssignEnterproseId);