Merge remote-tracking branch 'origin/master'

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

 package com.zehong.system.service.impl;
 
-import java.util.List;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.TWorkOrderMapper;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.TEnterpriseInfo;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.mapper.TEnterpriseInfoMapper;
+import com.zehong.system.mapper.TWorkOrderMapper;
 import com.zehong.system.service.ITWorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 燃气任务Service业务层处理
@@ -21,6 +25,9 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     @Autowired
     private TWorkOrderMapper tWorkOrderMapper;
 
+    @Autowired
+    private TEnterpriseInfoMapper tEnterpriseInfoMapper;
+
     /**
      * 查询燃气任务
      * 
@@ -56,6 +63,21 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     {
         tWorkOrder.setCreateTime(DateUtils.getNowDate());
         tWorkOrder.setCreateBy(SecurityUtils.getUsername());
+        Long enterpriseId = SecurityUtils.getLoginUser().getUser().getDeptId();
+        if(null != enterpriseId){
+            if("-2".equals(enterpriseId.toString())){
+                tWorkOrder.setWorkCreateEnterpriseId("-2");
+                tWorkOrder.setWorkCreateEnterpriseName("政府部门");
+            }else{
+
+                TEnterpriseInfo enterpriseInfo = tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
+                if(null != enterpriseInfo && StringUtils.isNotEmpty(enterpriseInfo.getEnterpriseName())){
+                    tWorkOrder.setWorkCreateEnterpriseId(enterpriseId.toString());
+                    tWorkOrder.setWorkCreateEnterpriseName(enterpriseInfo.getEnterpriseName());
+                }
+
+            }
+        }
         return tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
     }
 

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

@@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workCreateEnterpriseId != null">work_create_enterprise_id = #{workCreateEnterpriseId},</if>
             <if test="workAssignEnterproseName != null">work_assign_enterprose_name = #{workAssignEnterproseName},</if>
             <if test="workAssignEnterproseId != null">work_assign_enterprose_id = #{workAssignEnterproseId},</if>
+            <if test="workAssignManId == null">work_assign_man_id = null,</if>
             <if test="workAssignManId != null">work_assign_man_id = #{workAssignManId},</if>
             <if test="workAssignMan != null">work_assign_man = #{workAssignMan},</if>
             <if test="workStatus != null">work_status = #{workStatus},</if>

gassafetyprogress-web/package.json

 {
   "name": "zehong",
   "version": "3.5.0",
-  "description": "泽宏管理系统",
+  "description": "智慧管网管理系统",
   "author": "泽宏",
   "license": "MIT",
   "scripts": {

gassafetyprogress-web/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '泽宏管理系统',
+      title: '智慧管网管理系统',
       logo: logoImg
     }
   }

gassafetyprogress-web/src/settings.js

 module.exports = {
-  title: '泽宏管理系统',
+  title: '智慧管网管理系统',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

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="(('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == 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"
@@ -225,7 +225,7 @@
         <el-col :span="12">
           <el-form-item label="指派人" prop="workAssignMan">
             <!--<el-input v-model="form.workAssignManId" placeholder="请输入指派人" />-->
-            <el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 350px" @change="selectInspection($event,'edit')" :disabled="isDetail">
+            <el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 350px" @change="selectInspection($event,'edit')" :disabled="isDetail" clearable>
               <el-option
                 v-for="item in inspectors"
                 :key="item.userId "
@@ -237,7 +237,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <el-col :span="12" v-show="isDetail">
           <el-form-item label="创建单位" prop="inspectionDate">
             <el-input v-model="form.workCreateEnterpriseName" placeholder="请输入创建单位名称" :disabled="isDetail"/>
           </el-form-item>
@@ -706,19 +706,28 @@ export default {
     selectworkAssignEnterprose(enterpriseId){
       this.form.workAssignManId = "";
       this.workForm.workAssignManId = "";
+      this.workForm.workAssignMan="";
+      this.form.workAssignMan = "";
       this.getInspectionUserList(enterpriseId);
       let enterpriseName = this.enterprises.find(val=>val.enterpriseId == enterpriseId).enterpriseName;
       this.form.workAssignEnterproseName = enterpriseName;
     },
     //获取指派人
     selectInspection(userId,type){
+      if(userId){
         let userName = this.inspectors.find(val=>val.userId == userId).userName;
         if("edit" == type){
           this.form.workAssignMan = userName;
         }else{
           this.workForm.workAssignMan = userName;
         }
-
+      }else{
+        if("edit" == type){
+          this.form.workAssignMan = "";
+        }else{
+          this.workForm.workAssignMan = "";
+        }
+      }
     },
     /*//选择任务类型
     selectWorkType(workType){
@@ -741,6 +750,7 @@ export default {
     //任务下发
     workIssue(row){
       this.title = "任务下发";
+      this.workForm = {};
       this.workForm.workId = row.workId;
       this.workForm.workTitle = row.workTitle;
       this.workForm.workType = row.workType;
@@ -748,10 +758,10 @@ export default {
         this.workForm.workAssignEnterproseId = row.workAssignEnterproseId;
         this.workForm.workAssignEnterproseName = row.workAssignEnterproseName;
       }
-      if(row.workAssignManId){
+     /* if(row.workAssignManId){
         this.workForm.workAssignManId =  row.workAssignManId;
         this.workForm.workAssignMan = row.workAssignMan;
-      }
+      }*/
       //this.workForm = row;
       this.workForm.workStatus = '1';
       this.workOpen = true;

gassafetyprogress-web/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '泽宏管理系统' // 标题
+const name = defaultSettings.title || '智慧管网管理系统' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://222.223.203.154:8092/gassafety`,
+        target: `http://localhost:8903/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''