diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 3426505..f43dea7 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -12,16 +12,21 @@
-
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
@@ -120,7 +130,9 @@ export default {
deviceName: '',
id: '',
idRemark: '',
- remark: ''
+ remark: '',
+ userCardId: '',
+ userPhone: ''
},
form: {
required: {
@@ -133,9 +145,11 @@ export default {
deviceId: '',
deviceName: '',
id: '',
- idRemark: ''
+ userCardId: '',
+ userPhone: ''
},
- remark: ''
+ remark: '',
+ idRemark: ''
},
normalizer(node) {
return {
@@ -166,6 +180,12 @@ export default {
],
idRemark: [
{ required: true, message: '请填写其他系统编号备注', trigger: 'change' }
+ ],
+ userPhone: [
+ { required: true, message: '请填写负责人手机号', trigger: 'change' }
+ ],
+ userCardId: [
+ { required: true, message: '请填写负责人身份证', trigger: 'change' }
]
},
heirloom: {},
@@ -182,12 +202,34 @@ export default {
},
methods: {
async init(e) {
- if (e) {
- this.heirloom = e
- }
this.visible = true
await this.getDepartmentTree()
- this.getDict()
+ await this.getDict()
+ await this.getPeopleList({ id: e.departmentId })
+ if (e) {
+ await this.initInfo(e)
+ }
+ },
+ initInfo(e) {
+ return new Promise(resolve => {
+ this.heirloom = e
+ this.material.type = e.type
+ this.material.typeName = e.typeName
+ this.material.typeInfo = JSON.stringify({ name: e.typeName, value: e.type })
+ this.material.userId = e.userId
+ this.material.userName = e.userName
+ this.material.departmentId = e.departmentId
+ this.material.departmentName = e.departmentName
+ this.material.userPhone = e.userPhone
+ this.material.userCardId = e.userCardId
+ this.material.deviceId = e.deviceId
+ this.material.deviceName = e.deviceName
+ this.material.id = e.id
+ this.material.idRemark = e.idRemark
+ this.material.userInfo = e.userName
+ this.material.dwUserMapId = e.dwUserMapId
+ this.material.remark = e.remark
+ })
},
getMenu() {
return new Promise(resolve => {
@@ -204,6 +246,7 @@ export default {
})
},
sendMessage(e) {
+ console.log(this.material)
this.$refs.form.validate((valid) => {
if (!valid) {
this.$message.error('请填写完整信息')
@@ -217,16 +260,20 @@ export default {
this.form.required.deviceId = this.material.deviceId
this.form.required.deviceName = this.material.deviceName
this.form.required.id = this.material.id
- this.form.required.idRemark = this.material.idRemark
+ this.form.required.userCardId = this.material.userCardId
+ this.form.required.userPhone = this.material.userPhone
+ this.form.idRemark = this.material.idRemark
this.form.remark = this.material.remark
+ this.form.dwUserMapId = this.material.dwUserMapId
requestFN(
'/dingWei/saveOrUpdateMap', { data: JSON.stringify(this.form) }
).then((data) => {
- if (data.code === 0) {
+ if (data.code === 200) {
this.$message.success('操作成功')
this.handleClose()
- this.$emit('refresh')
+ this.$emit('flush')
+ this.visible = false
} else {
this.$message.error(data.msg)
}
@@ -237,17 +284,21 @@ export default {
})
},
getPeopleList(e) {
- this.material.departmentName = e.name
- requestFN(
- '/user/listAll',
- {
- DEPARTMENT_ID: e.id
- }
- ).then((data) => {
- this.dic.userList = data.userList
- this.material.userInfo = ''
- }).catch((e) => {
- console.log(e)
+ return new Promise(resolve => {
+ this.material.departmentName = e.name
+ requestFN(
+ '/user/listAll',
+ {
+ DEPARTMENT_ID: e.id
+ }
+ ).then((data) => {
+ this.dic.userList = data.userList
+ this.material.userInfo = ''
+ resolve(true)
+ }).catch((e) => {
+ console.log(e)
+ resolve(true)
+ })
})
},
chooseUser(e) {
@@ -256,32 +307,46 @@ export default {
this.material.userName = entity.NAME
},
handleClose() {
- this.form = {
- STATUS: '',
- APPOINT_DEPARTMENT_ID: null,
- APPOINT_DEPARTMENT_NAME: '',
- APPOINT_USER_ID: '',
- APPOINT_USER_NAME: '',
- OPINION: '',
- user: '',
- list: [],
- tm: new Date().getTime()
- }
- this.visible = false
+ this.beforeClose()
},
beforeClose() {
this.visible = false
this.form = {
- STATUS: '',
- APPOINT_DEPARTMENT_ID: null,
- APPOINT_DEPARTMENT_NAME: '',
- APPOINT_USER_ID: '',
- APPOINT_USER_NAME: '',
- OPINION: '',
- user: '',
- list: [],
- tm: new Date().getTime()
+ required: {
+ type: '',
+ typeName: '',
+ departmentId: '',
+ departmentName: '',
+ userId: '',
+ userName: '',
+ deviceId: '',
+ deviceName: '',
+ id: '',
+ userCardId: '',
+ userPhone: ''
+ },
+ remark: '',
+ idRemark: ''
}
+ this.material = {
+ typeInfo: '',
+ type: '',
+ typeName: '',
+ deptInfo: '',
+ departmentId: null,
+ departmentName: '',
+ userInfo: '',
+ userId: '',
+ userName: '',
+ deviceId: '',
+ deviceName: '',
+ id: '',
+ idRemark: '',
+ remark: '',
+ userCardId: '',
+ userPhone: ''
+ }
+ this.$emit('flush')
},
saveInfo(e) {
const info = JSON.parse(e)
@@ -289,12 +354,16 @@ export default {
this.material.typeName = info.name
},
getDict() {
- requestFN('dingWei/getDictionary').then((data) => {
- this.dic.alarmStatus = JSON.parse(data.AlarmStatus)
- this.dic.logType = JSON.parse(data.LogType)
- this.dic.mapType = JSON.parse(data.MapType)
- }).catch((e) => {
- this.listLoading = false
+ return new Promise(resolve => {
+ requestFN('dingWei/getDictionary').then((data) => {
+ this.dic.alarmStatus = JSON.parse(data.AlarmStatus)
+ this.dic.logType = JSON.parse(data.LogType)
+ this.dic.mapType = JSON.parse(data.MapType)
+ resolve(true)
+ }).catch((e) => {
+ this.listLoading = false
+ resolve(true)
+ })
})
},
getDepartmentTree() {
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index 8d173f7..be3ee81 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -36,19 +36,19 @@
highlight-current-row>
-
-
+
+
-
+
- 删除
- 编辑
+ 删除
+ 编辑
@@ -89,8 +89,7 @@ export default {
}
},
created() {
- this.getDict()
- // this.getList()
+ this.getList()
this.hasButton()
},
methods: {
@@ -118,7 +117,7 @@ export default {
).then((data) => {
this.listLoading = false
this.varList = data.list
- this.total = data.page.total
+ this.listQuery.total = Number(data.page.total)
}).catch((e) => {
this.listLoading = false
})
@@ -155,7 +154,37 @@ export default {
}).catch((e) => {
this.listLoading = false
})
+ },
+ handleDelete(row) {
+ this.$confirm('是否删除该条数据?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.listLoading = true
+ requestFN(
+ '/dingWei/deleteMap', { id: row.dwUserMapId }
+ ).then((data) => {
+ this.listLoading = false
+ this.$message({
+ type: 'success',
+ message: '删除成功!'
+ })
+ this.getList()
+ }).catch((e) => {
+ this.listLoading = false
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ })
+ })
+ },
+ handleEdit(row) {
+ this.$refs.info.init(row)
}
+
}
}