antissoft / NetworkInformation

Commit 87e6927c2db4c07eb27811196c8320fee51ef68c

Authored by monkeyhouyi
1 parent 93adad84

弹框样式

Inline Side-by-side
Showing 20 changed files with 108 additions and 91 deletions
src/assets/style/common.scss
  View file @87e6927
... ... @@ -61,7 +61,6 @@ body,
61 61  
62 62 a {
63 63 text-decoration: none
64   -
65 64 }
66 65  
67 66 .form-item {
... ... @@ -81,3 +80,11 @@ a {
81 80 }
82 81 }
83 82  
  83 +.NCC-dialog.NCC-dialog_center {
  84 + .NCC-dialog-content {
  85 + padding: 20px 50px 0 !important;
  86 + margin: 0 !important;
  87 + width: 100%;
  88 + }
  89 +}
  90 +
... ...
src/components/InfoForm/index.vue
  View file @87e6927
... ... @@ -15,7 +15,8 @@
15 15 class="NCC-dialog NCC-dialog_center dialog-box"
16 16 destroy-on-close
17 17 >
18   - <el-form
  18 + <div class="NCC-dialog-content">
  19 + <el-form
19 20 :model="infoForm"
20 21 :rules="infoRules"
21 22 ref="infoForm"
... ... @@ -258,7 +259,8 @@
258 259 </el-form-item>
259 260 </el-col>
260 261 </el-row>
261   - </el-form>
  262 + </el-form>
  263 + </div>
262 264 <span slot="footer" class="dialog-footer">
263 265 <el-button @click="close">取消</el-button>
264 266 <el-button type="primary" @click="confirm" :loading="btnLoading">确认</el-button>
... ...
src/main.js
  View file @87e6927
... ... @@ -4,13 +4,14 @@ import App from &#39;./App.vue&#39;
4 4 import router from './router'
5 5 import 'normalize.css/normalize.css'
6 6 import ElementUI from 'element-ui';
7   -import './styles/element-variables.scss'
8   -import '@/assets/scss/common.scss'
9   -import '@/assets/style/common.scss'
10 7 import * as filters from './filters' // global filters
11   -
  8 +import '@/styles/element-variables.scss'
12 9 import '@/styles/index.scss' // global css
  10 +
  11 +import '@/assets/style/common.scss'
  12 +import '@/assets/scss/common.scss'
13 13 import '@/assets/scss/theme.scss' // 主题
  14 +
14 15 import { message } from './utils/message';
15 16  
16 17 import 'element-ui/lib/theme-chalk/index.css';
... ...
src/views/DisposalSuggestions/Form.vue
  View file @87e6927
... ... @@ -8,7 +8,7 @@
8 8 width="60%"
9 9 v-loading="loading"
10 10 >
11   - <el-row :gutter="15" class="">
  11 + <el-row :gutter="15" class="NCC-dialog-content">
12 12 <el-col :span="10" style="border-right: 1px solid #e6e6e6">
13 13 <el-row>
14 14 <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
... ...
src/views/baseCaseHandling/Form.vue
  View file @87e6927
... ... @@ -8,7 +8,7 @@
8 8 width="50%"
9 9 v-loading="loading"
10 10 >
11   - <el-row :gutter="15">
  11 + <el-row :gutter="15" class="NCC-dialog-content">
12 12 <el-form
13 13 ref="elForm"
14 14 :model="dataForm"
... ... @@ -97,8 +97,8 @@
97 97 </el-form-item>
98 98 </el-col>
99 99 <el-col :span="24" v-if='formType'>
100   - <el-form-item label="执法说明" prop="enforceContent">
101   - <el-input type="textarea" v-model="dataForm.enforceContent" placeholder="请输入处罚内容" clearable maxlength="200"/>
  100 + <el-form-item label="执法说明" prop="enforcecontent">
  101 + <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入处罚内容" clearable maxlength="200"/>
