@@ -158,7 +158,7 @@
-
+
-
+
@@ -195,7 +195,7 @@
filterable
clearable
placeholder="请选择"
- @change="selectCaseTypeTime">
+ @change="updateHoursAndMins">
@@ -261,7 +261,7 @@
-
+
提交
@@ -288,8 +288,8 @@
components: { ArcGisMap },
props: {
id: {
- type: Number,
- default: 0
+ type: String,
+ default: ''
},
row: {
type: Object,
@@ -368,11 +368,14 @@
this.initProcess()
}
},
- // 选择案件处理单选键组
+ // 初始化案件处理单选键组
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
},
+ /**
+ * 选择常用语，更新审核意见
+ */
selectCommonLang(value) {
this.processForm.remarks = value
},
@@ -382,7 +385,7 @@
async selectCaseType(value) {
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.processCompObj.caseTypeDetailList = caseTypeDetailRes.data
- this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].casetypeDetailCode
+ this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].id
},
/**
* 选择小类，更新立案标准下拉框
@@ -393,21 +396,35 @@
this.processCompObj.caseTypeTime = caseTypeTimesRes.data[0].id
},
/**
- * 选择立案标准,同时更新完成时限
+ * 案卷等级和立案标准发生改变时，更新hours和minutes
*/
- selectCaseTypeTime(value) {
- console.log('selectCaseTypeTime', value)
- if (!value) { // 清空时清空完成时限
+ updateHoursAndMins() {
+ console.log('updateHoursAndMins', this.processCompObj.caseTypeTime)
+ if (!this.processCompObj.caseLevel) {
+ this.$message.error('请选择案卷等级')
+ return
+ }
+ if (!this.processCompObj.caseTypeTime) {
this.processCompObj.hours = ''
this.processCompObj.minutes = ''
return
}
- const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', value])
+ const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime])
+ console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj)
const day = parseInt(caseTypeTimeObj.day)
let hours = parseInt(caseTypeTimeObj.hours)
const minutes = parseInt(caseTypeTimeObj.minutes)
if (day) {
- hours += day * 24
+ switch (this.processCompObj.caseLevel) {
+ case '1':
+ hours += day * 7
+ break
+ case '2':
+ hours += day * 24
+ break
+ default:
+ this.$message.error('请选择案卷等级')
+ }
}
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
@@ -432,10 +449,15 @@
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey])
const radioConfig = radioMap[this.operationKey]
- switch (radioConfig.showComp) {
+ if (!radioConfig.showComp) {
+ this.processCompShow = ''
+ return
+ }
+ switch (radioConfig.showComp.split('_')[0]) {
case 'selectUser': { // 选择用户
this.processCompShow = 'selectUser'
- const userRes = await getUserList()
+ const roleTips = radioConfig.showComp.split('_')[1]
+ const userRes = await getUserList(roleTips)
this.$set(this.processCompObj, 'userList', userRes.data)
// 有默认id的设默认id
this.setDefaultUserId(radioConfig)
@@ -452,12 +474,13 @@
this.processCompShow = 'selectCaseTime'
const caseTypeRes = await getCaseTypeList(this.caseDetail.eorc) // 大类
this.$set(this.processCompObj, 'caseTypeList', caseTypeRes.data)
- const defaultCaseTypeId = _.find(caseTypeRes, ['typeCode', this.caseDetail.casetypeCode])
+ const defaultCaseTypeId = _.find(this.processCompObj.caseTypeList, ['typeCode', this.caseDetail.casetypeCode])
this.$set(this.processCompObj, 'caseType', defaultCaseTypeId)
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.$set(this.processCompObj, 'caseTypeDetailList', caseTypeDetailRes.data)
- this.$set(this.processCompObj, 'caseTypeDetail', this.caseDetail.casetypeDetailCode)
+ const defaultCaseTypeDetailId = _.find(this.processCompObj.caseTypeDetailList, ['typeDetailCode', this.caseDetail.casetypeDetailCode])
+ this.$set(this.processCompObj, 'caseTypeDetail', defaultCaseTypeDetailId)
const caseTypeTimeRes = await getCaseTypeTimes(this.processCompObj.caseTypeDetail) // 立案标准
this.$set(this.processCompObj, 'caseTypeTimeList', caseTypeTimeRes.data)
@@ -485,6 +508,7 @@
break
}
default:
+ console.log('default')
this.processCompShow = ''
break
}
@@ -507,7 +531,7 @@
// 其他参数
const radioConfig = radioMap[this.operationKey]
// 1. taskUserId
- if (radioConfig.showComp === 'selectUser' || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
+ if ((radioConfig.showComp && radioConfig.showComp.indexOf('selectUser') > 0) || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
if (!this.processCompObj.taskUserId) {
this.$message.error('请选择人员')
return false
diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js
index 8202ed9..317a956 100644
--- a/src/components/CaseCommon/radioMap.js
+++ b/src/components/CaseCommon/radioMap.js
@@ -1,6 +1,6 @@
const radioMap = {
'APHS': { // 安排核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'BLA': { // 不立案
@@ -44,7 +44,7 @@
passBack: null
},
'CZRY': { // 处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
},
'CZRYFKCLWC': { // 处置人员反馈处理完成
@@ -52,7 +52,7 @@
passBack: null
},
'DHC': { // 待核查
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'DLA': { // 待立案
@@ -60,7 +60,7 @@
passBack: null
},
'FHCL': { // 返回处理
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: 'processPersonId'
},
'GQ': { // 挂起
@@ -132,12 +132,12 @@
passBack: null
},
'THHS': { // 退回核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: 'verifyPersonId'
},
'XA': { // 销案
- showComp: 'selectUser',
- passBack: null
+ showComp: null,
+ passBack: 'isNeedRevisit'
},
'YLA': { // 预立案
showComp: null,
@@ -160,7 +160,7 @@
passBack: null
},
'ZCZRY': { // 转处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
}
diff --git a/.gitignore b/.gitignore
index 55371e5..ee78858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
node_modules
-.vscode
\ No newline at end of file
+.vscode
+dist
+dcms_coo_front.zip
+.gitignore
diff --git a/config/prod.env.js b/config/prod.env.js
index 23e92b9..037e66b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
- BASE_API: '"http://119.254.103.80:14536"',
+ BASE_API: '"http://192.168.8.201:8083"',
}
diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js
index 48d00c3..ec5a88a 100644
--- a/src/api/coorBusiness/case.js
+++ b/src/api/coorBusiness/case.js
@@ -1,10 +1,12 @@
import request from '@/utils/request'
-export function getUserList(data) {
+export function getUserList(roleTips) {
return request({
url: '/mgr/simplelist',
method: 'post',
- data
+ params: {
+ roleTips: roleTips
+ }
})
}
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 3329859..a9b5c8f 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -83,7 +83,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
案卷处理:
@@ -158,7 +158,7 @@
-
+
-
+
@@ -195,7 +195,7 @@
filterable
clearable
placeholder="请选择"
- @change="selectCaseTypeTime">
+ @change="updateHoursAndMins">
@@ -261,7 +261,7 @@
-
+
提交
@@ -288,8 +288,8 @@
components: { ArcGisMap },
props: {
id: {
- type: Number,
- default: 0
+ type: String,
+ default: ''
},
row: {
type: Object,
@@ -368,11 +368,14 @@
this.initProcess()
}
},
- // 选择案件处理单选键组
+ // 初始化案件处理单选键组
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
},
+ /**
+ * 选择常用语，更新审核意见
+ */
selectCommonLang(value) {
this.processForm.remarks = value
},
@@ -382,7 +385,7 @@
async selectCaseType(value) {
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.processCompObj.caseTypeDetailList = caseTypeDetailRes.data
- this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].casetypeDetailCode
+ this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].id
},
/**
* 选择小类，更新立案标准下拉框
@@ -393,21 +396,35 @@
this.processCompObj.caseTypeTime = caseTypeTimesRes.data[0].id
},
/**
- * 选择立案标准,同时更新完成时限
+ * 案卷等级和立案标准发生改变时，更新hours和minutes
*/
- selectCaseTypeTime(value) {
- console.log('selectCaseTypeTime', value)
- if (!value) { // 清空时清空完成时限
+ updateHoursAndMins() {
+ console.log('updateHoursAndMins', this.processCompObj.caseTypeTime)
+ if (!this.processCompObj.caseLevel) {
+ this.$message.error('请选择案卷等级')
+ return
+ }
+ if (!this.processCompObj.caseTypeTime) {
this.processCompObj.hours = ''
this.processCompObj.minutes = ''
return
}
- const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', value])
+ const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime])
+ console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj)
const day = parseInt(caseTypeTimeObj.day)
let hours = parseInt(caseTypeTimeObj.hours)
const minutes = parseInt(caseTypeTimeObj.minutes)
if (day) {
- hours += day * 24
+ switch (this.processCompObj.caseLevel) {
+ case '1':
+ hours += day * 7
+ break
+ case '2':
+ hours += day * 24
+ break
+ default:
+ this.$message.error('请选择案卷等级')
+ }
}
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
@@ -432,10 +449,15 @@
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey])
const radioConfig = radioMap[this.operationKey]
- switch (radioConfig.showComp) {
+ if (!radioConfig.showComp) {
+ this.processCompShow = ''
+ return
+ }
+ switch (radioConfig.showComp.split('_')[0]) {
case 'selectUser': { // 选择用户
this.processCompShow = 'selectUser'
- const userRes = await getUserList()
+ const roleTips = radioConfig.showComp.split('_')[1]
+ const userRes = await getUserList(roleTips)
this.$set(this.processCompObj, 'userList', userRes.data)
// 有默认id的设默认id
this.setDefaultUserId(radioConfig)
@@ -452,12 +474,13 @@
this.processCompShow = 'selectCaseTime'
const caseTypeRes = await getCaseTypeList(this.caseDetail.eorc) // 大类
this.$set(this.processCompObj, 'caseTypeList', caseTypeRes.data)
- const defaultCaseTypeId = _.find(caseTypeRes, ['typeCode', this.caseDetail.casetypeCode])
+ const defaultCaseTypeId = _.find(this.processCompObj.caseTypeList, ['typeCode', this.caseDetail.casetypeCode])
this.$set(this.processCompObj, 'caseType', defaultCaseTypeId)
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.$set(this.processCompObj, 'caseTypeDetailList', caseTypeDetailRes.data)
- this.$set(this.processCompObj, 'caseTypeDetail', this.caseDetail.casetypeDetailCode)
+ const defaultCaseTypeDetailId = _.find(this.processCompObj.caseTypeDetailList, ['typeDetailCode', this.caseDetail.casetypeDetailCode])
+ this.$set(this.processCompObj, 'caseTypeDetail', defaultCaseTypeDetailId)
const caseTypeTimeRes = await getCaseTypeTimes(this.processCompObj.caseTypeDetail) // 立案标准
this.$set(this.processCompObj, 'caseTypeTimeList', caseTypeTimeRes.data)
@@ -485,6 +508,7 @@
break
}
default:
+ console.log('default')
this.processCompShow = ''
break
}
@@ -507,7 +531,7 @@
// 其他参数
const radioConfig = radioMap[this.operationKey]
// 1. taskUserId
- if (radioConfig.showComp === 'selectUser' || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
+ if ((radioConfig.showComp && radioConfig.showComp.indexOf('selectUser') > 0) || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
if (!this.processCompObj.taskUserId) {
this.$message.error('请选择人员')
return false
diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js
index 8202ed9..317a956 100644
--- a/src/components/CaseCommon/radioMap.js
+++ b/src/components/CaseCommon/radioMap.js
@@ -1,6 +1,6 @@
const radioMap = {
'APHS': { // 安排核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'BLA': { // 不立案
@@ -44,7 +44,7 @@
passBack: null
},
'CZRY': { // 处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
},
'CZRYFKCLWC': { // 处置人员反馈处理完成
@@ -52,7 +52,7 @@
passBack: null
},
'DHC': { // 待核查
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'DLA': { // 待立案
@@ -60,7 +60,7 @@
passBack: null
},
'FHCL': { // 返回处理
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: 'processPersonId'
},
'GQ': { // 挂起
@@ -132,12 +132,12 @@
passBack: null
},
'THHS': { // 退回核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: 'verifyPersonId'
},
'XA': { // 销案
- showComp: 'selectUser',
- passBack: null
+ showComp: null,
+ passBack: 'isNeedRevisit'
},
'YLA': { // 预立案
showComp: null,
@@ -160,7 +160,7 @@
passBack: null
},
'ZCZRY': { // 转处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
}
diff --git a/src/views/coorBusiness/delayed/index.vue b/src/views/coorBusiness/delayed/index.vue
index b81a6a7..fd896bf 100644
--- a/src/views/coorBusiness/delayed/index.vue
+++ b/src/views/coorBusiness/delayed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/.gitignore b/.gitignore
index 55371e5..ee78858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
node_modules
-.vscode
\ No newline at end of file
+.vscode
+dist
+dcms_coo_front.zip
+.gitignore
diff --git a/config/prod.env.js b/config/prod.env.js
index 23e92b9..037e66b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
- BASE_API: '"http://119.254.103.80:14536"',
+ BASE_API: '"http://192.168.8.201:8083"',
}
diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js
index 48d00c3..ec5a88a 100644
--- a/src/api/coorBusiness/case.js
+++ b/src/api/coorBusiness/case.js
@@ -1,10 +1,12 @@
import request from '@/utils/request'
-export function getUserList(data) {
+export function getUserList(roleTips) {
return request({
url: '/mgr/simplelist',
method: 'post',
- data
+ params: {
+ roleTips: roleTips
+ }
})
}
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 3329859..a9b5c8f 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -83,7 +83,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
案卷处理:
@@ -158,7 +158,7 @@
-
+
-
+
@@ -195,7 +195,7 @@
filterable
clearable
placeholder="请选择"
- @change="selectCaseTypeTime">
+ @change="updateHoursAndMins">
@@ -261,7 +261,7 @@
-
+
提交
@@ -288,8 +288,8 @@
components: { ArcGisMap },
props: {
id: {
- type: Number,
- default: 0
+ type: String,
+ default: ''
},
row: {
type: Object,
@@ -368,11 +368,14 @@
this.initProcess()
}
},
- // 选择案件处理单选键组
+ // 初始化案件处理单选键组
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
},
+ /**
+ * 选择常用语，更新审核意见
+ */
selectCommonLang(value) {
this.processForm.remarks = value
},
@@ -382,7 +385,7 @@
async selectCaseType(value) {
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.processCompObj.caseTypeDetailList = caseTypeDetailRes.data
- this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].casetypeDetailCode
+ this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].id
},
/**
* 选择小类，更新立案标准下拉框
@@ -393,21 +396,35 @@
this.processCompObj.caseTypeTime = caseTypeTimesRes.data[0].id
},
/**
- * 选择立案标准,同时更新完成时限
+ * 案卷等级和立案标准发生改变时，更新hours和minutes
*/
- selectCaseTypeTime(value) {
- console.log('selectCaseTypeTime', value)
- if (!value) { // 清空时清空完成时限
+ updateHoursAndMins() {
+ console.log('updateHoursAndMins', this.processCompObj.caseTypeTime)
+ if (!this.processCompObj.caseLevel) {
+ this.$message.error('请选择案卷等级')
+ return
+ }
+ if (!this.processCompObj.caseTypeTime) {
this.processCompObj.hours = ''
this.processCompObj.minutes = ''
return
}
- const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', value])
+ const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime])
+ console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj)
const day = parseInt(caseTypeTimeObj.day)
let hours = parseInt(caseTypeTimeObj.hours)
const minutes = parseInt(caseTypeTimeObj.minutes)
if (day) {
- hours += day * 24
+ switch (this.processCompObj.caseLevel) {
+ case '1':
+ hours += day * 7
+ break
+ case '2':
+ hours += day * 24
+ break
+ default:
+ this.$message.error('请选择案卷等级')
+ }
}
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
@@ -432,10 +449,15 @@
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey])
const radioConfig = radioMap[this.operationKey]
- switch (radioConfig.showComp) {
+ if (!radioConfig.showComp) {
+ this.processCompShow = ''
+ return
+ }
+ switch (radioConfig.showComp.split('_')[0]) {
case 'selectUser': { // 选择用户
this.processCompShow = 'selectUser'
- const userRes = await getUserList()
+ const roleTips = radioConfig.showComp.split('_')[1]
+ const userRes = await getUserList(roleTips)
this.$set(this.processCompObj, 'userList', userRes.data)
// 有默认id的设默认id
this.setDefaultUserId(radioConfig)
@@ -452,12 +474,13 @@
this.processCompShow = 'selectCaseTime'
const caseTypeRes = await getCaseTypeList(this.caseDetail.eorc) // 大类
this.$set(this.processCompObj, 'caseTypeList', caseTypeRes.data)
- const defaultCaseTypeId = _.find(caseTypeRes, ['typeCode', this.caseDetail.casetypeCode])
+ const defaultCaseTypeId = _.find(this.processCompObj.caseTypeList, ['typeCode', this.caseDetail.casetypeCode])
this.$set(this.processCompObj, 'caseType', defaultCaseTypeId)
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.$set(this.processCompObj, 'caseTypeDetailList', caseTypeDetailRes.data)
- this.$set(this.processCompObj, 'caseTypeDetail', this.caseDetail.casetypeDetailCode)
+ const defaultCaseTypeDetailId = _.find(this.processCompObj.caseTypeDetailList, ['typeDetailCode', this.caseDetail.casetypeDetailCode])
+ this.$set(this.processCompObj, 'caseTypeDetail', defaultCaseTypeDetailId)
const caseTypeTimeRes = await getCaseTypeTimes(this.processCompObj.caseTypeDetail) // 立案标准
this.$set(this.processCompObj, 'caseTypeTimeList', caseTypeTimeRes.data)
@@ -485,6 +508,7 @@
break
}
default:
+ console.log('default')
this.processCompShow = ''
break
}
@@ -507,7 +531,7 @@
// 其他参数
const radioConfig = radioMap[this.operationKey]
// 1. taskUserId
- if (radioConfig.showComp === 'selectUser' || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
+ if ((radioConfig.showComp && radioConfig.showComp.indexOf('selectUser') > 0) || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
if (!this.processCompObj.taskUserId) {
this.$message.error('请选择人员')
return false
diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js
index 8202ed9..317a956 100644
--- a/src/components/CaseCommon/radioMap.js
+++ b/src/components/CaseCommon/radioMap.js
@@ -1,6 +1,6 @@
const radioMap = {
'APHS': { // 安排核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'BLA': { // 不立案
@@ -44,7 +44,7 @@
passBack: null
},
'CZRY': { // 处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
},
'CZRYFKCLWC': { // 处置人员反馈处理完成
@@ -52,7 +52,7 @@
passBack: null
},
'DHC': { // 待核查
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'DLA': { // 待立案
@@ -60,7 +60,7 @@
passBack: null
},
'FHCL': { // 返回处理
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: 'processPersonId'
},
'GQ': { // 挂起
@@ -132,12 +132,12 @@
passBack: null
},
'THHS': { // 退回核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: 'verifyPersonId'
},
'XA': { // 销案
- showComp: 'selectUser',
- passBack: null
+ showComp: null,
+ passBack: 'isNeedRevisit'
},
'YLA': { // 预立案
showComp: null,
@@ -160,7 +160,7 @@
passBack: null
},
'ZCZRY': { // 转处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
}
diff --git a/src/views/coorBusiness/delayed/index.vue b/src/views/coorBusiness/delayed/index.vue
index b81a6a7..fd896bf 100644
--- a/src/views/coorBusiness/delayed/index.vue
+++ b/src/views/coorBusiness/delayed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/postponed/index.vue b/src/views/coorBusiness/postponed/index.vue
index 63d1ed3..513625d 100644
--- a/src/views/coorBusiness/postponed/index.vue
+++ b/src/views/coorBusiness/postponed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/.gitignore b/.gitignore
index 55371e5..ee78858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
node_modules
-.vscode
\ No newline at end of file
+.vscode
+dist
+dcms_coo_front.zip
+.gitignore
diff --git a/config/prod.env.js b/config/prod.env.js
index 23e92b9..037e66b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
- BASE_API: '"http://119.254.103.80:14536"',
+ BASE_API: '"http://192.168.8.201:8083"',
}
diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js
index 48d00c3..ec5a88a 100644
--- a/src/api/coorBusiness/case.js
+++ b/src/api/coorBusiness/case.js
@@ -1,10 +1,12 @@
import request from '@/utils/request'
-export function getUserList(data) {
+export function getUserList(roleTips) {
return request({
url: '/mgr/simplelist',
method: 'post',
- data
+ params: {
+ roleTips: roleTips
+ }
})
}
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 3329859..a9b5c8f 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -83,7 +83,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
案卷处理:
@@ -158,7 +158,7 @@
-
+
-
+
@@ -195,7 +195,7 @@
filterable
clearable
placeholder="请选择"
- @change="selectCaseTypeTime">
+ @change="updateHoursAndMins">
@@ -261,7 +261,7 @@
-
+
提交
@@ -288,8 +288,8 @@
components: { ArcGisMap },
props: {
id: {
- type: Number,
- default: 0
+ type: String,
+ default: ''
},
row: {
type: Object,
@@ -368,11 +368,14 @@
this.initProcess()
}
},
- // 选择案件处理单选键组
+ // 初始化案件处理单选键组
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
},
+ /**
+ * 选择常用语，更新审核意见
+ */
selectCommonLang(value) {
this.processForm.remarks = value
},
@@ -382,7 +385,7 @@
async selectCaseType(value) {
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.processCompObj.caseTypeDetailList = caseTypeDetailRes.data
- this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].casetypeDetailCode
+ this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].id
},
/**
* 选择小类，更新立案标准下拉框
@@ -393,21 +396,35 @@
this.processCompObj.caseTypeTime = caseTypeTimesRes.data[0].id
},
/**
- * 选择立案标准,同时更新完成时限
+ * 案卷等级和立案标准发生改变时，更新hours和minutes
*/
- selectCaseTypeTime(value) {
- console.log('selectCaseTypeTime', value)
- if (!value) { // 清空时清空完成时限
+ updateHoursAndMins() {
+ console.log('updateHoursAndMins', this.processCompObj.caseTypeTime)
+ if (!this.processCompObj.caseLevel) {
+ this.$message.error('请选择案卷等级')
+ return
+ }
+ if (!this.processCompObj.caseTypeTime) {
this.processCompObj.hours = ''
this.processCompObj.minutes = ''
return
}
- const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', value])
+ const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime])
+ console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj)
const day = parseInt(caseTypeTimeObj.day)
let hours = parseInt(caseTypeTimeObj.hours)
const minutes = parseInt(caseTypeTimeObj.minutes)
if (day) {
- hours += day * 24
+ switch (this.processCompObj.caseLevel) {
+ case '1':
+ hours += day * 7
+ break
+ case '2':
+ hours += day * 24
+ break
+ default:
+ this.$message.error('请选择案卷等级')
+ }
}
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
@@ -432,10 +449,15 @@
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey])
const radioConfig = radioMap[this.operationKey]
- switch (radioConfig.showComp) {
+ if (!radioConfig.showComp) {
+ this.processCompShow = ''
+ return
+ }
+ switch (radioConfig.showComp.split('_')[0]) {
case 'selectUser': { // 选择用户
this.processCompShow = 'selectUser'
- const userRes = await getUserList()
+ const roleTips = radioConfig.showComp.split('_')[1]
+ const userRes = await getUserList(roleTips)
this.$set(this.processCompObj, 'userList', userRes.data)
// 有默认id的设默认id
this.setDefaultUserId(radioConfig)
@@ -452,12 +474,13 @@
this.processCompShow = 'selectCaseTime'
const caseTypeRes = await getCaseTypeList(this.caseDetail.eorc) // 大类
this.$set(this.processCompObj, 'caseTypeList', caseTypeRes.data)
- const defaultCaseTypeId = _.find(caseTypeRes, ['typeCode', this.caseDetail.casetypeCode])
+ const defaultCaseTypeId = _.find(this.processCompObj.caseTypeList, ['typeCode', this.caseDetail.casetypeCode])
this.$set(this.processCompObj, 'caseType', defaultCaseTypeId)
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.$set(this.processCompObj, 'caseTypeDetailList', caseTypeDetailRes.data)
- this.$set(this.processCompObj, 'caseTypeDetail', this.caseDetail.casetypeDetailCode)
+ const defaultCaseTypeDetailId = _.find(this.processCompObj.caseTypeDetailList, ['typeDetailCode', this.caseDetail.casetypeDetailCode])
+ this.$set(this.processCompObj, 'caseTypeDetail', defaultCaseTypeDetailId)
const caseTypeTimeRes = await getCaseTypeTimes(this.processCompObj.caseTypeDetail) // 立案标准
this.$set(this.processCompObj, 'caseTypeTimeList', caseTypeTimeRes.data)
@@ -485,6 +508,7 @@
break
}
default:
+ console.log('default')
this.processCompShow = ''
break
}
@@ -507,7 +531,7 @@
// 其他参数
const radioConfig = radioMap[this.operationKey]
// 1. taskUserId
- if (radioConfig.showComp === 'selectUser' || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
+ if ((radioConfig.showComp && radioConfig.showComp.indexOf('selectUser') > 0) || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
if (!this.processCompObj.taskUserId) {
this.$message.error('请选择人员')
return false
diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js
index 8202ed9..317a956 100644
--- a/src/components/CaseCommon/radioMap.js
+++ b/src/components/CaseCommon/radioMap.js
@@ -1,6 +1,6 @@
const radioMap = {
'APHS': { // 安排核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'BLA': { // 不立案
@@ -44,7 +44,7 @@
passBack: null
},
'CZRY': { // 处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
},
'CZRYFKCLWC': { // 处置人员反馈处理完成
@@ -52,7 +52,7 @@
passBack: null
},
'DHC': { // 待核查
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'DLA': { // 待立案
@@ -60,7 +60,7 @@
passBack: null
},
'FHCL': { // 返回处理
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: 'processPersonId'
},
'GQ': { // 挂起
@@ -132,12 +132,12 @@
passBack: null
},
'THHS': { // 退回核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: 'verifyPersonId'
},
'XA': { // 销案
- showComp: 'selectUser',
- passBack: null
+ showComp: null,
+ passBack: 'isNeedRevisit'
},
'YLA': { // 预立案
showComp: null,
@@ -160,7 +160,7 @@
passBack: null
},
'ZCZRY': { // 转处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
}
diff --git a/src/views/coorBusiness/delayed/index.vue b/src/views/coorBusiness/delayed/index.vue
index b81a6a7..fd896bf 100644
--- a/src/views/coorBusiness/delayed/index.vue
+++ b/src/views/coorBusiness/delayed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/postponed/index.vue b/src/views/coorBusiness/postponed/index.vue
index 63d1ed3..513625d 100644
--- a/src/views/coorBusiness/postponed/index.vue
+++ b/src/views/coorBusiness/postponed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/secIsDelay/index.vue b/src/views/coorBusiness/secIsDelay/index.vue
index 1d88567..0ec70c1 100644
--- a/src/views/coorBusiness/secIsDelay/index.vue
+++ b/src/views/coorBusiness/secIsDelay/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/.gitignore b/.gitignore
index 55371e5..ee78858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
node_modules
-.vscode
\ No newline at end of file
+.vscode
+dist
+dcms_coo_front.zip
+.gitignore
diff --git a/config/prod.env.js b/config/prod.env.js
index 23e92b9..037e66b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
'use strict'
module.exports = {
NODE_ENV: '"production"',
- BASE_API: '"http://119.254.103.80:14536"',
+ BASE_API: '"http://192.168.8.201:8083"',
}
diff --git a/src/api/coorBusiness/case.js b/src/api/coorBusiness/case.js
index 48d00c3..ec5a88a 100644
--- a/src/api/coorBusiness/case.js
+++ b/src/api/coorBusiness/case.js
@@ -1,10 +1,12 @@
import request from '@/utils/request'
-export function getUserList(data) {
+export function getUserList(roleTips) {
return request({
url: '/mgr/simplelist',
method: 'post',
- data
+ params: {
+ roleTips: roleTips
+ }
})
}
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index 3329859..a9b5c8f 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -83,7 +83,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
案卷处理:
@@ -158,7 +158,7 @@
-
+
-
+
@@ -195,7 +195,7 @@
filterable
clearable
placeholder="请选择"
- @change="selectCaseTypeTime">
+ @change="updateHoursAndMins">
@@ -261,7 +261,7 @@
-
+
提交
@@ -288,8 +288,8 @@
components: { ArcGisMap },
props: {
id: {
- type: Number,
- default: 0
+ type: String,
+ default: ''
},
row: {
type: Object,
@@ -368,11 +368,14 @@
this.initProcess()
}
},
- // 选择案件处理单选键组
+ // 初始化案件处理单选键组
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
},
+ /**
+ * 选择常用语，更新审核意见
+ */
selectCommonLang(value) {
this.processForm.remarks = value
},
@@ -382,7 +385,7 @@
async selectCaseType(value) {
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.processCompObj.caseTypeDetailList = caseTypeDetailRes.data
- this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].casetypeDetailCode
+ this.processCompObj.caseTypeDetail = caseTypeDetailRes.data[0].id
},
/**
* 选择小类，更新立案标准下拉框
@@ -393,21 +396,35 @@
this.processCompObj.caseTypeTime = caseTypeTimesRes.data[0].id
},
/**
- * 选择立案标准,同时更新完成时限
+ * 案卷等级和立案标准发生改变时，更新hours和minutes
*/
- selectCaseTypeTime(value) {
- console.log('selectCaseTypeTime', value)
- if (!value) { // 清空时清空完成时限
+ updateHoursAndMins() {
+ console.log('updateHoursAndMins', this.processCompObj.caseTypeTime)
+ if (!this.processCompObj.caseLevel) {
+ this.$message.error('请选择案卷等级')
+ return
+ }
+ if (!this.processCompObj.caseTypeTime) {
this.processCompObj.hours = ''
this.processCompObj.minutes = ''
return
}
- const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', value])
+ const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime])
+ console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj)
const day = parseInt(caseTypeTimeObj.day)
let hours = parseInt(caseTypeTimeObj.hours)
const minutes = parseInt(caseTypeTimeObj.minutes)
if (day) {
- hours += day * 24
+ switch (this.processCompObj.caseLevel) {
+ case '1':
+ hours += day * 7
+ break
+ case '2':
+ hours += day * 24
+ break
+ default:
+ this.$message.error('请选择案卷等级')
+ }
}
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
@@ -432,10 +449,15 @@
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey])
const radioConfig = radioMap[this.operationKey]
- switch (radioConfig.showComp) {
+ if (!radioConfig.showComp) {
+ this.processCompShow = ''
+ return
+ }
+ switch (radioConfig.showComp.split('_')[0]) {
case 'selectUser': { // 选择用户
this.processCompShow = 'selectUser'
- const userRes = await getUserList()
+ const roleTips = radioConfig.showComp.split('_')[1]
+ const userRes = await getUserList(roleTips)
this.$set(this.processCompObj, 'userList', userRes.data)
// 有默认id的设默认id
this.setDefaultUserId(radioConfig)
@@ -452,12 +474,13 @@
this.processCompShow = 'selectCaseTime'
const caseTypeRes = await getCaseTypeList(this.caseDetail.eorc) // 大类
this.$set(this.processCompObj, 'caseTypeList', caseTypeRes.data)
- const defaultCaseTypeId = _.find(caseTypeRes, ['typeCode', this.caseDetail.casetypeCode])
+ const defaultCaseTypeId = _.find(this.processCompObj.caseTypeList, ['typeCode', this.caseDetail.casetypeCode])
this.$set(this.processCompObj, 'caseType', defaultCaseTypeId)
const caseTypeDetailRes = await getCaseTypeDetailList(this.caseDetail.eorc, this.processCompObj.caseType) // 小类
this.$set(this.processCompObj, 'caseTypeDetailList', caseTypeDetailRes.data)
- this.$set(this.processCompObj, 'caseTypeDetail', this.caseDetail.casetypeDetailCode)
+ const defaultCaseTypeDetailId = _.find(this.processCompObj.caseTypeDetailList, ['typeDetailCode', this.caseDetail.casetypeDetailCode])
+ this.$set(this.processCompObj, 'caseTypeDetail', defaultCaseTypeDetailId)
const caseTypeTimeRes = await getCaseTypeTimes(this.processCompObj.caseTypeDetail) // 立案标准
this.$set(this.processCompObj, 'caseTypeTimeList', caseTypeTimeRes.data)
@@ -485,6 +508,7 @@
break
}
default:
+ console.log('default')
this.processCompShow = ''
break
}
@@ -507,7 +531,7 @@
// 其他参数
const radioConfig = radioMap[this.operationKey]
// 1. taskUserId
- if (radioConfig.showComp === 'selectUser' || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
+ if ((radioConfig.showComp && radioConfig.showComp.indexOf('selectUser') > 0) || radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonid') {
if (!this.processCompObj.taskUserId) {
this.$message.error('请选择人员')
return false
diff --git a/src/components/CaseCommon/radioMap.js b/src/components/CaseCommon/radioMap.js
index 8202ed9..317a956 100644
--- a/src/components/CaseCommon/radioMap.js
+++ b/src/components/CaseCommon/radioMap.js
@@ -1,6 +1,6 @@
const radioMap = {
'APHS': { // 安排核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'BLA': { // 不立案
@@ -44,7 +44,7 @@
passBack: null
},
'CZRY': { // 处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
},
'CZRYFKCLWC': { // 处置人员反馈处理完成
@@ -52,7 +52,7 @@
passBack: null
},
'DHC': { // 待核查
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: null
},
'DLA': { // 待立案
@@ -60,7 +60,7 @@
passBack: null
},
'FHCL': { // 返回处理
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: 'processPersonId'
},
'GQ': { // 挂起
@@ -132,12 +132,12 @@
passBack: null
},
'THHS': { // 退回核实
- showComp: 'selectUser',
+ showComp: 'selectUser_supervisor',
passBack: 'verifyPersonId'
},
'XA': { // 销案
- showComp: 'selectUser',
- passBack: null
+ showComp: null,
+ passBack: 'isNeedRevisit'
},
'YLA': { // 预立案
showComp: null,
@@ -160,7 +160,7 @@
passBack: null
},
'ZCZRY': { // 转处置人员
- showComp: 'selectUser',
+ showComp: 'selectUser_process',
passBack: null
}
diff --git a/src/views/coorBusiness/delayed/index.vue b/src/views/coorBusiness/delayed/index.vue
index b81a6a7..fd896bf 100644
--- a/src/views/coorBusiness/delayed/index.vue
+++ b/src/views/coorBusiness/delayed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/postponed/index.vue b/src/views/coorBusiness/postponed/index.vue
index 63d1ed3..513625d 100644
--- a/src/views/coorBusiness/postponed/index.vue
+++ b/src/views/coorBusiness/postponed/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/secIsDelay/index.vue b/src/views/coorBusiness/secIsDelay/index.vue
index 1d88567..0ec70c1 100644
--- a/src/views/coorBusiness/secIsDelay/index.vue
+++ b/src/views/coorBusiness/secIsDelay/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+
diff --git a/src/views/coorBusiness/secIsPostpone/index.vue b/src/views/coorBusiness/secIsPostpone/index.vue
index be029b5..58300ff 100644
--- a/src/views/coorBusiness/secIsPostpone/index.vue
+++ b/src/views/coorBusiness/secIsPostpone/index.vue
@@ -21,7 +21,7 @@
closable
>
-
+