Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
b4f4b2bd by xiaomiao
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 439a52a1 e1d1004e
Inline Side-by-side
Showing 20 changed files with 728 additions and 550 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
9 */ 15 * @param {*} qxdm
10 async getSuucessRate(startDate,endDate,qxdm) { 16 * @author: renchao
17 */
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 })
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 })
69 } 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,106 +4,113 @@ ...@@ -4,106 +4,113 @@
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="editDialogBox-box"> 7 <div class="regularHeight">
8 <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab"> 8 <div class="editDialogBox-box">
9 <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> 9 <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab">
10 <el-tab-pane v-if="visiableXml" label="xml报文" name="xml"></el-tab-pane> 10 <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
11 <el-tab-pane v-if="visiableXml" label="响应结果" name="xyjg"></el-tab-pane> 11 <el-tab-pane v-if="visiableXml" label="xml报文" name="xml"></el-tab-pane>
12 </el-tabs> 12 <el-tab-pane v-if="visiableXml" label="响应结果" name="xyjg"></el-tab-pane>
13 <div class="dialog-from" v-if="titleName == 'sjmx'">
14 <el-row>
15 <el-col :span="5">
16 <span>业务报文ID：</span>
17 <p>{{ dataReport.BizMsgId }}</p>
18 </el-col>
19 <el-col :span="6">
20 <span>接入报文ID：</span>
21 <p>{{ dataReport.ASID }}</p>
22 </el-col>
23 <el-col :span="6">
24 <span>行政区划编码：</span>
25 <p>{{ dataReport.AreaCode }}</p>
26 </el-col>
27 <el-col :span="7">
28 <span>上次不动产单元号：</span>
29 <p>{{ dataReport.PreEstateNum }}</p>
30 </el-col>
31 </el-row>
32 <el-row>
33 <el-col :span="5">
34 <span>业务编码：</span>
35 <p>{{ dataReport.RecType }}</p>
36 </el-col>
37 <el-col :span="6">
38 <span>权利类型：</span>
39 <p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p>
40 </el-col>
41 <el-col :span="6">
42 <span>登记类型：</span>
43 <p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p>
44 </el-col>
45 <el-col :span="7">
46 <span>不动产权证书数量：</span>
47 <p>{{ dataReport.CertCount }}</p>
48 </el-col>
49 </el-row>
50 <el-row>
51 <el-col :span="5">
52 <span>创建时间：</span>
53 <p>{{ dataReport.createDate }}</p>
54 </el-col>
55 <el-col :span="6">
56 <span>业务流水号：</span>
57 <p>{{ dataReport.RecFlowID }}</p>
58 </el-col>
59 <el-col :span="6">
60 <span>宗地/宗海代码：</span>
61 <p>{{ dataReport.ParcelID }}</p>
62 </el-col>
63 <el-col :span="7">
64 <span>证明数量：</span>
65 <p>{{ dataReport.ProofCount }}</p>
66 </el-col>
67 </el-row>
68 <el-row>
69 <el-col :span="6">
70 <span>不动产单元号：</span>
71 <p>{{ dataReport.EstateNum }}</p>
72 </el-col>
73 <el-col :span="8">
74 <span>登记机构：</span>
75 <p>{{ dataReport.RegOrgID }}</p>
76 </el-col>
77 <el-col :span="11">
78 <span>上次不动产权证号/不动产登记证明：</span>
79 <p>{{ dataReport.PreCertID }}</p>
80 </el-col>
81 </el-row>
82 </div>
83 </div>
84 <div class="editDialogBox-box">
85 <div v-if="titleName == 'sjmx'" class="sjmx">
86 <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 <div slot="label" class="tab-pane-item">
89 <p class="name">{{ item.chinesetable }}</p>
90 <p class="soleurl" :data-name="item.soleurl">({{ item.datatable }})</p>
91 </div>
92 </el-tab-pane>
93 </el-tabs> 13 </el-tabs>
94 <div class="edit-content"> 14 <div class="dialog-from" v-if="titleName == 'sjmx'">
95 <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" 15 <el-row>
96 :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> 16 <el-col :span="5">
17 <span>业务报文ID：</span>
18 <p>{{ dataReport.BizMsgId }}</p>
19 </el-col>
20 <el-col :span="6">
21 <span>接入报文ID：</span>
22 <p>{{ dataReport.ASID }}</p>
23 </el-col>
24 <el-col :span="6">
25 <span>行政区划编码：</span>
26 <p>{{ dataReport.AreaCode }}</p>
27 </el-col>
28 <el-col :span="7">
29 <span>上次不动产单元号：</span>
30 <p>{{ dataReport.PreEstateNum }}</p>
31 </el-col>
32 </el-row>
33 <el-row>
34 <el-col :span="5">
35 <span>业务编码：</span>
36 <p>{{ dataReport.RecType }}</p>
37 </el-col>
38 <el-col :span="6">
39 <span>权利类型：</span>
40 <p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p>
41 </el-col>
42 <el-col :span="6">
43 <span>登记类型：</span>
44 <p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p>
45 </el-col>
46 <el-col :span="7">
47 <span>不动产权证书数量：</span>
48 <p>{{ dataReport.CertCount }}</p>
49 </el-col>
50 </el-row>
51 <el-row>
52 <el-col :span="5">
53 <span>创建时间：</span>
54 <p>{{ dataReport.createDate }}</p>
55 </el-col>
56 <el-col :span="6">
57 <span>业务流水号：</span>
58 <p>{{ dataReport.RecFlowID }}</p>
59 </el-col>
60 <el-col :span="6">
61 <span>宗地/宗海代码：</span>
62 <p>{{ dataReport.ParcelID }}</p>
63 </el-col>
64 <el-col :span="7">
65 <span>证明数量：</span>
66 <p>{{ dataReport.ProofCount }}</p>
67 </el-col>
68 </el-row>
69 <el-row>
70 <el-col :span="6">
71 <span>不动产单元号：</span>
72 <p>{{ dataReport.EstateNum }}</p>
73 </el-col>
74 <el-col :span="8">
75 <span>登记机构：</span>
76 <p>{{ dataReport.RegOrgID }}</p>
77 </el-col>
78 <el-col :span="11">
79 <span>上次不动产权证号/不动产登记证明：</span>
80 <p>{{ dataReport.PreCertID }}</p>
81 </el-col>
82 </el-row>
97 </div> 83 </div>
98 <div class="d-center" v-if="!$store.state.business.Edit"> 84 </div>
99 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> 85 <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'">
100 <btn nativeType="cx" @click="submitForm">确 定</btn> 86 <div class="sjmx">
87 <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList">
88 <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl">
89 <div slot="label" class="tab-pane-item">
90 <p class="name">{{ item.chinesetable }}</p>
91 <p class="soleurl" :data-name="item.soleurl">({{ item.datatable }})</p>
92 </div>
93 </el-tab-pane>
94 </el-tabs>
95 <div class="edit-content">
96 <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }"
97 :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" />
98 </div>
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 })
258 } 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 })
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"> 3 </el-input>
4 </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;
......
1 .tableClass { 1 .tableClass {
2 /deep/.el-table { 2 /deep/.el-table {
3 border: none !important; 3 border: none !important;
4 border-radius: 0 !important; 4 border-radius: 0 !important;
5 background-color: rgba(0, 0, 0, 0); 5 background-color: rgba(0, 0, 0, 0);
6 6
7 .el-table__header-wrapper { 7 .el-table__header-wrapper {
8 border-right: none; 8 border-right: none;
9 9
10 } 10 }
11 11
12 .el-table__row .cell { 12 .el-table__row .cell {
13 color: #8DEAF9 !important; 13 color: #8DEAF9 !important;
14 font-weight: 100 !important; 14 font-weight: 100 !important;
15 } 15 }
16 16
17 .el-table__row { 17 .el-table__row {
18 background: rgba(0, 0, 0, 0) !important; 18 background: rgba(0, 0, 0, 0) !important;
19 } 19 }
20 20
21 thead { 21 thead {
22 background: #073781; 22 background: #073781;
23 border-radius: 2px; 23 border-radius: 2px;
24 height: 42px; 24 height: 42px;
25 25
26 & th { 26 & th {
27 //inherit：规定应该从父元素继承 background-color 属性的设置。 27 //inherit：规定应该从父元素继承 background-color 属性的设置。
28 //transparent：默认。背景颜色为透明。 28 //transparent：默认。背景颜色为透明。
29 // background-color: inherit !important; 29 // background-color: inherit !important;
30 background-color: transparent; 30 background-color: transparent;
31 color: #02D9FD; 31 color: #02D9FD;
32 } 32 }
33 33
34 & tr { 34 & tr {
35 // background-color: inherit !important; 35 // background-color: inherit !important;
36 background-color: transparent; 36 background-color: transparent;
37 } 37 }
38 }
39 } 38 }
39 }
40 } 40 }
41 41
42 //*****start*通用表单查询条件，列表样式******// 42 //*****start*通用表单查询条件，列表样式******//
43 .from-clues { 43 .from-clues {
44 height: 100%; 44 height: 100%;
45 width: 100%;
46 min-width: 1280px;
47 box-sizing: border-box;
48 overflow-x: hidden;
49 padding: 2px;
50
51 &-header {
45 width: 100%; 52 width: 100%;
46 min-width: 1280px; 53 padding: 5px 30px 20px 24px;
47 box-sizing: border-box; 54 box-sizing: border-box;
48 overflow-x: hidden; 55 background: url("~@/image/formHeader.png") no-repeat;
49 padding: 2px; 56 background-size: 100% 100%;
50 57 margin-top: 15px;
51 &-header {
52 width: 100%;
53 padding: 5px 30px 20px 24px;
54 box-sizing: border-box;
55 background: url("~@/image/formHeader.png") no-repeat;
56 background-size: 100% 100%;
57 margin-top: 15px;
58
59 /deep/.el-form-item__label {
60 color: #E3F1FF;
61 }
62 58
63 /deep/.el-input__inner { 59 /deep/.el-form-item__label {
64 background: #07388B; 60 color: #E3F1FF;
65 border-radius: 2px;
66 color: #CEF8FF;
67 border: 1px solid #6BC1FC;
68 }
69 } 61 }
70 62
71 .advanced-search { 63 /deep/.el-input__inner {
72 display: flex; 64 background: #07388B;
73 font-size: 12px; 65 border-radius: 2px;
74 flex-wrap: wrap; 66 color: #CEF8FF;
75 padding-top: 5px; 67 border: 1px solid #6BC1FC;
76 height: 30px; 68 }
77 69 }
78 span {
79 display: flex;
80 align-items: center;
81 }
82 70
83 i { 71 .advanced-search {
84 color: $light-blue; 72 display: flex;
85 margin-left: 5px; 73 font-size: 12px;
86 cursor: pointer; 74 flex-wrap: wrap;
87 } 75 padding-top: 5px;
76 height: 30px;
88 77
89 ul { 78 span {
90 display: flex; 79 display: flex;
91 align-items: center; 80 align-items: center;
92 81 }
93 li {
94 color: $light-blue;
95 border: 1px solid $light-blue;
96 border-radius: 10px;
97 padding: 2px 8px;
98 line-height: 16px;
99 }
100 }
101 82
102 .clean-btn { 83 i {
103 margin-left: 10px; 84 color: $light-blue;
104 } 85 margin-left: 5px;
86 cursor: pointer;
105 } 87 }
106 88
107 &-content { 89 ul {
108 width: 100%; 90 display: flex;
109 box-sizing: border-box; 91 align-items: center;
110 margin-top: 15px; 92
111 background: url("~@/image/formContent.png") no-repeat; 93 li {
112 background-size: 100% 100%; 94 color: $light-blue;
113 padding: 22px 42px 20px; 95 border: 1px solid $light-blue;
114 //修改表头的背景颜色横向渐变色 96 border-radius: 10px;
115 @extend .tableClass; 97 padding: 2px 8px;
116 98 line-height: 16px;
117 /deep/.el-pagination__total { 99 }
118 color: #FFFFFF; 100 }
119 }
120 101
121 .bgc { 102 .clean-btn {
122 box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5); 103 margin-left: 10px;
123 background-color: rgba(0, 0, 0, 0); 104 }
124 } 105 }
125 106
126 /deep/ .el-pagination { 107 &-content {
127 .el-input__inner { 108 width: 100%;
128 color: #FFFFFF; 109 box-sizing: border-box;
129 border: none; 110 margin-top: 15px;
130 @extend .bgc; 111 background: url("~@/image/formContent.png") no-repeat;
131 } 112 background-size: 100% 100%;
132 113 padding: 22px 42px 20px;
133 .el-pager li:not(.disabled).active { 114 //修改表头的背景颜色横向渐变色
134 box-shadow: inset 0px 0px 12px 0px #02D9FD; 115 @extend .tableClass;
135 border-radius: 1px;
136 border: 1px solid #02D9FD;
137 background-color: rgba(0, 0, 0, 0);
138 }
139
140 .el-pager li {
141 @extend .bgc;
142 color: #FFFFFF;
143 }
144 }
145 116
146 /deep/.btn-next, 117 /deep/.el-pagination__total {
147 /deep/.btn-prev { 118 color: #FFFFFF;
148 @extend .bgc; 119 }
149 color: #FFFFFF;
150 }
151 120
121 .bgc {
122 box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
123 background-color: rgba(0, 0, 0, 0);
152 } 124 }
153 125
154 .el-form--inline .el-form-item { 126 /deep/ .el-pagination {
155 width: auto; 127 .el-input__inner {
156 margin-right: 0px; 128 color: #FFFFFF;
129 border: none;
130 @extend .bgc;
131 }
157 132
158 .el-form-item__content { 133 .el-pager li:not(.disabled).active {
159 width: auto; 134 box-shadow: inset 0px 0px 12px 0px #02D9FD;
160 } 135 border-radius: 1px;
136 border: 1px solid #02D9FD;
137 background-color: rgba(0, 0, 0, 0);
138 }
139
140 .el-pager li {
141 @extend .bgc;
142 color: #FFFFFF;
143 }
161 } 144 }
162 145
146 /deep/.btn-next,
147 /deep/.btn-prev {
148 @extend .bgc;
149 color: #FFFFFF;
150 }
163 151
152 }
164 153
165 .el-form-item--small.el-form-item { 154 .el-form--inline .el-form-item {
166 margin-bottom: 0px; 155 width: auto;
156 margin-right: 0px;
157
158 .el-form-item__content {
159 width: auto;
167 } 160 }
161 }
162
163
164
165 .el-form-item--small.el-form-item {
166 margin-bottom: 0px;
167 }
168 } 168 }
169 169
170 170
171 171
172 //*****end*通用表单查询条件，列表样式******// 172 //*****end*通用表单查询条件，列表样式******//
173 /deep/.el-range-separator { 173 /deep/.el-range-separator {
174 line-height: 28px !important; 174 line-height: 28px !important;
175 } 175 }
176 176
177 .width200px { 177 .width200px {
178 width: 200px; 178 width: 200px;
179 } 179 }
180 180
181 .width300px { 181 .width300px {
182 width: 300px; 182 width: 300px;
183 } 183 }
184 184
185 185
186 .slxx_title { 186 .slxx_title {
187 border-bottom: 1px solid $borderColor; 187 border-bottom: 1px solid $borderColor;
188 padding-left: 10px; 188 padding-left: 10px;
189 padding-bottom: 5px; 189 padding-bottom: 5px;
190 margin-bottom: 10px; 190 margin-bottom: 10px;
191 margin-top: 5px; 191 margin-top: 5px;
192 font-size: 16px; 192 font-size: 16px;
193 font-weight: 500; 193 font-weight: 500;
194 color: #4a4a4a; 194 color: #4a4a4a;
195 } 195 }
196 196
197 // 搜索框按钮的位置 197 // 搜索框按钮的位置
198 .btnColRight { 198 .btnColRight {
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
...@@ -429,5 +441,4 @@ ...@@ -429,5 +441,4 @@
429 } 441 }
430 } 442 }
431 443
432 } 444 }
433
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -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, 178 rgba(99, 163, 255, 1) 0,
195 rgba(99, 163, 255, 1) 0, 179 rgba(99, 163, 255, 1) 0,
196 rgba(99, 163, 255, 1) 0, 180 rgba(182, 220, 255, 1) 49.731445%,
197 rgba(182, 220, 255, 1) 49.731445%, 181 rgba(114, 190, 255, 1) 100%,
198 rgba(114, 190, 255, 1) 100%, 182 rgba(114, 190, 255, 1) 100%);
199 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,211 +4,217 @@ ...@@ -4,211 +4,217 @@
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="editDialogBox-box"> 7 <div class="regularHeight">
8 <el-tabs v-model="titleName" type="card"> 8 <div class="editDialogBox-box">
9 <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane> 9 <el-tabs v-model="titleName" type="card">
10 <el-tab-pane label="xml报文" name="xml"></el-tab-pane> 10 <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane>
11 <el-tab-pane label="响应结果" name="xyjg"></el-tab-pane> 11 <el-tab-pane label="xml报文" name="xml"></el-tab-pane>
12 </el-tabs> 12 <el-tab-pane label="响应结果" name="xyjg"></el-tab-pane>
13 <div class="dialog-from" v-if="titleName == 'sjmx'"> 13 </el-tabs>
14 <el-row class="dialog-from_header item-content-input"> 14 <div class="dialog-from" v-if="titleName == 'sjmx'">
15 <el-col :span="8">
16 <span>行政编码：</span>
17 <el-input v-model="titleForm.xzbm" maxlength="10"></el-input>
18 </el-col>
19 <el-col :span="8">
20 <span>行政名称：</span>
21 <el-input v-model="titleForm.mc" maxlength="20"></el-input>
22 </el-col>
23 <el-col :span="8">
24 <span>日期：</span>
25 <el-date-picker v-model="titleForm.date" type="date">
26 </el-date-picker>
27 </el-col>
28 </el-row>
29 <el-row class="dialog-from_header item-content-input">
30 <el-col :span="24">
31 <span class="bz">备注：</span>
32 <el-input placeholder="请输入内容" maxlength="1000" v-model="titleForm.bz">
33 </el-input>
34 </el-col>
35 </el-row>
36 <P class="dialog-from_title">当日登薄信息记录数</P>
37 <div>
38 <el-row class="dialog-from_header item-content-input">
39 <el-col :span="4">
40 <span>总数量：</span>
41 <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)"
42 type="number"></el-input>
43 </el-col>
44 <el-col :span="4">
45 <span>首次登记数量：</span>
46 <el-input v-model="titleForm.firstReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
47 type="number"></el-input>
48 </el-col>
49 <el-col :span="4">
50 <span>转移登记数量：</span>
51 <el-input v-model="titleForm.transferReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
52 type="number"></el-input>
53 </el-col>
54 <el-col :span="4">
55 <span>变更登记数量：</span>
56 <el-input v-model="titleForm.changeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
57 type="number"></el-input>
58 </el-col>
59 <el-col :span="4">
60 <span>注销登记数量：</span>
61 <el-input v-model="titleForm.logoutReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
62 type="number"></el-input>
63 </el-col>
64 <!-- 更正登记数量 -->
65 <el-col :span="4">
66 <span>更正登记数量：</span>
67 <el-input v-model="titleForm.riviseReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
68 type="number"></el-input>
69 </el-col>
70 </el-row>
71 <el-row class="dialog-from_header item-content-input">
72 <el-col :span="4">
73 <span>异议登记数量：</span>
74 <el-input v-model="titleForm.dissentingReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
75 type="number"></el-input>
76 </el-col>
77 <el-col :span="4">
78 <span>预告登记数量：</span>
79 <el-input v-model="titleForm.advanceReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
80 type="number"></el-input>
81 </el-col>
82 <el-col :span="4">
83 <span>查封登记数量：</span>
84 <el-input v-model="titleForm.seizeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
85 type="number"></el-input>
86 </el-col>
87 <!-- 地役权登记数量 -->
88 <el-col :span="4">
89 <span>地役权登记数量：</span>
90 <el-input v-model="titleForm.easementReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
91 type="number"></el-input>
92 </el-col>
93 <!-- 其他登记数量 -->
94 <el-col :span="4">
95 <span>其他登记数量：</span>
96 <el-input v-model="titleForm.otherReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
97 type="number"></el-input>
98 </el-col>
99 <!-- 业务类型总数 -->
100 <el-col :span="4">
101 <span>业务类型总数：</span>
102 <el-input v-model="titleForm.businessTypeCount" oninput="if(value.length > 6) value=value.slice(0, 6)"
103 type="number"></el-input>
104 </el-col>
105 </el-row>
106 </div>
107 <P class="dialog-from_title">当日上报记录数</P>
108 <!-- 当日上报记录数 -->
109 <div>
110 <el-row class="dialog-from_header item-content-input"> 15 <el-row class="dialog-from_header item-content-input">
111 <el-col :span="4"> 16 <el-col :span="8">
112 <span>总数量1：</span> 17 <span>行政编码：</span>
113 <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)" 18 <el-input v-model="accessLog.AREACODE" maxlength="10"></el-input>
114 type="number"></el-input>
115 </el-col>
116 <el-col :span="4">
117 <span>首次登记数量：</span>
118 <el-input v-model="titleForm.firstReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
119 type="number"></el-input>
120 </el-col>
121 <el-col :span="4">
122 <span>转移登记数量：</span>
123 <el-input v-model="titleForm.transferReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
124 type="number"></el-input>
125 </el-col> 19 </el-col>
126 <el-col :span="4"> 20 <el-col :span="8">
127 <span>变更登记数量：</span> 21 <span>行政名称：</span>
128 <el-input v-model="titleForm.changeReg" oninput="if(value.length > 6) value=value.slice(0, 6)" 22 <el-input v-model="accessLog.AREANAME" maxlength="20"></el-input>
129 type="number"></el-input>
130 </el-col> 23 </el-col>
131 <el-col :span="4"> 24 <el-col :span="8">
132 <span>注销登记数量：</span> 25 <span>日期：</span>
133 <el-input v-model="titleForm.logoutReg" oninput="if(value.length > 6) value=value.slice(0, 6)" 26 <el-date-picker v-model="accessLog.CREATEDATE" type="date">
134 type="number"></el-input> 27 </el-date-picker>
135 </el-col>
136 <!-- 更正登记数量 -->
137 <el-col :span="4">
138 <span>更正登记数量：</span>
139 <el-input v-model="titleForm.riviseReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
140 type="number"></el-input>
141 </el-col> 28 </el-col>
142 </el-row> 29 </el-row>
143 <el-row class="dialog-from_header item-content-input"> 30 <el-row class="dialog-from_header item-content-input">
144 <el-col :span="4"> 31 <el-col :span="24">
145 <span>异议登记数量：</span> 32 <span class="bz">备注：</span>
146 <el-input v-model="titleForm.dissentingReg" oninput="if(value.length > 6) value=value.slice(0, 6)" 33 <el-input placeholder="请输入内容" maxlength="1000" v-model="accessLog.REMARK">
147 type="number"></el-input> 34 </el-input>
148 </el-col>
149 <el-col :span="4">
150 <span>预告登记数量：</span>
151 <el-input v-model="titleForm.advanceReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
152 type="number"></el-input>
153 </el-col>
154 <el-col :span="4">
155 <span>查封登记数量：</span>
156 <el-input v-model="titleForm.seizeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
157 type="number"></el-input>
158 </el-col>
159 <!-- 地役权登记数量 -->
160 <el-col :span="4">
161 <span>地役权登记数量：</span>
162 <el-input v-model="titleForm.easementReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
163 type="number"></el-input>
164 </el-col>
165 <!-- 其他登记数量 -->
166 <el-col :span="4">
167 <span>其他登记数量：</span>
168 <el-input v-model="titleForm.otherReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
169 type="number"></el-input>
170 </el-col>
171 <!-- 业务类型总数 -->
172 <el-col :span="4">
173 <span>业务类型总数：</span>
174 <el-input v-model="titleForm.businessTypeCount" oninput="if(value.length > 6) value=value.slice(0, 6)"
175 type="number"></el-input>
176 </el-col> 35 </el-col>
177 </el-row> 36 </el-row>
178 </div> 37 <P class="dialog-from_title">当日登薄信息记录数</P>
179 <el-tabs v-model="titleName2" type="card"> 38 <div>
180 <el-tab-pane label="当日登薄详单" name="drdbxd"></el-tab-pane> 39 <el-row class="dialog-from_header item-content-input">
181 <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane> 40 <el-col :span="4">
182 </el-tabs> 41 <span>总数量：</span>
183 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key"> 42 <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)"
184 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" 43 type="number"></el-input>
185 :data="tableDBData.data"> 44 </el-col>
186 </lb-table> 45 <el-col :span="4">
187 </div> 46 <span>首次登记数量：</span>
188 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'"> 47 <el-input v-model="titleForm.firstReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
189 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165" 48 type="number"></el-input>
190 :data="tableSBData.data"> 49 </el-col>
191 </lb-table> 50 <el-col :span="4">
192 </div> 51 <span>转移登记数量：</span>
52 <el-input v-model="titleForm.transferReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
53 type="number"></el-input>
54 </el-col>
55 <el-col :span="4">
56 <span>变更登记数量：</span>
57 <el-input v-model="titleForm.changeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
58 type="number"></el-input>
59 </el-col>
60 <el-col :span="4">
61 <span>注销登记数量：</span>
62 <el-input v-model="titleForm.logoutReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
63 type="number"></el-input>
64 </el-col>
65 <!-- 更正登记数量 -->
66 <el-col :span="4">
67 <span>更正登记数量：</span>
68 <el-input v-model="titleForm.riviseReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
69 type="number"></el-input>
70 </el-col>
71 </el-row>
72 <el-row class="dialog-from_header item-content-input">
73 <el-col :span="4">
74 <span>异议登记数量：</span>
75 <el-input v-model="titleForm.dissentingReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
76 type="number"></el-input>
77 </el-col>
78 <el-col :span="4">
79 <span>预告登记数量：</span>
80 <el-input v-model="titleForm.advanceReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
81 type="number"></el-input>
82 </el-col>
83 <el-col :span="4">
84 <span>查封登记数量：</span>
85 <el-input v-model="titleForm.seizeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
86 type="number"></el-input>
87 </el-col>
88 <!-- 地役权登记数量 -->
89 <el-col :span="4">
90 <span>地役权登记数量：</span>
91 <el-input v-model="titleForm.easementReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
92 type="number"></el-input>
93 </el-col>
94 <!-- 其他登记数量 -->
95 <el-col :span="4">
96 <span>其他登记数量：</span>
97 <el-input v-model="titleForm.otherReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
98 type="number"></el-input>
99 </el-col>
100 <!-- 业务类型总数 -->
101 <el-col :span="4">
102 <span>业务类型总数：</span>
103 <el-input v-model="titleForm.businessTypeCount" oninput="if(value.length > 6) value=value.slice(0, 6)"
104 type="number"></el-input>
105 </el-col>
106 </el-row>
107 </div>
108 <P class="dialog-from_title">当日上报记录数</P>
109 <!-- 当日上报记录数 -->
110 <div>
111 <el-row class="dialog-from_header item-content-input">
112 <el-col :span="4">
113 <span>总数量：</span>
114 <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)"
115 type="number"></el-input>
116 </el-col>
117 <el-col :span="4">
118 <span>首次登记数量：</span>
119 <el-input v-model="titleForm.firstReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
120 type="number"></el-input>
121 </el-col>
122 <el-col :span="4">
123 <span>转移登记数量：</span>
124 <el-input v-model="titleForm.transferReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
125 type="number"></el-input>
126 </el-col>
127 <el-col :span="4">
128 <span>变更登记数量：</span>
129 <el-input v-model="titleForm.changeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
130 type="number"></el-input>
131 </el-col>
132 <el-col :span="4">
133 <span>注销登记数量：</span>
134 <el-input v-model="titleForm.logoutReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
135 type="number"></el-input>
136 </el-col>
137 <!-- 更正登记数量 -->
138 <el-col :span="4">
139 <span>更正登记数量：</span>
140 <el-input v-model="titleForm.riviseReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
141 type="number"></el-input>
142 </el-col>
143 </el-row>
144 <el-row class="dialog-from_header item-content-input">
145 <el-col :span="4">
146 <span>异议登记数量：</span>
147 <el-input v-model="titleForm.dissentingReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
148 type="number"></el-input>
149 </el-col>
150 <el-col :span="4">
151 <span>预告登记数量：</span>
152 <el-input v-model="titleForm.advanceReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
153 type="number"></el-input>
154 </el-col>
155 <el-col :span="4">
156 <span>查封登记数量：</span>
157 <el-input v-model="titleForm.seizeReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
158 type="number"></el-input>
159 </el-col>
160 <!-- 地役权登记数量 -->
161 <el-col :span="4">
162 <span>地役权登记数量：</span>
163 <el-input v-model="titleForm.easementReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
164 type="number"></el-input>
165 </el-col>
166 <!-- 其他登记数量 -->
167 <el-col :span="4">
168 <span>其他登记数量：</span>
169 <el-input v-model="titleForm.otherReg" oninput="if(value.length > 6) value=value.slice(0, 6)"
170 type="number"></el-input>
171 </el-col>
172 <!-- 业务类型总数 -->
173 <el-col :span="4">
174 <span>业务类型总数：</span>
175 <el-input v-model="titleForm.businessTypeCount" oninput="if(value.length > 6) value=value.slice(0, 6)"
176 type="number"></el-input>
177 </el-col>
178 </el-row>
179 </div>
180 <el-tabs v-model="titleName2" type="card">
181 <el-tab-pane label="当日登薄详单" name="drdbxd"></el-tab-pane>
182 <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane>
183 </el-tabs>
184 <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key">
185 <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
186 :data="tableDBData.data">
187 </lb-table>
188 </div>
189 <div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
190 <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
191 :data="tableSBData.data">
192 </lb-table>
193 </div>
193 194
195 </div>
196 </div>
197 <div class="editDialogBox-box" v-if="titleName == 'xml'">
198 <JsonEditor :resultInfo="resultInfo" />
199 </div>
200 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
201 <Xyjg :form-data='dataReport'></Xyjg>
194 </div> 202 </div>
195 </div>
196 <div class="editDialogBox-box" v-if="titleName == 'xml'">
197 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" />
198 </div>
199 <div class="editDialogBox-box" v-if="titleName == 'xyjg'">
200 <Xyjg :form-data='dataReport'></Xyjg>
201 </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>
......