guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

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

dev
kongyeqing 2023-09-07 18:18:53 +08:00
parent 5d7452d530
commit f78252cd50
5 changed files with 113 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/hiddenDanger/clap.component.vue
View File

@ -558,7 +558,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
type: "随手拍", type: "随手拍",
}, res.data) }, res.data)
this.updateParams.majorHazard = +this.updateParams.majorHazard 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]; this.center = [res.data.locationLng, res.data.locationLat];

13
src/views/hiddenDanger/common.component.html
View File

@ -18,20 +18,22 @@
<el-table ref="multipleTable" :data="tableData.datas" height="100%" border row-key="checked" <el-table ref="multipleTable" :data="tableData.datas" height="100%" border row-key="checked"
@selection-change="handleSelectionChange" style="width: 100%" @sort-change="sortChange($event)"> @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>
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<div slot-scope="scope">{{scope.$index+1}}</div> <div slot-scope="scope">{{scope.$index+1}}</div>
</el-table-column> </el-table-column>
<template v-for="item in tableColumn"> <template v-for="item in tableColumn">
<el-table-column v-if="item.render" :label="item.name" :filters="item.filters" <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)" <div slot-scope="scope" @click="" v-html="item.render(scope.row)"
style="pointer-events: none;" @click="rowCallback($event,scope.row)"></div> style="pointer-events: none;" @click="rowCallback($event,scope.row)"></div>
</el-table-column> </el-table-column>
<el-table-column v-else :prop="item.key" :label="item.name" :filters="item.filters" <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> </el-table-column>
</template> </template>
<el-table-column label="操作" fixed="right" :width="tableActionWidth"> <el-table-column label="操作" fixed="right" :width="tableActionWidth">
@ -40,8 +42,7 @@
@click="showUpdateModel(scope.row,true)">查看</el-button> @click="showUpdateModel(scope.row,true)">查看</el-button>
<el-button type="text" v-if="isBase && !(isClap && scope.row.status)" <el-button type="text" v-if="isBase && !(isClap && scope.row.status)"
@click="showUpdateModel(scope.row)">修改</el-button> @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" @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" <el-button type="text" v-if="isManager && params.type===4 && scope.row.status<5"

2
src/views/hiddenDanger/files.component.vue
View File

