From f0607fe7fc9926c3362590c5a482b4343a9d00d6 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 8 May 2024 12:07:33 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E6=9A=82=E5=AD=98=E5=8D=B1=E5=A4=A7?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../langs/cn/dangerousBigProject/index.js     |  1 +
 src/assets/js/http.js                         |  2 +-
 .../dangerousBigProject/addPlan.vue           | 42 +++++++-------
 .../dangerousBigProject/detail.vue            | 41 ++++++++-----
 .../dangerousBigProject/editPlan.vue          | 57 +++++++++---------
 .../dangerousBigProject/index.vue             | 58 +++++++++++--------
 6 files changed, 113 insertions(+), 88 deletions(-)

diff --git a/src/assets/i18n/langs/cn/dangerousBigProject/index.js b/src/assets/i18n/langs/cn/dangerousBigProject/index.js
index f0401a40..828a9da1 100644
--- a/src/assets/i18n/langs/cn/dangerousBigProject/index.js
+++ b/src/assets/i18n/langs/cn/dangerousBigProject/index.js
@@ -12,6 +12,7 @@ export default {
     subpackageUnit: '分包单位',
     buildSchedule: '施工进度',
     safeStatus: '安全状态',
+    finalAcceptanceStatus: '最终验收状态',
     item: '条',
     nothing: '无',
     record: '记录于',
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index ab796baf..82bddebf 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
diff --git a/src/views/projectFront/dangerousBigProject/addPlan.vue b/src/views/projectFront/dangerousBigProject/addPlan.vue
index ca8c05be..f997b5d2 100644
--- a/src/views/projectFront/dangerousBigProject/addPlan.vue
+++ b/src/views/projectFront/dangerousBigProject/addPlan.vue
@@ -51,7 +51,7 @@
                             <el-input v-model="addForm.constructionLocation" :disabled="isDisabled" placeholder="请输入施工部位" autocomplete="off"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="施工时间：" required :label-width="formLabelWidth">
+                        <!-- <el-form-item label="施工时间：" required :label-width="formLabelWidth">
                             <el-date-picker
                                 :disabled="isDisabled"
                                 v-model="addForm.buildTime"
@@ -62,7 +62,7 @@
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期">
                             </el-date-picker>
-                        </el-form-item>
+                        </el-form-item> -->
 
                         <!-- <el-form-item label="施工计划" :label-width="formLabelWidth">
                             <el-input v-model="addForm.people" :disabled="isDisabled" placeholder="请输入施工计划" autocomplete="off"></el-input>
@@ -81,19 +81,6 @@
                             </el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="责任人：" required :label-width="formLabelWidth">
-                            <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
-                            <el-select v-model="addForm.personLiableId" placeholder="请选择责任人">
-                                <el-option
-                                    :label="item.realName"
-                                    :value="item.userId"
-                                    v-for="(item, index) in personList"
-                                    :key="index"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-
                         <el-form-item label="责任分包单位：" required :label-width="formLabelWidth">
                             <!-- <el-cascader
                                 :disabled="isDisabled"
@@ -113,7 +100,18 @@
                             </el-option>
                             </el-select>
                         </el-form-item>
-
+                        <el-form-item label="责任人：" required :label-width="formLabelWidth">
+                            <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
+                            <el-select v-model="addForm.personLiableId" placeholder="请选择责任人">
+                                <el-option
+                                    :label="item.realName"
+                                    :value="item.userId"
+                                    v-for="(item, index) in personList"
+                                    :key="index"
+                                >
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
                     </el-form>
                 </div>
                 <div class="control-point" v-if="company != 'longguang'">
@@ -676,10 +674,10 @@ export default {
                 this.$message.error('请输入施工部位！')
                 return;
             }
-            if(!this.addForm.buildTime){
-                this.$message.error('请选择施工时间！')
-                return;
-            }
+            // if(!this.addForm.buildTime){
+            //     this.$message.error('请选择施工时间！')
+            //     return;
+            // }
             if(!this.addForm.responsibilityCompanyId){
                 this.$message.error('请选择责任分包单位！')
                 return;
@@ -697,8 +695,8 @@ export default {
                     personLiableId,
                     engineeringTypeId,
                     engineeringTypeName,
-                    buildStartTime: this.addForm.buildTime[0],
-                    buildEndTime: this.addForm.buildTime[1],
+                    // buildStartTime: this.addForm.buildTime[0],
+                    // buildEndTime: this.addForm.buildTime[1],
                     planStartTime: this.addForm.planTime[0] ? this.addForm.planTime[0]:'',
                     planEndTime: this.addForm.planTime[1] ? this.addForm.planTime[1]:'',
                     // typeDescribeId: this.addForm.typeDescribeId.join(','),
diff --git a/src/views/projectFront/dangerousBigProject/detail.vue b/src/views/projectFront/dangerousBigProject/detail.vue
index 5dac9721..31f989af 100644
--- a/src/views/projectFront/dangerousBigProject/detail.vue
+++ b/src/views/projectFront/dangerousBigProject/detail.vue
@@ -13,7 +13,7 @@
                 </div>
               </div>
               <div v-permission="{key: 'wdgc_end', menuPath: '/project/dangerousBigProject/parameter'}" class="close-task">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   size="medium"
                   v-if="detailData.isEnd == 0"
@@ -26,7 +26,7 @@
                   size="medium"
                   disabled
                   >危大工程已结束</el-button
-                >
+                > -->
                 <!-- <span v-else>危大工程已结束</span> -->
               </div>
               <div class="info-content">
@@ -85,7 +85,7 @@
                     ></el-input>
                   </el-form-item>
 
-                  <el-form-item
+                  <!-- <el-form-item
                     label="施工时间："
                     required
                     :label-width="formLabelWidth"
@@ -101,7 +101,7 @@
                       end-placeholder="结束日期"
                     >
                     </el-date-picker>
-                  </el-form-item>
+                  </el-form-item> -->
 
                   <el-form-item
                     label="计划时间："
@@ -120,15 +120,6 @@
                     </el-date-picker>
                   </el-form-item>
 
-                  <el-form-item label="责任人：" :label-width="formLabelWidth">
-                    <el-input
-                      v-model="detailData.personLiable"
-                      :disabled="isDisabled"
-                      placeholder="请输入责任人"
-                      autocomplete="off"
-                    ></el-input>
-                  </el-form-item>
-
                   <el-form-item
                     label="责任分包单位："
                     :label-width="formLabelWidth"
@@ -156,6 +147,14 @@
                     </el-option>
                   </el-select>
                   </el-form-item>
+                  <el-form-item label="责任人：" :label-width="formLabelWidth">
+                    <el-input
+                      v-model="detailData.personLiable"
+                      :disabled="isDisabled"
+                      placeholder="请输入责任人"
+                      autocomplete="off"
+                    ></el-input>
+                  </el-form-item>
                 </el-form>
                 <!-- <div v-if="COMPANY != 'longguang'" class="qr-box">
                             <div id="qrCode" ref="qrCodeDiv"></div>
@@ -1465,6 +1464,10 @@ export default {
     },
     // 删除进度记录
     deleteDangerousEngineeringProgressRecord(val) {
+      if(this.detailData.finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1492,6 +1495,10 @@ export default {
     },
     // 删除旁站记录
     deleteDangerousEngineeringSideStation(val) {
+      if(this.detailData.finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1517,6 +1524,10 @@ export default {
     },
     // 删除验收记录
     deleteDangerousEngineeringAcceptanceCheck(val) {
+      if(this.detailData.finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1544,6 +1555,10 @@ export default {
     },
     // 删除隐患排查记录
     deletehiddenDangerInspectRecord(val, type) {
+      if(this.detailData.finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
diff --git a/src/views/projectFront/dangerousBigProject/editPlan.vue b/src/views/projectFront/dangerousBigProject/editPlan.vue
index a82fefa8..271e627b 100644
--- a/src/views/projectFront/dangerousBigProject/editPlan.vue
+++ b/src/views/projectFront/dangerousBigProject/editPlan.vue
@@ -90,7 +90,7 @@
                   ></el-input>
                 </el-form-item>
 
-                <el-form-item
+                <!-- <el-form-item
                   label="施工时间："
                   required
                   :label-width="formLabelWidth"
@@ -106,7 +106,7 @@
                     end-placeholder="结束日期"
                   >
                   </el-date-picker>
-                </el-form-item>
+                </el-form-item> -->
 
                 <!-- <el-form-item label="施工计划" :label-width="formLabelWidth">
                             <el-input v-model="addForm.people" :disabled="isDisabled" placeholder="请输入施工计划" autocomplete="off"></el-input>
@@ -126,27 +126,6 @@
                   </el-date-picker>
                 </el-form-item>
 
-                <el-form-item
-                  label="责任人："
-                  required
-                  :label-width="formLabelWidth"
-                >
-                  <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
-                  <el-select
-                    v-model="addForm.personLiableId"
-                    placeholder="请选择责任人"
-                    disabled
-                  >
-                    <el-option
-                      :label="item.realName"
-                      :value="item.userId"
-                      v-for="(item, index) in personList"
-                      :key="index"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-
                 <el-form-item
                   label="责任分包单位："
                   required
@@ -175,6 +154,26 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item
+                  label="责任人："
+                  required
+                  :label-width="formLabelWidth"
+                >
+                  <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
+                  <el-select
+                    v-model="addForm.personLiableId"
+                    placeholder="请选择责任人"
+                    disabled
+                  >
+                    <el-option
+                      :label="item.realName"
+                      :value="item.userId"
+                      v-for="(item, index) in personList"
+                      :key="index"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
               </el-form>
             </div>
             <div class="control-point" v-if="company != 'longguang'">
@@ -963,10 +962,10 @@ export default {
         this.$message.error("请输入施工部位！");
         return;
       }
-      if (!this.addForm.buildTime) {
-        this.$message.error("请选择施工时间！");
-        return;
-      }
+      // if (!this.addForm.buildTime) {
+      //   this.$message.error("请选择施工时间！");
+      //   return;
+      // }
       if (!this.addForm.responsibilityCompanyId) {
         this.$message.error("请选择责任分包单位！");
         return;
@@ -992,8 +991,8 @@ export default {
           personLiableId,
           engineeringTypeId,
           engineeringTypeName,
-          buildStartTime: this.addForm.buildTime[0],
-          buildEndTime: this.addForm.buildTime[1],
+          // buildStartTime: this.addForm.buildTime[0],
+          // buildEndTime: this.addForm.buildTime[1],
           planStartTime: this.addForm.planTime[0]
             ? this.addForm.planTime[0]
             : "",
diff --git a/src/views/projectFront/dangerousBigProject/index.vue b/src/views/projectFront/dangerousBigProject/index.vue
index bc2890fc..093b7b33 100644
--- a/src/views/projectFront/dangerousBigProject/index.vue
+++ b/src/views/projectFront/dangerousBigProject/index.vue
@@ -28,21 +28,12 @@
           size="small"
           @cell-click="previewDetail"
           @selection-change="handleSelectionChange"
+          :header-cell-style="{'text-align':'center'}"
         >
-          <!-- <el-table-column
-                type="selection"
-                align="center"
-                width="60px"
-                >
-                </el-table-column>
-                <el-table-column
-                label="序号"
-                type="index"
-                align="center"
-                width="60">
-                </el-table-column> -->
+          <!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
+          <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
 
-          <el-table-column
+          <el-table-column align="center"
             :label="$t('message.dangerousBigProject.category')"
             show-overflow-tooltip
           >
@@ -67,29 +58,32 @@
             </template>
           </el-table-column>
           <!-- 危大工程 -->
-          <el-table-column
+          <el-table-column align="center"
             :label="$t('message.dangerousBigProject.dangerProject')"
           >
             <template slot-scope="scope">
               <div class="table-item">
-                <p class="item-title">{{ scope.row.engineeringName }}</p>
+                <div style="display: flex">
+                  <!-- <el-tag type="danger" effect="dark" size="mini" v-if="scope.row.isOverdue" >超期</el-tag> -->
+                  <el-tag type="danger" effect="dark" size="mini">超期</el-tag>
+                  <p class="item-title" style="margin-left:5px">{{ scope.row.engineeringName }}</p>
+                </div>
                 <!-- <p>{{scope.row.people}}识别于：{{ scope.row.date }}</p> -->
               </div>
             </template>
           </el-table-column>
           <!-- 施工部位 -->
-          <el-table-column
+          <el-table-column align="center"
             prop="constructionLocation"
             :label="$t('message.dangerousBigProject.buildPart')"
           ></el-table-column>
           <!-- 施工时间 -->
-          <el-table-column
+          <!-- <el-table-column align="center"
             :label="$t('message.dangerousBigProject.buildTime')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <div class="table-item">
-                <!-- 至 -->
                 <p v-if="scope.row.buildStartTime">
                   {{ scope.row.buildStartTime
                   }}{{ $t('message.dangerousBigProject.to')
@@ -97,9 +91,9 @@
                 </p>
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <!-- 计划时间 -->
-          <el-table-column
+          <el-table-column align="center"
             :label="$t('message.dangerousBigProject.planTime')"
             show-overflow-tooltip
           >
@@ -115,12 +109,12 @@
             </template>
           </el-table-column>
           <!-- 责任人 -->
-          <el-table-column
+          <el-table-column align="center"
             prop="personLiable"
             :label="$t('message.dangerousBigProject.dutyPeople')"
           ></el-table-column>
           <!-- 分包单位 -->
-          <el-table-column
+          <el-table-column align="center"
             prop="responsibilityCompany"
             :label="$t('message.dangerousBigProject.subpackageUnit')"
           ></el-table-column>
@@ -178,8 +172,18 @@
               </div>
             </template>
           </el-table-column>
-          <!-- 操作 -->
+          <!-- 状态 -->
           <el-table-column
+            :label="$t('message.dangerousBigProject.finalAcceptanceStatus')"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.finalAcceptanceStatus === 1" style="color:#DAA520;font-weight:bold;">进行中</span>
+              <span v-if="scope.row.finalAcceptanceStatus === 2" style="color:#008000;font-weight:bold;">已闭合</span>
+            </template>
+          </el-table-column>
+          <!-- 操作 -->
+          <el-table-column align="center"
             :label="$t('message.dangerousBigProject.operation')"
             width="120"
           >
@@ -519,6 +523,10 @@ export default {
   },
   methods: {
     editRow(index, rows) {
+      if(rows[index].finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       // console.log(index,rows[index].id)
       this.editId = rows[index].id
       this.operateTitle = "编辑"
@@ -785,6 +793,10 @@ export default {
       this.multipleSelection = val;
     },
     deleteRow(index, rows) {
+      if(rows[index].finalAcceptanceStatus === 2){
+        this.$message.warning('该项危大工程已闭合，请勿操作')
+        return
+      }
       // console.log(index,rows[index].id)
       this.deleteId = rows[index].id
       this.deleteDialog = true