diff --git a/src/api/systemData/dataInterface.js b/src/api/systemData/dataInterface.js index a4d6501..9e39cba 100644 --- a/src/api/systemData/dataInterface.js +++ b/src/api/systemData/dataInterface.js @@ -40,7 +40,7 @@ export function updataForm(data) { }) } // 判研 -export function disposalSuggestions(data) { +export function disposalSuggestionsAPI(data) { return request({ url: `/Extend/BaseInspectionReport/${data.id}/disposalSuggestions`, method: 'PUT', diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss index 53ca7e2..075a0e8 100644 --- a/src/assets/style/common.scss +++ b/src/assets/style/common.scss @@ -80,6 +80,9 @@ a { &.w-120 { width: 120px; } + &.w-180 { + width: 180px; + } } .text { flex: 1; diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue index 9339d78..a384f38 100644 --- a/src/views/DisposalSuggestions/Form.vue +++ b/src/views/DisposalSuggestions/Form.vue @@ -91,10 +91,10 @@ {{ dataForm.disposalSuggestions || "--" }} - +
附件:
- +
@@ -121,14 +121,14 @@
- + {{ v.fullName }} - + {{ v.fullName }} @@ -164,7 +164,7 @@ import request from "@/utils/request"; import infoMixin from "@/mixins/info"; import { dynamicText } from "@/filters/index"; import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; -import { getDetail, disposalSuggestions } from "@/api/systemData/dataInterface"; +import { getDetail, disposalSuggestionsAPI } from "@/api/systemData/dataInterface"; export default { components: {}, mixins: [infoMixin], @@ -305,7 +305,7 @@ export default { id: this.dataForm.id, }; this.btnLoading = true; - let res = await disposalSuggestions(obj); + let res = await disposalSuggestionsAPI(obj); if(res.code != 200) return this.btnLoading = false; this.$message({ message: res.msg, diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue index a521150..33daa5c 100644 --- a/src/views/DisposalSuggestions/HandleForm.vue +++ b/src/views/DisposalSuggestions/HandleForm.vue @@ -96,8 +96,8 @@ - - + + @@ -115,7 +115,7 @@ import infoMixin from "@/mixins/info"; import { dynamicText } from "@/filters/index"; import { getDictionaryDataSelector } from "@/api/systemData/dictionary"; - import { getDetail, disposalSuggestions } from "@/api/systemData/dataInterface"; + import { getDetail, disposalSuggestionsAPI } from "@/api/systemData/dataInterface"; export default { components: {}, mixins: [infoMixin], @@ -158,7 +158,7 @@ deadline: "", area: '', disposalSuggestions: '', // 处置建议 - disposalFiles: [], + disposalResult: [], }, rules: { disposalSuggestions: [ @@ -247,7 +247,7 @@ id: this.dataForm.id, }; this.btnLoading = true; - let res = await disposalSuggestions(obj); + let res = await disposalSuggestionsAPI(obj); if(res.code != 200) return this.btnLoading = false; this.$message({ message: res.msg, diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue index 091593f..6b4ca09 100644 --- a/src/views/DisposalSuggestions/index.vue +++ b/src/views/DisposalSuggestions/index.vue @@ -42,9 +42,7 @@ - - - + diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue index c1e9183..d542526 100644 --- a/src/views/baseCaseHandling/Form.vue +++ b/src/views/baseCaseHandling/Form.vue @@ -5,7 +5,7 @@ :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll - width="50%" + width="60%" v-loading="loading" :modal="false" > @@ -14,7 +14,7 @@ ref="elForm" :model="dataForm" size="small" - label-width="110px" + label-width="180px" label-position="right" :disabled="!!isDetail" :rules="rules" @@ -25,26 +25,8 @@ - - - - - - - - - + + @@ -58,7 +40,8 @@ style="width: 100%" @blur.native.capture="selectCompanyBlur" @visible-change="visibleNameCompanyChange" - :disabled="formType != 0 || dataForm.isHaveSystem" + :disabled="formType != 0" + @change="(val) => companyChange(val, 'change')" > + + + + + + + - + {{ item.FullName }} @@ -124,62 +125,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
来源登记:
-
{{ dataForm.sourceRecord || '--' }}
+
来源登记:
+
{{ dataForm.sourceRegistration || '--' }}
-
案件名称:
+
案件名称:
{{ dataForm.systemNameStr || '--' }}
-
运营主体:
+
运营主体:
{{ dataForm.registeredEntityStr || '--' }}
-
应用类别:
+
应用类别:
{{ dataForm.categoryName || '--' }}
-
备案号:
+
备案号:
{{ dataForm.recordNumber || '--' }}
-
所属区县:
+
所属区县:
{{ dataForm.districtCountyName }}
-
违法原因:
+
违法原因:

{{ dataForm.illegalReasons || '--' }}

-
处罚要求:
+
处罚要求:

{{ dataForm.punishmentRequirements || '--' }}

-
处罚内容:
+
处罚内容:

{{ dataForm.punishmentContent || '--' }}

-
执法方式:
+
执法方式:

{{ dataForm.enforceType || '--' }}

-
执法说明:
+
执法说明:

{{ dataForm.enforcecontent || '--' }}

+ +
立案审批:
+

{{ dataForm.registerApproval || '--' }}

+
+ +
立案审批附件:
+ +
+ +
调查(询问)笔录:
+

{{ dataForm.record || '--' }}

+
+ +
调查(询问)笔录附件:
+ +
+ +
案件处理意见:
+

{{ dataForm.caseHandlingOpinions || '--' }}

+
+ +
案件处理意见附件:
+ +
+ +
执法约谈:
+

{{ dataForm.enforcementRecords || '--' }}

+
+ +
执法约谈附件:
+ +
+ +
行政处罚意见告知:
+

{{ dataForm.noticeLetter || '--' }}

+
+ +
行政处罚意见告知附件:
+ +
+ +
行政处罚决定:
+

{{ dataForm.punishmentDecision || '--' }}

+
+ +
行政处罚决定附件:
+ +
+ +
行政处罚结案报告:
+

{{ dataForm.closingReport || '--' }}

+
+ +
行政处罚结案报告附件:
+ +
+ +
其他:
+

{{ dataForm.other || '--' }}

+
+ +
其他附件:
+ +
取 消 @@ -201,7 +348,7 @@ export default { formType: false, // 0 新增 1 编辑 2 处理 dataForm: { id: undefined, - sourceRecord: undefined, + sourceRegistration: undefined, registrationTime: undefined, systemName: undefined, registeredEntity: undefined, @@ -214,18 +361,28 @@ export default { punishmentRequirements: undefined, punishmentContent: undefined, state: undefined, - record: undefined, - caseHandlingOpinions: undefined, - enforcementRecords: undefined, - noticeLetter: undefined, - punishmentDecision: undefined, - closingReport: undefined, enforceType: undefined, enforcecontent: undefined, isHaveSystem: undefined, + registerApproval: undefined, + registerApprovalFileModel: [], + record: undefined, + recordFileModel: [], + caseHandlingOpinions: undefined, + caseHandlingOpinionsFileModel: [], + enforcementRecords: undefined, + enforcementRecordsFileModel: [], + noticeLetter: undefined, + noticeLetterFileModel: [], + punishmentDecision: undefined, + punishmentDecisionFileModel: [], + closingReport: undefined, + closingReportFileModel: [], + other: undefined, + otherFileModel: [], }, rules: { - sourceRecord: [ + sourceRegistration: [ { required: true, message: "请输入来源登记", trigger: "bulr" } ], systemName: [ @@ -261,7 +418,6 @@ export default { watch: {}, created() { this.getplatformTypeOptions(); - this.getSystemSelect(); this.initSystemTypeList(); this.initAreaTypeList(); this.initCompanyList(); @@ -283,11 +439,12 @@ export default { }) }, // 获取系统列表 - getSystemSelect() { + getSystemSelect(companyId) { this.system_loading = true; request({ url: "/Extend/basesysteminfo/GetNoPagingList", method: "get", + params: { companyId } }).then(({data}) => { this.systemOption = data; this.system_loading = false; @@ -301,9 +458,9 @@ export default { }, platformNameChange(val, type) { let obj = this.systemOption.find(v => type == 'blur' ? val == v.fullName : val == v.id); + console.log(obj); this.dataForm.isHaveSystem = obj ? true : false; this.dataForm.systemName = obj ? obj.id : val; - this.dataForm.registeredEntity = obj ? obj.companyId : ''; this.dataForm.category = obj ? this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id : ''; // this.dataForm.recordNumber = obj ? obj.platform : ''; }, @@ -321,6 +478,12 @@ export default { let input = this.$refs.select.$children[0].$refs.input; input.blur(); }, + companyChange(val, type) { + let obj = this.companyOptions.find(v => val == v.id); + obj ? this.getSystemSelect(val) : (this.systemOption == []); + this.dataForm.systemName = ''; + this.dataForm.category = ''; + }, // 运营主体改变 selectCompanyBlur(e) { let value = e.target.value; @@ -362,10 +525,12 @@ export default { // 上报/下派 submit(type) { // type: 1 上报 0 保存 + // status 状态 0保存/1办结 let obj = { ...this.dataForm, isReport: type, } + this.$refs['elForm'].validate((valid) => { if(valid) { !this.dataForm.id ? this.toRequest('/Extend/BaseCaseHandling', 'POST', obj) : this.toRequest(`/Extend/BaseCaseHandling/${this.dataForm.id}`, 'PUT', obj); @@ -373,15 +538,15 @@ export default { }) }, // 处理 - handle() { + handle(status) { this.$refs['elForm'].validate((valid) => { if(valid) { this.btnLoading = true; - let { enforceType, enforcecontent } = this.dataForm; + this.dataForm.status = status; request({ url: `/Extend/basecasehandling/HandlingCase/${this.dataForm.id}`, method: "POST", - data: { enforceType, enforcecontent }, + data: this.dataForm, }).then((res) => { this.visible = false; this.$emit("refresh", true); diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue index 8dcaf73..a9b3a39 100644 --- a/src/views/baseCaseHandling/index.vue +++ b/src/views/baseCaseHandling/index.vue @@ -92,6 +92,11 @@ {{ scope.row.state | dynamicTextUP(stateOptions) }} + + +