feat:隐患治理日期选择限制

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"
+                    <el-table-column v-if="!(isManager && params.type>1)" type="selection" :selectable="selectable"
-                        :selectable="selectable" fixed label="全选" width="40">
+                        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"
+                            <el-button type="text" v-if="isBase" @click="deleteData([scope.row.id])">删除</el-button>
-                                @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"

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) {

src/views/hiddenDanger/manager.component.vue

@@ -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
                 }
@@ -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,

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
+            }
+        }
     }