1 老旧管网改造-企业端和政府端设置 上传时间和上传状态，燃气企业 新增时 赋默认值。并调整 企详情操作。

zh-baseversion-admin/src/main/java/com/zehong/web/controller/oldpipesystem/TPipeOldPlanProcessController.java

@@ -107,7 +107,7 @@ public class TPipeOldPlanProcessController extends BaseController
     }
 
     /**
-     * 上传计划和进度
+     * 政府端 上传计划和进度
      * @param fOldPlanProcessId 计划id
      * @return
      */
@@ -120,4 +120,14 @@ public class TPipeOldPlanProcessController extends BaseController
             return AjaxResult.error("上传计划和进度接口异常");
         }
     }
+
+    /**
+     * 企业端 上传计划和进度
+     * @param fOldPlanProcessId 计划id
+     * @return
+     */
+    @GetMapping("/entReportPipeOldPlanProcess")
+    public AjaxResult entReportPipeOldPlanProcess(Long fOldPlanProcessId) {
+        return toAjax(tPipeOldPlanProcessService.entReportPipeOldPlanProcess(fOldPlanProcessId));
+    }
 }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TPipeOldPlanProcess.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 老旧管网-改造计划和进度对象 t_pipe_old_plan_process
  * 
@@ -89,11 +91,11 @@ public class TPipeOldPlanProcess extends BaseEntity
 
     /** 当前改造进度，填写百分比，100为完成 */
     @Excel(name = "当前改造进度")
-    private Long fReconstructionProgress;
+    private Float fReconstructionProgress;
 
     /** 当前资金拨付进度，填写百分比，100为完成 */
     @Excel(name = "当前资金拨付进度")
-    private Long fFundsDisbursementProgress;
+    private Float fFundsDisbursementProgress;
 
     /** 是否已上传，1-是，0-否 */
     @Excel(name = "是否已上传",readConverterExp = "1=是,0=否")
@@ -105,6 +107,29 @@ public class TPipeOldPlanProcess extends BaseEntity
 
     private Long fEnterpriseId;
 
+    /**
+     * 政府端上传数据
+     */
+    private String govUploadState;
+
+    private Date govUploadTime;
+
+    public String getGovUploadState() {
+        return govUploadState;
+    }
+
+    public void setGovUploadState(String govUploadState) {
+        this.govUploadState = govUploadState;
+    }
+
+    public Date getGovUploadTime() {
+        return govUploadTime;
+    }
+
+    public void setGovUploadTime(Date govUploadTime) {
+        this.govUploadTime = govUploadTime;
+    }
+
     public Long getfEnterpriseId() {
         return fEnterpriseId;
     }
@@ -266,21 +291,21 @@ public class TPipeOldPlanProcess extends BaseEntity
     {
         return fActualFinishTime;
     }
-    public void setfReconstructionProgress(Long fReconstructionProgress) 
+    public void setfReconstructionProgress(Float fReconstructionProgress)
     {
         this.fReconstructionProgress = fReconstructionProgress;
     }
 
-    public Long getfReconstructionProgress() 
+    public Float getfReconstructionProgress()
     {
         return fReconstructionProgress;
     }
-    public void setfFundsDisbursementProgress(Long fFundsDisbursementProgress) 
+    public void setfFundsDisbursementProgress(Float fFundsDisbursementProgress)
     {
         this.fFundsDisbursementProgress = fFundsDisbursementProgress;
     }
 
-    public Long getfFundsDisbursementProgress() 
+    public Float getfFundsDisbursementProgress()
     {
         return fFundsDisbursementProgress;
     }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TPipeOldPlanProcessMapper.java

 package com.zehong.system.mapper;
 
+import java.util.Date;
 import java.util.List;
 import com.zehong.system.domain.TPipeOldPlanProcess;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 老旧管网-改造计划和进度Mapper接口
@@ -43,6 +45,13 @@ public interface TPipeOldPlanProcessMapper
      */
     public int updateTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
 
