diff --git a/src/components/selUser/index.vue b/src/components/selUser/index.vue
index 3e166bef..b796441a 100644
--- a/src/components/selUser/index.vue
+++ b/src/components/selUser/index.vue
@@ -170,7 +170,8 @@ export default {
},
treeList: [],
whereSql: false,
- whereValue: ''
+ whereValue: '',
+ Users: ''
}
},
created() {
@@ -364,7 +365,7 @@ export default {
this.getList()
},
handleSelectionChange(val) {
- this.$emit('updateUsers', val)
+ this.Users = val
},
closeDialog() {
this.dialogFormVisible = false
diff --git a/src/router/index.js b/src/router/index.js
index 911e0362..bfc62ded 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -99,7 +99,14 @@ export const constantRoutes = [
meta: { title: '安全点巡检', icon: 'list', noCache: true }
},
{
- path: 'edit_form/:id',
+ path: 'edit_form/create',
+ component: () => import('@/views/safe_insp/components/create/index'),
+ name: 'EditForm',
+ hidden: true,
+ meta: { title: '安全点巡检新增', icon: 'list', noCache: true }
+ },
+ {
+ path: 'edit_form/audit/:id',
component: () => import('@/views/safe_insp/components/edit_form/index'),
name: 'EditForm',
hidden: true,
diff --git a/src/views/insp_name/api/index.js b/src/views/insp_name/api/index.js
new file mode 100644
index 00000000..888f549c
--- /dev/null
+++ b/src/views/insp_name/api/index.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ auditSave(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=insp_name&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ getFormDate(id) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Save(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/insp_name/components/edit_form/index.vue b/src/views/insp_name/components/edit_form/index.vue
new file mode 100644
index 00000000..774b172c
--- /dev/null
+++ b/src/views/insp_name/components/edit_form/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/insp_name/components/insp_item/api/index.js b/src/views/insp_name/components/insp_item/api/index.js
new file mode 100644
index 00000000..a506b21a
--- /dev/null
+++ b/src/views/insp_name/components/insp_item/api/index.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(id, pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=subeditgrid&query_funid=insp_item&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=(insp_item.insp_name_id = ?)${whereSql}&where_value=${id}${whereValue}&where_type=string${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=insp_item&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/insp_name/components/insp_item/index.vue b/src/views/insp_name/components/insp_item/index.vue
new file mode 100644
index 00000000..079840e1
--- /dev/null
+++ b/src/views/insp_name/components/insp_item/index.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
123
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_insp/components/inspName/api/index.js b/src/views/safe_insp/components/inspName/api/index.js
new file mode 100644
index 00000000..888f549c
--- /dev/null
+++ b/src/views/safe_insp/components/inspName/api/index.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ auditSave(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=insp_name&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ getFormDate(id) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=insp_name&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Save(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=safe_insp&keyid=${data.safe_insp__safe_insp_id}&safe_insp__insp_code=${data.safe_insp__insp_code}&safe_insp__insp_name=${data.safe_insp__insp_name}&safe_insp__insp_man=${data.safe_insp__insp_man}&safe_insp__insp_times=${data.safe_insp__insp_times}&safe_insp__insp_name_id=${data.safe_insp__insp_name_id}&safe_insp__org_id=${data.safe_insp__org_id}&safe_insp__insp_state=${data.safe_insp__insp_state}&safe_insp__insp_date=${data.safe_insp__insp_date}&safe_insp__insp_memo=${data.safe_insp__insp_memo}&safe_insp__safe_insp_id=${data.safe_insp__safe_insp_id}&safe_insp__dept_id=${data.safe_insp__dept_id}&safe_insp__insp_man_id=${data.safe_insp__insp_man_id}&safe_insp__insp_ed=&safe_insp__insp_ing=${data.safe_insp__insp_ing}&safe_insp__insp_non=&pagetype=form&eventcode=save&dirtyfields=safe_insp.insp_man;safe_insp.insp_times;safe_insp.insp_date;safe_insp.insp_memo;safe_insp.insp_man_id;safe_insp.insp_name;safe_insp.insp_name_id;&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/safe_insp/components/inspName/index.vue b/src/views/safe_insp/components/inspName/index.vue
new file mode 100644
index 00000000..cb12ca51
--- /dev/null
+++ b/src/views/safe_insp/components/inspName/index.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/safe_insp/components/insp_det/index.vue b/src/views/safe_insp/components/insp_det/index.vue
index dacf505f..799c1ae2 100644
--- a/src/views/safe_insp/components/insp_det/index.vue
+++ b/src/views/safe_insp/components/insp_det/index.vue
@@ -205,7 +205,7 @@ export default {
},
editCreate() {
this.title = '新增'
- this.form = this.initFrom
+ this.form = JSON.parse(JSON.stringify(this.initFrom))
this.dialogFormVisible = true
},
edit(row) {
@@ -257,7 +257,7 @@ export default {
},
cellDblclick(row) {
this.title = '编辑'
- this.form = row
+ this.form = JSON.parse(JSON.stringify(row))
this.dialogFormVisible = true
},
sizeChange(size) {
diff --git a/src/views/safe_insp/index.vue b/src/views/safe_insp/index.vue
index cebf69fe..4865f4c2 100644
--- a/src/views/safe_insp/index.vue
+++ b/src/views/safe_insp/index.vue
@@ -277,15 +277,8 @@ export default {
}
},
editCreate() {
- if (this.ids === null) {
- this.$message.warning('请选择一个组织再添加下属组织')
- } else if (this.ids.length !== 1) {
- this.$message.warning('请选择一个组织再添加下属组织')
- } else {
- this.dialogFormVisible = true
- this.dept_id = this.ids[0]
- this.level = this.levels[0]
- }
+ const param = `/insp/edit_form/create`
+ this.$router.push(param)
},
create() {
this.$refs['form'].validate((valid) => {
@@ -368,7 +361,7 @@ export default {
})
},
cellDblclick(row) {
- const param = `/insp/edit_form/${row.safe_insp__safe_insp_id}`
+ const param = `/insp/edit_form/audit/${row.safe_insp__safe_insp_id}`
this.$router.push(param)
},
sizeChange(size) {