Commit b42f8dc9697b72d554ff9468a6d0bab0162f3a76

Authored by monkeyhouyi
1 parent df22ed7d

应用添加关联外协

src/components/InfoForm/index.vue
@@ -288,6 +288,19 @@ @@ -288,6 +288,19 @@
288 </el-radio-group> 288 </el-radio-group>
289 </el-form-item> 289 </el-form-item>
290 </el-col> 290 </el-col>
  291 + <el-col :span="24">
  292 + <el-form-item label="所属外协" prop="externalAssistanceId">
  293 + <el-radio-group
  294 + v-model="infoForm.externalAssistanceId"
  295 + placeholder="请选择所属外协"
  296 + style="line-height: 22px"
  297 + >
  298 + <el-radio v-for="v in communicationOutOptions" :key="v.id" :label="v.id">{{
  299 + v.fullName
  300 + }}</el-radio>
  301 + </el-radio-group>
  302 + </el-form-item>
  303 + </el-col>
291 </el-row> 304 </el-row>
292 </el-form> 305 </el-form>
293 </div> 306 </div>
@@ -347,6 +360,7 @@ export default { @@ -347,6 +360,7 @@ export default {
347 systemIconModel: '', 360 systemIconModel: '',
348 MAU: '', 361 MAU: '',
349 followerCount: 0, 362 followerCount: 0,
  363 + externalAssistanceId: '',
350 }, 364 },
351 infoRules: { 365 infoRules: {
352 systemName: { 366 systemName: {
@@ -392,6 +406,7 @@ export default { @@ -392,6 +406,7 @@ export default {
392 systemTypeOptions: [], 406 systemTypeOptions: [],
393 systemClassOptions: [], 407 systemClassOptions: [],
394 specialRecordTypeOption: [], 408 specialRecordTypeOption: [],
  409 + communicationOutOptions: [],
395 areaOptions: [], 410 areaOptions: [],
396 btnLoading: false, 411 btnLoading: false,
397 isFilings: false, 412 isFilings: false,
@@ -466,6 +481,7 @@ export default { @@ -466,6 +481,7 @@ export default {
466 this.infoForm_loading = true; 481 this.infoForm_loading = true;
467 await this.initCompanyList(); 482 await this.initCompanyList();
468 await this.initSystemTypeList(); 483 await this.initSystemTypeList();
  484 + await this.initCommunicationOutOptions();
469 await this.initAreaTypeList(); 485 await this.initAreaTypeList();
470 await this.initSpecialRecordTypeOption(); 486 await this.initSpecialRecordTypeOption();
471 this.type == "edit" && (await this.initForm()); 487 this.type == "edit" && (await this.initForm());
src/mixins/info.js
@@ -7,6 +7,7 @@ export default { @@ -7,6 +7,7 @@ export default {
7 systemClassOptions: [], 7 systemClassOptions: [],
8 specialRecordTypeOption: [], 8 specialRecordTypeOption: [],
9 stateOptions: [], 9 stateOptions: [],
  10 + communicationOutOptions: [],
10 } 11 }
11 }, 12 },
12 created() {}, 13 created() {},
@@ -36,6 +37,11 @@ export default { @@ -36,6 +37,11 @@ export default {
36 !list && (list = await this.$store.dispatch('getTypeListByCode', 'stateType')); 37 !list && (list = await this.$store.dispatch('getTypeListByCode', 'stateType'));
37 this.stateOptions = list; 38 this.stateOptions = list;
38 }, 39 },
  40 + async initCommunicationOutOptions() {
  41 + let list = this.$store.state.meta.externalAssistanceList;
  42 + !list && (list = await this.$store.dispatch("getTypeListByCode", "externalAssistance"));
  43 + this.communicationOutOptions = list;
  44 + },
39 45
40 }, 46 },
41 } 47 }
42 \ No newline at end of file 48 \ No newline at end of file
src/views/DisposalSuggestions/index.vue
@@ -58,7 +58,8 @@ @@ -58,7 +58,8 @@
58 <el-table-column label="操作" fixed="right" width="100"> 58 <el-table-column label="操作" fixed="right" width="100">
59 <template slot-scope="scope"> 59 <template slot-scope="scope">
60 <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 --> 60 <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 -->
61 - <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> 61 + <!-- <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">{{ scope.row.stage == '577006641364189019' ? '下发' : '研判'}}</el-button> -->
  62 + <el-button type="text" v-if="isSHILevel" @click="addOrUpdateHandle(scope.row.id)" :disabled="['577006621985604869', '577006641364189019', '577006696312866053'].includes(scope.row.stage) == -1">研判</el-button>
62 <el-button type="text" v-else @click="toHandle(scope.row.id)" >处理</el-button> 63 <el-button type="text" v-else @click="toHandle(scope.row.id)" >处理</el-button>
63 <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button> 64 <el-button type="text" @click="toDetail(scope.row.id)" >详情</el-button>
64 </template> 65 </template>
src/views/baseSystemInfo/DetailForm.vue
@@ -139,6 +139,18 @@ @@ -139,6 +139,18 @@
139 <span v-else>无</span> 139 <span v-else>无</span>
140 </div> 140 </div>
141 </el-col> 141 </el-col>
  142 + <el-col :span="24">
  143 + <div class="form-item">
  144 + <div class="label w-100">所属区域:</div>
  145 + <p class="text">{{ dataForm.areaId | dynamicText(areaOptions) }}</p>
  146 + </div>
  147 + </el-col>
  148 + <el-col :span="24">
  149 + <div class="form-item">
  150 + <div class="label w-100">所属外协:</div>
  151 + <p class="text">{{ dataForm.externalAssistanceId ? '外协一' : "--" }}</p>
  152 + </div>
  153 + </el-col>
142 </div> 154 </div>
143 </el-tab-pane> 155 </el-tab-pane>
144 <el-tab-pane label="运营主体信息" name="2"> 156 <el-tab-pane label="运营主体信息" name="2">
@@ -274,7 +286,7 @@ import HandForm from &#39;@/views/baseCaseHandling/Form.vue&#39; // 案件处理 @@ -274,7 +286,7 @@ import HandForm from &#39;@/views/baseCaseHandling/Form.vue&#39; // 案件处理
274 import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理 286 import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理
275 export default { 287 export default {
276 components: {HandForm, ReportForm}, 288 components: {HandForm, ReportForm},
277 - props: [], 289 + props: ['areaOptions'],
278 data() { 290 data() {
279 return { 291 return {
280 loading: false, 292 loading: false,
src/views/baseSystemInfo/index.vue
@@ -9,61 +9,31 @@ @@ -9,61 +9,31 @@
9 <el-form @submit.native.prevent size="mini"> 9 <el-form @submit.native.prevent size="mini">
10 <el-col :span="4"> 10 <el-col :span="4">
11 <el-form-item label=""> 11 <el-form-item label="">
12 - <el-input  
13 - clearable  
14 - v-model="query.keyword"  
15 - placeholder="请输入应用名称、运营主体名称进行查询"  
16 - /> 12 + <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/>
17 </el-form-item> 13 </el-form-item>
18 </el-col> 14 </el-col>
19 <el-col :span="3"> 15 <el-col :span="3">
20 <el-form-item label=""> 16 <el-form-item label="">
21 - <el-select  
22 - v-model="query.systemType"  
23 - placeholder="请选择应用类型"  
24 - clearable  
25 - @change="handleSystemTypeChange"  
26 - >  
27 - <el-option  
28 - v-for="item in systemTypeOptions"  
29 - :key="item.Id"  
30 - :label="item.FullName"  
31 - :value="item.Id"  
32 - /> 17 + <el-select v-model="query.systemType" placeholder="请选择应用类型" clearable @change="handleSystemTypeChange">
  18 + <el-option v-for="item in systemTypeOptions" :key="item.Id" :label="item.FullName" :value="item.Id"/>
33 </el-select> 19 </el-select>
34 </el-form-item> 20 </el-form-item>
35 </el-col> 21 </el-col>
36 <el-col :span="3"> 22 <el-col :span="3">
37 <el-form-item label=""> 23 <el-form-item label="">
38 - <el-select  
39 - v-model="query.systemClass"  
40 - placeholder="请选择应用分类"  
41 - :disabled="!query.systemType"  
42 - clearable  
43 - >  
44 - <el-option  
45 - v-for="item in systemClassOptions"  
46 - :key="item.Id"  
47 - :label="item.ClassName"  
48 - :value="item.Id"  
49 - /> 24 + <el-select v-model="query.systemClass" placeholder="请选择应用分类" :disabled="!query.systemType" clearable>
  25 + <el-option v-for="item in systemClassOptions" :key="item.Id" :label="item.ClassName" :value="item.Id"/>
50 </el-select> 26 </el-select>
51 </el-form-item> 27 </el-form-item>
52 </el-col> 28 </el-col>
53 <el-col :span="3"> 29 <el-col :span="3">
54 <el-form-item label=""> 30 <el-form-item label="">
55 - <el-input  
56 - v-model="query.principalName"  
57 - placeholder="请输入联系人"  
58 - /> 31 + <el-input v-model="query.principalName" placeholder="请输入联系人"/>
59 </el-form-item> 32 </el-form-item>
60 </el-col> 33 </el-col>
61 <el-col :span="3"> 34 <el-col :span="3">
62 <el-form-item label=""> 35 <el-form-item label="">
63 - <el-input  
64 - v-model="query.principalPhone"  
65 - placeholder="请输入联系电话"  
66 - /> 36 + <el-input v-model="query.principalPhone" placeholder="请输入联系电话"/>
67 </el-form-item> 37 </el-form-item>
68 </el-col> 38 </el-col>
69 <el-col :span="3"> 39 <el-col :span="3">
@@ -75,14 +45,7 @@ @@ -75,14 +45,7 @@
75 </el-form> 45 </el-form>
76 <div class="NCC-common-search-box-right"> 46 <div class="NCC-common-search-box-right">
77 <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button> 47 <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button>
78 - <el-upload  
79 - class="uploadXlax"  
80 - :action="define.APIURl + '/api/Extend/basesysteminfo/Actions/ImportByExcel'"  
81 - :headers="uploadHeaders"  
82 - :on-success="uploadSuccess"  
83 - :show-file-list="false"  
84 - name="excelfile"  
85 - > 48 + <el-upload class="uploadXlax" :action="define.APIURl + '/api/Extend/basesysteminfo/Actions/ImportByExcel'" :headers="uploadHeaders" :on-success="uploadSuccess" :show-file-list="false" name="excelfile">
86 <div class="avatar-box"> 49 <div class="avatar-box">
87 <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button> 50 <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
88 </div> 51 </div>
@@ -120,67 +83,31 @@ @@ -120,67 +83,31 @@
120 </template> 83 </template>
121 </el-table-column> 84 </el-table-column>
122 </NCC-table> 85 </NCC-table>
123 - <pagination  
124 - :total="total"  
125 - :page.sync="listQuery.currentPage"  
126 - :limit.sync="listQuery.pageSize"  
127 - @pagination="initList"  
128 - /> 86 + <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initList"/>
129 </div> 87 </div>
130 </div> 88 </div>
131 - <el-dialog  
132 - title="归属地变更"  
133 - :visible.sync="areaChangeVisible"  
134 - width="50%"  
135 - >  
136 - <el-form  
137 - :model="areaForm"  
138 - :rules="areaRules"  
139 - ref="areaForm"  
140 - size="small"  
141 - label-width="100px"  
142 - v-loading="areaDialogLoading"  
143 - > 89 + <el-dialog title="归属地变更" :visible.sync="areaChangeVisible" width="50%">
  90 + <el-form :model="areaForm" :rules="areaRules" ref="areaForm" size="small" label-width="100px" v-loading="areaDialogLoading">
144 <!-- <el-form-item label="市属" prop="city"> 91 <!-- <el-form-item label="市属" prop="city">
145 - <el-input  
146 - v-model="areaForm.city"  
147 - placeholder="请输入市属"  
148 - maxlength="20"  
149 - ></el-input> 92 + <el-input v-model="areaForm.city" placeholder="请输入市属" maxlength="20"></el-input>
150 </el-form-item> --> 93 </el-form-item> -->
151 <el-form-item label="所属区县" prop="areaId"> 94 <el-form-item label="所属区县" prop="areaId">
152 - <el-radio-group  
153 - v-model="areaForm.areaId"  
154 - placeholder="请选择所属区县"  
155 - style="line-height: 22px"  
156 - >  
157 - <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{  
158 - v.fullName  
159 - }}</el-radio> 95 + <el-radio-group v-model="areaForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
  96 + <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
160 </el-radio-group> 97 </el-radio-group>
161 </el-form-item> 98 </el-form-item>
162 <el-form-item label="申请内容描述" prop="applnycontent"> 99 <el-form-item label="申请内容描述" prop="applnycontent">
163 - <el-input  
164 - type="textarea"  
165 - v-model="areaForm.applnycontent"  
166 - placeholder="请输入申请内容描述"  
167 - maxlength="300"  
168 - ></el-input> 100 + <el-input type="textarea" v-model="areaForm.applnycontent" placeholder="请输入申请内容描述" maxlength="300"></el-input>
169 </el-form-item> 101 </el-form-item>
170 </el-form> 102 </el-form>
171 -  
172 <span slot="footer" class="dialog-footer"> 103 <span slot="footer" class="dialog-footer">
173 <el-button @click="areaChangeVisible = false">取 消</el-button> 104 <el-button @click="areaChangeVisible = false">取 消</el-button>
174 <el-button type="primary" @click="areaSubmit" :loading="btnLoading">确 定</el-button> 105 <el-button type="primary" @click="areaSubmit" :loading="btnLoading">确 定</el-button>
175 </span> 106 </span>
176 </el-dialog> 107 </el-dialog>
177 - <InspectionForm  
178 - v-if="InspectionFormVisible"  
179 - ref="InspectionForm"  
180 - @refresh="refresh"  
181 - /> 108 + <InspectionForm v-if="InspectionFormVisible" ref="InspectionForm" @refresh="refresh"/>
182 <ChangeRecord v-if="ChangeRecordVisible" ref="ChangeRecord"/> 109 <ChangeRecord v-if="ChangeRecordVisible" ref="ChangeRecord"/>
183 - <DetailForm v-if="DetailFormVisible" ref="DetailForm"/> 110 + <DetailForm v-if="DetailFormVisible" :areaOptions="areaOptions" ref="DetailForm"/>
184 <ExportBox v-if="ExportBoxVisible" ref="ExportBox" @download="download"/> 111 <ExportBox v-if="ExportBoxVisible" ref="ExportBox" @download="download"/>
185 </div> 112 </div>
186 </div> 113 </div>
@@ -314,7 +241,7 @@ export default { @@ -314,7 +241,7 @@ export default {
314 search() { 241 search() {
315 this.listQuery = { 242 this.listQuery = {
316 currentPage: 1, 243 currentPage: 1,
317 - pageSize: 10, 244 + pageSize: 20,
318 sort: "desc", 245 sort: "desc",
319 sidx: "", 246 sidx: "",
320 }; 247 };