+    /**
+     * 企业端上传数据
+     * @return
+     */
+    public int entReportPipeOldPlanProcess(@Param("state")  String state, @Param("entUploadTime") Date entUploadTime,
+                                           @Param("fOldPlanProcessId") Long fOldPlanProcessId);
+
     /**
      * 删除老旧管网-改造计划和进度
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/ITPipeOldPlanProcessService.java

@@ -65,4 +65,11 @@ public interface ITPipeOldPlanProcessService
      * @return
      */
     int reportPipeOldPlanProcess(Long fOldPlanProcessId) throws Exception;
+
+    /**
+     * 企业端上传 计划
+     * @param fOldPlanProcessId f
+     * @return r
+     */
+    int entReportPipeOldPlanProcess(Long fOldPlanProcessId);
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPipeOldPlanProcessServiceImpl.java

@@ -31,7 +31,7 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
 {
     private static final Logger log = LoggerFactory.getLogger(TPipeOldPlanProcessServiceImpl.class);
 
-    @Autowired
+    @Resource
     private TPipeOldPlanProcessMapper tPipeOldPlanProcessMapper;
 
     @Resource
@@ -121,6 +121,20 @@ public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessServi
         JSONObject reportResult = governmentDataUtil.setInfo("pipeline/old/plan/process","WRITE",data);
         log.info("上传计划和进度结果===================" + reportResult.toJSONString());
         if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传计划和进度接口失败");
+        tPipeOldPlanProcess.setGovUploadState("1");
+        tPipeOldPlanProcess.setGovUploadTime(new Date());
+        tPipeOldPlanProcessMapper.updateTPipeOldPlanProcess(tPipeOldPlanProcess);
+        return 1;
+    }
+
+    /**
+     * 企业端上传数据
+     * @param fOldPlanProcessId f
+     * @return r
+     */
+    @Override
+    public int entReportPipeOldPlanProcess(Long fOldPlanProcessId) {
+        tPipeOldPlanProcessMapper.entReportPipeOldPlanProcess("1",new Date(),fOldPlanProcessId);
         return 1;
     }
 }

zh-baseversion-system/src/main/resources/mapper/system/TConGasProIncMapper.xml

@@ -107,9 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fRemark != null and fRemark != ''">f_remark = #{fRemark},</if>
             <if test="fUpdateTime != null and fUpdateTime != ''">f_update_time = #{fUpdateTime},</if>
 
-            <if test="entUploadTime != null and entUploadTime != ''">f_ent_upload_time = #{entUploadTime},</if>
+            <if test="entUploadTime != null">f_ent_upload_time = #{entUploadTime},</if>
             <if test="entUploadState != null and entUploadState != ''">f_ent_upload_state = #{entUploadState},</if>
-            <if test="govUploadTime != null and govUploadTime != ''">f_gov_upload_time = #{govUploadTime},</if>
+            <if test="govUploadTime != null">f_gov_upload_time = #{govUploadTime},</if>
             <if test="govUploadState != null and govUploadState != ''">f_gov_upload_state = #{govUploadState},</if>
         </trim>
         where f_con_gas_pro_inc_id = #{fConGasProIncId}

zh-baseversion-system/src/main/resources/mapper/system/TPipeOldPlanProcessMapper.xml

@@ -27,10 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fUploadType"    column="f_upload_type"    />
         <result property="fUploadTime"    column="f_upload_time"    />
         <result property="fEnterpriseId"    column="f_enterprise_id"    />
+
+        <result property="govUploadState"    column="f_gov_upload_state"    />
+        <result property="govUploadTime"    column="f_gov_upload_time"    />
     </resultMap>
 
     <sql id="selectTPipeOldPlanProcessVo">
