Commit 4614132f8d7804ab54843220e25077e97fd33e44

Authored by monkeyhouyi
1 parent 8f1d4460

列表查询,案件处理

src/api/baseData/company.js
... ... @@ -2,10 +2,11 @@
2 2 import request from "@/utils/request";
3 3  
4 4 // 获取公司信息列表
5   -export async function getCompanyInfoList() {
  5 +export async function getCompanyInfoList(data) {
6 6 return await request({
7 7 url: '/Extend/basecomapnyinfo',
8 8 method: 'get',
  9 + params: data,
9 10 });
10 11 }
11 12 // 获取公司信息
... ...
src/api/systemData/dataInterface.js
... ... @@ -5,7 +5,7 @@ export function getListForJudge(data) {
5 5 return request({
6 6 url: `/Extend/BaseInspectionReport/GetListForJudge`,
7 7 method: 'GET',
8   - data
  8 + params: data
9 9 })
10 10 }
11 11 // 查询当前登陆人发起的列表
... ... @@ -13,7 +13,7 @@ export function getList(data) {
13 13 return request({
14 14 url: `/Extend/BaseInspectionReport/GetListForCurrentUser`,
15 15 method: 'GET',
16   - data
  16 + params: data
17 17 })
18 18 }
19 19 // 获取单个巡查上报
... ...
src/views/DisposalSuggestions/index.vue
... ... @@ -14,7 +14,7 @@
14 14 <el-col :span="4">
15 15 <el-form-item label="">
16 16 <el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
17   - <el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
  17 + <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" />
18 18 </el-select>
19 19 </el-form-item>
20 20 </el-col>
... ... @@ -25,16 +25,7 @@
25 25 </el-col> -->
26 26 <el-col :span="4">
27 27 <el-form-item label="">
28   - <el-select v-model="query.questionType" placeholder="请选择问题类型" >
29   - <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
30   - </el-select>
31   - </el-form-item>
32   - </el-col>
33   - <el-col :span="4">
34   - <el-form-item label="">
35   - <el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
36   - <el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id" />
37   - </el-select>
  28 + <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />
38 29 </el-form-item>
39 30 </el-col>
40 31 <el-col :span="4">
... ... @@ -48,7 +39,7 @@
48 39 <NCC-table v-loading="listLoading" :data="list">
49 40 <el-table-column show-overflow-tooltip prop="platformName" label="平台名称" align="left" />
50 41 <el-table-column show-overflow-tooltip label="平台类型" prop="platformType" align="left">
51   - <template slot-scope="scope">{{ scope.row.platformType | dynamicText(platformTypeOptions) }}</template>
  42 + <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
52 43 </el-table-column>
53 44 <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left">
54 45 <template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template>
... ... @@ -81,12 +72,13 @@
81 72 </template>
82 73 <script>
83 74 import request from '@/utils/request'
84   - import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
  75 + import infoMixin from "@/mixins/info";
85 76 import NCCForm from './Form'
86 77 import { getListForJudge, previewDataInterface } from '@/api/systemData/dataInterface'
87 78 export default {
88   - components: { NCCForm },
89   - data() {
  79 + components: { NCCForm },
  80 + mixins: [infoMixin],
  81 + data() {
90 82 return {
91 83 showAll: false,
92 84 query: {
... ... @@ -119,7 +111,7 @@
119 111 { prop: 'stage', label: '阶段' },
120 112 ],
121 113 sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
122   - platformTypeOptions : [],
  114 + systemTypeOptions : [],
123 115 questionTypeOptions : [],
124 116 questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
125 117 stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
... ... @@ -127,21 +119,10 @@
127 119 },
128 120 computed: {},
129 121 created() {
  122 + this.initSystemTypeList();
130 123 this.initData()
131   - this.getplatformTypeOptions();
132   - this.getquestionTypeOptions();
133 124 },
134 125 methods: {
135   - getplatformTypeOptions(){
136   - getDictionaryDataSelector('576279943168656645').then(res => {
137   - this.platformTypeOptions = res.data.list
138   - });
139   - },
140   - getquestionTypeOptions(){
141   - getDictionaryDataSelector('577006814432855301').then(res => {
142   - this.questionTypeOptions = res.data.list
143   - });
144   - },
145 126 initData() {
146 127 this.listLoading = true;
147 128 let _query = {
... ...
src/views/baseCaseHandling/Form.vue
1 1 <template>
2 2 <el-dialog
3   - :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
  3 + :title="!dataForm.id ? '新建' : isDetail ? '详情' : formType ? '案件处理' : '编辑'"
4 4 :close-on-click-modal="false"
5 5 :visible.sync="visible"
6 6 class="NCC-dialog NCC-dialog_center"
... ... @@ -88,15 +88,15 @@
88 88 <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType"/>
89 89 </el-form-item>
90 90 </el-col>
91   - <el-col :span="24" v-if='isSHILevel'>
  91 + <el-col :span="24" v-if="isSHILevel && (formType || dataForm.state == '592592999649641733')">
92 92 <el-form-item label="执法方式" prop="enforceType">
93 93 <el-radio-group v-model="dataForm.enforceType">
94   - <el-radio :label="1">柔性执法</el-radio>
95   - <el-radio :label="2">行政执法</el-radio>
  94 + <el-radio :label="'1'">柔性执法</el-radio>
  95 + <el-radio :label="'2'">行政执法</el-radio>
96 96 </el-radio-group>
97 97 </el-form-item>
98 98 </el-col>
99   - <el-col :span="24" v-if='formType'>
  99 + <el-col :span="24" v-if="formType || dataForm.state == '592592999649641733'">
100 100 <el-form-item label="执法说明" prop="enforcecontent">
101 101 <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入处罚内容" clearable maxlength="200"/>
102 102 </el-form-item>
... ... @@ -228,6 +228,9 @@ export default {
228 228 }).then((res) => {
229 229 this.dataForm = res.data;
230 230 this.loading = false;
  231 + this.$nextTick(() => {
  232 + this.$refs["elForm"].clearValidate();
  233 + })
231 234 }).catch(() => {
232 235 this.loading = false;
233 236 });
... ... @@ -258,8 +261,11 @@ export default {
258 261 method: "POST",
259 262 data: { enforceType, enforcecontent },
260 263 }).then((res) => {
  264 + this.visible = false;
  265 + this.$emit("refresh", true);
261 266 this.$message({
262 267 type: "success",
  268 + message: res.msg,
263 269 })
264 270 }).catch(() => {
265 271 this.btnLoading = false;
... ...
src/views/baseCaseHandling/index.vue
... ... @@ -45,10 +45,10 @@
45 45 clearable
46 46 >
47 47 <el-option
48   - v-for="(item, index) in categoryOptions"
  48 + v-for="(item, index) in systemTypeOptions"
49 49 :key="index"
50   - :label="item.fullName"
51   - :value="item.id"
  50 + :label="item.FullName"
  51 + :value="item.Id"
52 52 />
53 53 </el-select>
54 54 </el-form-item>
... ... @@ -88,7 +88,7 @@
88 88 <el-table-column prop="systemName" label="网站/APP名称" align="left" width="150" show-overflow-tooltip/>
89 89 <el-table-column prop="registeredEntity" label="注册主体" align="left" show-overflow-tooltip/>
90 90 <el-table-column label="类别" prop="category" align="left">
91   - <template slot-scope="scope">{{ scope.row.category | dynamicText(categoryOptions) }}</template>
  91 + <template slot-scope="scope">{{ scope.row.category | dynamicTextUP(systemTypeOptions) }}</template>
92 92 </el-table-column>
93 93 <el-table-column prop="recordNumber" label="备案号" align="left" show-overflow-tooltip/>
94 94 <el-table-column prop="districtCounty" label="所属区(市)县" align="left" width="150">
... ... @@ -103,7 +103,7 @@
103 103 <el-table-column label="操作" fixed="right" width="180">
104 104 <template slot-scope="scope">
105 105 <el-button size="mini" type="text" @click="addOrUpdateHandle(scope.row.id, true) " >详情</el-button>
106   - <!-- <el-button type="text" v-if="scope.row.state == '592592903172261125'" @click="addOrUpdateHandle(scope.row.id, false, 1)" >处理</el-button> -->
  106 + <el-button type="text" v-if="scope.row.state == '592592903172261125' && scope.row.creatorUserId != $store.state.user.id" @click="addOrUpdateHandle(scope.row.id, false, 1)" >处理</el-button>
107 107 <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
108 108 <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
109 109 <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
... ... @@ -168,7 +168,7 @@ export default {
168 168 { prop: "punishmentContent", label: "处罚内容" },
169 169 { prop: "state", label: "状态" },
170 170 ],
171   - categoryOptions: [
  171 + systemTypeOptions: [
172 172 { fullName: "选项一", id: "选项一" },
173 173 { fullName: "", id: "选项二" },
174 174 ],
... ... @@ -186,6 +186,7 @@ export default {
186 186 },
187 187 },
188 188 created() {
  189 + this.initSystemTypeList();
189 190 this.initAreaTypeList();
190 191 this.initStateTypeOption();
191 192 this.initData();
... ... @@ -213,7 +214,7 @@ export default {
213 214 request({
214 215 url: `/Extend/BaseCaseHandling`,
215 216 method: "GET",
216   - data: query,
  217 + params: query,
217 218 }).then((res) => {
218 219 this.list = res.data.list;
219 220 this.total = res.data.pagination.total;
... ...
src/views/baseInspectionReport/index.vue
... ... @@ -14,27 +14,13 @@
14 14 <el-col :span="4">
15 15 <el-form-item label="">
16 16 <el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
17   - <el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
18   - </el-select>
19   - </el-form-item>
20   - </el-col>
21   - <!-- <el-col :span="4">
22   - <el-form-item label="">
23   - <depSelect v-model="query.department" placeholder="请选择部门" />
24   - </el-form-item>
25   - </el-col> -->
26   - <el-col :span="4">
27   - <el-form-item label="">
28   - <el-select v-model="query.questionType" placeholder="请选择问题类型" >
29   - <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
  17 + <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" />
30 18 </el-select>
31 19 </el-form-item>
32 20 </el-col>
33 21 <el-col :span="4">
34 22 <el-form-item label="">
35   - <el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
36   - <el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id" />
37   - </el-select>
  23 + <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />
38 24 </el-form-item>
39 25 </el-col>
40 26 <el-col :span="4">
... ... @@ -53,13 +39,13 @@
53 39 <NCC-table v-loading="listLoading" :data="list">
54 40 <el-table-column show-overflow-tooltip prop="platformName" label="平台名称" align="left" />
55 41 <el-table-column show-overflow-tooltip label="平台类型" prop="platformType" align="left">
56   - <template slot-scope="scope">{{ scope.row.platformType | dynamicText(platformTypeOptions) }}</template>
  42 + <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
57 43 </el-table-column>
58 44 <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left">
59 45 <template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template>
60 46 </el-table-column>
61 47 <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" />
62   - <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="关键词" align="left" />
  48 + <el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" />
63 49 <!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> -->
64 50 <!-- <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left">
65 51 <template slot-scope="scope">{{ scope.row.questionClass | dynamicText(questionClassOptions) }}</template>
... ... @@ -86,11 +72,12 @@
86 72 </template>
87 73 <script>
88 74 import request from '@/utils/request'
89   - import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
90 75 import NCCForm from './Form'
  76 + import infoMixin from "@/mixins/info";
91 77 import ExportBox from './ExportBox'
92 78 import { getList, previewDataInterface } from '@/api/systemData/dataInterface'
93 79 export default {
  80 + mixins: [infoMixin],
94 81 components: { NCCForm, ExportBox },
95 82 data() {
96 83 return {
... ... @@ -125,7 +112,7 @@
125 112 { prop: 'stage', label: '阶段' },
126 113 ],
127 114 sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
128   - platformTypeOptions : [],
  115 + systemTypeOptions : [],
129 116 questionTypeOptions : [],
130 117 questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
131 118 stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
... ... @@ -138,21 +125,10 @@
138 125 },
139 126 },
140 127 created() {
  128 + this.initSystemTypeList();
141 129 this.initData()
142   - this.getplatformTypeOptions();
143   - this.getquestionTypeOptions();
144 130 },
145 131 methods: {
146   - getplatformTypeOptions(){
147   - getDictionaryDataSelector('576279943168656645').then(res => {
148   - this.platformTypeOptions = res.data.list
149   - });
150   - },
151   - getquestionTypeOptions(){
152   - getDictionaryDataSelector('577006814432855301').then(res => {
153   - this.questionTypeOptions = res.data.list
154   - });
155   - },
156 132 initData() {
157 133 this.listLoading = true;
158 134 let _query = {
... ...
src/views/basePrincipalResponsibility/Form.vue
1 1 <template>
2   - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
  2 + <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="50%">
3 3 <el-row :gutter="15" class="NCC-dialog-content" >
4 4 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
5 5 <el-col :span="24" v-if="false" >
... ... @@ -67,7 +67,7 @@
67 67 </el-row>
68 68 <span slot="footer" class="dialog-footer">
69 69 <el-button @click="visible = false">取 消</el-button>
70   - <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
  70 + <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :loading="btnLoading">确 定</el-button>
71 71 </span>
72 72 </el-dialog>
73 73 </template>
... ... @@ -99,6 +99,7 @@
99 99 rules: {
100 100 },
101 101 fileTypeOptions : [],
  102 + btnLoading: false,
102 103 }
103 104 },
104 105 computed: {},
... ... @@ -137,6 +138,7 @@
137 138 dataFormSubmit() {
138 139 this.$refs['elForm'].validate((valid) => {
139 140 if (valid) {
  141 + this.btnLoading = true;
140 142 if (!this.dataForm.id) {
141 143 request({
142 144 url: `/Extend/BasePrincipalResponsibility`,
... ... @@ -148,11 +150,12 @@
148 150 type: 'success',
149 151 duration: 1000,
150 152 onClose: () => {
  153 + this.btnLoading = false,
151 154 this.visible = false,
152 155 this.$emit('refresh', true)
153 156 }
154 157 })
155   - })
  158 + }).catch(() => this.btnLoading = false);
156 159 } else {
157 160 request({
158 161 url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
... ... @@ -164,11 +167,12 @@
164 167 type: 'success',
165 168 duration: 1000,
166 169 onClose: () => {
  170 + this.btnLoading = false,
167 171 this.visible = false
168 172 this.$emit('refresh', true)
169 173 }
170 174 })
171   - })
  175 + }).catch(() => this.btnLoading = false);
172 176 }
173 177 }
174 178 })
... ...
src/views/basePrincipalResponsibility/index.vue
... ... @@ -55,9 +55,9 @@
55 55 </div>
56 56 </div>
57 57 <NCC-table v-loading="listLoading" :data="list">
58   - <el-table-column prop="id" label="主键" align="left" />
59   - <el-table-column prop="fileName" label="文件名" align="left" />
60   - <el-table-column label="文件类型" prop="fileType" align="left">
  58 + <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
  59 + <el-table-column prop="fileName" label="文件名" align="left" show-overflow-tooltip/>
  60 + <el-table-column label="文件类型" prop="fileType" align="left" show-overflow-tooltip>
61 61 <template slot-scope="scope">{{
62 62 scope.row.fileType | dynamicText(fileTypeOptions)
63 63 }}</template>
... ... @@ -66,27 +66,32 @@
66 66 prop="timeTakingEffect"
67 67 label="生效时间"
68 68 align="left"
  69 + show-overflow-tooltip
69 70 />
70 71 <el-table-column prop="content" label="具体内容" align="left" />
71 72 <el-table-column
72 73 prop="creatorUserId"
73 74 label="创建用户"
74 75 align="left"
  76 + show-overflow-tooltip
75 77 />
76 78 <el-table-column
77 79 prop="creatorTime"
78 80 label="创建时间"
79 81 align="left"
  82 + show-overflow-tooltip
80 83 />
81 84 <el-table-column
82 85 prop="lastModifyUserId"
83 86 label="修改用户"
  87 + show-overflow-tooltip
84 88 align="left"
85 89 />
86 90 <el-table-column
87 91 prop="lastModifyTime"
88 92 label="修改时间"
89 93 align="left"
  94 + show-overflow-tooltip
90 95 />
91 96 <el-table-column label="操作" fixed="right" width="100">
92 97 <template slot-scope="scope">
... ... @@ -164,8 +169,8 @@ export default {
164 169 },
165 170 computed: {},
166 171 created() {
167   - // this.initData();
168   - // this.getfileTypeOptions();
  172 + this.initData();
  173 + this.getfileTypeOptions();
169 174 },
170 175 methods: {
171 176 getfileTypeOptions() {
... ... @@ -276,8 +281,5 @@ export default {
276 281 height: calc(100% - 47px);
277 282 overflow-y: scroll;
278 283 }
279   - .item-body {
280   - height: calc(100% - 35px);
281   - }
282 284 }
283 285 </style>
... ...
src/views/baseSpecialAction/index.vue
... ... @@ -51,11 +51,11 @@
51 51 <el-table-column label="传达外协" prop="communicationOut" align="left" show-overflow-tooltip>
52 52 <template slot-scope="scope">{{ JSON.parse(scope.row.communicationOut) | dynamicText(communicationOutOptions) }}</template>
53 53 </el-table-column>
54   - <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
55   - <template slot-scope="scope">
56   - <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
57   - </template>
58   - </el-table-column>
  54 + <el-table-column prop="deadline" label="截止日期" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="175">
  55 + <template slot-scope="scope">
  56 + <el-tag v-if="scope.row.deadline" :type="`${ncc.timeDeadLine(scope.row.deadline)}`">{{ncc.stateDeadLine(scope.row.deadline)}}{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
  57 + </template>
  58 + </el-table-column>
59 59 <el-table-column prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/>
60 60 <el-table-column label="操作" fixed="right" width="100">
61 61 <template slot-scope="scope">
... ...
src/views/baseSystemInfo/index.vue
... ... @@ -36,7 +36,7 @@
36 36 <el-form-item label="">
37 37 <el-select
38 38 v-model="query.proId"
39   - placeholder="请选择应用分类"
  39 + placeholder="请先选择应用类型再选择类别"
40 40 :disabled="!query.systemType"
41 41 clearable
42 42 >
... ... @@ -52,7 +52,7 @@
52 52 <el-col :span="4">
53 53 <el-form-item label="">
54 54 <el-input
55   - v-model="query.contactUser"
  55 + v-model="query.principalName"
56 56 placeholder="请输入联系人"
57 57 />
58 58 </el-form-item>
... ... @@ -60,7 +60,7 @@
60 60 <el-col :span="4">
61 61 <el-form-item label="">
62 62 <el-input
63   - v-model="query.contactPhone"
  63 + v-model="query.principalPhone"
64 64 placeholder="请输入联系电话"
65 65 />
66 66 </el-form-item>
... ... @@ -238,8 +238,8 @@ export default {
238 238 keyword: "",
239 239 systemType: "",
240 240 systemClass: "",
241   - contactUser: "",
242   - contactPhone: "",
  241 + principalName: "",
  242 + principalPhone: "",
243 243 },
244 244 listQuery: {
245 245 pageIndex: 1,
... ...
src/views/overView/Overview.vue
... ... @@ -316,7 +316,7 @@ export default {
316 316 formData = res.data.formData;
317 317 this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
318 318 });
319   - } else if(row.taskType == '执法') {
  319 + } else if(row.taskType == '案件处理') {
320 320 this.HandFormVisible = true;
321 321 this.$nextTick(() => {
322 322 this.$refs.HandForm.init(row.taskCorrelationId, false, 1);
... ...