-
+
@@ -234,7 +234,11 @@ export default {
created() {
console.log('id', this.id);
this.getOptionStaff();
- this.getList();
+ if (this.id) {
+ this.getList();
+ } else {
+ this.handleAdd();
+ }
},
methods: {
@@ -327,8 +331,13 @@ export default {
if (row.result == '0' && row.reviewTime == '') {
this.$message.error('拟复查时间不能为空');
} else {
- if (this.btnType == 'add') this.save(row);
- else this.edit(row);
+ if (this.id) {
+ console.log('有id');
+ if (this.btnType == 'add') this.save(row);
+ else this.edit(row);
+ } else {
+ this.$message.error('请先保存上方信息');
+ }
}
},
@@ -352,6 +361,7 @@ export default {
},
async save(row) {
+ console.log(row, this.id);
const params = {
equipmentId: this.id,
...row
@@ -370,6 +380,7 @@ export default {
},
async edit(row) {
+ console.log(row, this.id);
const params = {
...row
};
@@ -386,9 +397,9 @@ export default {
},
async del(row) {
- let arr=[row.id]
+ let arr = [row.id];
const url = `/actual/base/safetyEquipmentInspectRecord/delete`;
- const { data, code, msg } = await requestPost(url,arr);
+ const { data, code, msg } = await requestPost(url, arr);
if (code === 0) {
this.$message.success('删除成功');
@@ -415,6 +426,7 @@ export default {
isEdit: false
};
});
+ this.handleAdd();
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
index 3314cd7d7..a2848320f 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue
@@ -161,10 +161,10 @@
确 定
-
+
@@ -249,7 +249,7 @@ export default {
dangerContent: [{ required: true, message: '隐患内容不能为空', trigger: 'bulr' }],
reportPerson: [{ required: true, message: '上报人不能为空', trigger: 'bulr' }],
mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
- // mobile: [{ required: true, validator: checkMObile, trigger: 'blur' }],
+ gridId: [{ required: true, validator: '所属网格不能为空', trigger: 'blur' }],
location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
},
@@ -502,6 +502,6 @@ export default {
@import '@/assets/scss/modules/management/form.scss';
@import '@/assets/scss/modules/visual/a_customize.scss';
.el-dialog__body {
- padding: 30px 80px;
+ padding: 30px 80px;
}
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
index 7f4ffd921..4a9d14b16 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/index.vue
@@ -68,7 +68,7 @@
-
+
diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
index d6e9283ca..50e197fa7 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue
@@ -2,14 +2,14 @@
处理记录
-
+
-
+
{{ scope.row.handleTime }}
-
+
@@ -106,7 +106,7 @@ export default {
isEdit: false,
tableData: [],
tempRow: {},
-
+
optionResult: [
{
label: '待处理',
@@ -150,7 +150,11 @@ export default {
created() {
console.log('id', this.id);
this.getOptionStaff();
- this.getList();
+ if (this.id) {
+ this.getList();
+ } else {
+ this.handleAdd();
+ }
},
methods: {
@@ -240,8 +244,14 @@ export default {
},
async handleEdit(row) {
- if (this.btnType == 'add') this.save(row);
- else this.edit(row);
+ if (this.id) {
+ console.log('有id');
+ if (this.btnType == 'add') this.save(row);
+ else this.edit(row);
+ } else {
+ this.$message.error('请先保存上方信息');
+ }
+
},
handleAdd() {
@@ -294,8 +304,8 @@ export default {
async del(row) {
const url = `/actual/base/hiddenDangerRecord/deleteProcess`;
- let arr=[row.id]
- const { data, code, msg } = await requestPost(url,arr);
+ let arr = [row.id];
+ const { data, code, msg } = await requestPost(url, arr);
if (code === 0) {
this.$message.success('删除成功');
@@ -322,6 +332,7 @@ export default {
isEdit: false
};
});
+ this.handleAdd();
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
index 466ce47d3..3e12ede43 100644
--- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue
@@ -94,7 +94,7 @@
diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
index b4e8ce2a5..f226d91af 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/record.vue
@@ -2,9 +2,9 @@
检查记录
-
+
@@ -234,7 +234,11 @@ export default {
created() {
console.log('id', this.id);
this.getOptionStaff();
- this.getList();
+ if (this.id) {
+ this.getList();
+ } else {
+ this.handleAdd();
+ }
},
methods: {
@@ -324,11 +328,16 @@ export default {
},
async handleEdit(row) {
- if (row.inspectResult == '0' && row.nextInspectTime == '') {
+ if (row.result == '0' && row.reviewTime == '') {
this.$message.error('拟复查时间不能为空');
} else {
- if (this.btnType == 'add') this.save(row);
- else this.edit(row);
+ if (this.id) {
+ console.log('有id');
+ if (this.btnType == 'add') this.save(row);
+ else this.edit(row);
+ } else {
+ this.$message.error('请先保存上方信息');
+ }
}
},
@@ -416,6 +425,7 @@ export default {
isEdit: false
};
});
+ this.handleAdd();
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
index 37ee65f65..0f328b69e 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue
@@ -93,7 +93,7 @@
diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
index a8bf02c0a..46d743e77 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/record.vue
@@ -2,9 +2,9 @@
检查记录
-
+
@@ -234,7 +234,11 @@ export default {
created() {
console.log('id', this.id);
this.getOptionStaff();
- this.getList();
+ if (this.id) {
+ this.getList();
+ } else {
+ this.handleAdd();
+ }
},
methods: {
@@ -324,11 +328,16 @@ export default {
},
async handleEdit(row) {
- if (row.inspectResult == '0' && row.nextInspectTime == '') {
+ if (row.result == '0' && row.reviewTime == '') {
this.$message.error('拟复查时间不能为空');
} else {
- if (this.btnType == 'add') this.save(row);
- else this.edit(row);
+ if (this.id) {
+ console.log('有id');
+ if (this.btnType == 'add') this.save(row);
+ else this.edit(row);
+ } else {
+ this.$message.error('请先保存上方信息');
+ }
}
},
@@ -415,6 +424,7 @@ export default {
isEdit: false
};
});
+ this.handleAdd();
} else {
this.$message.error(msg);
}
diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
index 0f92378c2..27b851c30 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue
@@ -178,8 +178,8 @@
确 定
-