315b0f4c by 赵千

Merge remote-tracking branch 'origin/dev' into dev

2 parents f571eea9 a83e9b45
...@@ -447,8 +447,8 @@ ...@@ -447,8 +447,8 @@
447 const maxWidth = 295; // 最大宽度限制 447 const maxWidth = 295; // 最大宽度限制
448 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 448 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
449 for (let i = 0; i < lines.length; i++) { 449 for (let i = 0; i < lines.length; i++) {
450 let num = Math.ceil(getByteLen(lines[i]) / 41) 450 let num = Math.ceil(getByteLen(lines[i]) / 37)
451 if (getByteLen(lines[i]) > 41) { 451 if (getByteLen(lines[i]) > 37) {
452 let currentLine = ''; 452 let currentLine = '';
453 let arr = []; 453 let arr = [];
454 for (let word of lines[i]) { 454 for (let word of lines[i]) {
...@@ -483,8 +483,8 @@ ...@@ -483,8 +483,8 @@
483 // fj 483 // fj
484 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : []; 484 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
485 for (let i = 0; i < lines1.length; i++) { 485 for (let i = 0; i < lines1.length; i++) {
486 let num = Math.ceil(getByteLen(lines1[i]) / 41) 486 let num = Math.ceil(getByteLen(lines1[i]) / 37)
487 if (getByteLen(lines1[i]) > 41) { 487 if (getByteLen(lines1[i]) > 37) {
488 let currentLine = ''; 488 let currentLine = '';
489 let arr = []; 489 let arr = [];
490 for (let word of lines1[i]) { 490 for (let word of lines1[i]) {
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-06 10:31:23
5 -->
1 <template> 6 <template>
2 <div> 7 <div class="slxx sdqxx">
3 <div>自来水信息</div> 8 <!-- <div>自来水信息</div>
4 <div>天然气信息</div> 9 <div>天然气信息</div>-->
5 <div>电力信息</div> 10 <el-form
11 :model="ruleForm"
12 ref="ruleForm"
13 v-Loading="loading"
14 :label-position="flag ? 'top' : ''"
15 :inline="flag"
16 label-width="130px">
17 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block">
19 电力信息
20 <div class="triangle"></div>
21 </div>
22 <el-row :gutter="10">
23 <el-col :span="8">
24 <el-form-item label="服务代码:">
25 <el-input v-model="ruleForm.serviceCode"></el-input>
26 </el-form-item>
27 </el-col>
28 <el-col :span="8">
29 <el-form-item label="行政区划区县代码:">
30 <el-input v-model="ruleForm.AREACODE"></el-input>
31 </el-form-item>
32 </el-col>
33 <el-col :span="8">
34 <el-form-item label="登记系统业务号:">
35 <el-input v-model="ruleForm.YWH"></el-input>
36 </el-form-item>
37 </el-col>
38 </el-row>
39
40 <el-row :gutter="10">
41 <el-col :span="8">
42 <el-form-item label="推送日期:">
43 <el-input v-model="ruleForm.SENDTIME"></el-input>
44 </el-form-item>
45 </el-col>
46 <el-col :span="8">
47 <el-form-item label="原户主姓名:">
48 <el-input v-model="ruleForm.MC_OLD"></el-input>
49 </el-form-item>
50 </el-col>
51 <el-col :span="8">
52 <el-form-item label="原户主身份证号码:">
53 <el-input v-model="ruleForm.ZJHM_OLD"></el-input>
54 </el-form-item>
55 </el-col>
56 </el-row>
57 <el-row :gutter="10">
58 <el-col :span="8">
59 <el-form-item label="原户主联系电话:">
60 <el-input v-model="ruleForm.LXDH_OLD"></el-input>
61 </el-form-item>
62 </el-col>
63 <el-col :span="8">
64 <el-form-item label="新户主姓名:">
65 <el-input v-model="ruleForm.MC_NEW"></el-input>
66 </el-form-item>
67 </el-col>
68 <el-col :span="8">
69 <el-form-item label="新户主身份证号码:">
70 <el-input v-model="ruleForm.ZJHM_NEW"></el-input>
71 </el-form-item>
72 </el-col>
73 </el-row>
74 <el-row :gutter="10">
75 <el-col :span="8">
76 <el-form-item label="新户主联系电话:">
77 <el-input v-model="ruleForm.LXDH_NEW"></el-input>
78 </el-form-item>
79 </el-col>
80 <el-col :span="8">
81 <el-form-item label="房屋坐落(地址):">
82 <el-input v-model="ruleForm.FWZL"></el-input>
83 </el-form-item>
84 </el-col>
85 <el-col :span="8">
86 <el-form-item label="房产证编号:">
87 <el-input v-model="ruleForm.FCZBH"></el-input>
88 </el-form-item>
89 </el-col>
90 </el-row>
91 <el-row :gutter="10">
92 <el-col :span="8">
93 <el-form-item label="是否过户:">
94 <el-switch
95 v-model="ruleForm.SFGH"
96 :active-value='1'
97 active-text="是"
98 :inactive-value="0"
99 inactive-text="否">
100 </el-switch>
101 </el-form-item>
102 </el-col>
103 </el-row>
104 </div>
105 </el-form>
6 </div> 106 </div>
7 </template>
...\ No newline at end of file ...\ No newline at end of file
107 </template>
108 <script>
109 import { mapGetters } from "vuex";
110 export default {
111 computed: {
112 ...mapGetters(["dictData", "flag"]),
113 },
114 mounted () {
115 // this.loading = true
116 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
117 this.propsParam = this.$attrs;
118 var formdata = new FormData();
119 formdata.append("bsmSldy", this.propsParam.bsmSldy);
120 formdata.append("djlx", this.propsParam.djlx);
121 formdata.append("isEdit", this.viewEdit);
122 // Init(formdata).then((res) => {
123 // if (res.code === 200 && res.result) {
124 // }
125 // });
126 },
127 data () {
128 return {
129 loading: false,
130 //表单是否可操作
131 viewEdit: false,
132 ruleForm: {
133 SFGH: 1
134 }
135 }
136 },
137 methods: {
138 }
139 }
140 </script>
141 <style scoped lang="scss">
142 @import "~@/styles/public.scss";
143 @import "~@/styles/slxx/slxx.scss";
144 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-05 16:52:14 4 * @LastEditTime: 2023-09-06 09:09:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="sfxx"> 7 <div class='sfxx'>
8 8 <div class="sfxx-left">
9 <div class="slxx_title title-block">
10 基本信息
11 <div class="triangle"></div>
12 </div>
13 <ul>
14 <li>
15 <p>业务号</p>
16 <p>{{detail.ywh}}</p>
17 </li>
18 <li>
19 <p>申请登记类型</p>
20 <p>{{detail.sqdjlx}}</p>
21 </li>
22 <li>
23 <p>联系人</p>
24 <p>{{detail.lxr}}</p>
25 </li>
26 <li>
27 <p>联系人电话</p>
28 <p>{{detail.lxdh}}</p>
29 </li>
30 <li>
31 <p>缴费人</p>
32 <p><el-input v-model="detail.jfr"></el-input></p>
33 </li>
34 <li>
35 <p>缴费单号</p>
36 <p><el-input v-model="detail.jfdh"></el-input></p>
37 </li>
38 <li>
39 <p>应收金额</p>
40 <p style="color:red">{{detail.ysje}}</p>
41 </li>
42 <li>
43 <p>实收金额</p>
44 <p><el-input v-model="detail.ssje"></el-input></p>
45 </li>
46 <li>
47 <p>备注</p>
48 <p><el-input v-model="detail.bz"></el-input></p>
49 </li>
50 </ul>
51 </div>
52 <div class="sfxx-right">
53 <div class="slxx_title title-block">
54 收费明细
55 <div class="triangle"></div>
56 </div>
57 <el-table :data="tableData.data" border :height="355">
58 <el-table-column v-for="item in tableData.columns" :key="item.index" :prop="item.prop" :label="item.label" align="center">
59 </el-table-column>
60 <el-table-column label="操作" width="50">
61 <template slot-scope="scope">
62 <el-button type="text">使用</el-button>
63 </template>
64 </el-table-column>
65 </el-table>
66 </div>
9 </div> 67 </div>
10 </template>
...\ No newline at end of file ...\ No newline at end of file
68 </template>
69 <script>
70
71 export default {
72 components: {},
73 data () {
74 return {
75 detail: {
76 ywh: '',
77 sqdjlx: '',
78 lxr: '',
79 lxdh: '',
80 jfr: '',
81 jfdh: '',
82 ysje: '',
83 ssje: '',
84 bz: ''
85 },
86 tableData: {
87 columns: [
88 {
89 prop: "sfxmmc",
90 label: "收费项目名称",
91 },
92 {
93 prop: "sl",
94 label: "数县",
95 },
96 {
97 prop: "je",
98 label: "金额(元)",
99 },
100 {
101 label: '操作',
102 align: 'center',
103 render: (h, scope) => {
104 return (
105 <div>
106 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { }}></el-button>
107 </div>
108 )
109 }
110 }
111 ],
112 data: []
113 }
114 }
115 }
116 }
117 </script>
118 <style scoped lang='scss'>
119 @import "~@/styles/public.scss";
120 .sfxx {
121 display: flex;
122 padding: 10px;
123 height: 100%;
124 box-sizing: border-box;
125 &-left {
126 width: 50%;
127 margin-right: 10px;
128 ul {
129 border-radius: 3px;
130 }
131 li:last-child {
132 border-bottom: 1px solid #e8e5e5;
133 }
134 li {
135 display: flex;
136 border: 1px solid #e8e5e5;
137 border-bottom: none;
138
139 p:nth-child(1) {
140 width: 35%;
141 text-align: center;
142 background-color: #fafafa;
143 border-right: 1px solid #e8e5e5;
144 padding: 10px 0;
145 }
146 p:nth-child(2) {
147 width: 65%;
148 display: flex;
149 align-items: center;
150 box-sizing: border-box;
151 margin: 0 10px;
152 }
153 }
154 }
155 &-right {
156 width: 50%;
157 margin-left: 10px;
158 }
159 }
160 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--
2 * @Author: yangwei
3 * @Date: 2023-09-06 09:20:11
4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-09-06 09:20:44
6 * @FilePath: \bdcdj-web\src\views\ywbl\ycsl\ycsl.vue
7 * @Description:
8 *
9 * Copyright (c) 2023 by yangwei, All Rights Reserved.
10 -->
11 <template>
12 <div></div>
13 </template>
14
15 <script>
16 export default {
17 name: "BdcdjWebYcsl",
18
19 data() {
20 return {};
21 },
22
23 mounted() {},
24
25 methods: {},
26 };
27 </script>
28
29 <style lang="scss" scoped></style>
1 <!--
2 * @Author: yangwei
3 * @Date: 2023-09-06 09:19:56
4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-09-06 09:20:51
6 * @FilePath: \bdcdj-web\src\views\ywbl\ydsq\ydsq.vue
7 * @Description:
8 *
9 * Copyright (c) 2023 by yangwei, All Rights Reserved.
10 -->
11 <template>
12 <div></div>
13 </template>
14
15 <script>
16 export default {
17 name: "BdcdjWebYcsl",
18
19 data() {
20 return {};
21 },
22
23 mounted() {},
24
25 methods: {},
26 };
27 </script>
28
29 <style lang="scss" scoped></style>