diff --git a/config/dev.env.js b/config/dev.env.js index d4fd706..f3507b4 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://localhost:8083/"' + // BASE_API: '"http://localhost:8083/"' + BASE_API: '"http://192.168.8.201:8083/"' }) diff --git a/config/dev.env.js b/config/dev.env.js index d4fd706..f3507b4 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://localhost:8083/"' + // BASE_API: '"http://localhost:8083/"' + BASE_API: '"http://192.168.8.201:8083/"' }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 772cd48..c49fbbc 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -206,6 +206,7 @@ filterable clearable placeholder="请选择立案标准" + style="width: 72%;" @change="updateHoursAndMins"> @@ -213,21 +214,21 @@ - - + + - - + + — - - + + - - + + @@ -292,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -576,7 +577,7 @@ } // 4. hours,minutes if (radioConfig.showComp === 'selectCaseTime' || radioConfig.showComp === 'inputDelayTime') { - if (!this.processCompObj.hours || !this.processCompObj.minutes) { + if (!this.numberIsNull(this.processCompObj.hours) || !this.numberIsNull(this.processCompObj.minutes)) { this.$message.error('请输入时间') return false } @@ -590,21 +591,26 @@ return false } this.processForm.caseLevel = this.processCompObj.caseLevel + // casetypeCode if (!this.processCompObj.caseType) { this.$message.error('请选择案卷大类') return false } - this.processForm.caseType = this.processCompObj.caseType + const caseType = _.find(this.processCompObj.caseTypeList, ['id', this.processCompObj.caseType]) + this.processForm.caseType = caseType.typeCode + // casetypeDetailCode if (!this.processCompObj.caseTypeDetail) { this.$message.error('请选择案卷小类') return false } - this.processForm.caseTypeDetail = this.processCompObj.caseTypeDetail - if (!this.processCompObj.caseTypeTimes) { + const caseTypeDetail = _.find(this.processCompObj.caseTypeDetailList, ['id', this.processCompObj.caseTypeDetail]) + this.processForm.casetypeDetailCode = caseTypeDetail.typeDetailCode + // casetypesTimeId + if (!this.processCompObj.caseTypeTime) { this.$message.error('请选择立案标准') return false } - this.processForm.caseTypeTimes = this.processCompObj.caseTypeTimes + this.processForm.casetypesTimeId = this.processCompObj.caseTypeTime } // 5. filingType if (radioConfig.showComp === 'selectFilingType') { @@ -617,6 +623,13 @@ console.log(this.processForm) return true }, + numberIsNull(value) { // 判断数值是否为空 + if (value || value === 0) { + return true + } else { + return false + } + }, submit() { console.log('submit') this.$confirm('确定提交案件处理吗?', '提示', { diff --git a/config/dev.env.js b/config/dev.env.js index d4fd706..f3507b4 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://localhost:8083/"' + // BASE_API: '"http://localhost:8083/"' + BASE_API: '"http://192.168.8.201:8083/"' }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 772cd48..c49fbbc 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -206,6 +206,7 @@ filterable clearable placeholder="请选择立案标准" + style="width: 72%;" @change="updateHoursAndMins"> @@ -213,21 +214,21 @@ - - + + - - + + — - - + + - - + + @@ -292,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -576,7 +577,7 @@ } // 4. hours,minutes if (radioConfig.showComp === 'selectCaseTime' || radioConfig.showComp === 'inputDelayTime') { - if (!this.processCompObj.hours || !this.processCompObj.minutes) { + if (!this.numberIsNull(this.processCompObj.hours) || !this.numberIsNull(this.processCompObj.minutes)) { this.$message.error('请输入时间') return false } @@ -590,21 +591,26 @@ return false } this.processForm.caseLevel = this.processCompObj.caseLevel + // casetypeCode if (!this.processCompObj.caseType) { this.$message.error('请选择案卷大类') return false } - this.processForm.caseType = this.processCompObj.caseType + const caseType = _.find(this.processCompObj.caseTypeList, ['id', this.processCompObj.caseType]) + this.processForm.caseType = caseType.typeCode + // casetypeDetailCode if (!this.processCompObj.caseTypeDetail) { this.$message.error('请选择案卷小类') return false } - this.processForm.caseTypeDetail = this.processCompObj.caseTypeDetail - if (!this.processCompObj.caseTypeTimes) { + const caseTypeDetail = _.find(this.processCompObj.caseTypeDetailList, ['id', this.processCompObj.caseTypeDetail]) + this.processForm.casetypeDetailCode = caseTypeDetail.typeDetailCode + // casetypesTimeId + if (!this.processCompObj.caseTypeTime) { this.$message.error('请选择立案标准') return false } - this.processForm.caseTypeTimes = this.processCompObj.caseTypeTimes + this.processForm.casetypesTimeId = this.processCompObj.caseTypeTime } // 5. filingType if (radioConfig.showComp === 'selectFilingType') { @@ -617,6 +623,13 @@ console.log(this.processForm) return true }, + numberIsNull(value) { // 判断数值是否为空 + if (value || value === 0) { + return true + } else { + return false + } + }, submit() { console.log('submit') this.$confirm('确定提交案件处理吗?', '提示', { diff --git a/src/views/busAdmin/TimeLimit/detailTimeLimit.vue b/src/views/busAdmin/TimeLimit/detailTimeLimit.vue index 08edce0..c8c4ad2 100644 --- a/src/views/busAdmin/TimeLimit/detailTimeLimit.vue +++ b/src/views/busAdmin/TimeLimit/detailTimeLimit.vue @@ -2,11 +2,11 @@ - + - + diff --git a/config/dev.env.js b/config/dev.env.js index d4fd706..f3507b4 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://119.254.103.80:14537"' // BASE_API: '"http://192.168.0.225:14537"' // BASE_API: '"http://localhost:8080/api/"' - BASE_API: '"http://localhost:8083/"' + // BASE_API: '"http://localhost:8083/"' + BASE_API: '"http://192.168.8.201:8083/"' }) diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue index 772cd48..c49fbbc 100644 --- a/src/components/CaseCommon/caseDetail.vue +++ b/src/components/CaseCommon/caseDetail.vue @@ -206,6 +206,7 @@ filterable clearable placeholder="请选择立案标准" + style="width: 72%;" @change="updateHoursAndMins"> @@ -213,21 +214,21 @@ - - + + - - + + — - - + + - - + + @@ -292,7 +293,7 @@ :append-to-body="true" title="位置详情" > - + @@ -576,7 +577,7 @@ } // 4. hours,minutes if (radioConfig.showComp === 'selectCaseTime' || radioConfig.showComp === 'inputDelayTime') { - if (!this.processCompObj.hours || !this.processCompObj.minutes) { + if (!this.numberIsNull(this.processCompObj.hours) || !this.numberIsNull(this.processCompObj.minutes)) { this.$message.error('请输入时间') return false } @@ -590,21 +591,26 @@ return false } this.processForm.caseLevel = this.processCompObj.caseLevel + // casetypeCode if (!this.processCompObj.caseType) { this.$message.error('请选择案卷大类') return false } - this.processForm.caseType = this.processCompObj.caseType + const caseType = _.find(this.processCompObj.caseTypeList, ['id', this.processCompObj.caseType]) + this.processForm.caseType = caseType.typeCode + // casetypeDetailCode if (!this.processCompObj.caseTypeDetail) { this.$message.error('请选择案卷小类') return false } - this.processForm.caseTypeDetail = this.processCompObj.caseTypeDetail - if (!this.processCompObj.caseTypeTimes) { + const caseTypeDetail = _.find(this.processCompObj.caseTypeDetailList, ['id', this.processCompObj.caseTypeDetail]) + this.processForm.casetypeDetailCode = caseTypeDetail.typeDetailCode + // casetypesTimeId + if (!this.processCompObj.caseTypeTime) { this.$message.error('请选择立案标准') return false } - this.processForm.caseTypeTimes = this.processCompObj.caseTypeTimes + this.processForm.casetypesTimeId = this.processCompObj.caseTypeTime } // 5. filingType if (radioConfig.showComp === 'selectFilingType') { @@ -617,6 +623,13 @@ console.log(this.processForm) return true }, + numberIsNull(value) { // 判断数值是否为空 + if (value || value === 0) { + return true + } else { + return false + } + }, submit() { console.log('submit') this.$confirm('确定提交案件处理吗?', '提示', { diff --git a/src/views/busAdmin/TimeLimit/detailTimeLimit.vue b/src/views/busAdmin/TimeLimit/detailTimeLimit.vue index 08edce0..c8c4ad2 100644 --- a/src/views/busAdmin/TimeLimit/detailTimeLimit.vue +++ b/src/views/busAdmin/TimeLimit/detailTimeLimit.vue @@ -2,11 +2,11 @@ - + - + diff --git a/src/views/coorBusiness/completed/index.vue b/src/views/coorBusiness/completed/index.vue index f02339d..e7e49c0 100644 --- a/src/views/coorBusiness/completed/index.vue +++ b/src/views/coorBusiness/completed/index.vue @@ -9,6 +9,7 @@ :case-list="caseList" :total="total" :list-query="listQuery" + :table-columns="tableColumns" @changeQuery="changeQuery" @addDetail="addDetail"/> @@ -49,7 +50,29 @@ order: '' }, // 筛选条件 total: 0, - listLoading: true // 加载动画 + listLoading: true, // 加载动画 + tableColumns: [ + { + text: '案卷编号', + value: 'caseid' + }, + { + text: '节点名称', + value: 'caseStateName' + }, + { + text: '信息来源', + value: 'sourceName' + }, + { + text: '案卷类别', + value: 'eorcName' + }, + { + text: '问题描述', + value: 'description' + } + ] } }, mounted() {