From f78252cd506ee42dcff87654cea9868169fad69f Mon Sep 17 00:00:00 2001
From: kongyeqing <2697454777@qq.com>
Date: Thu, 7 Sep 2023 18:18:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=9A=90=E6=82=A3=E6=B2=BB=E7=90=86?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hiddenDanger/clap.component.vue     |   2 +-
 src/views/hiddenDanger/common.component.html  |  13 +-
 src/views/hiddenDanger/files.component.vue    |   2 +-
 src/views/hiddenDanger/manager.component.vue  | 182 +++++++++---------
 .../hiddenDanger/safe/action.component.vue    |  13 ++
 5 files changed, 113 insertions(+), 99 deletions(-)

diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue
index c6b3690..dad184b 100644
--- a/src/views/hiddenDanger/clap.component.vue
+++ b/src/views/hiddenDanger/clap.component.vue
@@ -558,7 +558,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
                     type: "随手拍",
                 }, res.data)
                 this.updateParams.majorHazard = +this.updateParams.majorHazard
-                this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
+                this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
 
                 // 地图定位
                 this.center = [res.data.locationLng, res.data.locationLat];
diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html
index 7c63e1f..9195122 100644
--- a/src/views/hiddenDanger/common.component.html
+++ b/src/views/hiddenDanger/common.component.html
@@ -18,20 +18,22 @@
 
                 <el-table ref="multipleTable" :data="tableData.datas" height="100%" border row-key="checked"
                     @selection-change="handleSelectionChange" style="width: 100%" @sort-change="sortChange($event)">
-                    <el-table-column v-if="!(isManager && params.type>1)" type="selection"
-                        :selectable="selectable" fixed label="全选" width="40">
+                    <el-table-column v-if="!(isManager && params.type>1)" type="selection" :selectable="selectable"
+                        fixed label="全选" width="40">
                     </el-table-column>
                     <el-table-column label="序号" width="60">
                         <div slot-scope="scope">{{scope.$index+1}}</div>
                     </el-table-column>
                     <template v-for="item in tableColumn">
                         <el-table-column v-if="item.render" :label="item.name" :filters="item.filters"
-                            :filter-method="item.filterMethod" :width="item.width" :key="item.key"  :sortable="item.sortable">
+                            :filter-method="item.filterMethod" :width="item.width" :key="item.key"
+                            :sortable="item.sortable">
                             <div slot-scope="scope" @click="" v-html="item.render(scope.row)"
                                 style="pointer-events: none;" @click="rowCallback($event,scope.row)"></div>
                         </el-table-column>
                         <el-table-column v-else :prop="item.key" :label="item.name" :filters="item.filters"
-                            :filter-method="item.filterMethod" :width="item.width" :key="item.key"  :sortable="item.sortable">
+                            :filter-method="item.filterMethod" :width="item.width" :key="item.key"
+                            :sortable="item.sortable">
                         </el-table-column>
                     </template>
                     <el-table-column label="操作" fixed="right" :width="tableActionWidth">
@@ -40,8 +42,7 @@
                                 @click="showUpdateModel(scope.row,true)">查看</el-button>
                             <el-button type="text" v-if="isBase && !(isClap && scope.row.status)"
                                 @click="showUpdateModel(scope.row)">修改</el-button>
-                            <el-button type="text" v-if="isBase"
-                                @click="deleteData([scope.row.id])">删除</el-button>
+                            <el-button type="text" v-if="isBase" @click="deleteData([scope.row.id])">删除</el-button>
                             <!-- <el-button type="text" v-if="isManager" @click="showUpdateModel(0)">抄送</el-button>
                             <el-button type="text" v-if="isManager" @click="showUpdateModel(0)">移交</el-button> -->
                             <el-button type="text" v-if="isManager && params.type===4 && scope.row.status<5"
diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue
index ebe7999..330ce44 100644
--- a/src/views/hiddenDanger/files.component.vue
+++ b/src/views/hiddenDanger/files.component.vue
@@ -694,7 +694,7 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
             reformModeName: this.reformModeMap[row.reformMode],
         }, row);
         this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