-        select f_old_plan_process_id, f_uuid, f_enterprise_id,f_ent_uuid, f_region, f_project_name, f_relation_object_type, f_year, f_start_time, f_end_time, f_total_investment, f_create_time, f_update_time, f_subject_implementation, f_concat_person, f_concat_tel, f_construction_content, f_actual_finish_time, f_reconstruction_progress, f_funds_disbursement_progress, f_upload_type, f_upload_time from t_pipe_old_plan_process
+        select f_old_plan_process_id, f_uuid, f_enterprise_id,f_ent_uuid, f_region, f_project_name, f_relation_object_type, f_year, f_start_time, f_end_time, f_total_investment, f_create_time, f_update_time, f_subject_implementation, f_concat_person, f_concat_tel, f_construction_content, f_actual_finish_time, f_reconstruction_progress, f_funds_disbursement_progress, f_upload_type, f_upload_time,f_gov_upload_state, f_gov_upload_time from t_pipe_old_plan_process
     </sql>
 
     <select id="selectTPipeOldPlanProcessList" parameterType="TPipeOldPlanProcess" resultMap="TPipeOldPlanProcessResult">
@@ -42,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fConcatTel != null  and fConcatTel != ''"> and f_concat_tel like concat('%', #{fConcatTel}, '%')</if>
             <if test="fFundsDisbursementProgress != null "> and f_funds_disbursement_progress = #{fFundsDisbursementProgress}</if>
             <if test="fUploadType != null  and fUploadType != ''"> and f_upload_type = #{fUploadType}</if>
+            <if test="fEnterpriseId != null  and fEnterpriseId != ''"> and f_enterprise_id = #{fEnterpriseId}</if>
         </where>
     </select>
     
@@ -74,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">f_upload_type,</if>
             <if test="fUploadTime != null">f_upload_time,</if>
             <if test="fEnterpriseId != null">f_enterprise_id,</if>
+
+            <if test="govUploadState != null">f_gov_upload_state,</if>
+            <if test="govUploadTime != null">f_gov_upload_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fUuid != null and fUuid != ''">#{fUuid},</if>
@@ -97,6 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">#{fUploadType},</if>
             <if test="fUploadTime != null">#{fUploadTime},</if>
             <if test="fEnterpriseId != null">#{fEnterpriseId},</if>
+
+            <if test="govUploadState != null">#{govUploadState},</if>
+            <if test="govUploadTime != null">#{govUploadTime},</if>
          </trim>
     </insert>
 
@@ -124,6 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUploadType != null">f_upload_type = #{fUploadType},</if>
             <if test="fUploadTime != null">f_upload_time = #{fUploadTime},</if>
             <if test="fEnterpriseId != null">f_enterprise_id = #{fEnterpriseId},</if>
+
+            <if test="govUploadState != null">f_gov_upload_state = #{govUploadState},</if>
+            <if test="govUploadTime != null">f_gov_upload_time = #{govUploadTime},</if>
         </trim>
         where f_old_plan_process_id = #{fOldPlanProcessId}
     </update>
@@ -132,6 +145,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from t_pipe_old_plan_process where f_old_plan_process_id = #{fOldPlanProcessId}
     </delete>
 
+    <update id="entReportPipeOldPlanProcess">
+        update t_pipe_old_plan_process set f_upload_type = #{state}, f_upload_time = #{entUploadTime} where  f_old_plan_process_id = #{fOldPlanProcessId}
+    </update>
     <delete id="deleteTPipeOldPlanProcessByIds" parameterType="String">
         delete from t_pipe_old_plan_process where f_old_plan_process_id in 
         <foreach item="fOldPlanProcessId" collection="array" open="(" separator="," close=")">

zh-baseversion-web/src/api/oldpipesystem/process.js

@@ -51,3 +51,21 @@ export function exportProcess(query) {
     params: query
   })
 }
+
+// 企业端上传 老旧官网
+export function entReportPipeOldPlanProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/entReportPipeOldPlanProcess',
+    method: 'get',
+    params: query
+  })
+}
+
+// 政府端上传 老旧官网
+export function reportPipeOldPlanProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/reportPipeOldPlanProcess',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue

 <template>
   <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
     <el-form label-width="170px">
-      <el-row class="el-row-table">
+      <el-row class="el-row-table"> 
+
         <el-col :span="12">
-          <el-form-item label="项目名称">
-            <span v-if="detailInfo.fProjectName">{{ detailInfo.fProjectName }}</span>
-            <span v-else>-</span>
+          <el-form-item label="燃气企业" >
+            <span>{{ enterpriseName }}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="燃气企业编码" >
-            <span v-if="detailInfo.fEntUuid">{{ detailInfo.fEntUuid }}</span>
+          <el-form-item label="项目名称">
+            <span v-if="detailInfo.fProjectName">{{ detailInfo.fProjectName }}</span>
             <span v-else>-</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="项目所在县级行政区ID" >
