Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
20 changed files
with
311 additions
and
133 deletions
1 | /* | ||
2 | * @Description: 统计率 | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-01 15:37:49 | ||
5 | */ | ||
6 | /* 引入请求文件 */ | ||
1 | import request from '@/utils/request' | 7 | import request from '@/utils/request' |
8 | /* 引入配置文件 */ | ||
2 | import SERVER from './config' | 9 | import SERVER from './config' |
3 | |||
4 | class business { | 10 | class business { |
5 | /* | 11 | /** |
6 | 成功率统计 | 12 | * @description: 成功率统计 |
7 | startDate:开始日期 | 13 | * @param {*} startDate |
8 | endDate:结束日期 | 14 | * @param {*} endDate |
15 | * @param {*} qxdm | ||
16 | * @author: renchao | ||
9 | */ | 17 | */ |
10 | async getSuucessRate(startDate,endDate,qxdm) { | 18 | async getSuucessRate (startDate, endDate, qxdm) { |
11 | return request({ | 19 | return request({ |
12 | url: SERVER.SERVERAPI + '/rest/statistics/Business/sf', | 20 | url: SERVER.SERVERAPI + '/rest/statistics/Business/sf', |
13 | method: 'get', | 21 | method: 'get', |
14 | params: { | 22 | params: { |
15 | startDate:startDate, | 23 | startDate: startDate, |
16 | endDate:endDate, | 24 | endDate: endDate, |
17 | qxdm:qxdm | 25 | qxdm: qxdm |
18 | } | 26 | } |
19 | }) | 27 | }) |
20 | } | 28 | } | ... | ... |
1 | /* | ||
2 | * @Description: 这个是所有api的前缀配置文件 | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-01 15:35:44 | ||
5 | */ | ||
1 | export default { | 6 | export default { |
2 | // SERVERAPI: '/service-bdcsjsb-th', //浩浩 | 7 | // SERVERAPI: '/service-bdcsjsb-th', //浩浩 |
3 | // SERVERAPI: '/service-bdcsjsb-zz', | 8 | // SERVERAPI: '/service-bdcsjsb-zz', | ... | ... |
1 | /* | ||
2 | * @Description: 数据上报模块api文件 | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-01 16:33:08 | ||
5 | */ | ||
6 | /* 引入axios请求文件 */ | ||
1 | import request from '@/utils/request' | 7 | import request from '@/utils/request' |
8 | /* 引入配置 */ | ||
2 | import SERVER from './config' | 9 | import SERVER from './config' |
10 | const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/' | ||
3 | 11 | ||
4 | // 区县上报分页 | 12 | /** |
13 | * @description: 区县上报根据业务id获取xml | ||
14 | * @param {*} bizMsgid | ||
15 | * @author: renchao | ||
16 | */ | ||
5 | export function getXml (bizMsgid) { | 17 | export function getXml (bizMsgid) { |
6 | return request({ | 18 | return request({ |
7 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getXml', | 19 | url: urlHeader + 'getXml', |
8 | method: 'get', | 20 | method: 'get', |
9 | params: { | 21 | params: { |
10 | businessId: bizMsgid | 22 | businessId: bizMsgid |
... | @@ -12,58 +24,89 @@ export function getXml (bizMsgid) { | ... | @@ -12,58 +24,89 @@ export function getXml (bizMsgid) { |
12 | }) | 24 | }) |
13 | } | 25 | } |
14 | 26 | ||
15 | // 区县上报分页 | 27 | /** |
28 | * @description: 区县上报分页 | ||
29 | * @param {*} data | ||
30 | * @author: renchao | ||
31 | */ | ||
16 | export function getAreaReportPage (data) { | 32 | export function getAreaReportPage (data) { |
17 | return request({ | 33 | return request({ |
18 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getAreaReportPage', | 34 | url: urlHeader + 'getAreaReportPage', |
19 | method: 'post', | 35 | method: 'post', |
20 | data | 36 | data |
21 | }) | 37 | }) |
22 | } | 38 | } |
23 | 39 | ||
24 | 40 | /** | |
25 | // 接入数据上报分页 | 41 | * @description: 接入数据上报分页 |
42 | * @author: renchao | ||
43 | */ | ||
26 | export function getReceiveDataReportPage (data) { | 44 | export function getReceiveDataReportPage (data) { |
27 | return request({ | 45 | return request({ |
28 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportPage', | 46 | url: urlHeader + 'getReceiveDataReportPage', |
29 | method: 'post', | 47 | method: 'post', |
30 | data | 48 | data |
31 | }) | 49 | }) |
32 | } | 50 | } |
33 | 51 | ||
34 | // 数据上报分页 | 52 | /** |
53 | * @description: 数据上报分页 | ||
54 | * @author: renchao | ||
55 | */ | ||
35 | export function getDataReportPage (data) { | 56 | export function getDataReportPage (data) { |
36 | return request({ | 57 | return request({ |
37 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getDataReportPage', | 58 | url: urlHeader + 'getDataReportPage', |
38 | method: 'post', | 59 | method: 'post', |
39 | data | 60 | data |
40 | }) | 61 | }) |
41 | } | 62 | } |
42 | 63 | /** | |
43 | // 查询数据上报详情tabs选项卡 | 64 | * @description: 查询数据上报详情tabs选项卡 |
65 | * @author: renchao | ||
66 | */ | ||
44 | export function getTabsDetail (params) { | 67 | export function getTabsDetail (params) { |
45 | return request({ | 68 | return request({ |
46 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getTabsDetail', | 69 | url: urlHeader + 'getTabsDetail', |
47 | method: 'get', | 70 | method: 'get', |
48 | params | 71 | params |
49 | }) | 72 | }) |
50 | } | 73 | } |
51 | // 查询数据上报详情 | 74 | /** |
75 | * @description: 查询数据上报详情 | ||
76 | * @author: renchao | ||
77 | */ | ||
52 | export function getReportDetail (params) { | 78 | export function getReportDetail (params) { |
53 | return request({ | 79 | return request({ |
54 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReportDetail', | 80 | url: urlHeader + 'getReportDetail', |
55 | method: 'get', | 81 | method: 'get', |
56 | params | 82 | params |
57 | }) | 83 | }) |
58 | } | 84 | } |
59 | 85 | ||
60 | // 结果 | 86 | /** |
87 | * @description: 获取数据上报结果 | ||
88 | * @param {*} bsmReport | ||
89 | * @author: renchao | ||
90 | */ | ||
61 | export function getReceiveDataReportResult (bsmReport) { | 91 | export function getReceiveDataReportResult (bsmReport) { |
62 | return request({ | 92 | return request({ |
63 | url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportResult', | 93 | url: urlHeader + 'getReceiveDataReportResult', |
64 | method: 'get', | 94 | method: 'get', |
65 | params: { | 95 | params: { |
66 | bsmReport: bsmReport | 96 | bsmReport: bsmReport |
67 | } | 97 | } |
68 | }) | 98 | }) |
69 | } | 99 | } |
100 | |||
101 | /** | ||
102 | * @description: 重新上报 | ||
103 | * @param {*} bsmReport | ||
104 | * @author: renchao | ||
105 | */ | ||
106 | |||
107 | export function restartGenerateXml (bsmReport) { | ||
108 | return request({ | ||
109 | url: urlHeader + 'restartGenerateXml?bsmReport=' + bsmReport, | ||
110 | method: 'post' | ||
111 | }) | ||
112 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | /* | ||
2 | * @Description: 登薄日志 | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-03-01 17:09:38 | ||
5 | */ | ||
6 | /* 引入请求文件 */ | ||
1 | import request from '@/utils/request' | 7 | import request from '@/utils/request' |
8 | /* 引入配置文件 */ | ||
2 | import SERVER from './config' | 9 | import SERVER from './config' |
10 | const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/RecordLog/' | ||
3 | 11 | ||
4 | // 登簿日志分页 | 12 | /** |
13 | * @description: 登簿日志分页 | ||
14 | * @author: renchao | ||
15 | */ | ||
5 | export function getRecordLogPage (data) { | 16 | export function getRecordLogPage (data) { |
6 | return request({ | 17 | return request({ |
7 | url: SERVER.SERVERAPI + '/rest/sjsb/RecordLog/getRecordLogPage', | 18 | url: urlHeader + 'getRecordLogPage', |
8 | method: 'post', | 19 | method: 'post', |
9 | data | 20 | data |
10 | }) | 21 | }) |
11 | } | 22 | } |
12 | 23 | ||
24 | /** | ||
25 | * @description: 获取详情明细 | ||
26 | * @param {*} dbBsm | ||
27 | * @author: renchao | ||
28 | */ | ||
29 | export function getDetail (dbBsm) { | ||
30 | return request({ | ||
31 | url: urlHeader + 'getDetail', | ||
32 | method: 'get', | ||
33 | params: { | ||
34 | dbBsm: dbBsm | ||
35 | } | ||
36 | }) | ||
37 | } | ||
13 | 38 | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | <div class="naturalBuilding itemForm"> | 2 | <div class="naturalBuilding itemForm"> |
3 | <el-form :model="naturalForm" :rules="rules" ref="formList" label-width="115px" :key="key"> | 3 | <el-form :model="naturalForm" :rules="rules" ref="formList" label-width="115px" :key="key"> |
4 | <div v-for="(item, index) in naturalForm.naturalList" :key="index" class="naturalBuilding-item"> | 4 | <div v-for="(item, index) in naturalForm.naturalList" :key="index" class="naturalBuilding-item"> |
5 | <p class="naturalBuilding-name">自然幢{{ index + 1 }}</p> | 5 | <p class="naturalBuilding-name obligee-item-name">自然幢{{ index + 1 }}</p> |
6 | <div class="naturalBuilding-list"> | 6 | <div class="naturalBuilding-list"> |
7 | <el-row> | 7 | <el-row> |
8 | <el-col :span="8"> | 8 | <el-col :span="8"> |
... | @@ -330,7 +330,7 @@ export default { | ... | @@ -330,7 +330,7 @@ export default { |
330 | default: "", | 330 | default: "", |
331 | }, | 331 | }, |
332 | }, | 332 | }, |
333 | data() { | 333 | data () { |
334 | return { | 334 | return { |
335 | naturalForm: { | 335 | naturalForm: { |
336 | naturalList: [ | 336 | naturalList: [ |
... | @@ -366,7 +366,7 @@ export default { | ... | @@ -366,7 +366,7 @@ export default { |
366 | }; | 366 | }; |
367 | }, | 367 | }, |
368 | methods: { | 368 | methods: { |
369 | async featchData() { | 369 | async featchData () { |
370 | try { | 370 | try { |
371 | let { result: res } = await kttFwZrz.getKttFwZrzById(this.bsmSjsb); | 371 | let { result: res } = await kttFwZrz.getKttFwZrzById(this.bsmSjsb); |
372 | this.naturalForm.naturalList = res; | 372 | this.naturalForm.naturalList = res; |
... | @@ -375,7 +375,7 @@ export default { | ... | @@ -375,7 +375,7 @@ export default { |
375 | this.$refs.msg.messageShow(); | 375 | this.$refs.msg.messageShow(); |
376 | } | 376 | } |
377 | }, | 377 | }, |
378 | handleUpdateForm() { | 378 | handleUpdateForm () { |
379 | return new Promise(async (resolve) => { | 379 | return new Promise(async (resolve) => { |
380 | try { | 380 | try { |
381 | let res = await kttFwZrz.updateKttFwZrz(this.naturalForm.naturalList); | 381 | let res = await kttFwZrz.updateKttFwZrz(this.naturalForm.naturalList); | ... | ... |
... | @@ -42,6 +42,7 @@ export default { | ... | @@ -42,6 +42,7 @@ export default { |
42 | 42 | ||
43 | .result { | 43 | .result { |
44 | padding: 15px; | 44 | padding: 15px; |
45 | height: 100%; | ||
45 | 46 | ||
46 | p { | 47 | p { |
47 | color: #ffffff; | 48 | color: #ffffff; |
... | @@ -50,7 +51,7 @@ export default { | ... | @@ -50,7 +51,7 @@ export default { |
50 | } | 51 | } |
51 | 52 | ||
52 | /deep/.el-textarea__inner { | 53 | /deep/.el-textarea__inner { |
53 | min-height: 33vh !important; | 54 | min-height: 30vh !important; |
54 | background-color: #08346F !important; | 55 | background-color: #08346F !important; |
55 | color: #ffffff; | 56 | color: #ffffff; |
56 | border: none !important; | 57 | border: none !important; | ... | ... |
... | @@ -4,6 +4,7 @@ | ... | @@ -4,6 +4,7 @@ |
4 | <div slot="title" class="dialog_title" ref="dialogTitle"> | 4 | <div slot="title" class="dialog_title" ref="dialogTitle"> |
5 | {{ title || '标题' }} | 5 | {{ title || '标题' }} |
6 | </div> | 6 | </div> |
7 | <div class="regularHeight"> | ||
7 | <div class="editDialogBox-box"> | 8 | <div class="editDialogBox-box"> |
8 | <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab"> | 9 | <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab"> |
9 | <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> | 10 | <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> |
... | @@ -81,8 +82,8 @@ | ... | @@ -81,8 +82,8 @@ |
81 | </el-row> | 82 | </el-row> |
82 | </div> | 83 | </div> |
83 | </div> | 84 | </div> |
84 | <div class="editDialogBox-box"> | 85 | <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'"> |
85 | <div v-if="titleName == 'sjmx'" class="sjmx"> | 86 | <div class="sjmx"> |
86 | <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList"> | 87 | <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList"> |
87 | <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl"> | 88 | <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl"> |
88 | <div slot="label" class="tab-pane-item"> | 89 | <div slot="label" class="tab-pane-item"> |
... | @@ -95,15 +96,21 @@ | ... | @@ -95,15 +96,21 @@ |
95 | <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" | 96 | <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" |
96 | :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> | 97 | :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> |
97 | </div> | 98 | </div> |
98 | <div class="d-center" v-if="!$store.state.business.Edit"> | ||
99 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> | ||
100 | <btn nativeType="cx" @click="submitForm">确 定</btn> | ||
101 | </div> | 99 | </div> |
102 | </div> | 100 | </div> |
103 | <div v-if="titleName == 'xyjg'"> | 101 | <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'"> |
102 | <JsonEditor :resultInfo="resultInfo" /> | ||
103 | </div> | ||
104 | <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'"> | ||
104 | <Xyjg :form-data='dataReport'></Xyjg> | 105 | <Xyjg :form-data='dataReport'></Xyjg> |
105 | </div> | 106 | </div> |
106 | <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" /> | 107 | </div> |
108 | <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'"> | ||
109 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> | ||
110 | <btn nativeType="cx" @click="submitForm">确 定</btn> | ||
111 | </div> | ||
112 | <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> | ||
113 | <btn nativeType="cx" @click="handleResubmit">重新上报</btn> | ||
107 | </div> | 114 | </div> |
108 | </el-dialog> | 115 | </el-dialog> |
109 | </template> | 116 | </template> |
... | @@ -112,8 +119,7 @@ | ... | @@ -112,8 +119,7 @@ |
112 | import { mapGetters } from "vuex"; | 119 | import { mapGetters } from "vuex"; |
113 | import JsonEditor from "@/components/JsonEditor.vue"; | 120 | import JsonEditor from "@/components/JsonEditor.vue"; |
114 | import Xyjg from "./Result"; | 121 | import Xyjg from "./Result"; |
115 | import { getTabsDetail, getXml, getReportDetail } from "@/api/dataReport.js"; | 122 | import { getTabsDetail, getXml, getReportDetail, restartGenerateXml } from "@/api/dataReport.js"; |
116 | import { MessageBox } from "element-ui"; | ||
117 | export default { | 123 | export default { |
118 | components: { JsonEditor, Xyjg }, | 124 | components: { JsonEditor, Xyjg }, |
119 | props: { | 125 | props: { |
... | @@ -184,7 +190,6 @@ export default { | ... | @@ -184,7 +190,6 @@ export default { |
184 | } | 190 | } |
185 | }, | 191 | }, |
186 | handleTitleTab (val) { | 192 | handleTitleTab (val) { |
187 | console.log(val); | ||
188 | }, | 193 | }, |
189 | isShow (item) { | 194 | isShow (item) { |
190 | this.dataReport = item; | 195 | this.dataReport = item; |
... | @@ -235,11 +240,11 @@ export default { | ... | @@ -235,11 +240,11 @@ export default { |
235 | this.editItem = ""; | 240 | this.editItem = ""; |
236 | this.headerList = []; | 241 | this.headerList = []; |
237 | }, | 242 | }, |
238 | submitForm () { | 243 | /** |
239 | // this.$store.dispatch( | 244 | * @description: 提交 |
240 | // "business/setRules", | 245 | * @author: renchao |
241 | // this.$store.state.business.subRules | 246 | */ |
242 | // ); | 247 | submitForm: _.debounce(function () { |
243 | this.$refs["editItem"].handleUpdateForm() | 248 | this.$refs["editItem"].handleUpdateForm() |
244 | .then((res) => { | 249 | .then((res) => { |
245 | if (res == 200) { | 250 | if (res == 200) { |
... | @@ -255,7 +260,22 @@ export default { | ... | @@ -255,7 +260,22 @@ export default { |
255 | type: "error" | 260 | type: "error" |
256 | }) | 261 | }) |
257 | }) | 262 | }) |
263 | }, 500), | ||
264 | /** | ||
265 | * @description: 重新上报 | ||
266 | * @author: renchao | ||
267 | */ | ||
268 | handleResubmit: _.debounce(function () { | ||
269 | restartGenerateXml(this.dataReport.bsmSjsb || this.dataReport.bsmReport).then((res) => { | ||
270 | if (res.code == 200) { | ||
271 | this.resultInfo = res.message | ||
272 | this.$message({ | ||
273 | message: '生成成功', | ||
274 | type: 'success' | ||
275 | }) | ||
258 | } | 276 | } |
277 | }) | ||
278 | }, 500) | ||
259 | } | 279 | } |
260 | } | 280 | } |
261 | </script> | 281 | </script> |
... | @@ -266,6 +286,7 @@ export default { | ... | @@ -266,6 +286,7 @@ export default { |
266 | /deep/.el-dialog__body { | 286 | /deep/.el-dialog__body { |
267 | display: flex; | 287 | display: flex; |
268 | flex-direction: column; | 288 | flex-direction: column; |
289 | padding-bottom: 25px; | ||
269 | } | 290 | } |
270 | 291 | ||
271 | /deep/ .el-tabs { | 292 | /deep/ .el-tabs { |
... | @@ -273,8 +294,6 @@ export default { | ... | @@ -273,8 +294,6 @@ export default { |
273 | } | 294 | } |
274 | 295 | ||
275 | .sjmx { | 296 | .sjmx { |
276 | padding-bottom: 25px; | ||
277 | |||
278 | /deep/.el-tabs__item { | 297 | /deep/.el-tabs__item { |
279 | height: 50px; | 298 | height: 50px; |
280 | padding-top: 6px; | 299 | padding-top: 6px; |
... | @@ -350,21 +369,18 @@ export default { | ... | @@ -350,21 +369,18 @@ export default { |
350 | } | 369 | } |
351 | 370 | ||
352 | .edit-content { | 371 | .edit-content { |
353 | height: 420px; | ||
354 | overflow-y: auto; | 372 | overflow-y: auto; |
355 | overflow-x: hidden; | 373 | overflow-x: hidden; |
356 | padding-right: 1px; | 374 | padding-right: 1px; |
357 | margin-bottom: 10px; | 375 | margin-bottom: 10px; |
358 | border-top: none; | 376 | border-top: none; |
377 | height: 45vh; | ||
359 | } | 378 | } |
360 | 379 | ||
361 | /deep/.editDialogBox { | 380 | /deep/.editDialogBox { |
362 | border-radius: 8px; | 381 | border-radius: 8px; |
363 | overflow: hidden; | 382 | overflow: hidden; |
364 | min-width: 1228px; | 383 | min-width: 1228px; |
365 | height: 825px !important; | ||
366 | |||
367 | |||
368 | 384 | ||
369 | .el-dialog__header { | 385 | .el-dialog__header { |
370 | display: flex; | 386 | display: flex; | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo"> |
3 | <el-input type="textarea" :rows="6" :disabled="$store.state.business.Edit" placeholder="配置参数" v-model="resultInfo"> | ||
4 | </el-input> | 3 | </el-input> |
5 | <div class="d-center" v-if="!$store.state.business.Edit"> | ||
6 | <btn nativeType="cx" @click="submitForm">重新上报</btn> | ||
7 | </div> | ||
8 | </div> | ||
9 | </template> | 4 | </template> |
10 | <script> | 5 | <script> |
11 | // 引入json编译器 | 6 | // 引入json编译器 |
... | @@ -15,26 +10,15 @@ export default { | ... | @@ -15,26 +10,15 @@ export default { |
15 | type: String, | 10 | type: String, |
16 | default: '' | 11 | default: '' |
17 | } | 12 | } |
18 | }, | ||
19 | data () { | ||
20 | return { | ||
21 | myValue: this.value, | ||
22 | } | ||
23 | }, | ||
24 | methods: { | ||
25 | onJsonChange (value) { | ||
26 | }, | ||
27 | onJsonSave (value) { | ||
28 | } | ||
29 | } | 13 | } |
30 | } | 14 | } |
31 | 15 | ||
32 | </script> | 16 | </script> |
33 | 17 | ||
34 | <style scoped lang="scss"> | 18 | <style scoped lang="scss"> |
35 | /* jsoneditor右上角默认有一个链接,加css去掉了 */ | ||
36 | /deep/.el-textarea__inner { | 19 | /deep/.el-textarea__inner { |
37 | min-height: 70vh !important; | 20 | height: 67vh !important; |
21 | border: none !important; | ||
38 | background-color: #08346F !important; | 22 | background-color: #08346F !important; |
39 | color: #ffffff; | 23 | color: #ffffff; |
40 | border: none !important; | 24 | border: none !important; | ... | ... |
... | @@ -18,6 +18,9 @@ const actions = { | ... | @@ -18,6 +18,9 @@ const actions = { |
18 | getUserInfo ({ commit }) { | 18 | getUserInfo ({ commit }) { |
19 | return new Promise(async (resolve) => { | 19 | return new Promise(async (resolve) => { |
20 | let { result: res } = await getUserInfo(); | 20 | let { result: res } = await getUserInfo(); |
21 | // require.ensure([], function (require) { | ||
22 | // require("@/assets/sass/smart-lift/index.scss"); | ||
23 | // }); | ||
21 | commit("SET_USERINFO", res); | 24 | commit("SET_USERINFO", res); |
22 | resolve(true); | 25 | resolve(true); |
23 | }); | 26 | }); | ... | ... |
... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
2 | overflow: hidden; | 2 | overflow: hidden; |
3 | background: url("~@/image/dialogBg.png") no-repeat !important; | 3 | background: url("~@/image/dialogBg.png") no-repeat !important; |
4 | background-size: 100% 100% !important; | 4 | background-size: 100% 100% !important; |
5 | min-height: 89vh; | 5 | min-height: 90vh; |
6 | 6 | ||
7 | .dialog_title { | 7 | .dialog_title { |
8 | display: flex; | 8 | display: flex; |
... | @@ -56,7 +56,19 @@ | ... | @@ -56,7 +56,19 @@ |
56 | box-shadow: inset 0px 0px 12px 0px #02D9FD; | 56 | box-shadow: inset 0px 0px 12px 0px #02D9FD; |
57 | border-radius: 2px; | 57 | border-radius: 2px; |
58 | border: 1px solid #6BC1FC; | 58 | border: 1px solid #6BC1FC; |
59 | margin: 0 18px 15px 18px; | 59 | margin: 0 18px 10px 18px; |
60 | } | ||
61 | } | ||
62 | |||
63 | .regularHeight { | ||
64 | height: 80vh; | ||
65 | display: flex; | ||
66 | flex-direction: column; | ||
67 | |||
68 | .editDialogBox-con, | ||
69 | .JsonEditor { | ||
70 | flex: 1; | ||
71 | height: 100%; | ||
60 | } | 72 | } |
61 | } | 73 | } |
62 | 74 | ||
... | @@ -105,7 +117,7 @@ | ... | @@ -105,7 +117,7 @@ |
105 | } | 117 | } |
106 | 118 | ||
107 | /deep/.el-textarea__inner { | 119 | /deep/.el-textarea__inner { |
108 | border: 1px solid #224C7C !important; | 120 | border: 1px solid #224C7C; |
109 | margin: 0 0 10px 0 !important; | 121 | margin: 0 0 10px 0 !important; |
110 | width: 100% !important; | 122 | width: 100% !important; |
111 | color: #dadde3 !important; | 123 | color: #dadde3 !important; | ... | ... |
... | @@ -199,11 +199,13 @@ | ... | @@ -199,11 +199,13 @@ |
199 | box-sizing: border-box; | 199 | box-sizing: border-box; |
200 | text-align: right; | 200 | text-align: right; |
201 | } | 201 | } |
202 | |||
202 | // 修改弹框样式 | 203 | // 修改弹框样式 |
203 | .modifydialog{ | 204 | .modifydialog { |
204 | /deep/.el-dialog__header { | 205 | /deep/.el-dialog__header { |
205 | text-align: center; | 206 | text-align: center; |
206 | margin-bottom: 10px; | 207 | margin-bottom: 10px; |
208 | |||
207 | .el-dialog__title { | 209 | .el-dialog__title { |
208 | color: white; | 210 | color: white; |
209 | } | 211 | } |
... | @@ -212,29 +214,36 @@ | ... | @@ -212,29 +214,36 @@ |
212 | /deep/.el-form-item__label { | 214 | /deep/.el-form-item__label { |
213 | color: white; | 215 | color: white; |
214 | } | 216 | } |
217 | |||
215 | /deep/.el-input__inner { | 218 | /deep/.el-input__inner { |
216 | background-color: #07388b; | 219 | background-color: #07388b; |
217 | } | 220 | } |
221 | |||
218 | /deep/.el-input__inner { | 222 | /deep/.el-input__inner { |
219 | background: #07388b; | 223 | background: #07388b; |
220 | border-radius: 2px; | 224 | border-radius: 2px; |
221 | border: 1px solid #6bc1fc; | 225 | border: 1px solid #6bc1fc; |
222 | } | 226 | } |
227 | |||
223 | /deep/.el-textarea__inner { | 228 | /deep/.el-textarea__inner { |
224 | background: #07388b; | 229 | background: #07388b; |
225 | color: #fff; | 230 | color: #fff; |
226 | } | 231 | } |
232 | |||
227 | /deep/.el-form-item__label { | 233 | /deep/.el-form-item__label { |
228 | color: #fff; | 234 | color: #fff; |
229 | } | 235 | } |
236 | |||
230 | /deep/.el-dialog__headerbtn { | 237 | /deep/.el-dialog__headerbtn { |
231 | position: absolute; | 238 | position: absolute; |
232 | top: 22px; | 239 | top: 22px; |
233 | right: 30px; | 240 | right: 30px; |
234 | } | 241 | } |
242 | |||
235 | /deep/.el-dialog__header { | 243 | /deep/.el-dialog__header { |
236 | text-align: center; | 244 | text-align: center; |
237 | margin-bottom: 10px; | 245 | margin-bottom: 10px; |
246 | |||
238 | .el-dialog__title { | 247 | .el-dialog__title { |
239 | color: white; | 248 | color: white; |
240 | } | 249 | } |
... | @@ -242,7 +251,7 @@ | ... | @@ -242,7 +251,7 @@ |
242 | } | 251 | } |
243 | 252 | ||
244 | // 角色配置 | 253 | // 角色配置 |
245 | .roleconfiguration{ | 254 | .roleconfiguration { |
246 | /deep/.el-dialog__body { | 255 | /deep/.el-dialog__body { |
247 | display: flex; | 256 | display: flex; |
248 | flex-direction: column; | 257 | flex-direction: column; |
... | @@ -328,7 +337,6 @@ | ... | @@ -328,7 +337,6 @@ |
328 | } | 337 | } |
329 | 338 | ||
330 | .edit-content { | 339 | .edit-content { |
331 | height: 450px; | ||
332 | overflow-y: auto; | 340 | overflow-y: auto; |
333 | overflow-x: hidden; | 341 | overflow-x: hidden; |
334 | padding-right: 1px; | 342 | padding-right: 1px; |
... | @@ -401,6 +409,7 @@ | ... | @@ -401,6 +409,7 @@ |
401 | display: flex; | 409 | display: flex; |
402 | margin-bottom: 15px; | 410 | margin-bottom: 15px; |
403 | } | 411 | } |
412 | |||
404 | .el-dialog__footer { | 413 | .el-dialog__footer { |
405 | padding-right: 40px; | 414 | padding-right: 40px; |
406 | } | 415 | } |
... | @@ -414,12 +423,15 @@ | ... | @@ -414,12 +423,15 @@ |
414 | .el-dialog__wrapper { | 423 | .el-dialog__wrapper { |
415 | overflow: hidden; | 424 | overflow: hidden; |
416 | } | 425 | } |
426 | |||
417 | /deep/.el-table { | 427 | /deep/.el-table { |
418 | background: none; | 428 | background: none; |
429 | |||
419 | th.el-table__cell { | 430 | th.el-table__cell { |
420 | background-color: #073781; | 431 | background-color: #073781; |
421 | color: #02d9fd; | 432 | color: #02d9fd; |
422 | } | 433 | } |
434 | |||
423 | tr { | 435 | tr { |
424 | background: none; | 436 | background: none; |
425 | 437 | ||
... | @@ -430,4 +442,3 @@ | ... | @@ -430,4 +442,3 @@ |
430 | } | 442 | } |
431 | 443 | ||
432 | } | 444 | } |
... | \ No newline at end of file | ... | \ No newline at end of file |
433 | ... | ... |
... | @@ -118,6 +118,7 @@ | ... | @@ -118,6 +118,7 @@ |
118 | }, | 118 | }, |
119 | data () { | 119 | data () { |
120 | return { | 120 | return { |
121 | |||
121 | pickerOptionsStart: { | 122 | pickerOptionsStart: { |
122 | disabledDate: (time) => { | 123 | disabledDate: (time) => { |
123 | let endDateVal = this.form.receiveEndTime; | 124 | let endDateVal = this.form.receiveEndTime; | ... | ... |
... | @@ -4,38 +4,16 @@ | ... | @@ -4,38 +4,16 @@ |
4 | <h2>{{ productName }}</h2> | 4 | <h2>{{ productName }}</h2> |
5 | <div class="user_style"> | 5 | <div class="user_style"> |
6 | <h3>欢迎登录</h3> | 6 | <h3>欢迎登录</h3> |
7 | <el-form | 7 | <el-form :model="user" :rules="rules" ref="user" id="loginform" class="demo-ruleForm"> |
8 | :model="user" | ||
9 | :rules="rules" | ||
10 | ref="user" | ||
11 | id="loginform" | ||
12 | class="demo-ruleForm" | ||
13 | > | ||
14 | <el-form-item prop="account"> | 8 | <el-form-item prop="account"> |
15 | <el-input | 9 | <el-input class="username" v-model="user.account" placeholder="请输入用户名"></el-input> |
16 | class="username" | ||
17 | v-model="user.account" | ||
18 | placeholder="请输入用户名" | ||
19 | ></el-input> | ||
20 | </el-form-item> | 10 | </el-form-item> |
21 | <el-form-item prop="password"> | 11 | <el-form-item prop="password"> |
22 | <el-input | 12 | <el-input type="password" class="password" @keyup.native="login('user')" v-model="user.password" |
23 | type="password" | 13 | placeholder="请输入密码"></el-input> |
24 | class="password" | ||
25 | v-model="user.password" | ||
26 | placeholder="请输入密码" | ||
27 | ></el-input> | ||
28 | </el-form-item> | 14 | </el-form-item> |
29 | <!-- <el-form-item> | ||
30 | <el-checkbox | ||
31 | label="记住用户名" | ||
32 | @change="checkUserName" | ||
33 | ></el-checkbox> | ||
34 | </el-form-item> --> | ||
35 | <el-form-item class="login-btn"> | 15 | <el-form-item class="login-btn"> |
36 | <el-button type="primary" style="width: 100%" @click="login('user')" | 16 | <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button> |
37 | >登录</el-button | ||
38 | > | ||
39 | </el-form-item> | 17 | </el-form-item> |
40 | </el-form> | 18 | </el-form> |
41 | </div> | 19 | </div> |
... | @@ -48,7 +26,7 @@ import { loginIn } from "@/api/login.js"; | ... | @@ -48,7 +26,7 @@ import { loginIn } from "@/api/login.js"; |
48 | import { api, getAction } from "@/api/manageApi"; | 26 | import { api, getAction } from "@/api/manageApi"; |
49 | export default { | 27 | export default { |
50 | name: "Login", | 28 | name: "Login", |
51 | data() { | 29 | data () { |
52 | return { | 30 | return { |
53 | user: { | 31 | user: { |
54 | account: "", | 32 | account: "", |
... | @@ -62,7 +40,7 @@ export default { | ... | @@ -62,7 +40,7 @@ export default { |
62 | }, | 40 | }, |
63 | }; | 41 | }; |
64 | }, | 42 | }, |
65 | created() { | 43 | created () { |
66 | const params = {}; | 44 | const params = {}; |
67 | const queryOptions = { | 45 | const queryOptions = { |
68 | conditionGroup: { | 46 | conditionGroup: { |
... | @@ -87,7 +65,7 @@ export default { | ... | @@ -87,7 +65,7 @@ export default { |
87 | } | 65 | } |
88 | }); | 66 | }); |
89 | }, | 67 | }, |
90 | mounted() { | 68 | mounted () { |
91 | // this.checkUserName(); | 69 | // this.checkUserName(); |
92 | }, | 70 | }, |
93 | methods: { | 71 | methods: { |
... | @@ -106,7 +84,7 @@ export default { | ... | @@ -106,7 +84,7 @@ export default { |
106 | this.user.account = localStorage.getItem("accountId"); | 84 | this.user.account = localStorage.getItem("accountId"); |
107 | } | 85 | } |
108 | }, | 86 | }, |
109 | login(user) { | 87 | login (user) { |
110 | var self = this; | 88 | var self = this; |
111 | this.$refs[user].validate((valid) => { | 89 | this.$refs[user].validate((valid) => { |
112 | if (valid) { | 90 | if (valid) { |
... | @@ -135,6 +113,7 @@ export default { | ... | @@ -135,6 +113,7 @@ export default { |
135 | .username, | 113 | .username, |
136 | .password { | 114 | .password { |
137 | position: relative; | 115 | position: relative; |
116 | |||
138 | &:before { | 117 | &:before { |
139 | content: ""; | 118 | content: ""; |
140 | display: block; | 119 | display: block; |
... | @@ -145,18 +124,22 @@ export default { | ... | @@ -145,18 +124,22 @@ export default { |
145 | top: 7px; | 124 | top: 7px; |
146 | background-size: 100% 100%; | 125 | background-size: 100% 100%; |
147 | } | 126 | } |
127 | |||
148 | /deep/ .el-input__inner { | 128 | /deep/ .el-input__inner { |
149 | text-indent: 24px; | 129 | text-indent: 24px; |
150 | border: 1px solid rgba(11, 161, 248, 0.4); | 130 | border: 1px solid rgba(11, 161, 248, 0.4); |
151 | background-color: rgba(6, 135, 205, 0.3) !important; | 131 | background-color: rgba(6, 135, 205, 0.3) !important; |
152 | } | 132 | } |
153 | } | 133 | } |
134 | |||
154 | .username::before { | 135 | .username::before { |
155 | background-image: url(../../image/username.png); | 136 | background-image: url(../../image/username.png); |
156 | } | 137 | } |
138 | |||
157 | .password::before { | 139 | .password::before { |
158 | background-image: url(../../image/password.png); | 140 | background-image: url(../../image/password.png); |
159 | } | 141 | } |
142 | |||
160 | .bg { | 143 | .bg { |
161 | width: 100%; | 144 | width: 100%; |
162 | height: 100%; | 145 | height: 100%; |
... | @@ -180,6 +163,7 @@ export default { | ... | @@ -180,6 +163,7 @@ export default { |
180 | background-size: 100% 100%; | 163 | background-size: 100% 100%; |
181 | box-sizing: border-box; | 164 | box-sizing: border-box; |
182 | padding: 56px; | 165 | padding: 56px; |
166 | |||
183 | h2 { | 167 | h2 { |
184 | width: 100%; | 168 | width: 100%; |
185 | font-size: 36px; | 169 | font-size: 36px; |
... | @@ -190,14 +174,12 @@ export default { | ... | @@ -190,14 +174,12 @@ export default { |
190 | position: absolute; | 174 | position: absolute; |
191 | right: 0; | 175 | right: 0; |
192 | top: -70px; | 176 | top: -70px; |
193 | background-image: linear-gradient( | 177 | background-image: linear-gradient(180deg, |
194 | 180deg, | ||
195 | rgba(99, 163, 255, 1) 0, | 178 | rgba(99, 163, 255, 1) 0, |
196 | rgba(99, 163, 255, 1) 0, | 179 | rgba(99, 163, 255, 1) 0, |
197 | rgba(182, 220, 255, 1) 49.731445%, | 180 | rgba(182, 220, 255, 1) 49.731445%, |
198 | rgba(114, 190, 255, 1) 100%, | 181 | rgba(114, 190, 255, 1) 100%, |
199 | rgba(114, 190, 255, 1) 100% | 182 | rgba(114, 190, 255, 1) 100%); |
200 | ); | ||
201 | overflow-wrap: break-word; | 183 | overflow-wrap: break-word; |
202 | color: rgba(255, 255, 255, 1); | 184 | color: rgba(255, 255, 255, 1); |
203 | font-size: 36px; | 185 | font-size: 36px; |
... | @@ -206,6 +188,7 @@ export default { | ... | @@ -206,6 +188,7 @@ export default { |
206 | -webkit-text-fill-color: transparent; | 188 | -webkit-text-fill-color: transparent; |
207 | } | 189 | } |
208 | } | 190 | } |
191 | |||
209 | .login { | 192 | .login { |
210 | .user_style { | 193 | .user_style { |
211 | h3 { | 194 | h3 { |
... | @@ -217,6 +200,7 @@ export default { | ... | @@ -217,6 +200,7 @@ export default { |
217 | font-weight: 400; | 200 | font-weight: 400; |
218 | } | 201 | } |
219 | } | 202 | } |
203 | |||
220 | .btn { | 204 | .btn { |
221 | width: 100%; | 205 | width: 100%; |
222 | height: 6vh; | 206 | height: 6vh; |
... | @@ -225,6 +209,7 @@ export default { | ... | @@ -225,6 +209,7 @@ export default { |
225 | font-size: 1.4vw; | 209 | font-size: 1.4vw; |
226 | color: #ffffff; | 210 | color: #ffffff; |
227 | } | 211 | } |
212 | |||
228 | .btn:hover { | 213 | .btn:hover { |
229 | cursor: pointer; | 214 | cursor: pointer; |
230 | background-color: #2d8cf0; | 215 | background-color: #2d8cf0; |
... | @@ -235,18 +220,22 @@ export default { | ... | @@ -235,18 +220,22 @@ export default { |
235 | .el-form-item { | 220 | .el-form-item { |
236 | margin-bottom: 24px !important; | 221 | margin-bottom: 24px !important; |
237 | } | 222 | } |
223 | |||
238 | .login-btn { | 224 | .login-btn { |
239 | margin-top: 40px !important; | 225 | margin-top: 40px !important; |
240 | } | 226 | } |
227 | |||
241 | .el-button { | 228 | .el-button { |
242 | font-size: 18px; | 229 | font-size: 18px; |
243 | background: #0d8cc0 !important; | 230 | background: #0d8cc0 !important; |
244 | color: #ffffff !important; | 231 | color: #ffffff !important; |
245 | cursor: pointer !important; | 232 | cursor: pointer !important; |
246 | } | 233 | } |
234 | |||
247 | .el-input__inner { | 235 | .el-input__inner { |
248 | width: 100% !important; | 236 | width: 100% !important; |
249 | } | 237 | } |
238 | |||
250 | .el-checkbox__label { | 239 | .el-checkbox__label { |
251 | color: #fff; | 240 | color: #fff; |
252 | } | 241 | } | ... | ... |
... | @@ -51,7 +51,7 @@ import data from "./data"; | ... | @@ -51,7 +51,7 @@ import data from "./data"; |
51 | // 引入table混入方法 | 51 | // 引入table混入方法 |
52 | import tableMixin from "@/mixins/tableMixin.js"; | 52 | import tableMixin from "@/mixins/tableMixin.js"; |
53 | // 导出excel表格 | 53 | // 导出excel表格 |
54 | import downLbTable from '@/components/downLbTable' | 54 | import downLbTable from '@/components/DownLbTable' |
55 | // 获取时间 | 55 | // 获取时间 |
56 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; | 56 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; |
57 | export default { | 57 | export default { | ... | ... |
... | @@ -51,7 +51,7 @@ import data from "./data"; | ... | @@ -51,7 +51,7 @@ import data from "./data"; |
51 | // 引入table混入方法 | 51 | // 引入table混入方法 |
52 | import tableMixin from "@/mixins/tableMixin.js"; | 52 | import tableMixin from "@/mixins/tableMixin.js"; |
53 | // 导出excel表格 | 53 | // 导出excel表格 |
54 | import downLbTable from '@/components/downLbTable' | 54 | import downLbTable from '@/components/DownLbTable' |
55 | // 获取时间 | 55 | // 获取时间 |
56 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; | 56 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; |
57 | export default { | 57 | export default { | ... | ... |
... | @@ -49,7 +49,7 @@ import data from "./data"; | ... | @@ -49,7 +49,7 @@ import data from "./data"; |
49 | // 引入table混入方法 | 49 | // 引入table混入方法 |
50 | import tableMixin from "@/mixins/tableMixin.js"; | 50 | import tableMixin from "@/mixins/tableMixin.js"; |
51 | // 导出excel表格 | 51 | // 导出excel表格 |
52 | import downLbTable from '@/components/downLbTable' | 52 | import downLbTable from '@/components/DownLbTable' |
53 | // 获取时间 | 53 | // 获取时间 |
54 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; | 54 | import { getCurrentDate, setExport2Excel } from "@/utils/tools"; |
55 | export default { | 55 | export default { | ... | ... |
... | @@ -50,7 +50,7 @@ export default { | ... | @@ -50,7 +50,7 @@ export default { |
50 | } | 50 | } |
51 | 51 | ||
52 | /deep/.el-textarea__inner { | 52 | /deep/.el-textarea__inner { |
53 | min-height: 33vh !important; | 53 | min-height: 27vh !important; |
54 | background-color: #08346F !important; | 54 | background-color: #08346F !important; |
55 | color: #ffffff; | 55 | color: #ffffff; |
56 | border: none !important; | 56 | border: none !important; | ... | ... |
... | @@ -6,6 +6,31 @@ class data { | ... | @@ -6,6 +6,31 @@ class data { |
6 | columns () { | 6 | columns () { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | width: "70", | ||
10 | renderHeader: (h, scope) => { | ||
11 | return ( | ||
12 | <div> | ||
13 | <i | ||
14 | class="el-icon-plus" | ||
15 | onClick={() => { | ||
16 | vm.handleSBAdd(); | ||
17 | }} | ||
18 | style="cursor:pointer;color:#409EFF" | ||
19 | ></i> | ||
20 | </div> | ||
21 | ); | ||
22 | }, | ||
23 | render: (h, scope) => { | ||
24 | return <i | ||
25 | class="el-icon-minus" | ||
26 | onClick={() => { | ||
27 | vm.handleSBMinus(scope.row); | ||
28 | }} | ||
29 | style="cursor:pointer;color:#409EFF" | ||
30 | ></i> | ||
31 | }, | ||
32 | }, | ||
33 | { | ||
9 | prop: 'ywh', | 34 | prop: 'ywh', |
10 | label: '业务号', | 35 | label: '业务号', |
11 | render: (h, scope) => { | 36 | render: (h, scope) => { | ... | ... |
... | @@ -4,6 +4,7 @@ | ... | @@ -4,6 +4,7 @@ |
4 | <div slot="title" class="dialog_title" ref="dialogTitle"> | 4 | <div slot="title" class="dialog_title" ref="dialogTitle"> |
5 | {{ title || '标题' }} | 5 | {{ title || '标题' }} |
6 | </div> | 6 | </div> |
7 | <div class="regularHeight"> | ||
7 | <div class="editDialogBox-box"> | 8 | <div class="editDialogBox-box"> |
8 | <el-tabs v-model="titleName" type="card"> | 9 | <el-tabs v-model="titleName" type="card"> |
9 | <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane> | 10 | <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane> |
... | @@ -14,22 +15,22 @@ | ... | @@ -14,22 +15,22 @@ |
14 | <el-row class="dialog-from_header item-content-input"> | 15 | <el-row class="dialog-from_header item-content-input"> |
15 | <el-col :span="8"> | 16 | <el-col :span="8"> |
16 | <span>行政编码:</span> | 17 | <span>行政编码:</span> |
17 | <el-input v-model="titleForm.xzbm" maxlength="10"></el-input> | 18 | <el-input v-model="accessLog.AREACODE" maxlength="10"></el-input> |
18 | </el-col> | 19 | </el-col> |
19 | <el-col :span="8"> | 20 | <el-col :span="8"> |
20 | <span>行政名称:</span> | 21 | <span>行政名称:</span> |
21 | <el-input v-model="titleForm.mc" maxlength="20"></el-input> | 22 | <el-input v-model="accessLog.AREANAME" maxlength="20"></el-input> |
22 | </el-col> | 23 | </el-col> |
23 | <el-col :span="8"> | 24 | <el-col :span="8"> |
24 | <span>日期:</span> | 25 | <span>日期:</span> |
25 | <el-date-picker v-model="titleForm.date" type="date"> | 26 | <el-date-picker v-model="accessLog.CREATEDATE" type="date"> |
26 | </el-date-picker> | 27 | </el-date-picker> |
27 | </el-col> | 28 | </el-col> |
28 | </el-row> | 29 | </el-row> |
29 | <el-row class="dialog-from_header item-content-input"> | 30 | <el-row class="dialog-from_header item-content-input"> |
30 | <el-col :span="24"> | 31 | <el-col :span="24"> |
31 | <span class="bz">备注:</span> | 32 | <span class="bz">备注:</span> |
32 | <el-input placeholder="请输入内容" maxlength="1000" v-model="titleForm.bz"> | 33 | <el-input placeholder="请输入内容" maxlength="1000" v-model="accessLog.REMARK"> |
33 | </el-input> | 34 | </el-input> |
34 | </el-col> | 35 | </el-col> |
35 | </el-row> | 36 | </el-row> |
... | @@ -109,7 +110,7 @@ | ... | @@ -109,7 +110,7 @@ |
109 | <div> | 110 | <div> |
110 | <el-row class="dialog-from_header item-content-input"> | 111 | <el-row class="dialog-from_header item-content-input"> |
111 | <el-col :span="4"> | 112 | <el-col :span="4"> |
112 | <span>总数量1:</span> | 113 | <span>总数量:</span> |
113 | <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)" | 114 | <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)" |
114 | type="number"></el-input> | 115 | type="number"></el-input> |
115 | </el-col> | 116 | </el-col> |
... | @@ -181,12 +182,12 @@ | ... | @@ -181,12 +182,12 @@ |
181 | <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane> | 182 | <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane> |
182 | </el-tabs> | 183 | </el-tabs> |
183 | <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key"> | 184 | <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key"> |
184 | <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" | 185 | <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" |
185 | :data="tableDBData.data"> | 186 | :data="tableDBData.data"> |
186 | </lb-table> | 187 | </lb-table> |
187 | </div> | 188 | </div> |
188 | <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> | 189 | <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> |
189 | <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" | 190 | <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200" |
190 | :data="tableSBData.data"> | 191 | :data="tableSBData.data"> |
191 | </lb-table> | 192 | </lb-table> |
192 | </div> | 193 | </div> |
... | @@ -194,21 +195,26 @@ | ... | @@ -194,21 +195,26 @@ |
194 | </div> | 195 | </div> |
195 | </div> | 196 | </div> |
196 | <div class="editDialogBox-box" v-if="titleName == 'xml'"> | 197 | <div class="editDialogBox-box" v-if="titleName == 'xml'"> |
197 | <JsonEditor :resultInfo="resultInfo" class="JsonEditor" /> | 198 | <JsonEditor :resultInfo="resultInfo" /> |
198 | </div> | 199 | </div> |
199 | <div class="editDialogBox-box" v-if="titleName == 'xyjg'"> | 200 | <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'"> |
200 | <Xyjg :form-data='dataReport'></Xyjg> | 201 | <Xyjg :form-data='dataReport'></Xyjg> |
201 | </div> | 202 | </div> |
203 | </div> | ||
202 | <div class="d-center" v-if="titleName == 'sjmx'"> | 204 | <div class="d-center" v-if="titleName == 'sjmx'"> |
203 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> | 205 | <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> |
204 | <btn nativeType="cx" @click="submitForm">确 定</btn> | 206 | <btn nativeType="cx" @click="submitForm">确 定</btn> |
205 | </div> | 207 | </div> |
208 | <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> | ||
209 | <btn nativeType="cx" @click="handleResubmit">重新上报</btn> | ||
210 | </div> | ||
206 | </el-dialog> | 211 | </el-dialog> |
207 | </template> | 212 | </template> |
208 | 213 | ||
209 | <script> | 214 | <script> |
210 | import { sbdata, sendThis } from './data/sbdata' | 215 | import { sbdata, sendThis } from './data/sbdata' |
211 | import { dbdata, sendThis1 } from './data/dbdata' | 216 | import { dbdata, sendThis1 } from './data/dbdata' |
217 | import { getDetail } from "@/api/recordLog.js" | ||
212 | import JsonEditor from "@/components/JsonEditor.vue"; | 218 | import JsonEditor from "@/components/JsonEditor.vue"; |
213 | import Xyjg from "./Result"; | 219 | import Xyjg from "./Result"; |
214 | export default { | 220 | export default { |
... | @@ -225,11 +231,15 @@ export default { | ... | @@ -225,11 +231,15 @@ export default { |
225 | dialogVisible: false, | 231 | dialogVisible: false, |
226 | titleName: 'sjmx', | 232 | titleName: 'sjmx', |
227 | titleName2: 'drdbxd', | 233 | titleName2: 'drdbxd', |
234 | // 头部信息 | ||
235 | accessLog: { | ||
236 | AREACODE: '', | ||
237 | AREANAME: '', | ||
238 | CREATEDATE: '', | ||
239 | REMARK: '' | ||
240 | }, | ||
241 | |||
228 | titleForm: { | 242 | titleForm: { |
229 | xzbm: '', | ||
230 | mc: '', | ||
231 | date: '', | ||
232 | bz: '', | ||
233 | totalNum: '', | 243 | totalNum: '', |
234 | firstReg: '', | 244 | firstReg: '', |
235 | transferReg: '', | 245 | transferReg: '', |
... | @@ -252,6 +262,8 @@ export default { | ... | @@ -252,6 +262,8 @@ export default { |
252 | data: [], | 262 | data: [], |
253 | column: sbdata.columns() | 263 | column: sbdata.columns() |
254 | }, | 264 | }, |
265 | // XML详情 | ||
266 | resultInfo: '', | ||
255 | dataReport: {} | 267 | dataReport: {} |
256 | } | 268 | } |
257 | }, | 269 | }, |
... | @@ -264,9 +276,14 @@ export default { | ... | @@ -264,9 +276,14 @@ export default { |
264 | this.dialogVisible = false; | 276 | this.dialogVisible = false; |
265 | }, | 277 | }, |
266 | isShow (item) { | 278 | isShow (item) { |
267 | this.titleName = 'sjmx'; | 279 | this.titleName = 'sjmx' |
268 | this.dialogVisible = true; | 280 | this.dialogVisible = true |
281 | console.log(item, 'itemitemitem') | ||
282 | getDetail(item.dbBsm).then(res => { | ||
283 | console.log(res, 'eeeeeeeeeeeeeeeee'); | ||
284 | }) | ||
269 | }, | 285 | }, |
286 | // 当日登薄详单 | ||
270 | handleDBAdd () { | 287 | handleDBAdd () { |
271 | this.tableDBData.data.push({ | 288 | this.tableDBData.data.push({ |
272 | ywh: '', | 289 | ywh: '', |
... | @@ -285,6 +302,25 @@ export default { | ... | @@ -285,6 +302,25 @@ export default { |
285 | handleDBMinus (row) { | 302 | handleDBMinus (row) { |
286 | this.tableDBData.data.splice(row.index, 1) | 303 | this.tableDBData.data.splice(row.index, 1) |
287 | }, | 304 | }, |
305 | // 当日上报详单 | ||
306 | handleSBAdd () { | ||
307 | this.tableSBData.data.push({ | ||
308 | ywh: '', | ||
309 | djlx: '', | ||
310 | qllx: '', | ||
311 | bdcdyh: '', | ||
312 | zszmh: '', | ||
313 | sfsb: '', | ||
314 | bwid: '' | ||
315 | }) | ||
316 | this.tableSBData.data.forEach((item, indx) => { | ||
317 | this.$set(item, 'index', index) | ||
318 | }) | ||
319 | this.key++ | ||
320 | }, | ||
321 | handleSBMinus (row) { | ||
322 | this.tableSBData.data.splice(row.index, 1) | ||
323 | }, | ||
288 | submitForm () { } | 324 | submitForm () { } |
289 | } | 325 | } |
290 | } | 326 | } |
... | @@ -294,6 +330,22 @@ export default { | ... | @@ -294,6 +330,22 @@ export default { |
294 | @import "~@/styles/public.scss"; | 330 | @import "~@/styles/public.scss"; |
295 | @import "~@/styles/dialogBox.scss"; | 331 | @import "~@/styles/dialogBox.scss"; |
296 | 332 | ||
333 | |||
334 | /deep/.el-tabs__header { | ||
335 | margin: 0; | ||
336 | } | ||
337 | |||
338 | .regularHeight { | ||
339 | height: 77vh; | ||
340 | display: flex; | ||
341 | flex-direction: column; | ||
342 | |||
343 | .editDialogBox-con, | ||
344 | .JsonEditor { | ||
345 | flex: 1; | ||
346 | } | ||
347 | } | ||
348 | |||
297 | /deep/.el-tabs__item { | 349 | /deep/.el-tabs__item { |
298 | color: #CEF8FF !important; | 350 | color: #CEF8FF !important; |
299 | 351 | ... | ... |
... | @@ -147,6 +147,9 @@ export default { | ... | @@ -147,6 +147,9 @@ export default { |
147 | this.$refs.editLog.isShow(row); | 147 | this.$refs.editLog.isShow(row); |
148 | this.$store.dispatch('business/setReportLogEdit') | 148 | this.$store.dispatch('business/setReportLogEdit') |
149 | } | 149 | } |
150 | }, | ||
151 | destroyed () { | ||
152 | this.$store.dispatch('business/setEdit') | ||
150 | } | 153 | } |
151 | } | 154 | } |
152 | </script> | 155 | </script> | ... | ... |
-
Please register or sign in to post a comment