-
+        this.updateParams.majorHazard = +this.updateParams.majorHazard
         this.getTableCallback()
         // 获取url
         if (row.resourceId) {
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index 234cec8..8435f24 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -356,7 +356,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             width: "calc(50% - 20px)",
             require: true,
             showError: false,
-            pickerOptions:this.getPickerOptions(),
+            pickerOptions: this.getPickerOptions(),
         }, {
             name: "隐患照片",
             key: "photo",
@@ -465,92 +465,92 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
             showError: false,
             datas: this.riskSource
         },]
-        if(this.params)
-        this.updateOptions2 = [{
-            name: "隐患确认",
-            key: "reformConfirmFlag",
-            format: "reformConfirmFlagName",
-            type: "radio",
-            width: "100%",
-            require: true,
-            showError: false,
-            datas: this.isSure
-        }, {
-            name: "原因说明",
-            type: "textarea",
-            width: "100%",
-            key: "reformReasonDescription",
-            require: true,
-            hide: this.updateParams.reformConfirmFlag,
-            showError: false,
-            placeholder: "请输入未确认原因"
-        }, {
-            name: "治理人",
-            type: "select",
-            width: "calc(50% - 20px)",
-            require: true,
-            key: "executeUserId",
-            format: "executeUserName",
-            showError: false,
-            hide: this.updateParams.reformConfirmFlag === 0,
-            datas: this.$store.state.userList
-        }, {
-            name: "治理时限",
-            type: "date",
-            subType: "datetime",
-            width: "calc(50% - 20px)",
-            require: true,
-            key: "executeDeadline",
-            format: "yyyy-MM-dd HH:mm",
-            showError: false,
-            hide: this.updateParams.reformConfirmFlag === 0,
-            pickerOptions: this.getPickerOptions(this.updateParams.createTime, this.updateParams.reformDeadline)
-        }, {
-            name: "治理措施及要求",
-            type: "textarea",
-            width: "100%",
-            key: "executeMeasure",
-            require: true,
-            hide: this.updateParams.reformConfirmFlag === 0,
-            showError: false,
-            placeholder: "请输入治理措施与要求"
-        }, {
-            name: "治理资金",
-            type: "number",
-            width: "35%",
-            key: "executeMoney",
-            require: true,
-            hide: this.updateParams.reformConfirmFlag === 0,
-            showError: false,
-            unit: {
-                name: "元",
-                type: "text"
-            }
-        }, {
-            name: "",
-            type: "textarea",
-            width: "calc(65% - 40px)",
-            key: "executeMoneySource",
-            hide: this.updateParams.reformConfirmFlag === 0,
-            placeholder: "请输入资金来源"
-        }, {
-            name: "确认人",
-            type: "text",
-            width: "calc(50% - 20px)",
-            key: "realConfirmUserName",
-            require: true,
-            disable: true,
-        }, {
-            name: "确认时间",
-            type: "date",
-            subType: "datetime",
-            width: "calc(50% - 20px)",
-            require: true,
-            key: "realConfirmTime",
-            format: "yyyy-MM-dd HH:mm",
-            showError: false,
-            pickerOptions:this.getPickerOptions(this.updateParams.createTime),
-        }]
+        if (this.params)
+            this.updateOptions2 = [{
+                name: "隐患确认",
+                key: "reformConfirmFlag",
+                format: "reformConfirmFlagName",
+                type: "radio",
+                width: "100%",
+                require: true,
+                showError: false,
+                datas: this.isSure
+            }, {
+                name: "原因说明",
+                type: "textarea",
+                width: "100%",
+                key: "reformReasonDescription",
+                require: true,
+                hide: this.updateParams.reformConfirmFlag,
+                showError: false,
+                placeholder: "请输入未确认原因"
+            }, {
+                name: "治理人",
+                type: "select",
+                width: "calc(50% - 20px)",
+                require: true,
+                key: "executeUserId",
+                format: "executeUserName",
+                showError: false,
+                hide: this.updateParams.reformConfirmFlag === 0,
+                datas: this.$store.state.userList
+            }, {
+                name: "治理时限",
+                type: "date",
+                subType: "datetime",
+                width: "calc(50% - 20px)",
+                require: true,
+                key: "executeDeadline",
+                format: "yyyy-MM-dd HH:mm",
+                showError: false,
+                hide: this.updateParams.reformConfirmFlag === 0,
+                pickerOptions: this.getPickerOptions(this.updateParams.createTime, this.updateParams.reformDeadline)
+            }, {
+                name: "治理措施及要求",
+                type: "textarea",
+                width: "100%",
+                key: "executeMeasure",
+                require: true,
+                hide: this.updateParams.reformConfirmFlag === 0,
+                showError: false,
+                placeholder: "请输入治理措施与要求"
+            }, {
+                name: "治理资金",
+                type: "number",
+                width: "35%",
+                key: "executeMoney",
+                require: true,
+                hide: this.updateParams.reformConfirmFlag === 0,
+                showError: false,
+                unit: {
+                    name: "元",
+                    type: "text"
+                }
+            }, {
+                name: "",
+                type: "textarea",
+                width: "calc(65% - 40px)",
+                key: "executeMoneySource",
+                hide: this.updateParams.reformConfirmFlag === 0,
+                placeholder: "请输入资金来源"
+            }, {
+                name: "确认人",
+                type: "text",
+                width: "calc(50% - 20px)",
+                key: "realConfirmUserName",
+                require: true,
+                disable: true,
+            }, {
+                name: "确认时间",
+                type: "date",
+                subType: "datetime",
+                width: "calc(50% - 20px)",
+                require: true,
+                key: "realConfirmTime",
+                format: "yyyy-MM-dd HH:mm",
+                showError: false,
+                pickerOptions: this.getPickerOptions(this.updateParams.createTime),
+            }]
         this.updateOptions3 = [{
             name: "接受确认",
             key: "executeConfirmFlag",
@@ -710,7 +710,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         this.tableColumn.push({
             name: '隐患标题', width: "150", render: (data) => {
                 if (this.params.type === 1 || this.params.type === 2) {
-                    return `<span class="link">${data.title}</span>`
+                    return `<span class="link">${data.title || '未命名'}</span>`
                 } else {
                     return data.title
                 }
@@ -911,7 +911,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     public showUpdateModel(row?, isRead?) {
         this.initRiskSource()
         this.isReadonly = !!isRead
-        this.updateParams = { status: 0, source: 9, dangerType:4 ,photo:null} as any;
+        this.updateParams = { status: 0, source: 9, dangerType: 4, photo: null } as any;
         if (!row) {
             this.tableService.getNumber().then(res => {
                 this.updateParams.number = res.data
@@ -935,7 +935,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
                 reformModeName: this.reformModeMap[row.reformMode],
             }, row);
             this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard]
-
+            this.updateParams.majorHazard = +this.updateParams.majorHazard
             this.getTableCallback()
             // 获取url
             if (row.resourceId) {
@@ -1004,7 +1004,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         // 从状态1  上报来不走startWorkFlow
         let preStatus = this.updateParams.status;
         const handleParams = {
-            "taskId": this.updateParams.taskId,
+            "taskId": this.updateParams.taskInfo?.taskId ?? "",
             "type": "agree",
             "bizData": [{
                 "bizId": this.updateParams.id,
diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue
index 8315962..8d8ea3c 100644
--- a/src/views/hiddenDanger/safe/action.component.vue
+++ b/src/views/hiddenDanger/safe/action.component.vue
@@ -308,6 +308,11 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
             width: "calc(50% - 20px)",
             require: true,
             showError: false,
+            pickerOptions: {
+                disabledDate(time: any) {
+                    return time.getTime() < moment().subtract(1, 'day').valueOf();
+                }
+            }
         }, {
             name: "隐患类别",
             key: "dangerType",
@@ -467,6 +472,14 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         if (item && item.key === "verifyUserId") {
             this.updateParams.verifyUserName = this.$store.getters.user_map[data]
         }
+        if (item && item.key === "reformDeadline") {
+            const now = moment().format("YYYY-MM-DD HH");
+            if (now > data) {
+                this.$message.error("整改时限不能早于当前时间")
+                this.updateParams.reformDeadline = null;
+                return
+            }
+        }
     }