From 40bd301a2fd78454cdac69298ce3e6bbd96fce31 Mon Sep 17 00:00:00 2001
From: liy <3101763317@qq.com>
Date: Fri, 19 Jul 2024 17:08:07 +0800
Subject: [PATCH] =?UTF-8?q?li=E9=A2=84=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../company_plan-check/components/addfrom.vue | 514 ++++++++++++++++++
.../company_plan-check/components/list.vue | 235 ++++++++
.../components/yingjizhuangjia.vue | 154 ++++++
.../components/yjshenherenyuan.vue | 194 +++++++
.../components/yvanfujian.vue | 252 +++++++++
.../components/yvanwenben.vue | 111 ++++
.../components/yvanziling.vue | 328 +++++++++++
.../components/yvanziyuan.vue | 376 +++++++++++++
.../components/zuzhijiagou.vue | 306 +++++++++++
.../company_plan-check/index.vue | 26 +
.../company_plan/components/addfrom.vue | 84 ++-
.../company_plan/components/list.vue | 26 +-
.../components/yingjizhuangjia.vue | 46 +-
.../components/yjshenherenyuan.vue | 194 +++++++
.../company_plan/components/yvanfujian.vue | 35 +-
.../company_plan/components/yvanwenben.vue | 2 +-
.../company_plan/components/yvanziling.vue | 112 ++--
.../company_plan/components/yvanziyuan.vue | 57 +-
.../company_plan/components/zuzhijiagou.vue | 164 ++++--
19 files changed, 3057 insertions(+), 159 deletions(-)
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue
create mode 100644 src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
new file mode 100644
index 0000000..906d438
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
@@ -0,0 +1,514 @@
+
+
+
+
+
应急预案详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 危化品事故
+ 爆炸
+ 火灾
+ 水灾
+ 其他
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
new file mode 100644
index 0000000..c98b453
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+ {{ docheck(row.AUDIT_STATUS) }}
+
+
+
+
+ 查看
+ 审核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue
new file mode 100644
index 0000000..0d0605a
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yingjizhuangjia.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue
new file mode 100644
index 0000000..23d3995
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yjshenherenyuan.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue
new file mode 100644
index 0000000..a777e0d
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue
@@ -0,0 +1,252 @@
+
+
+
+
+
+
+
+
+
+
+
+ 下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue
new file mode 100644
index 0000000..fbae549
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanwenben.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+ {{ planName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
new file mode 100644
index 0000000..0ae4fbe
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
@@ -0,0 +1,328 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
new file mode 100644
index 0000000..75c9409
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
@@ -0,0 +1,376 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue
new file mode 100644
index 0000000..9f5b5af
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/zuzhijiagou.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上级菜单:{{ jigoumainid == '0' ?'(无) 此项为顶级分组':jigouname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 所属机构:{{ jigoumainid == '0' ?'(无) 此项为顶级分组':jigouname }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue
new file mode 100644
index 0000000..9859403
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/index.vue
@@ -0,0 +1,26 @@
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
index 40e4133..8b94285 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue
@@ -7,10 +7,10 @@
-
+
-
+
@@ -40,7 +40,7 @@
:options="yhPLANGRADEthree"
v-model="form.PLANGRADE"
- placeholder="请选择预案类型"
+ placeholder="请选择预案等级"
no-options-text="暂无数据"
no-children-text="暂无数据"
/>
@@ -100,17 +100,17 @@
-
-
+
+
-
+
-
+
@@ -129,6 +129,8 @@
上一步
下一步
+
+ 提交审核
@@ -164,6 +166,10 @@
+
+
+
+
@@ -177,10 +183,26 @@ import yvanziyuan from './yvanziyuan.vue'
import yvanziling from './yvanziling.vue'
import yvanwenben from './yvanwenben.vue'
import yvanfujian from './yvanfujian.vue'
+import yjshenherenyuan from './yjshenherenyuan.vue'
export default {
- components: { Treeselect, yingjizhuangjia, zuzhijiagou, yvanziyuan, yvanziling, yvanwenben, yvanfujian },
+ components: { Treeselect, yingjizhuangjia, zuzhijiagou, yvanziyuan, yvanziling, yvanwenben, yvanfujian, yjshenherenyuan },
data() {
return {
+ rules: {
+ PLANNAME: [
+ { required: true, message: '预案名称不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ PLANTYPE: [
+ { required: true, message: '预案类型不能为空', trigger: 'blur' }],
+ PLANCODE: [
+ { required: true, message: '预案编码不能为空', trigger: 'blur' }],
+ PLANGRADE: [
+ { required: true, message: '预案等级不能为空', trigger: 'blur' }],
+ PLANDES: [
+ { required: true, message: '预案概述不能为空', trigger: 'blur' }]
+
+ },
+ dialogFormshenhe: false,
// 地图相关
CORPINFO_ID: this.$parent.CORPINFO_ID,
clientHeight: 600,
@@ -231,6 +253,45 @@ export default {
this.getYaTypeDataList()
},
methods: {
+ fenjihuidiao() {
+ this.zhilingreset()
+ },
+ zuzhihuidiao() {
+ this.zhilingreset()
+ },
+ // 指令初始化刷新
+ zhilingreset() {
+ this.$refs.zhiling.getForFractModule()
+ this.$refs.zhiling.getTreeList()
+ },
+
+ yjwenancheck(id) {
+ console.log(id)
+ const params = {
+ FIRERESERVEPLAN_ID: this.PLAN_ID,
+ CHECKSTATUS: '1',
+ AUDIT_UESRID: id
+ }
+ requestFN('/major/emergencyplan/submitCheck', params).then((data) => {
+ this.$message({
+ message: '提交成功',
+ type: 'success'
+ })
+ setTimeout(() => {
+ this.dialogFormshenhe = false
+ this.$parent.activeName = 'list'
+ this.$parent.huidiao()
+ }, 500)
+ }).catch((e) => {
+
+ })
+ },
+ closeDialog() {
+ this.dialogFormshenhe = false
+ },
+ tijiaoshenhe() {
+ this.dialogFormshenhe = true
+ },
//* **************地图相关*****************
// 地图相关
mapOpen() {
@@ -437,6 +498,13 @@ export default {
},
confirm(type) {
+ /* if (this.form.PLANNAME === undefined) {
+ this.$message({
+ message: '预案名称不能为空',
+ type: 'warning'
+ })
+ return
+ }*/
this.$refs.form.validate(valid => {
if (valid) {
this.saveData(type)
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
index 06e8011..c2d6237 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/list.vue
@@ -10,9 +10,13 @@
-
-
-
+
+
+
+
+ {{ docheck(row.AUDIT_STATUS) }}
+
+
@@ -60,7 +64,19 @@ export default {
this.getList()
},
methods: {
-
+ docheck(status) {
+ let mess = '未审核'
+ if (status === '0') {
+ mess = '未审核'
+ } else if (status === '1') {
+ mess = '待审核'
+ } else if (status === '2') {
+ mess = '审核通过'
+ } else if (status === '3') {
+ mess = '审核未通过'
+ }
+ return mess
+ },
//* ***********************************
goList(page, CASE_ID, ticketType) {
this.$parent.activeName = page
@@ -133,7 +149,7 @@ export default {
return false
}
const ids = _selectData.map((item, index) => {
- return item.ID
+ return item.FIRERESERVEPLAN_ID
}).join(',')
this.$confirm('确定要删除选中的数据吗?', {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yingjizhuangjia.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yingjizhuangjia.vue
index 77b3bb6..8081ce0 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yingjizhuangjia.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yingjizhuangjia.vue
@@ -21,11 +21,11 @@
-
+
@@ -69,11 +69,19 @@ export default {
},
data() {
return {
+ rules: {
+ HIERARCHICALNAME: [
+ { required: true, message: '预案名称不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ HIERARCHICALDES: [
+ { required: true, message: '分级描述不能为空', trigger: 'blur' }]
+
+ },
zhuangjiatotal: 0,
zhuangjianame: '',
dialogzhuangjiaShow: false,
yjzjvarList: [],
- yjzhuangjiatotal: [],
+ yjzhuangjiatotal: 0,
zhuanjiaList: [],
listQueryzj: {
page: 1,
@@ -105,26 +113,32 @@ export default {
this.listISLOADing = false
this.getPlanexpertList()
+ this.$emit('fenjihuidiao')
}).catch((e) => {
this.listISLOADing = false
})
},
confirm() {
this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ this.listISLOADing = true
+ requestFN(
+ '/plan/fractional/save', this.zhuangjiafrom
+ ).then((data) => {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.dialogzhuangjiaShow = false
+ this.listISLOADing = false
+ this.getPlanexpertList()
- this.listISLOADing = true
- requestFN(
- '/plan/fractional/save', this.zhuangjiafrom
- ).then((data) => {
- this.$message({
- message: '添加成功',
- type: 'success'
- })
- this.dialogzhuangjiaShow = false
- this.listISLOADing = false
- this.getPlanexpertList()
- }).catch((e) => {
- this.listISLOADing = false
+ this.$emit('fenjihuidiao')
+ }).catch((e) => {
+ this.listISLOADing = false
+ })
+ }
})
},
yjzjadd() {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
new file mode 100644
index 0000000..23d3995
--- /dev/null
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yjshenherenyuan.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
index 1496343..1240866 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue
@@ -29,7 +29,7 @@
-
+
-
+
0) {
- this.upload((v) => {
- this.fujianfrom.FILEURL = v
- this.$refs.upload.clearFiles()
- this.dataSave()
- })
- } else {
- this.dataSave()
- }
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ if (this.FFILE.length > 0) {
+ this.upload((v) => {
+ this.fujianfrom.FILEURL = v
+ this.$refs.upload.clearFiles()
+ this.dataSave()
+ })
+ } else {
+ this.dataSave()
+ }
+ } else {
+ return false
+ }
+ })
},
dataSave() {
this.fujianfrom.FIRERESERVEPLAN_ID = this.planid
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanwenben.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanwenben.vue
index 3e8b938..5fd9963 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanwenben.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanwenben.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziling.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziling.vue
index f759248..83df145 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziling.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziling.vue
@@ -3,10 +3,10 @@
-
+
-
+
{{ jibei.HIERARCHICALNAME }}
@@ -102,7 +102,7 @@
-
+
@@ -144,6 +144,26 @@ export default {
},
data() {
return {
+ rules: {
+ HIERARCHICALRESPONSE_ID: [
+ { required: true, message: '响应级别不能为空', trigger: 'blur' }],
+ DIRECTIVECONTENT: [
+ { required: true, message: '指令内容不能为空', trigger: 'blur' }],
+ EXECUTIVEBODY: [
+ { required: true, message: '执行机构不能为空', trigger: 'blur' }]
+
+ },
+ rules2: {
+ RESOURCENAME: [
+ { required: true, message: '资源名称不能为空', trigger: 'blur' }],
+ RESOURCETYPE: [
+ { required: true, message: '类型不能为空', trigger: 'blur' }],
+ LINKMPHONE: [
+ { required: true, message: '联系电话不能为空', trigger: 'blur' }],
+ URGENTLINKPHONE: [
+ { required: true, message: '紧急联系电话不能为空', trigger: 'blur' }]
+
+ },
checkList: [],
zhuangjiatotal: 0,
@@ -228,6 +248,7 @@ export default {
this.loading = false
this.$refs.multipleTable.clearSelection()
this.getDataList()
+ this.doreset()
}).catch((e) => {
this.loading = false
})
@@ -245,6 +266,7 @@ export default {
})
this.loading = false
this.getDataList()
+ this.doreset()
}).catch((e) => {
this.loading = false
})
@@ -277,46 +299,26 @@ export default {
this.yvanzhilingfrom.FIRERESERVEPLAN_ID = this.planid
this.yvanzhilingfrom.HIERARCHICALRESPONSE_ID = this.checkList.join(',')
- this.yvanzhilingfrom.listResources2 = this.yjzhilinglinshiList
- this.loading = true
-
- if (this.yvanzhilingfrom.HIERARCHICALRESPONSE_ID === '') {
- this.$message({
- message: '表单内容不能为空',
- type: 'warning'
- })
- return
- }
- if (this.yvanzhilingfrom.EXECUTIVEBODY) {
- console.log('通过')
- } else {
- this.$message({
- message: '表单内容不能为空',
- type: 'warning'
- })
- return
- }
- if (this.yvanzhilingfrom.DIRECTIVECONTENT) {
- console.log('通过')
- } else {
- this.$message({
- message: '表单内容不能为空',
- type: 'warning'
- })
- return
- }
- requestFN(
- '/plan/planningdirectives/save', this.yvanzhilingfrom
- ).then((data) => {
- this.$message({
- message: '添加成功',
- type: 'success'
- })
- this.loading = false
- this.doreset()
- this.getDataList()
- }).catch((e) => {
- this.loading = false
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ this.yvanzhilingfrom.listResources2 = this.yjzhilinglinshiList
+ this.loading = true
+ requestFN(
+ '/plan/planningdirectives/save', this.yvanzhilingfrom
+ ).then((data) => {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.loading = false
+ this.doreset()
+ this.getDataList()
+ }).catch((e) => {
+ this.loading = false
+ })
+ } else {
+ return false
+ }
})
},
//* ************添加应急指令相关资源************
@@ -334,15 +336,21 @@ export default {
this.dialogyjzlzyShow = true
},
confirmsave() {
- const form = {
- RESOURCENAME: this.zlxianghuanziyuanform.RESOURCENAME,
- RESOURCETYPE: this.zlxianghuanziyuanform.RESOURCETYPE,
- LINKMPHONE: this.zlxianghuanziyuanform.LINKMPHONE,
- URGENTLINKPHONE: this.zlxianghuanziyuanform.URGENTLINKPHONE,
- id: this.yjzhilinglinshiList.length + 1
- }
- this.yjzhilinglinshiList.push(form)
- this.dialogyjzlzyShow = false
+ this.$refs.form2.validate(valid => {
+ if (valid) {
+ const form = {
+ RESOURCENAME: this.zlxianghuanziyuanform.RESOURCENAME,
+ RESOURCETYPE: this.zlxianghuanziyuanform.RESOURCETYPE,
+ LINKMPHONE: this.zlxianghuanziyuanform.LINKMPHONE,
+ URGENTLINKPHONE: this.zlxianghuanziyuanform.URGENTLINKPHONE,
+ id: this.yjzhilinglinshiList.length + 1
+ }
+ this.yjzhilinglinshiList.push(form)
+ this.dialogyjzlzyShow = false
+ } else {
+ return false
+ }
+ })
},
//* *********获取应急机构树形列表********
getTreeList() {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
index 000975e..2d0e9b8 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
@@ -23,11 +23,11 @@
-
+
@@ -136,6 +136,23 @@ export default {
},
data() {
return {
+ rules: {
+ RESOURCETYPES: [
+ { required: true, message: '资源类型不能为空', trigger: 'blur' }],
+ RESOURCENAME: [
+ { required: true, message: '资源名称不能为空', trigger: 'blur' }],
+ RESOURCEADDRESS: [
+ { required: true, message: '资源地址不能为空', trigger: 'blur' }],
+ RESOURCESNUMBER: [
+ { required: true, message: '资源数量不能为空', trigger: 'blur' }],
+ LINKMAN: [
+ { required: true, message: '联系人不能为空', trigger: 'blur' }],
+ LINKPHONE: [
+ { required: true, message: '联系电话不能为空', trigger: 'blur' }],
+ RESOURCEDES: [
+ { required: true, message: '资源描述不能为空', trigger: 'blur' }]
+
+ },
// 地图相关
CORPINFO_ID: this.$parent.CORPINFO_ID,
clientHeight: 600,
@@ -156,7 +173,7 @@ export default {
zhuangjianame: '',
dialogzhuangjiaShow: false,
yjzjvarList: [],
- yjzhuangjiatotal: [],
+ yjzhuangjiatotal: 0,
zhuanjiaList: [],
listQueryzj: {
page: 1,
@@ -314,21 +331,27 @@ export default {
})
},
confirm() {
- this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
- this.listISLOADing = true
- requestFN(
- '/plan/planningresources/save', this.zhuangjiafrom
- ).then((data) => {
- this.$message({
- message: '添加成功',
- type: 'success'
- })
- this.dialogzhuangjiaShow = false
- this.listISLOADing = false
- this.getDataList()
- }).catch((e) => {
- this.listISLOADing = false
+ this.listISLOADing = true
+ requestFN(
+ '/plan/planningresources/save', this.zhuangjiafrom
+ ).then((data) => {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.dialogzhuangjiaShow = false
+ this.listISLOADing = false
+ this.getDataList()
+ }).catch((e) => {
+ this.listISLOADing = false
+ })
+ } else {
+ return false
+ }
})
},
yjzjadd() {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/zuzhijiagou.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/zuzhijiagou.vue
index 3bb5ecf..c976d2d 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/zuzhijiagou.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/zuzhijiagou.vue
@@ -64,7 +64,8 @@
- 上级菜单:{{ jigoumainid == '0' ?'(无) 此项为顶级分组':jigouname }}
+ 上级菜单:{{ jigoumainid === '0' ?'(无) 此项为顶级分组':jigouname }}
+
@@ -103,23 +104,24 @@
所属机构:{{ jigoumainid == '0' ?'(无) 此项为顶级分组':jigouname }}
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -148,7 +150,34 @@ export default {
},
data() {
return {
- rules: [],
+ rules: {
+ NAME: [
+ { required: true, message: '名称不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ NAME_EN: [
+ { required: true, message: '英文名称不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ BIANMA: [
+ { required: true, message: '编码不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ HEADMAN: [
+ { required: true, message: '负责人不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ TEL: [
+ { required: true, message: '电话不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }]
+
+ },
+ rules2: {
+ NAME: [
+ { required: true, message: '姓名不能为空', trigger: 'blur' },
+ { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+ LINKPHONE: [
+ { required: true, message: '联系电话不能为空', trigger: 'blur' }],
+ DUTIES: [
+ { required: true, message: '职务不能为空', trigger: 'blur' }]
+
+ },
listISLOADing: false,
listQuery: {
page: 1,
@@ -167,9 +196,9 @@ export default {
jigoumainid: '0',
jigouname: '',
dialogjigouShow: false,
- jigoufrom: {},
+ jigoufrom: { NAME: '' },
//* ******人员*********
- renyuanfrom: {},
+ renyuanfrom: { NAME: '' },
dialogrenyuanShow: false
}
},
@@ -179,6 +208,14 @@ export default {
},
methods: {
renyuanadd() {
+ if (this.jigoumainid === '0') {
+ this.$message({
+ message: '请选择结构',
+ type: 'warning'
+ })
+ return
+ }
+
this.dialogrenyuanShow = true
this.renyuanfrom = {}
},
@@ -213,21 +250,25 @@ export default {
})
},
renyuanconfirm() {
- this.listISLOADing = true
- this.renyuanfrom.FIRERESERVEPLAN_ID = this.planid
- this.renyuanfrom.PLANNINGDEPARTMENT_ID = this.jigoumainid
- requestFN(
- '/plan/planningDepartment/savePersonnel', this.renyuanfrom
- ).then((data) => {
- this.$message({
- message: '添加成功',
- type: 'success'
- })
- this.dialogrenyuanShow = false
- this.listISLOADing = false
- this.getDEPARTMENTList(this.jigoumainid)
- }).catch((e) => {
- this.listISLOADing = false
+ this.$refs.form2.validate(valid => {
+ if (valid) {
+ this.listISLOADing = true
+ this.renyuanfrom.FIRERESERVEPLAN_ID = this.planid
+ this.renyuanfrom.PLANNINGDEPARTMENT_ID = this.jigoumainid
+ requestFN(
+ '/plan/planningDepartment/savePersonnel', this.renyuanfrom
+ ).then((data) => {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.dialogrenyuanShow = false
+ this.listISLOADing = false
+ this.getDEPARTMENTList(this.jigoumainid)
+ }).catch((e) => {
+ this.listISLOADing = false
+ })
+ }
})
},
@@ -237,37 +278,62 @@ export default {
this.dialogjigouShow = true
},
jigoudelete() {
- this.listISLOADing = true
- requestFN(
- '/plan/planningDepartment/delete', { id: this.jigoumainid }
- ).then((data) => {
+ if (this.jigoumainid === '0') {
this.$message({
- message: '移除成功',
- type: 'success'
+ message: '请选择机构',
+ type: 'warning'
+ })
+ return
+ }
+ this.$confirm('确定要删除选中的机构[ ' + this.jigouname + ' ]吗?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.listISLOADing = true
+ requestFN(
+ '/plan/planningDepartment/delete', { id: this.jigoumainid }
+ ).then((data) => {
+ this.$message({
+ message: '移除成功',
+ type: 'success'
+ })
+ this.listISLOADing = false
+ this.getTreeList()
+ this.$emit('zuzhihuidiao')
+ }).catch((e) => {
+ this.listISLOADing = false
})
-
- this.listISLOADing = false
- this.getTreeList()
- }).catch((e) => {
- this.listISLOADing = false
})
},
jigouconfirm() {
- this.listISLOADing = true
- this.jigoufrom.FIRERESERVEPLAN_ID = this.planid
- this.jigoufrom.PARENT_ID = this.jigoumainid
- requestFN(
- '/plan/planningDepartment/save', this.jigoufrom
- ).then((data) => {
+ /* if (this.jigoufrom.NAME === undefined) {
this.$message({
- message: '添加成功',
- type: 'success'
+ message: '名称不能为空',
+ type: 'warning'
})
- this.dialogjigouShow = false
- this.listISLOADing = false
- this.getTreeList()
- }).catch((e) => {
- this.listISLOADing = false
+ return
+ }*/
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ this.listISLOADing = true
+ this.jigoufrom.FIRERESERVEPLAN_ID = this.planid
+ this.jigoufrom.PARENT_ID = this.jigoumainid
+ requestFN(
+ '/plan/planningDepartment/save', this.jigoufrom
+ ).then((data) => {
+ this.$message({
+ message: '添加成功',
+ type: 'success'
+ })
+ this.dialogjigouShow = false
+ this.listISLOADing = false
+ this.getTreeList()
+ this.$emit('zuzhihuidiao')
+ }).catch((e) => {
+ this.listISLOADing = false
+ })
+ }
})
},