@ -694,7 +694,7 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
reformModeName: this.reformModeMap[row.reformMode], reformModeName: this.reformModeMap[row.reformMode],
}, row); }, row);
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.updateParams.majorHazard = +this.updateParams.majorHazard
this.getTableCallback() this.getTableCallback()
// 获取url // 获取url
if (row.resourceId) { if (row.resourceId) {

182
src/views/hiddenDanger/manager.component.vue
View File

@ -356,7 +356,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
require: true, require: true,
showError: false, showError: false,
pickerOptions:this.getPickerOptions(), pickerOptions: this.getPickerOptions(),
}, { }, {
name: "隐患照片", name: "隐患照片",
key: "photo", key: "photo",
@ -465,92 +465,92 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
showError: false, showError: false,
datas: this.riskSource datas: this.riskSource
},] },]
if(this.params) if (this.params)
this.updateOptions2 = [{ this.updateOptions2 = [{
name: "隐患确认", name: "隐患确认",
key: "reformConfirmFlag", key: "reformConfirmFlag",
format: "reformConfirmFlagName", format: "reformConfirmFlagName",
type: "radio", type: "radio",
width: "100%", width: "100%",
require: true, require: true,
showError: false, showError: false,
datas: this.isSure datas: this.isSure
}, { }, {
name: "原因说明", name: "原因说明",
type: "textarea", type: "textarea",
width: "100%", width: "100%",
key: "reformReasonDescription", key: "reformReasonDescription",
require: true, require: true,
hide: this.updateParams.reformConfirmFlag, hide: this.updateParams.reformConfirmFlag,
showError: false, showError: false,
placeholder: "请输入未确认原因" placeholder: "请输入未确认原因"
}, { }, {
name: "治理人", name: "治理人",
type: "select", type: "select",
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
require: true, require: true,
key: "executeUserId", key: "executeUserId",
format: "executeUserName", format: "executeUserName",
showError: false, showError: false,
hide: this.updateParams.reformConfirmFlag === 0, hide: this.updateParams.reformConfirmFlag === 0,
datas: this.$store.state.userList datas: this.$store.state.userList
}, { }, {
name: "治理时限", name: "治理时限",
type: "date", type: "date",
subType: "datetime", subType: "datetime",
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
require: true, require: true,
key: "executeDeadline", key: "executeDeadline",
format: "yyyy-MM-dd HH:mm", format: "yyyy-MM-dd HH:mm",
showError: false, showError: false,
hide: this.updateParams.reformConfirmFlag === 0, hide: this.updateParams.reformConfirmFlag === 0,
pickerOptions: this.getPickerOptions(this.updateParams.createTime, this.updateParams.reformDeadline) pickerOptions: this.getPickerOptions(this.updateParams.createTime, this.updateParams.reformDeadline)
}, { }, {
name: "治理措施及要求", name: "治理措施及要求",
type: "textarea", type: "textarea",
width: "100%", width: "100%",
key: "executeMeasure", key: "executeMeasure",
require: true, require: true,
hide: this.updateParams.reformConfirmFlag === 0, hide: this.updateParams.reformConfirmFlag === 0,
showError: false, showError: false,
placeholder: "请输入治理措施与要求" placeholder: "请输入治理措施与要求"
}, { }, {
name: "治理资金", name: "治理资金",
type: "number", type: "number",
width: "35%", width: "35%",
key: "executeMoney", key: "executeMoney",
require: true, require: true,
hide: this.updateParams.reformConfirmFlag === 0, hide: this.updateParams.reformConfirmFlag === 0,
showError: false, showError: false,
unit: { unit: {
name: "元", name: "元",
type: "text" type: "text"
} }
}, { }, {
name: "", name: "",
type: "textarea", type: "textarea",
width: "calc(65% - 40px)", width: "calc(65% - 40px)",
key: "executeMoneySource", key: "executeMoneySource",
hide: this.updateParams.reformConfirmFlag === 0, hide: this.updateParams.reformConfirmFlag === 0,
placeholder: "请输入资金来源" placeholder: "请输入资金来源"
}, { }, {
name: "确认人", name: "确认人",
type: "text", type: "text",
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
key: "realConfirmUserName", key: "realConfirmUserName",
require: true, require: true,
disable: true, disable: true,
}, { }, {
name: "确认时间", name: "确认时间",
type: "date", type: "date",
subType: "datetime", subType: "datetime",
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
require: true, require: true,
key: "realConfirmTime", key: "realConfirmTime",
format: "yyyy-MM-dd HH:mm", format: "yyyy-MM-dd HH:mm",
showError: false, showError: false,
pickerOptions:this.getPickerOptions(this.updateParams.createTime), pickerOptions: this.getPickerOptions(this.updateParams.createTime),
}] }]
this.updateOptions3 = [{ this.updateOptions3 = [{
name: "接受确认", name: "接受确认",
key: "executeConfirmFlag", key: "executeConfirmFlag",
@ -710,7 +710,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
this.tableColumn.push({ this.tableColumn.push({
name: '隐患标题', width: "150", render: (data) => { name: '隐患标题', width: "150", render: (data) => {
if (this.params.type === 1 || this.params.type === 2) { if (this.params.type === 1 || this.params.type === 2) {
return `<span class="link">${data.title}</span>` return `<span class="link">${data.title || '未命名'}</span>`
} else { } else {
return data.title return data.title
} }
@ -911,7 +911,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
public showUpdateModel(row?, isRead?) { public showUpdateModel(row?, isRead?) {
this.initRiskSource() this.initRiskSource()
this.isReadonly = !!isRead 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) { if (!row) {
this.tableService.getNumber().then(res => { this.tableService.getNumber().then(res => {
this.updateParams.number = res.data this.updateParams.number = res.data
@ -935,7 +935,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
reformModeName: this.reformModeMap[row.reformMode], reformModeName: this.reformModeMap[row.reformMode],
}, row); }, row);
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.updateParams.majorHazard = +this.updateParams.majorHazard
this.getTableCallback() this.getTableCallback()
// 获取url // 获取url
if (row.resourceId) { if (row.resourceId) {
@ -1004,7 +1004,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
// 从状态1 上报来不走startWorkFlow // 从状态1 上报来不走startWorkFlow
let preStatus = this.updateParams.status; let preStatus = this.updateParams.status;
const handleParams = { const handleParams = {
"taskId": this.updateParams.taskId, "taskId": this.updateParams.taskInfo?.taskId ?? "",
"type": "agree", "type": "agree",
"bizData": [{ "bizData": [{
"bizId": this.updateParams.id, "bizId": this.updateParams.id,

13
src/views/hiddenDanger/safe/action.component.vue
View File

@ -308,6 +308,11 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
width: "calc(50% - 20px)", width: "calc(50% - 20px)",
require: true, require: true,
showError: false, showError: false,
pickerOptions: {
disabledDate(time: any) {
return time.getTime() < moment().subtract(1, 'day').valueOf();
}
}
}, { }, {
name: "隐患类别", name: "隐患类别",
key: "dangerType", key: "dangerType",
@ -467,6 +472,14 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
if (item && item.key === "verifyUserId") { if (item && item.key === "verifyUserId") {
this.updateParams.verifyUserName = this.$store.getters.user_map[data] 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
}
}
} }