diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index cd7f277..f2ae4e9 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -181,7 +181,7 @@ - + + > @@ -212,7 +212,7 @@ filterable clearable placeholder="请选择案卷小类" - @change="selectCaseTypeDetail"> + > @@ -301,7 +301,7 @@ - + @@ -352,7 +352,7 @@ commonLanguage: '', // 常用语 commonLanguageList: [], // 常用语列表 processRadioList: [], // 案件处理单选按钮 - processCompShow: '', // 案卷处理组件显示 + processCompShow: '', // 案卷处理组件显示:selectUser 显示人员选择框;selectDept 显示部门选择框;selectCaseTime 显示立案组件;selectFilingType 显示归档类型下拉框;inputDelayTime 显示时间输入框 processCompObj: {}, // 案卷处理组件相关对象 dialogVisible: false, caseLevelLoading: false, @@ -385,36 +385,6 @@ return this.processForm.operationKey } }, - watch: { - 'processCompObj.eorc': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectEorc(newValue) - } - } - }, - 'processCompObj.caseType': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseType(newValue) - } - } - }, - 'processCompObj.caseTypeDetail': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseTypeDetail(newValue) - } - } - }, - 'processCompObj.caseTypeTime': { - handler(newValue, oldValue) { - if (oldValue) { - this.updateHoursAndMins() - } - } - } - }, activated() { console.log('activated') this.id = this.$route.query.id @@ -545,7 +515,7 @@ return } const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime]) - console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) + // console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) const day = parseInt(caseTypeTimeObj.day) let hours = parseInt(caseTypeTimeObj.hours) const minutes = parseInt(caseTypeTimeObj.minutes) @@ -605,7 +575,7 @@ this.$set(this.processCompObj, 'dispatchDeptId', '') break } - case 'selectCaseTime': { // 大类,小类,选择立案标准,可输入时分(立案) + case 'selectCaseTime': { // 立案:案卷等级、类别、大类、小类、立案标准、完成时限 this.processCompShow = 'selectCaseTime' const caseLevelRes = await getCaseLevelList() // 案卷等级 @@ -655,8 +625,20 @@ if (this.caseDetail.casetypesTimeId) { this.processCompObj.caseTypeTime = this.caseDetail.casetypesTimeId } - // this.updateHoursAndMins() + // 添加watch监控 + this.$watch('processCompObj.eorc', (newValue, oldValue) => { + this.selectEorc(newValue) + }) + this.$watch('processCompObj.caseType', (newValue, oldValue) => { + this.selectCaseType(newValue) + }) + this.$watch('processCompObj.caseTypeDetail', (newValue, oldValue) => { + this.selectCaseTypeDetail(newValue) + }) + this.$watch('processCompObj.caseTypeTime', (newValue, oldValue) => { + this.updateHoursAndMins(newValue) + }) break } case 'selectFilingType': { // 选择归档类型 @@ -701,7 +683,6 @@ // 其他参数 const radioConfig = radioMap[this.operationKey] // 1. taskUserId - // debugger if (!this.processCompObj.taskUserId && (radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonId')) { this.setDefaultUserId(radioConfig) } @@ -781,7 +762,7 @@ console.log(this.processForm) return true }, - numberIsNull(value) { // 判断数值是否为空, + numberIsNull(value) { // 判断数值是否为空, 且非负 if (value && Number(value) >= 0) { return true } else { @@ -879,4 +860,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index cd7f277..f2ae4e9 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -181,7 +181,7 @@ - + + > @@ -212,7 +212,7 @@ filterable clearable placeholder="请选择案卷小类" - @change="selectCaseTypeDetail"> + > @@ -301,7 +301,7 @@ - + @@ -352,7 +352,7 @@ commonLanguage: '', // 常用语 commonLanguageList: [], // 常用语列表 processRadioList: [], // 案件处理单选按钮 - processCompShow: '', // 案卷处理组件显示 + processCompShow: '', // 案卷处理组件显示:selectUser 显示人员选择框;selectDept 显示部门选择框;selectCaseTime 显示立案组件;selectFilingType 显示归档类型下拉框;inputDelayTime 显示时间输入框 processCompObj: {}, // 案卷处理组件相关对象 dialogVisible: false, caseLevelLoading: false, @@ -385,36 +385,6 @@ return this.processForm.operationKey } }, - watch: { - 'processCompObj.eorc': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectEorc(newValue) - } - } - }, - 'processCompObj.caseType': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseType(newValue) - } - } - }, - 'processCompObj.caseTypeDetail': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseTypeDetail(newValue) - } - } - }, - 'processCompObj.caseTypeTime': { - handler(newValue, oldValue) { - if (oldValue) { - this.updateHoursAndMins() - } - } - } - }, activated() { console.log('activated') this.id = this.$route.query.id @@ -545,7 +515,7 @@ return } const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime]) - console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) + // console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) const day = parseInt(caseTypeTimeObj.day) let hours = parseInt(caseTypeTimeObj.hours) const minutes = parseInt(caseTypeTimeObj.minutes) @@ -605,7 +575,7 @@ this.$set(this.processCompObj, 'dispatchDeptId', '') break } - case 'selectCaseTime': { // 大类,小类,选择立案标准,可输入时分(立案) + case 'selectCaseTime': { // 立案:案卷等级、类别、大类、小类、立案标准、完成时限 this.processCompShow = 'selectCaseTime' const caseLevelRes = await getCaseLevelList() // 案卷等级 @@ -655,8 +625,20 @@ if (this.caseDetail.casetypesTimeId) { this.processCompObj.caseTypeTime = this.caseDetail.casetypesTimeId } - // this.updateHoursAndMins() + // 添加watch监控 + this.$watch('processCompObj.eorc', (newValue, oldValue) => { + this.selectEorc(newValue) + }) + this.$watch('processCompObj.caseType', (newValue, oldValue) => { + this.selectCaseType(newValue) + }) + this.$watch('processCompObj.caseTypeDetail', (newValue, oldValue) => { + this.selectCaseTypeDetail(newValue) + }) + this.$watch('processCompObj.caseTypeTime', (newValue, oldValue) => { + this.updateHoursAndMins(newValue) + }) break } case 'selectFilingType': { // 选择归档类型 @@ -701,7 +683,6 @@ // 其他参数 const radioConfig = radioMap[this.operationKey] // 1. taskUserId - // debugger if (!this.processCompObj.taskUserId && (radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonId')) { this.setDefaultUserId(radioConfig) } @@ -781,7 +762,7 @@ console.log(this.processForm) return true }, - numberIsNull(value) { // 判断数值是否为空, + numberIsNull(value) { // 判断数值是否为空, 且非负 if (value && Number(value) >= 0) { return true } else { @@ -879,4 +860,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 06a7622..402b3c7 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -306,4 +306,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index cd7f277..f2ae4e9 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -181,7 +181,7 @@ - + + > @@ -212,7 +212,7 @@ filterable clearable placeholder="请选择案卷小类" - @change="selectCaseTypeDetail"> + > @@ -301,7 +301,7 @@ - + @@ -352,7 +352,7 @@ commonLanguage: '', // 常用语 commonLanguageList: [], // 常用语列表 processRadioList: [], // 案件处理单选按钮 - processCompShow: '', // 案卷处理组件显示 + processCompShow: '', // 案卷处理组件显示:selectUser 显示人员选择框;selectDept 显示部门选择框;selectCaseTime 显示立案组件;selectFilingType 显示归档类型下拉框;inputDelayTime 显示时间输入框 processCompObj: {}, // 案卷处理组件相关对象 dialogVisible: false, caseLevelLoading: false, @@ -385,36 +385,6 @@ return this.processForm.operationKey } }, - watch: { - 'processCompObj.eorc': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectEorc(newValue) - } - } - }, - 'processCompObj.caseType': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseType(newValue) - } - } - }, - 'processCompObj.caseTypeDetail': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseTypeDetail(newValue) - } - } - }, - 'processCompObj.caseTypeTime': { - handler(newValue, oldValue) { - if (oldValue) { - this.updateHoursAndMins() - } - } - } - }, activated() { console.log('activated') this.id = this.$route.query.id @@ -545,7 +515,7 @@ return } const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime]) - console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) + // console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) const day = parseInt(caseTypeTimeObj.day) let hours = parseInt(caseTypeTimeObj.hours) const minutes = parseInt(caseTypeTimeObj.minutes) @@ -605,7 +575,7 @@ this.$set(this.processCompObj, 'dispatchDeptId', '') break } - case 'selectCaseTime': { // 大类,小类,选择立案标准,可输入时分(立案) + case 'selectCaseTime': { // 立案:案卷等级、类别、大类、小类、立案标准、完成时限 this.processCompShow = 'selectCaseTime' const caseLevelRes = await getCaseLevelList() // 案卷等级 @@ -655,8 +625,20 @@ if (this.caseDetail.casetypesTimeId) { this.processCompObj.caseTypeTime = this.caseDetail.casetypesTimeId } - // this.updateHoursAndMins() + // 添加watch监控 + this.$watch('processCompObj.eorc', (newValue, oldValue) => { + this.selectEorc(newValue) + }) + this.$watch('processCompObj.caseType', (newValue, oldValue) => { + this.selectCaseType(newValue) + }) + this.$watch('processCompObj.caseTypeDetail', (newValue, oldValue) => { + this.selectCaseTypeDetail(newValue) + }) + this.$watch('processCompObj.caseTypeTime', (newValue, oldValue) => { + this.updateHoursAndMins(newValue) + }) break } case 'selectFilingType': { // 选择归档类型 @@ -701,7 +683,6 @@ // 其他参数 const radioConfig = radioMap[this.operationKey] // 1. taskUserId - // debugger if (!this.processCompObj.taskUserId && (radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonId')) { this.setDefaultUserId(radioConfig) } @@ -781,7 +762,7 @@ console.log(this.processForm) return true }, - numberIsNull(value) { // 判断数值是否为空, + numberIsNull(value) { // 判断数值是否为空, 且非负 if (value && Number(value) >= 0) { return true } else { @@ -879,4 +860,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 06a7622..402b3c7 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -306,4 +306,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue index 7e00d5f..206edcd 100644 --- a/src/views/caseCommon/caseDetailRead.vue +++ b/src/views/caseCommon/caseDetailRead.vue @@ -298,4 +298,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index cd7f277..f2ae4e9 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -181,7 +181,7 @@ - + + > @@ -212,7 +212,7 @@ filterable clearable placeholder="请选择案卷小类" - @change="selectCaseTypeDetail"> + > @@ -301,7 +301,7 @@ - + @@ -352,7 +352,7 @@ commonLanguage: '', // 常用语 commonLanguageList: [], // 常用语列表 processRadioList: [], // 案件处理单选按钮 - processCompShow: '', // 案卷处理组件显示 + processCompShow: '', // 案卷处理组件显示:selectUser 显示人员选择框;selectDept 显示部门选择框;selectCaseTime 显示立案组件;selectFilingType 显示归档类型下拉框;inputDelayTime 显示时间输入框 processCompObj: {}, // 案卷处理组件相关对象 dialogVisible: false, caseLevelLoading: false, @@ -385,36 +385,6 @@ return this.processForm.operationKey } }, - watch: { - 'processCompObj.eorc': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectEorc(newValue) - } - } - }, - 'processCompObj.caseType': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseType(newValue) - } - } - }, - 'processCompObj.caseTypeDetail': { - handler(newValue, oldValue) { - if (oldValue) { - this.selectCaseTypeDetail(newValue) - } - } - }, - 'processCompObj.caseTypeTime': { - handler(newValue, oldValue) { - if (oldValue) { - this.updateHoursAndMins() - } - } - } - }, activated() { console.log('activated') this.id = this.$route.query.id @@ -545,7 +515,7 @@ return } const caseTypeTimeObj = _.find(this.processCompObj.caseTypeTimeList, ['id', this.processCompObj.caseTypeTime]) - console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) + // console.log(this.processCompObj.caseTypeTime, caseTypeTimeObj) const day = parseInt(caseTypeTimeObj.day) let hours = parseInt(caseTypeTimeObj.hours) const minutes = parseInt(caseTypeTimeObj.minutes) @@ -605,7 +575,7 @@ this.$set(this.processCompObj, 'dispatchDeptId', '') break } - case 'selectCaseTime': { // 大类,小类,选择立案标准,可输入时分(立案) + case 'selectCaseTime': { // 立案:案卷等级、类别、大类、小类、立案标准、完成时限 this.processCompShow = 'selectCaseTime' const caseLevelRes = await getCaseLevelList() // 案卷等级 @@ -655,8 +625,20 @@ if (this.caseDetail.casetypesTimeId) { this.processCompObj.caseTypeTime = this.caseDetail.casetypesTimeId } - // this.updateHoursAndMins() + // 添加watch监控 + this.$watch('processCompObj.eorc', (newValue, oldValue) => { + this.selectEorc(newValue) + }) + this.$watch('processCompObj.caseType', (newValue, oldValue) => { + this.selectCaseType(newValue) + }) + this.$watch('processCompObj.caseTypeDetail', (newValue, oldValue) => { + this.selectCaseTypeDetail(newValue) + }) + this.$watch('processCompObj.caseTypeTime', (newValue, oldValue) => { + this.updateHoursAndMins(newValue) + }) break } case 'selectFilingType': { // 选择归档类型 @@ -701,7 +683,6 @@ // 其他参数 const radioConfig = radioMap[this.operationKey] // 1. taskUserId - // debugger if (!this.processCompObj.taskUserId && (radioConfig.passBack === 'verifyPersonId' || radioConfig.passBack === 'processPersonId')) { this.setDefaultUserId(radioConfig) } @@ -781,7 +762,7 @@ console.log(this.processForm) return true }, - numberIsNull(value) { // 判断数值是否为空, + numberIsNull(value) { // 判断数值是否为空, 且非负 if (value && Number(value) >= 0) { return true } else { @@ -879,4 +860,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue index 06a7622..402b3c7 100644 --- a/src/components/CaseCommon/caseDetailRead.vue +++ b/src/components/CaseCommon/caseDetailRead.vue @@ -306,4 +306,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue index 7e00d5f..206edcd 100644 --- a/src/views/caseCommon/caseDetailRead.vue +++ b/src/views/caseCommon/caseDetailRead.vue @@ -298,4 +298,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + } diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue index e90bb01..604ade7 100644 --- a/src/views/caseCommon/caseDetailSupervise.vue +++ b/src/views/caseCommon/caseDetailSupervise.vue @@ -364,4 +364,7 @@ /deep/ .gutter{ background-color: #f3f3f3; } + /deep/ .el-icon-circle-close{ + color: #e2e2e2 + }