+          <el-form-item label="项目所在县级行政区" >
             <span v-if="detailInfo.fRegion">{{ detailInfo.fRegion }}</span>
             <span v-else>-</span>
           </el-form-item>
@@ -143,19 +143,55 @@
 
 <script>
   import { getProcess } from "@/api/oldpipesystem/process";
+  import { enterpriseLists ,queryAllEnterprise} from "@/api/regulation/info";
+  import { getDefaultCountyList } from "@/api/area/county";
   export default {
     name: "detail-info",
     data(){
         return{
+          enterprises: [],
+          countyInfo: [],
           detailInfo: {},
+          enterpriseName:"",
           detailOpen: false
         }
     },
+  created() { 
+    this.getCountyInfo();
+    this.getEnterpriseLists();
+  },
     methods:{
+      //获取县级
+      getCountyInfo(){
+        getDefaultCountyList().then(res =>{
+          if(res.code == 200 && res.data){
+          this.countyInfo =  res.data;
+        }
+      })
+      },
+      //所属单位
+      getEnterpriseLists(){ 
+        queryAllEnterprise().then(response => { 
+          this.enterprises = response; 
+        }); 
+      },
+      beyondCountyFormat(row){
+        let info = this.countyInfo.find(item => item.fId == row.fRegion);
+        return info?info.fName:"-";
+      },
+      beyondCompanyFormat(row){
+        let info = this.enterprises.find(item => item.enterpriseId == row.fEnterpriseId);
+        return info?info.enterpriseName:"-";
+      },
       getDetailInfo(id){
         getProcess(id).then(res =>{
           if(res.code == 200 && res.data){
             this.detailInfo = res.data;
+            this.detailInfo.fRegion = this.beyondCountyFormat(this.detailInfo);
+            let fEnterpriseId = this.detailInfo.fEnterpriseId;
+            if (fEnterpriseId != null) {
+              this.enterpriseName= this.beyondCompanyFormat(this.detailInfo);
+            }
             this.detailOpen = true;
           }
         })

zh-baseversion-web/src/views/oldpipesystem/process/index.vue

@@ -131,18 +131,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否已上传" align="center" prop="fUploadType">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fUploadType == '0'">否</span>
-          <span v-else-if="scope.row.fUploadType == '1'">是</span>
-          <span v-else>-</span>
-        </template>
+      <el-table-column label="上传状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="fUploadTime" width="150">
-        <template slot-scope="scope">
-          <span v-if="scope.row.fUploadTime != null">{{ scope.row.fUploadTime }}</span>
-          <span v-else>-</span>
-        </template>
+      <el-table-column label="上传时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
@@ -170,14 +161,8 @@
             size="mini"
             type="text"
             @click="handleReport(scope.row)"
-            v-if="(user.roleId==1||user.roleId==5)&&scope.row.fUploadType==0"
-          >上传</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleReport2(scope.row)"
-            v-if="(user.roleId==1||user.roleId==3)&&scope.row.fUploadType==1"
-          >上传</el-button>
+            v-if="judgeUploadIsShow((scope.row))"
+          >上传</el-button> 
         </template>
       </el-table-column>
     </el-table>
@@ -203,14 +188,7 @@
 
           <el-col :span="12">
             <el-form-item label="燃气企业" prop="beyondEnterpriseId">
-              <el-select v-model="form.fEnterpriseId" placeholder="请选择所属企业名称" style="width: 100%" >
-                <el-option
-                  v-for="item in enterprises"
-                  :key="parseInt(item.enterpriseId)"
-                  :label="item.enterpriseName"
-                  :value="parseInt(item.enterpriseId)">
-                </el-option>
-              </el-select>
+              <el-input v-model="enterpriseName" :disabled="true"></el-input>
             </el-form-item>
             <!--<el-form-item label="燃气企业编码" prop="fEntUuid">-->
               <!--<el-input v-model="form.fEntUuid" placeholder="请输入燃气企业编码" />-->
@@ -287,7 +265,7 @@
 
           <el-col :span="12">
             <el-form-item label="项目总投资/万元" prop="fTotalInvestment">
-              <el-input v-model="form.fTotalInvestment" placeholder="请输入项目总投资/万元" />
+              <el-input-number style="width: 100%;" v-model="form.fTotalInvestment" class="left-aligned-input" :controls="false" :min="0" placeholder="请输入项目总投资/万元" />
             </el-form-item>
           </el-col>
 
@@ -330,13 +308,13 @@
 
           <el-col :span="12">
             <el-form-item label="当前改造进度/百分比" prop="fReconstructionProgress">
-              <el-input v-model="form.fReconstructionProgress" placeholder="请输入当前改造进度/百分比" />
+              <el-input-number style="width: 100%;" v-model="form.fReconstructionProgress" class="left-aligned-input" :controls="false" :min="0" :max="100" precision="2" placeholder="请输入当前改造进度/百分比" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="当前资金拨付进度/百分比" prop="fFundsDisbursementProgress">
-              <el-input v-model="form.fFundsDisbursementProgress" placeholder="请输入当前资金拨付进度/百分比" />
+              <el-input-number style="width: 100%;" v-model="form.fFundsDisbursementProgress" class="left-aligned-input" :controls="false" :min="0" :max="100" precision="2"  placeholder="请输入当前资金拨付进度/百分比" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -354,7 +332,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess, exportProcess } from "@/api/oldpipesystem/process";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess, exportProcess,reportPipeOldPlanProcess,entReportPipeOldPlanProcess } from "@/api/oldpipesystem/process";
 import DetailInfo from "./components/DetailInfo";
 import{getInfo} from "@/api/login"
 import { enterpriseLists } from "@/api/regulation/info";
@@ -368,6 +346,7 @@ export default {
   },
   data() {
     return {
+      enterpriseName:"",
       user:{},
       enterprises: [],
       countyInfo: [],
@@ -426,7 +405,6 @@ export default {
     };
   },
   created() {
-    this.getList();
     this.getuserInfo();
     this.getDicts("t_relation_object_type").then(response => {
       this.fRelationObjectTypeOptions = response.data;
@@ -451,6 +429,7 @@ export default {
       getInfo().then(response => {
         console.log(response);
         this.user = response.user.roles[0]
+        this.getList();
       });
     },
     //所属单位
@@ -460,9 +439,10 @@ export default {
         enterpriseLists(param).then(response => {
           if (response.rows.length>1){
           this.enterprises = response.rows;
+          this.enterpriseName = response.rows[0].enterpriseName; 
         }else {
-          this.form.fEnterpriseId=response.rows[0].enterpriseId;
           this.enterprises = response.rows;
+          this.enterpriseName = response.rows[0].enterpriseName; 
         }
 
       });
@@ -475,6 +455,10 @@ export default {
     /** 查询老旧管网改造计划列表 */
     getList() {
       this.loading = true;
+      // 企业查自己的数据
+      if (this.user.roleId == 5) {
+        this.queryParams.fEnterpriseId = this.$store.state.user.enterpriseId 
+      }
       listProcess(this.queryParams).then(response => {
         this.processList = response.rows;
         this.total = response.total;
@@ -490,6 +474,66 @@ export default {
       this.open = false;
       this.reset();
     },
+     
+    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    judgeUploadIsShow(row) { 
+
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+
+      // 企业端 上传状态 0-未上传，1-已上传
+      let entUploadState = row.fUploadType;
+
+      // 政府端 上传状态 0-未上传，1-已上传
+      let govUploadState = row.govUploadState;
+
+      // 如果政府端都已经上传，那就不能显示了。
+      if(govUploadState === '1') {
+        return false;
+      }
+
+      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      if(entUploadState === '1' && govUploadState === '0') {
+        if (roleId === 5) {
+          return false;
+        } else {
+          return true;
+        }
+      }
+
+      // 别的情况，都显示
+      return true;
+
+    },
+    //上传状态动态展示
+    uploadStateFormat(row, column) { 
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        if (row.fUploadType == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } else { 
+        if (row.govUploadState == '0') {
+          return "未上传"
+        } else{
+          return "已上传"
+        } 
+      } 
+    },
+    //上传时间动态展示
+    uploadTimeFormat(row, column) {
+      //角色 1 超级管理员  5 企业
+      let roleId = this.user.roleId;
+      if (roleId == 5) {
+        return row.fUploadTime;
+      } else {
+        return row.govUploadTime;
+      }
+
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -561,6 +605,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.fEnterpriseId=this.enterprises[0].enterpriseId;
             addProcess(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -605,35 +650,42 @@ export default {
       this.$refs.detail.getDetailInfo(row.fOldPlanProcessId);
     },
     handleReport(row){
-      console.log("-----------------------------"+row.fOldPlanProcessId)
-      this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
+      // 如果是  超级管理员或者 企业，并且 企业端上传状态为0
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.fUploadType == '0') {
+        this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+          }).then(function() { 
+            return entReportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});  
+          }).then(() => { 
+            this.getList();
+            this.msgSuccess("上传成功");
+          }).catch(() => {});
+      } 
+      
+
+      // 如果是  超级管理员或者 政府，并且 政府端上传状态为0
+      if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
+        this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
-        updateProcess({fOldPlanProcessId:row.fOldPlanProcessId,fUploadType:1}).then(response => {
-          this.msgSuccess("上传成功");
-          this.open = false;
+        }).then(function() {
+          return reportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId}); 
+        }).then(() => {
           this.getList();
-        });
-        return ;
-      }).then(() => {
-        this.getList();
-        this.msgSuccess("上传成功");
-      }).catch(() => {});
+          this.msgSuccess("上传成功");
+        }).catch(() => {});
+      }
     },
