+ :actions="formActions" :full-btn="false" @change="callback" btn-position="end">
{
labelWidth: 'auto',
require: true,
disable: true,
-
+ showError: false,
datas: [
{
name: "否",
@@ -143,12 +143,14 @@ export default class DutyManagerComponent extends BaseRecordComponent {
width: "100%",
require: true,
disable: true,
+ showError: false,
}, {
name: "排查结果",
key: "result",
type: "radio",
width: "100%",
require: true,
+ showError: false,
datas: [
{
name: "正常",
@@ -166,6 +168,7 @@ export default class DutyManagerComponent extends BaseRecordComponent {
type: "radio",
width: "100%",
require: true,
+ showError: false,
hide: this.updateParams.result === 1,
datas: [
{
@@ -184,12 +187,14 @@ export default class DutyManagerComponent extends BaseRecordComponent {
width: "100%",
hide: this.updateParams.result === 1,
require: true,
+ showError: false,
}, {
name: "隐患类别",
key: "dangerType",
format: "dangerTypeName",
type: "select",
width: "100%",
+ showError: false,
require: true,
hide: this.updateParams.result === 1 || this.updateParams.dangerFlag == 0,
datas: this.$store.state.prevention_danger_type,
@@ -199,6 +204,7 @@ export default class DutyManagerComponent extends BaseRecordComponent {
type: "select",
width: "100%",
require: true,
+ showError: false,
hide: this.updateParams.result === 1 || this.updateParams.dangerFlag == 0,
datas: this.$store.state.userList,
},
@@ -209,6 +215,7 @@ export default class DutyManagerComponent extends BaseRecordComponent {
width: "100%",
require: true,
disable: true,
+ showError: false,
},
{
name: " 排查人",
@@ -216,6 +223,7 @@ export default class DutyManagerComponent extends BaseRecordComponent {
type: "select",
width: "100%",
require: true,
+ showError: false,
disable: true,
datas: this.$store.state.userList,
},
@@ -226,6 +234,7 @@ export default class DutyManagerComponent extends BaseRecordComponent {
width: "100%",
require: true,
disable: true,
+ showError: false,
}, {
name: "附件",
@@ -273,7 +282,12 @@ export default class DutyManagerComponent extends BaseRecordComponent {
if (data.areaId) {
this.params.unitId = data.id
} else {
- this.params.areaId = data.id
+ if (data.name === "全部") {
+ this.params.areaId = null
+ this.params.unitId = null
+ } else {
+ this.params.areaId = data.id;
+ }
}
this.getTableData()
}
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index a6a72c3..bc04378 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -201,15 +201,22 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent{
- return data.insuranceDutyFlag === 1 ? '是':'否'
- }})
+ this.tableColumn.push({
+ name: "是否包保责任人任务", key: "insuranceDutyFlag", width: "150px", render: (data) => {
+ return data.insuranceDutyFlag === 1 ? '是' : '否'
+ }
+ })
this.tableColumn.push({ name: '隐患排查任务', key: "taskName", with: "250px" });
this.tableColumn.push({
name: '重大危险源', key: 'majorHazard', render: (data) => {
diff --git a/src/views/workprogress/leader.component.vue b/src/views/workprogress/leader.component.vue
index 23b3a1c..15bd9d4 100644
--- a/src/views/workprogress/leader.component.vue
+++ b/src/views/workprogress/leader.component.vue
@@ -389,6 +389,10 @@ export default class LeadershipStructure extends BaseRecordComponent {
}
public doSave(goOn?) {
+ if(!this.updateParams.members.length){
+ this.$message.warning('请您添加至少一条成员信息！')
+ return
+ }
// 新增清单
if (this.fileList.length > 0) {
let resourceId = this.fileList.map((item) => {
diff --git a/src/views/workprogress/managementSystem.component.vue b/src/views/workprogress/managementSystem.component.vue
index b129955..b70981e 100644
--- a/src/views/workprogress/managementSystem.component.vue
+++ b/src/views/workprogress/managementSystem.component.vue
@@ -352,6 +352,7 @@ export default class ManagementSystem extends BaseRecordComponent {
pageNum: 1,
pageSize: 20,
} as any;
+ this.getTableData()
}
public showUpdateModel(id) {