102 102 </el-form-item>
103 103 </el-col>
104 104 </el-form>
... ... @@ -149,7 +149,7 @@ export default {
149 149 punishmentDecision: undefined,
150 150 closingReport: undefined,
151 151 enforceType: undefined,
152   - enforceContent: undefined,
  152 + enforcecontent: undefined,
153 153 },
154 154 rules: {
155 155 systemName: [
... ... @@ -161,7 +161,7 @@ export default {
161 161 enforceType: [
162 162 { required: true, message: "请选择执法方式", trigger: "change" }
163 163 ],
164   - enforceContent: [
  164 + enforcecontent: [
165 165 { required: true, message: "请填写执法说明", trigger: "bulr" }
166 166 ],
167 167 },
... ... @@ -242,7 +242,7 @@ export default {
242 242 isReport: type,
243 243 }
244 244 this.$refs['elForm'].validate((valid) => {
245   - if(!type || valid) {
  245 + if(valid) {
246 246 !this.dataForm.id ? this.toRequest('/Extend/BaseCaseHandling', 'POST', obj) : this.toRequest(`/Extend/BaseCaseHandling/${this.dataForm.id}`, 'PUT', obj);
247 247 }
248 248 })
... ... @@ -251,12 +251,12 @@ export default {
251 251 handle() {
252 252 this.$refs['elForm'].validate((valid) => {
253 253 if(valid) {
254   - return
255 254 this.btnLoading = true;
  255 + let { enforceType, enforcecontent } = this.dataForm;
256 256 request({
257   - url: `/Extend/basecasehandling/handling-case`,
258   - method: "PUT",
259   - data: this.dataForm,
  257 + url: `/Extend/basecasehandling/HandlingCase/${this.dataForm.id}`,
  258 + method: "POST",
  259 + data: { enforceType, enforcecontent },
260 260 }).then((res) => {
261 261 this.$message({
262 262 type: "success",
... ...
src/views/baseCaseHandling/index.vue
  View file @87e6927
... ... @@ -103,6 +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 107 <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
107 108 <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
108 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>
... ... @@ -239,10 +240,10 @@ export default {
239 240 })
240 241 .catch(() => {});
241 242 },
242   - addOrUpdateHandle(id, isDetail) {
  243 + addOrUpdateHandle(id, isDetail, type) {
243 244 this.flowVisible = true;
244 245 this.$nextTick(() => {
245   - this.$refs.FlowBox.init(id, isDetail);
  246 + this.$refs.FlowBox.init(id, isDetail, type);
246 247 });
247 248 },
248 249 toReportCase(id) {
... ...
src/views/baseComapnyInfo/Form.vue
  View file @87e6927
1 1 <template>
2 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   - <el-row :gutter="15" class="">
  4 + <el-row :gutter="15" class="NCC-dialog-content">
5 5 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
6 6 :disabled="!!isDetail" :rules="rules">
7 7 <el-col :span="24" v-if="false">
... ...
src/views/baseInspectionReport/Form.vue
  View file @87e6927
... ... @@ -7,7 +7,7 @@
7 7 lock-scroll
8 8 width="60%"
9 9 >
10   - <el-row :gutter="15" class="">
  10 + <el-row :gutter="15" class="NCC-dialog-content">
11 11 <el-form
12 12 ref="elForm"
13 13 :model="dataForm"
... ...
src/views/baseInspectionReport/FormPage.vue
  View file @87e6927
1 1 <template>
2 2 <div style="width: 100%;height: 100%;background-color: #FFF;padding-top: 10px;">
3   - <el-row :gutter="15" class="" >
  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" >
6 6 <el-form-item label="主键" prop="id">
... ...
src/views/baseListHazardousSamples/Form.vue
  View file @87e6927
1 1 <template>
2 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%">
3   - <el-row :gutter="15" class="" >
  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">
6 6 <el-form-item label="主键" prop="id">
... ...
src/views/basePrincipalResponsibility/Form.vue
  View file @87e6927
1 1 <template>
2 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%">
3   - <el-row :gutter="15" class="" >
  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" >
6 6 <el-form-item label="主键" prop="id">
... ...
src/views/baseSpecialAction/Form.vue
  View file @87e6927
... ... @@ -8,7 +8,7 @@
8 8 width="50%"
9 9 v-loading="loading"
10 10 >
11   - <el-row :gutter="15" style="padding-top: 10px">
  11 + <el-row :gutter="15" class="NCC-dialog-content">
12 12 <el-form
13 13 ref="elForm"
14 14 :model="dataForm"
... ...
src/views/baseSpecialAction/dynamicModel/list/Form.vue
  View file @87e6927
1 1 <template>
2 2 <div>
3 3  
4   - <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :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">
6 6 <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
7 7 :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
... ... @@ -13,7 +13,7 @@
13 13 </el-button>
14 14 </template>
15 15 <el-button @click="visible = false">{{ formConf.cancelButtonText || '取 消' }}</el-button>
16   - <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
  16 + <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" v-if="!isDetail">
17 17 {{ formConf.confirmButtonText || '确 定' }}</el-button>
18 18 </span>
19 19 </el-dialog>
... ... @@ -71,6 +71,7 @@ export default {
71 71 printBrowseVisible: false,
72 72 formOperates: [],
73 73 taskId: '',
  74 + isDetail: false
74 75 }
75 76 },
76 77 methods: {
... ... @@ -81,10 +82,11 @@ export default {
81 82 if (this.isPreview) return this.$message({ message: '功能预览不支持打印', type: 'warning' })
82 83 this.printBrowseVisible = true
83 84 },
84   - init(formConf, modelId, id, isPreview, useFormPermission, taskId) {
  85 + init(formConf, modelId, id, isPreview, useFormPermission, taskId, isDetail) {
85 86 this.formConf = deepClone(JSON.parse(formConf))
86 87 this.modelId = modelId
87 88 this.isPreview = isPreview
  89 + this.isDetail = isDetail || false
88 90 this.useFormPermission = useFormPermission
89 91 this.dataForm.id = id || ''
90 92 this.taskId = taskId
... ... @@ -100,7 +102,6 @@ export default {
100 102 this.dataForm = res.data
101 103 if (!this.dataForm.data) return
102 104 this.formData = JSON.parse(this.dataForm.data)
103   - console.log( this.formData);
104 105 this.fillFormData(this.formConf, this.formData)
105 106 this.$nextTick(() => {
106 107 this.visible = true
... ... @@ -169,7 +170,6 @@ export default {
169 170 }).catch(() => { this.btnLoading = false })
170 171 },
171 172 async toSaveItemid(itemId) {
172   - console.log(11);
173 173 let res = await request({
174 174 url: '/Extend/BaseSpecialActionInfo/UpdateState',
175 175 method: "PUT",
... ...
src/views/baseSpecialAction/infoForm.vue
  View file @87e6927
... ... @@ -8,7 +8,7 @@
8 8 lock-scroll
9 9 width="70%"
10 10 >
11   - <el-row :gutter="15" style="height: 65vh">
  11 + <el-row :gutter="15" style="height: 65vh" class="NCC-dialog-content">
12 12 <el-col :span="24" style="margin-bottom: 20px;">
13 13 <el-col :span="12" class="form-item">
14 14 <div class="label w-100">行动标题：</div>
... ...
src/views/baseSpecialhandle/index.vue
  View file @87e6927
... ... @@ -47,7 +47,7 @@
47 47 <el-table-column label="操作" fixed="right" width="130">
48 48 <template slot-scope="scope">
49 49 <el-button type="text" @click="toFillForm(scope.row)" :disabled="ncc.timeDeadLine(scope.row.deadline) == 'danger' && scope.row.state == '已填写'">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button>
50   - <!-- <el-button type="text" @click="toFillForm(scope.row)" v-if="scope.row.state == '已填写'">详情</el-button> -->
  50 + <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'">详情</el-button>
51 51 </template>
52 52 </el-table-column>
53 53 </NCC-table>
... ... @@ -142,7 +142,7 @@ export default {
142 142 this.listLoading = false;
143 143 });
144 144 },
145   - toFillForm(row) {
  145 + toFillForm(row, isDetail) {
146 146 this.dialogVisible = true;
147 147 var Itemid = row.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
148 148 var modelId = row.formId;//关联的表单id
... ... @@ -155,8 +155,10 @@ export default {
155 155 method: "GET",
156 156 params:null
157 157 }).then(res => {
158   - formData = res.data.formData;
159   - this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
  158 + formData = JSON.parse(res.data.formData);
  159 + formData.disabled = isDetail || false;
  160 + let form = JSON.stringify(formData);
  161 + this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail)
160 162 });
161 163  
162 164 // this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
... ...
src/views/baseSystemInfo/DetailForm.vue
  View file @87e6927
... ... @@ -7,7 +7,7 @@
7 7 lock-scroll
8 8 width="40%"
9 9 >
10   - <el-row :gutter="15" style="height: 65vh; margin: 10px;" v-loading="loading">
  10 + <el-row :gutter="15" style="height: 65vh;" class="NCC-dialog-content" v-loading="loading">
11 11 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
12 12 <el-tab-pane label="应用信息" name="1">
13 13 <div class="system-info">
... ...
src/views/baseSystemInfo/HandleInspectForm.vue
  View file @87e6927
... ... @@ -8,53 +8,55 @@
8 8 lock-scroll
9 9 width="70%"
10 10 >
11   - <el-form
12   - :model="dataForm"
13   - :rules="rules"
14   - ref="elForm"
15   - size="small"
16   - label-width="100px"
17   - v-loading="loading"
18   - >
19   - <!-- <el-form-item label="市属" prop="city">
20   - <el-input
21   - v-model="dataForm.city"
22   - placeholder="请输入市属"
23   - maxlength="20"
24   - ></el-input>
25   - </el-form-item> -->
26   - <el-form-item label="转入归属地" prop="toChangeIntoId">
27   - <el-radio-group
28   - v-model="dataForm.toChangeIntoId"
29   - placeholder="请选择所属区县"
30   - style="line-height: 22px"
31   - >
32   - <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
33   - </el-radio-group>
34   - </el-form-item>
35   - <el-form-item label="内容描述" prop="applnycontent">
36   - <el-input
37   - type="textarea"
38   - v-model="dataForm.applnycontent"
39   - placeholder="请输入内容描述"
40   - maxlength="300"
41   - ></el-input>
42   - </el-form-item>
43   - <el-form-item label="处理意见" prop="processingresults">
44   - <el-radio-group v-model="dataForm.processingresults">
45   - <el-radio label="同意">同意</el-radio>
46   - <el-radio label="不同意">不同意</el-radio>
47   - </el-radio-group>
48   - </el-form-item>
49   - <el-form-item label="处理意见" prop="opinion">
50   - <el-input
51   - type="textarea"
52   - v-model="dataForm.opinion"
53   - placeholder="请输入处理意见"
54   - maxlength="300"
55   - ></el-input>
56   - </el-form-item>
57   - </el-form>
  11 + <div class="NCC-dialog-content">
  12 + <el-form
  13 + :model="dataForm"
  14 + :rules="rules"
  15 + ref="elForm"
  16 + size="small"
  17 + label-width="100px"
  18 + v-loading="loading"
  19 + >
  20 + <!-- <el-form-item label="市属" prop="city">
  21 + <el-input
  22 + v-model="dataForm.city"
  23 + placeholder="请输入市属"
  24 + maxlength="20"
  25 + ></el-input>
  26 + </el-form-item> -->
  27 + <el-form-item label="转入归属地" prop="toChangeIntoId">
  28 + <el-radio-group
  29 + v-model="dataForm.toChangeIntoId"
  30 + placeholder="请选择所属区县"
  31 + style="line-height: 22px"
  32 + >
  33 + <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
  34 + </el-radio-group>
  35 + </el-form-item>
  36 + <el-form-item label="内容描述" prop="applnycontent">
  37 + <el-input
  38 + type="textarea"
  39 + v-model="dataForm.applnycontent"
  40 + placeholder="请输入内容描述"
  41 + maxlength="300"
  42 + ></el-input>
  43 + </el-form-item>
  44 + <el-form-item label="处理意见" prop="processingresults">
  45 + <el-radio-group v-model="dataForm.processingresults">
  46 + <el-radio label="同意">同意</el-radio>
  47 + <el-radio label="不同意">不同意</el-radio>
  48 + </el-radio-group>
  49 + </el-form-item>
  50 + <el-form-item label="处理意见" prop="opinion">
  51 + <el-input
  52 + type="textarea"
  53 + v-model="dataForm.opinion"
  54 + placeholder="请输入处理意见"
  55 + maxlength="300"
  56 + ></el-input>
  57 + </el-form-item>
  58 + </el-form>
  59 + </div>
58 60 <span slot="footer" class="dialog-footer">
59 61 <el-button @click="visible = false">取 消</el-button>
60 62 <el-button type="primary" @click="dataFormSubmit" :loading="btnLoading">确 定</el-button>
... ...
src/views/baseSystemInfo/InspectForm.vue
  View file @87e6927
... ... @@ -7,7 +7,7 @@
7 7 lock-scroll
8 8 width="60%"
9 9 >
10   - <el-row :gutter="15" class="">
  10 + <el-row :gutter="15" class="NCC-dialog-content">
11 11 <el-form
12 12 ref="elForm"
13 13 :model="dataForm"
... ...
src/views/baseSystemInfo/index.vue
  View file @87e6927
... ... @@ -224,7 +224,7 @@ import { getInfoList } from &quot;@/api/baseData/info&quot;;
224 224 import { applnyChageArea } from "@/api/baseData/info";
225 225 import infoMixin from "@/mixins/info";
226 226 import InspectionForm from "./InspectForm.vue";
227   -import DetailForm from './DetailForm.vue'
  227 +import DetailForm from './DetailForm.vue';
228 228 import ChangeRecord from "./ChangeRecord.vue";
229 229  
230 230 export default {
... ...
src/views/overView/msgForm.vue
  View file @87e6927
... ... @@ -7,8 +7,9 @@
7 7 lock-scroll
8 8 width="50%"
9 9 >
10   - <div style="padding-top: 10px" v-if="!isDetail">
11   - <el-form
  10 + <div class="NCC-dialog-content">
  11 + <div style="padding-top: 10px" v-if="!isDetail">
  12 + <el-form
12 13 ref="elForm"
13 14 :model="dataForm"
14 15 size="small"
... ... @@ -78,9 +79,9 @@
78 79 </div>
79 80 </el-form-item>
80 81 </el-col>
81   - </el-form>
82   - </div>
83   - <div
  82 + </el-form>
  83 + </div>
  84 + <div
84 85 style="padding-top: 10px"
85 86 class="msg-box"
86 87 v-loading="loading"
... ... @@ -111,6 +112,7 @@
111 112 </el-tag>
112 113 </div>
113 114 </div>
  115 + </div>
114 116 </div>
115 117 <span slot="footer" class="dialog-footer">
116 118 <el-button @click="visible = false">取 消</el-button>
... ...