antissoft / NetworkInformation

Commit 8994407e96b661a7c67606f45a0aab9420c85552

Authored by monkeyhouyi
1 parent 6d366830

优化

Inline Side-by-side
Showing 18 changed files with 231 additions and 90 deletions
src/assets/style/common.scss
  View file @8994407
... ... @@ -80,6 +80,9 @@ a {
80 80 &.w-120 {
81 81 width: 120px;
82 82 }
  83 + &.w-150 {
  84 + width: 150px;
  85 + }
83 86 &.w-180 {
84 87 width: 180px;
85 88 }
... ...
src/components/CompanyForm/index.vue
  View file @8994407
... ... @@ -2,7 +2,7 @@
2 2 <div class="companyForm">
3 3 <div class="userSelect-input" @click="openDialog">
4 4 <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
5   - >点击新增运营主体</el-button
  5 + >点击新增运营主体/个人</el-button
6 6 >
7 7 </div>
8 8 <el-dialog
... ... @@ -17,7 +17,7 @@
17 17 class="NCC-dialog NCC-dialog_center company-dialog"
18 18 >
19 19 <el-row :gutter="15" class="NCC-dialog-content">
20   - <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" :rules="rules">
  20 + <el-form ref="elForm" :model="dataForm" size="small" label-width="150px" label-position="right" :rules="rules">
21 21 <el-col :span="24" v-if="false">
22 22 <el-form-item label="主键" prop="id">
23 23 <el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{ "width": "100%" }'>
... ... @@ -25,8 +25,8 @@
25 25 </el-form-item>
26 26 </el-col>
27 27 <el-col :span="24">
28   - <el-form-item label="运营主体名称" prop="companyName">
29   - <el-input v-model="dataForm.companyName" placeholder="请输入运营主体名称" clearable required
  28 + <el-form-item label="运营主体/个人名称" prop="companyName">
  29 + <el-input v-model="dataForm.companyName" placeholder="请输入运营主体/个人名称" clearable required
30 30 :style='{ "width": "100%" }'>
31 31 </el-input>
32 32 </el-form-item>
... ...
src/components/InfoForm/index.vue
  View file @8994407
... ... @@ -22,15 +22,15 @@
22 22 ref="infoForm"
23 23 size="small"
24 24 v-loading="infoForm_loading"
25   - label-width="100px"
  25 + label-width="120px"
26 26 >
27 27 <el-row :gutter="20" style="margin: unset;">
28 28 <el-col :span="24">
29 29 <el-col :span="12">
30   - <el-form-item label="运营主体" prop="companyId">
  30 + <el-form-item label="运营主体/个人" prop="companyId">
31 31 <el-select
32 32 v-model="infoForm.companyId"
33   - placeholder="请选择运营主体"
  33 + placeholder="请选择运营主体/个人"
34 34 clearable
35 35 style="width: 100%"
36 36 @change="companyChange"
... ...
src/store/modules/user.js
  View file @8994407
... ... @@ -19,6 +19,7 @@ const user = {
19 19 menuList: [],
20 20 socket: '',
21 21 islader: false,
  22 + laderType: 0, // 0区县1外协2市级
22 23 },
23 24  
24 25 mutations: {
... ... @@ -55,6 +56,9 @@ const user = {
55 56 SET_ISLADER: (state, islader) => {
56 57 state.islader = islader
57 58 },
  59 + SET_LADERTYPE: (state, laderType) => {
  60 + state.laderType = laderType
  61 + },
58 62 },
59 63  
60 64 actions: {
... ... @@ -193,6 +197,8 @@ const user = {
193 197 commit('SET_USERINFO', userInfo)
194 198 // 是否为市级领导
195 199 commit('SET_ISLADER', userInfo.organizeId == '580547494862128389')
  200 + const laderTypeList = ['587869689288328453', '613171998939415813', '582426909564994821']
  201 + commit('SET_LADERTYPE', laderTypeList.findIndex(v => v == userInfo.roleId))
196 202 commit('SET_MENULIST', menuList)
197 203 resolve(routerList)
198 204 }).catch(error => {
... ...
src/views/DisposalSuggestions/Form.vue
  View file @8994407
... ... @@ -79,11 +79,19 @@
79 79 {{ dataForm.areaName || "--" }}
80 80 </div>
81 81 </el-col>
82   - <el-col :span="24">
  82 + <!-- <el-col :span="24">
83 83 <div class="form-item">
84 84 <div class="label w-100">所属外协：</div>
85 85 {{ dataForm.externalAssistanceId || "--" }}
86 86 </div>
  87 + </el-col> -->
  88 + <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length">
  89 + <div class="form-item">
  90 + <div class="label w-100">附件：</div>
  91 + <div class="text" style="width: calc(100% - 100px);">
  92 + <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
  93 + </div>
  94 + </div>
87 95 </el-col>
88 96 <el-col :span="24" v-if="dataForm.disposalSuggestions">
89 97 <div class="form-item">
... ...
src/views/DisposalSuggestions/HandleForm.vue
  View file @8994407
... ... @@ -62,12 +62,21 @@
62 62 {{ dataForm.questionClass || "--" }}
63 63 </div>
64 64 </el-col>
  65 + <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length">
  66 + <div class="form-item">
  67 + <div class="label w-100">附件：</div>
  68 + <div class="text" style="width: calc(100% - 100px);">
  69 + <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
  70 + </div>
  71 + </div>
  72 + </el-col>
65 73 <el-col :span="24" v-if="dataForm.judgmentOpinions">
66 74 <div class="form-item">
67 75 <div class="label w-100">处置建议：</div>
68 76 {{ dataForm.judgmentOpinions || "--" }}
69 77 </div>
70 78 </el-col>
  79 +
71 80 </el-row>
72 81 </el-col>
73 82 <el-col :span="14">
... ...
src/views/DisposalSuggestions/index.vue
  View file @8994407
... ... @@ -6,29 +6,42 @@
6 6 <div class="NCC-common-layout-center">
7 7 <el-row class="NCC-common-search-box" :gutter="16">
8 8 <el-form @submit.native.prevent size="mini">
9   - <el-col :span="4">
  9 + <el-col :span="5">
  10 + <el-form-item label="">
  11 + <el-date-picker
  12 + v-model="query.creatorTime"
  13 + type="datetimerange"
  14 + value-format="timestamp"
  15 + format="yyyy-MM-dd HH:mm:ss"
  16 + start-placeholder="登记开始日期"
  17 + end-placeholder="登记结束日期"
  18 + >
  19 + </el-date-picker>
  20 + </el-form-item>
  21 + </el-col>
  22 + <el-col :span="3">
10 23 <el-form-item label="">
11 24 <el-input v-model="query.platformName" placeholder="请输入应用名称" clearable />
12 25 </el-form-item>
13 26 </el-col>
14   - <el-col :span="4">
  27 + <el-col :span="3">
15 28 <el-form-item label="">
16 29 <el-select v-model="query.platformType" placeholder="请选择应用类型" clearable >
17 30 <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" />
18 31 </el-select>
19 32 </el-form-item>
20 33 </el-col>
21   - <!-- <el-col :span="4">
  34 + <!-- <el-col :span="3">
22 35 <el-form-item label="">
23 36 <depSelect v-model="query.department" placeholder="请选择部门" />
24 37 </el-form-item>
25 38 </el-col> -->
26   - <el-col :span="4">
  39 + <el-col :span="3">
27 40 <el-form-item label="">
28 41 <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />
29 42 </el-form-item>
30 43 </el-col>
31   - <el-col :span="4">
  44 + <el-col :span="3">
32 45 <el-form-item>
33 46 <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
34 47 <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
... ... @@ -97,6 +110,7 @@
97 110 department:undefined,
98 111 questionType:undefined,
99 112 questionClass:undefined,
  113 + creatorTime: [],
100 114 },
101 115 list: [],
102 116 listLoading: true,
... ...
src/views/baseCaseHandling/Form.vue
  View file @8994407
1 1 <template>
2 2 <el-dialog
3   - :title="!dataForm.id ? '新建' : isDetail ? '详情' : formType ? '案件处理' : '编辑'"
  3 + :title="!dataForm.id ? '新增' : isDetail ? '详情' : formType == 1 ? '编辑' : '案件处理'"
4 4 :close-on-click-modal="false"
5 5 :visible.sync="visible"
6 6 class="NCC-dialog NCC-dialog_center"
... ... @@ -29,12 +29,17 @@
29 29 <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/>
30 30 </el-form-item>
31 31 </el-col>
  32 + <!-- <el-col :span="24">
  33 + <el-form-item label="来源登记" prop="sourceRegistration">
  34 + <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/>
  35 + </el-form-item>
  36 + </el-col> -->
32 37 <el-col :span="24">
33   - <el-form-item label="运营主体" prop="registeredEntity">
  38 + <el-form-item label="运营主体/个人" prop="registeredEntity">
34 39 <el-select
35 40 ref="companySelect"
36 41 v-model="dataForm.registeredEntity"
37   - placeholder="请选择运营主体"
  42 + placeholder="请选择运营主体/个人"
38 43 clearable
39 44 filterable
40 45 style="width: 100%"
... ... @@ -218,7 +223,7 @@
218 223 <div class="text">{{ dataForm.systemNameStr || '--' }}</div>
219 224 </el-col>
220 225 <el-col class="form-item">
221   - <div class="label w-180">运营主体：</div>
  226 + <div class="label w-180">运营主体/个人：</div>
222 227 <div class="text">{{ dataForm.registeredEntityStr || '--' }}</div>
223 228 </el-col>
224 229 <el-col class="form-item">
... ...
src/views/baseComapnyInfo/Form.vue
  View file @8994407
1 1 <template>
2   - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
  2 + <el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
3 3 :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%" v-loading="loading">
4 4 <el-row :gutter="15" class="NCC-dialog-content">
5 5 <el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right"
... ... @@ -11,8 +11,8 @@
11 11 </el-form-item>
12 12 </el-col>
13 13 <el-col :span="24">
14   - <el-form-item label="运营主体名称" prop="companyName">
15   - <el-input v-model="dataForm.companyName" placeholder="请输入运营主体名称" clearable required
  14 + <el-form-item label="运营主体/个人名称" prop="companyName">
  15 + <el-input v-model="dataForm.companyName" placeholder="请输入运营主体/个人名称" clearable required
16 16 :style='{ "width": "100%" }'>
17 17 </el-input>
18 18 </el-form-item>
... ...
src/views/baseComapnyInfo/index.vue
  View file @8994407
1 1 <template>
2 2 <div>
3 3 <div class="common-info-box item-box companyInfo">
4   - <div class="item-title">公司信息</div>
  4 + <div class="item-title">运营主体信息</div>
5 5 <div class="item-body">
6 6 <div class="NCC-common-layout-center">
7 7 <el-row class="NCC-common-search-box" :gutter="16">
8 8 <el-form @submit.native.prevent size="mini">
9 9 <el-col :span="4">
10   - <el-form-item label="">
  10 + <el-form-item label="" v-if="laderType != 0">
11 11 <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
12 12 <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
13 13 </el-select>
... ... @@ -126,7 +126,11 @@ export default {
126 126 ],
127 127 };
128 128 },
129   - computed: {},
  129 + computed: {
  130 + laderType() {
  131 + return this.$store.state.user.laderType;
  132 + }
  133 + },
130 134 created() {
131 135 this.initAreaTypeList();
132 136 this.initData();
... ...
src/views/baseInspectionReport/Form.vue
  View file @8994407
1 1 <template>
2 2 <el-dialog
3   - :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
  3 + :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'"
4 4 :close-on-click-modal="false"
5 5 :visible.sync="visible"
6 6 class="NCC-dialog NCC-dialog_center dialog-box baseInspectionReportForm"
... ...
src/views/baseInspectionReport/index.vue
  View file @8994407
... ... @@ -6,24 +6,37 @@
6 6 <div class="NCC-common-layout-center">
7 7 <el-row class="NCC-common-search-box" :gutter="16">
8 8 <el-form @submit.native.prevent size="mini">
9   - <el-col :span="4">
  9 + <el-col :span="5">
  10 + <el-form-item label="">
  11 + <el-date-picker
  12 + v-model="query.creatorTime"
  13 + type="datetimerange"
  14 + value-format="timestamp"
  15 + format="yyyy-MM-dd HH:mm:ss"
  16 + start-placeholder="登记开始日期"
  17 + end-placeholder="登记结束日期"
  18 + >
  19 + </el-date-picker>
  20 + </el-form-item>
  21 + </el-col>
  22 + <el-col :span="3">
10 23 <el-form-item label="">
11 24 <el-input v-model="query.platformName" placeholder="请输入应用名称" clearable />
12 25 </el-form-item>
13 26 </el-col>
14   - <el-col :span="4">
  27 + <el-col :span="3">
15 28 <el-form-item label="">
16 29 <el-select v-model="query.platformType" placeholder="请选择系统类型" clearable >
17 30 <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id" />
18 31 </el-select>
19 32 </el-form-item>
20 33 </el-col>
21   - <el-col :span="4">
  34 + <el-col :span="3">
22 35 <el-form-item label="">
23 36 <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />
24 37 </el-form-item>
25 38 </el-col>
26   - <el-col :span="4">
  39 + <el-col :span="3">
27 40 <el-form-item>
28 41 <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
29 42 <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
... ... @@ -103,6 +116,7 @@
103 116 department:undefined,
104 117 questionType:undefined,
105 118 questionClass:undefined,
  119 + creatorTime: [],
106 120 },
107 121 list: [],
108 122 listLoading: true,
... ...
src/views/basePrincipalResponsibility/Form.vue
  View file @8994407
1 1 <template>
2   - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%">
  2 + <el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%">
3 3 <el-row :gutter="15" class="NCC-dialog-content" v-loading="dialogLoading">
4 4 <el-form ref="elForm" :model="dataForm" size="small" label-width="110px" label-position="right" :disabled="!!isDetail" :rules="rules">
5 5 <el-col :span="24" v-if="false" >
... ...
src/views/baseSpecialAction/Form.vue
  View file @8994407
1 1 <template>
2 2 <el-dialog
3   - :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
  3 + :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'"
4 4 :close-on-click-modal="false"
5 5 :visible.sync="visible"
6 6 class="NCC-dialog NCC-dialog_center"
... ...
src/views/baseSpecialAction/dynamicModel/list/Form.vue
  View file @8994407
1 1 <template>
2 2 <div>
3 3  
4   - <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
  4 + <el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
5 5 class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth" :modal="false">
6 6 <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
7 7 :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
... ...
src/views/baseSystemInfo/DetailForm.vue
  View file @8994407
... ... @@ -13,25 +13,25 @@
13 13 <div class="system-info" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;">
14 14 <el-col :span="24">
15 15 <div class="form-item">
16   - <div class="label w-100">运营主体:</div>
  16 + <div class="label w-120">运营主体/个人:</div>
17 17 <p class="text">{{ dataForm.companyName || '--' }}</p>
18 18 </div>
19 19 </el-col>
20 20 <el-col :span="24">
21 21 <div class="form-item">
22   - <div class="label w-100">应用类型:</div>
  22 + <div class="label w-120">应用类型:</div>
23 23 <p class="text">{{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}</p>
24 24 </div>
25 25 </el-col>
26 26 <el-col :span="24">
27 27 <div class="form-item">
28   - <div class="label w-100">应用名称:</div>
  28 + <div class="label w-120">应用名称:</div>
29 29 <p class="text">{{ dataForm.systemName || "--" }}</p>
30 30 </div>
31 31 </el-col>
32 32 <el-col :span="24">
33 33 <div class="form-item">
34   - <div class="label w-100">应用分类:</div>
  34 + <div class="label w-120">应用分类:</div>
35 35 <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p>
36 36 </div>
37 37 </el-col>
... ... @@ -43,112 +43,112 @@
43 43 >
44 44 <el-col :span="24">
45 45 <div class="form-item">
46   - <div class="label w-100">特殊备案类型:</div>
  46 + <div class="label w-120">特殊备案类型:</div>
47 47 <p class="text">{{ dataForm.specialRecordType || "--" }}</p>
48 48 </div>
49 49 </el-col>
50 50 <el-col :span="24">
51 51 <div class="form-item">
52   - <div class="label w-100">特殊备案内容:</div>
  52 + <div class="label w-120">特殊备案内容:</div>
53 53 <p class="text">{{ dataForm.specialRecordContent || "--" }}</p>
54 54 </div>
55 55 </el-col>
56 56 <el-col :span="24" v-if="dataForm.systemType == '576280043370579205'">
57 57 <div class="form-item">
58   - <div class="label w-100">域名:</div>
  58 + <div class="label w-120">域名:</div>
59 59 <p class="text">{{ dataForm.domain || "--" }}</p>
60 60 </div>
61 61 </el-col>
62 62 <el-col :span="24">
63 63 <div class="form-item">
64   - <div class="label w-100">特殊备案号:</div>
  64 + <div class="label w-120">特殊备案号:</div>
65 65 <p class="text">{{ dataForm.specialRecordNumber || "--" }}</p>
66 66 </div>
67 67 </el-col>
68 68 <el-col :span="24">
69 69 <div class="form-item">
70   - <div class="label w-100">特殊备案时间:</div>
  70 + <div class="label w-120">特殊备案时间:</div>
71 71 <p class="text">{{ ncc.dateFormat(dataForm.specialRecordTime, 'YYYY-MM-DD HH:mm:ss') || "--" }}</p>
72 72 </div>
73 73 </el-col>
74 74 </template>
75 75 <el-col :span="24" v-if="dataForm.systemType == '576280004254500101'">
76 76 <div class="form-item">
77   - <div class="label w-100">安装次数:</div>
  77 + <div class="label w-120">安装次数:</div>
78 78 <p class="text">{{ dataForm.systemDownloadVolume || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
79 79 </div>
80 80 </el-col>
81 81 <el-col :span="24" v-if="dataForm.systemType == '576280043370579205' || dataForm.systemType == '576280085330396421'">
82 82 <div class="form-item">
83   - <div class="label w-100">月活:</div>
  83 + <div class="label w-120">月活:</div>
84 84 <p class="text">{{ dataForm.MAU || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
85 85 </div>
86 86 </el-col>
87 87 <el-col :span="24" v-if="dataForm.systemType == '580634746028033285'">
88 88 <div class="form-item">
89   - <div class="label w-100">粉丝量:</div>
  89 + <div class="label w-120">粉丝量:</div>
90 90 <p class="text">{{ dataForm.followerCount || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
91 91 </div>
92 92 </el-col>
93 93 <el-col :span="24">
94 94 <div class="form-item">
95   - <div class="label w-100">备案许可证:</div>
  95 + <div class="label w-120">备案许可证:</div>
96 96 <p class="text">{{ dataForm.recordLicense || "--" }}</p>
97 97 </div>
98 98 </el-col>
99 99 <el-col :span="24">
100 100 <div class="form-item">
101   - <div class="label w-100">归属平台:</div>
  101 + <div class="label w-120">归属平台:</div>
102 102 <p class="text">{{ dataForm.platform || "--" }}</p>
103 103 </div>
104 104 </el-col>
105 105  
106 106 <!-- <el-col :span="24">
107 107 <div class="form-item">
108   - <div class="label w-100">下载量:</div>
  108 + <div class="label w-120">下载量:</div>
109 109 <p class="text">{{ dataForm.systemDownloadVolume || "--" }}</p>
110 110 </div>
111 111 </el-col> -->
112 112 <el-col :span="24">
113 113 <div class="form-item">
114   - <div class="label w-100">版本:</div>
  114 + <div class="label w-120">版本:</div>
115 115 <p class="text">{{ dataForm.version || "--" }}</p>
116 116 </div>
117 117 </el-col>
118 118 <el-col :span="24">
119 119 <div class="form-item">
120   - <div class="label w-100">负责人姓名:</div>
  120 + <div class="label w-120">负责人姓名:</div>
121 121 {{ dataForm.principalName || "--" }}
122 122 </div>
123 123 </el-col>
124 124 <el-col :span="24">
125 125 <div class="form-item">
126   - <div class="label w-100">负责人电话:</div>
  126 + <div class="label w-120">负责人电话:</div>
127 127 {{ dataForm.principalPhone || "--" }}
128 128 </div>
129 129 </el-col>
130 130 <el-col :span="24">
131 131 <div class="form-item">
132   - <div class="label w-100">办公地址:</div>
  132 + <div class="label w-120">办公地址:</div>
133 133 <p class="text">{{ dataForm.officeAddress || "--" }}</p>
134 134 </div>
135 135 </el-col>
136 136 <el-col :span="24">
137 137 <div class="form-item">
138   - <div class="label w-100">应用图标:</div>
  138 + <div class="label w-120">应用图标:</div>
139 139 <img v-if="dataForm.systemIconModel" class="avatar" :src="define.comUrl + dataForm.systemIconModel.url">
140 140 <span v-else>无</span>
141 141 </div>
142 142 </el-col>
143 143 <el-col :span="24">
144 144 <div class="form-item">
145   - <div class="label w-100">所属区域:</div>
  145 + <div class="label w-120">所属区域:</div>
146 146 <p class="text">{{ dataForm.areaId | dynamicText(areaOptions) }}</p>
147 147 </div>
148 148 </el-col>
149 149 <!-- <el-col :span="24">
150 150 <div class="form-item">
151   - <div class="label w-100">所属外协:</div>
  151 + <div class="label w-120">所属外协:</div>
152 152 <p class="text">{{ dataForm.externalAssistanceId ? '外协一' : "--" }}</p>
153 153 </div>
154 154 </el-col> -->
... ... @@ -158,57 +158,57 @@
158 158 <div class="company-info">
159 159 <el-col :span="24">
160 160 <div class="form-item">
161   - <div class="label w-100">运营主体名称:</div>
  161 + <div class="label w-120">运营主体/个人名称:</div>
162 162 <p class="text">{{ companyForm.companyName || "--" }}</p>
163 163 </div>
164 164 </el-col>
165 165 <el-col :span="24">
166 166 <div class="form-item">
167   - <div class="label w-100">社会信用代码:</div>
  167 + <div class="label w-120">社会信用代码:</div>
168 168 <p class="text">{{ companyForm.socialCreditAgency || "--" }}</p>
169 169 </div>
170 170 </el-col>
171 171 <el-col :span="24">
172 172 <div class="form-item">
173   - <div class="label w-100">运营主体法人:</div>
  173 + <div class="label w-120">运营主体法人:</div>
174 174 <p class="text">{{ companyForm.legalPerson || "--" }}</p>
175 175 </div>
176 176 </el-col>
177 177 <el-col :span="24">
178 178 <div class="form-item">
179   - <div class="label w-100">运营主体地址:</div>
  179 + <div class="label w-120">运营主体地址:</div>
180 180 <p class="text">{{ companyForm.address || "--" }}</p>
181 181 </div>
182 182 </el-col>
183 183 <el-col :span="24">
184 184 <div class="form-item">
185   - <div class="label w-100">资质证明:</div>
186   - <div class="text" style="width: calc(100% - 100px);">
  185 + <div class="label w-120">资质证明:</div>
  186 + <div class="text" style="width: calc(120% - 120px);">
187 187 <NCC-UploadFz v-model="companyForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
188 188 </div>
189 189 </div>
190 190 </el-col>
191 191 <el-col :span="24">
192 192 <div class="form-item">
193   - <div class="label w-100">联系人:</div>
  193 + <div class="label w-120">联系人:</div>
194 194 <p class="text">{{ companyForm.contactUser || "--" }}</p>
195 195 </div>
196 196 </el-col>
197 197 <el-col :span="24">
198 198 <div class="form-item">
199   - <div class="label w-100">联系电话:</div>
  199 + <div class="label w-120">联系电话:</div>
200 200 <p class="text">{{ companyForm.contactPhone || "--" }}</p>
201 201 </div>
202 202 </el-col>
203 203 <el-col :span="24">
204 204 <div class="form-item">
205   - <div class="label w-100">所属区县:</div>
  205 + <div class="label w-120">所属区县:</div>
206 206 <p class="text">{{ companyForm.areaName || "--" }}</p>
207 207 </div>
208 208 </el-col>
209 209 <el-col :span="24">
210 210 <div class="form-item">
211   - <div class="label w-100">其他信息:</div>
  211 + <div class="label w-120">其他信息:</div>
212 212 <div v-html="companyForm.otherInfo"></div>
213 213 </div>
214 214 </el-col>
... ...
src/views/baseSystemInfo/index.vue
  View file @8994407
... ... @@ -12,7 +12,7 @@
12 12 <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/>
13 13 </el-form-item>
14 14 </el-col> -->
15   - <el-col :span="3">
  15 + <el-col :span="3" v-if="laderType != 0">
16 16 <el-form-item label="">
17 17 <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
18 18 <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
... ... @@ -207,6 +207,9 @@ export default {
207 207 // 判断角色是否为‘市级办公室’
208 208 return this.$store.state.user.islader;
209 209 },
  210 + laderType() {
  211 + return this.$store.state.user.laderType;
  212 + }
210 213 },
211 214 watch: {
212 215 $route: {
... ...
src/views/overView/Overview.vue
  View file @8994407
... ... @@ -18,7 +18,7 @@
18 18 <el-table-column type="index" width="40"> </el-table-column>
19 19 <el-table-column prop="taskTitle" label="任务名称" show-overflow-tooltip/>
20 20 <el-table-column prop="taskType" label="任务类型" show-overflow-tooltip width="100"/>
21   - <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip />
  21 + <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip></el-table-column>
22 22 <el-table-column prop="taskState" label="状态" show-overflow-tooltip width="80">
23 23 <template slot-scope="scope">
24 24 <el-tag type="success">{{ scope.row.taskState }}</el-tag>
... ... @@ -132,12 +132,27 @@
132 132 <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refresh="msgRefresh"/>
133 133 <HandleInspectForm v-if="HandleInspectFormVisible" ref="HandleInspectForm" @refresh="(val) => {taskRefresh('HandleInspectFormVisible', val)}"/>
134 134 <NCC-Form v-if="formVisible" ref="NCCForm" @refreshDataList="(val) => {taskRefresh('formVisible', val)}" />
  135 +
135 136 <!-- 案件处理 -->
136 137 <HandForm v-if="HandFormVisible" ref="HandForm" @refresh="(val) => {taskRefresh('HandFormVisible', val)}" />
137 138 <!-- 研判 -->
138 139 <DisposalForm v-if="DisposalFormVisible" ref="DisposalForm" @refresh="(val) => {taskRefresh('DisposalFormVisible', val)}"/>
139 140 <DisposalHandleForm v-if="DisposalHandleFormVisible" ref="DisposalHandleForm" @refresh="(val) => {taskRefresh('DisposalHandleFormVisible', val)}"/>
140   -
  141 + <el-dialog
  142 + title="专项行动详情"
  143 + :visible.sync="dialogVisible"
  144 + class="NCC-dialog NCC-dialog_center baseSpecialAction"
  145 + width="60%"
  146 + :before-close="closeDis">
  147 + <el-row :gutter="15" class="NCC-dialog-content">
  148 + <h4>{{dataForm.title}}</h4>
  149 + <div class="content" v-html="dataForm.content"></div>
  150 + </el-row>
  151 + <span slot="footer" class="dialog-footer">
  152 + <el-button type="primary" @click="handleEditForm(dataForm.row)">填写表单</el-button>
  153 + <el-button @click="closeDis">取 消</el-button>
  154 + </span>
  155 + </el-dialog>
141 156 </div>
142 157 </template>
143 158  
... ... @@ -188,6 +203,8 @@ export default {
188 203 HandFormVisible: false,
189 204 DisposalHandleFormVisible: false,
190 205 DisposalFormVisible: false,
  206 + dialogVisible: false,
  207 + dataForm: {},
191 208 };
192 209 },
193 210 created() {
... ... @@ -309,30 +326,36 @@ export default {
309 326 },
310 327 async handleTask(row) {
311 328 if(row.taskType == '专项行动') {
312   - let loadingInstance = Loading.service({
313   - lock: true,
314   - text: 'Loading',
315   - spinner: 'el-icon-loading',
316   - background: 'rgba(255, 255, 255, 0.7)'
317   - });
318   - this.formVisible = true;
319   - // let data = await this.getBaseSpecialActionInfo('588008032122701061');
320   - let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
321   - var Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
322   - var modelId = data.formId;//关联的表单id
323   - var taskId = data.id; // 当前专项行动id
324   - var isPreview = false;//固定死，值不变
325   - var useFormPermission = false;//固定死，值不变
326   - var formData = [];
327   - request({
328   - url: '/visualdev/OnlineDev/'+modelId+'/Config',
329   - method: "GET",
330   - params:null
331   - }).then(res => {
332   - formData = res.data.formData;
333   - this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
334   - loadingInstance.close();
335   - });
  329 + this.dialogVisible = true;
  330 + this.dataForm = {
  331 + content: row.taskContent,
  332 + title: row.taskTitle,
  333 + row: row,
  334 + };
  335 + // let loadingInstance = Loading.service({
  336 + // lock: true,
  337 + // text: 'Loading',
  338 + // spinner: 'el-icon-loading',
  339 + // background: 'rgba(255, 255, 255, 0.7)'
  340 + // });
  341 + // this.formVisible = true;
  342 + // // let data = await this.getBaseSpecialActionInfo('588008032122701061');
  343 + // let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
  344 + // var Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
  345 + // var modelId = data.formId;//关联的表单id
  346 + // var taskId = data.id; // 当前专项行动id
  347 + // var isPreview = false;//固定死，值不变
  348 + // var useFormPermission = false;//固定死，值不变
  349 + // var formData = [];
  350 + // request({
  351 + // url: '/visualdev/OnlineDev/'+modelId+'/Config',
  352 + // method: "GET",
  353 + // params:null
  354 + // }).then(res => {
  355 + // formData = res.data.formData;
  356 + // this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
  357 + // loadingInstance.close();
  358 + // });
336 359 } else {
337 360 let type = row.taskType;
338 361 if(row.taskType == '核查处理' || row.taskType == '研判') {
... ... @@ -346,6 +369,37 @@ export default {
346 369 })
347 370 }
348 371 },
  372 + closeDis() {
  373 + this.dialogVisible = false;
  374 + this.dataForm = {};
  375 + this.$forceUpdate();
  376 + },
  377 + async handleEditForm(row) {
  378 + let loadingInstance = Loading.service({
  379 + lock: true,
  380 + text: 'Loading',
  381 + spinner: 'el-icon-loading',
  382 + background: 'rgba(255, 255, 255, 0.7)'
  383 + });
  384 + this.formVisible = true;
  385 + // let data = await this.getBaseSpecialActionInfo('588008032122701061');
  386 + let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
  387 + var Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
  388 + var modelId = data.formId;//关联的表单id
  389 + var taskId = data.id; // 当前专项行动id
  390 + var isPreview = false;//固定死，值不变
  391 + var useFormPermission = false;//固定死，值不变
  392 + var formData = [];
  393 + request({
  394 + url: '/visualdev/OnlineDev/'+modelId+'/Config',
  395 + method: "GET",
  396 + params:null
  397 + }).then(res => {
  398 + formData = res.data.formData;
  399 + this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
  400 + loadingInstance.close();
  401 + });
  402 + },
349 403 getDialog(type) {
350 404 switch (type) {
351 405 case '归属地变更':
... ... @@ -377,6 +431,7 @@ export default {
377 431 },
378 432 taskRefresh(key, val) {
379 433 this[key] = false;
  434 + key == 'formVisible' && (this.dialogVisible = false);
380 435 val && this.getAllTaskList();
381 436 }
382 437 },
... ... @@ -500,4 +555,24 @@ export default {
500 555 }
501 556 }
502 557 }
  558 +.baseSpecialAction {
  559 + h4 {
  560 + text-align: center;
  561 + line-height: 40px;
  562 + border-bottom: 1px solid #ccc;
  563 + }
  564 + .content {
  565 + padding: 20px;
  566 + border-bottom: 1px solid #ccc;
  567 + }
  568 + .tag-group {
  569 + margin: 10px 0;
  570 + }
  571 + .title-tag {
  572 + margin: 5px 8px;
  573 + }
  574 + :deep(.el-tag) {
  575 + margin: 4px 4px;
  576 + }
  577 +}
503 578 </style>
... ...