-    handleReport2(row){
-      var that = this
-      this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-          that.msgSuccess("上传成功");
-          this.open = false;
-        return ;
-      }).catch(() => {});
-    }
   }
 };
 </script>
+<style>
+/* 自定义输入框样式 */
+.left-aligned-input .el-input__inner{
+  text-align: left;
+  padding-left: 5px; /* 根据需要调整内边距 */
+}
+</style>
\ No newline at end of file

zh-baseversion-web/src/views/thirdbuild/accident/index.vue

@@ -436,6 +436,10 @@ export default {
       const fConGasProIncId = row.fConGasProIncId || this.ids
       getInc(fConGasProIncId).then(response => {
         this.form = response.data;
+        if (this.form.fAttachment) {
+
+          this.fileList = [{name: '附件', url: uploadfile}];
+        } 
         this.open = true;
         this.title = "修改涉气第三方施工意外事件";
       });
@@ -504,10 +508,8 @@ export default {
       })
     },
     //上传
-    getFileInfo(res){ 
-      console.log("this.form.fAttachment res" + res.url);
+    getFileInfo(res){  
       this.form.fAttachment = res.url;
-      console.log("this.form.fAttachment" + this.form.fAttachment);
       this.fileList.push({
         name: res.fileName,
         url: uploadfile,
@@ -525,8 +527,10 @@ export default {
       this.$refs.detail.getDetailInfo(row.fConGasProIncId);
     },
     /** 上传按钮操作 */
-    handleReport(row) {
-      if (this.user.roleId == 5) {
+    handleReport(row) { 
+
+      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
         this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -537,7 +541,10 @@ export default {
           this.getList();
         this.msgSuccess("上传成功");
         }).catch(() => {});
-      } else {
+      } 
+      
+      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
         this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

zh-baseversion-web/src/views/thirdbuild/project/index.vue

@@ -859,8 +859,8 @@ export default {
     /** 上传按钮操作 */
     handleReport(row) {
 
-      if (this.user.roleId == 5 ) {
-
+      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
         this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -871,7 +871,10 @@ export default {
           this.getList();
           this.msgSuccess("上传成功");
         }).catch(() => {});
-      } else {
+      } 
+    
+      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
         this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",