diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss index 79fa24d..b212a4f 100644 --- a/src/assets/style/common.scss +++ b/src/assets/style/common.scss @@ -68,10 +68,10 @@ a { justify-content: flex-start; align-items: center; flex-direction: row; - color: #757678; + color: #000; line-height: 30px; .label { - color: #000; + color: #757678; text-align: right; padding: 0 5px; &.w-100 { diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue index 119b976..a92f476 100644 --- a/src/components/CompanyForm/index.vue +++ b/src/components/CompanyForm/index.vue @@ -11,13 +11,14 @@ :visible.sync="visible" lock-scroll append-to-body - width="60%" + width="70%" top="15vh" :modal-append-to-body="false" class="NCC-dialog NCC-dialog_center company-dialog" > - + + @@ -26,61 +27,72 @@ - - - + - + - + + + {{ v.fullName }} + + + + + - 取消 - 确认 + 取消 + 确认 - diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue index 6c714cd..8917b21 100644 --- a/src/views/baseSpecialAction/index.vue +++ b/src/views/baseSpecialAction/index.vue @@ -34,8 +34,11 @@
- - + + + @@ -43,19 +46,21 @@ + - + - + @@ -67,6 +72,7 @@ +
@@ -76,8 +82,9 @@ import request from "@/utils/request"; import NCCForm from "./Form"; import ExportBox from "./ExportBox"; import InfoForm from "./infoForm.vue"; +import FormPage from "./FormPage.vue"; export default { - components: { NCCForm, ExportBox, InfoForm }, + components: { NCCForm, ExportBox, InfoForm, FormPage }, data() { return { query: { @@ -96,6 +103,7 @@ export default { formVisible: false, exportBoxVisible: false, InfoFormVisible: false, + FormPageVisible: false, communicationAreaOptions: [], communicationOutOptions: [], stateColor: { @@ -169,6 +177,12 @@ export default { this.$refs.InfoForm.init(row); }); }, + toFormDetail(row) { + this.FormPageVisible = true; + this.$nextTick(() => { + this.$refs.FormPage.init(row); + }); + }, exportData() { this.exportBoxVisible = true; this.$nextTick(() => { @@ -223,4 +237,15 @@ export default { overflow-y: scroll; } } +.red-start { + &::before { + content: ""; + display: inline-block; + margin-right: 4px; + width: 8px; + height: 8px; + background: red; + border-radius: 50%; + } +} diff --git a/src/views/baseSpecialAction/infoForm.vue b/src/views/baseSpecialAction/infoForm.vue index d551a60..b6c1083 100644 --- a/src/views/baseSpecialAction/infoForm.vue +++ b/src/views/baseSpecialAction/infoForm.vue @@ -15,7 +15,7 @@
{{ form.title }}
-
截止日期：
+
截止时间：
{{ ncc.dateFormat(form.deadline) }}
 diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue index 34af9e9..150ed56 100644 --- a/src/views/baseSpecialhandle/index.vue +++ b/src/views/baseSpecialhandle/index.vue @@ -27,27 +27,30 @@
- 导出 + +
- + + - + - + @@ -58,6 +61,7 @@
+ + + 取 消 @@ -238,8 +251,10 @@ import request from "@/utils/request"; import { getSystemDetail, getUpdataRecord } from "@/api/baseData/info"; import { getCompanyInfoById } from "@/api/baseData/company"; +import HandForm from '@/views/baseCaseHandling/Form.vue' // 案件处理 +import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理 export default { - components: {}, + components: {HandForm, ReportForm}, props: [], data() { return { @@ -282,6 +297,8 @@ export default { record_total: '', questionTypeOptions : [], stateOptions: [], + HandFormVisible: false, + ReportFormVisible: false, }; }, computed: { @@ -412,6 +429,31 @@ export default { this.queryList.pageIndex += 1; }); }, + + addOrUpdateHandle(row, isDetail) { + switch (this.activeName) { + case "3": + this.ReportFormVisible = true; + this.$nextTick(() => { + this.$refs.ReportForm.init(row.id, true); + }); + break; + case "4": + this.HandFormVisible = true; + this.$nextTick(() => { + this.$refs.HandForm.init(row.id, true); + }); + break; + + default: + break; + } + }, + + taskRefresh(key ,isrRefresh) { + this[`${key}`] = false; + if (isrRefresh) this.reset(); + }, goBack() { this.$emit("refresh"); diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index 33c933b..5fe0c0c 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -79,7 +79,7 @@
- + 导出
@@ -126,13 +126,13 @@ 查看 归属地变更 上报 - + @@ -222,7 +222,7 @@ export default { principalPhone: "", }, listQuery: { - pageIndex: 1, + currentPage: 1, pageSize: 10, sort: "desc", sidx: "", @@ -269,12 +269,19 @@ export default { ], }; }, + created() { this.initSystemTypeList(); this.initAreaTypeList(); this.initList(); }, mounted() {}, + computed: { + isSHILevel() { + // 判断角色是否为‘市级办公室’ + return this.$store.state.user.islader; + }, + }, watch: { $route: { handler: function (route) { @@ -304,7 +311,7 @@ export default { }, search() { this.listQuery = { - pageIndex: 1, + currentPage: 1, pageSize: 10, sort: "desc", sidx: "", diff --git a/src/views/homePage/components/Menu.vue b/src/views/homePage/components/Menu.vue index c3f2dbb..d2e7064 100644 --- a/src/views/homePage/components/Menu.vue +++ b/src/views/homePage/components/Menu.vue @@ -85,7 +85,7 @@ export default { color: #fff; padding: 40px 0px !important; &.is-active { - color: #02efff; + color: #409EFF; background-color: #dfdada34; } span { diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue index 99f2a04..5d767b8 100644 --- a/src/views/overView/Overview.vue +++ b/src/views/overView/Overview.vue @@ -119,7 +119,7 @@ @@ -334,7 +334,7 @@ export default { let openObject = this.getDialog(type); this[openObject.visible] = true; this.$nextTick(() => { - this.$refs[`${openObject.node}`].init(row.taskCorrelationId, true, openObject.isDetail, 1); + this.$refs[`${openObject.node}`].init(row.taskCorrelationId, openObject.isDetail, 1); }) } },