f0e43e77 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 22c5e3f5 95d7a962
...@@ -78,6 +78,27 @@ export function getNewDate(type = 1) { ...@@ -78,6 +78,27 @@ export function getNewDate(type = 1) {
78 } 78 }
79 } 79 }
80 80
81 // 获取当前时间
82 /**
83 * @description: 获取当前时间
84 * @param {*} type
85 * @author: renchao
86 */
87 export function getDateToString(date,type) {
88 const now = new Date(date);
89 const year = now.getFullYear();
90 const month = String(now.getMonth() + 1).padStart(2, '0');
91 const day = String(now.getDate()).padStart(2, '0');
92 const hours = String(now.getHours()).padStart(2, '0');
93 const minutes = String(now.getMinutes()).padStart(2, '0');
94 const seconds = String(now.getSeconds()).padStart(2, '0');
95 if (type == 1) {
96 return `${year}${month}${day}日`
97 } else {
98 return `${year}${month}${day}${hours}${minutes}${seconds}秒`
99 }
100 }
101
81 export function getNewDatesh() { 102 export function getNewDatesh() {
82 const now = new Date(); 103 const now = new Date();
83 const year = now.getFullYear(); 104 const year = now.getFullYear();
......
...@@ -22,17 +22,17 @@ class data extends filter { ...@@ -22,17 +22,17 @@ class data extends filter {
22 ) 22 )
23 } 23 }
24 }, 24 },
25 { 25 // {
26 label: "查询类型", 26 // label: "查询类型",
27 render: (h, scope) => { 27 // render: (h, scope) => {
28 switch (scope.row.cxlx) { 28 // switch (scope.row.cxlx) {
29 case '1': 29 // case '1':
30 return <div>家庭房产</div> 30 // return <div>家庭房产</div>
31 case '2': 31 // case '2':
32 return <div>房屋明细</div> 32 // return <div>房屋明细</div>
33 } 33 // }
34 } 34 // }
35 }, 35 // },
36 { 36 {
37 prop: "cxbh", 37 prop: "cxbh",
38 label: "查询编号", 38 label: "查询编号",
...@@ -52,6 +52,17 @@ class data extends filter { ...@@ -52,6 +52,17 @@ class data extends filter {
52 { 52 {
53 prop: "ycqrgxmc", 53 prop: "ycqrgxmc",
54 label: "与产权人的关系", 54 label: "与产权人的关系",
55
56 render: (h, scope) => {
57 switch (scope.row.ycqrgx) {
58 case '1':
59 return <div>房屋权利人</div>
60 case '2':
61 return <div>产权利害关系人</div>
62 case '3':
63 return <div>委托人</div>
64 }
65 }
55 }, 66 },
56 { 67 {
57 prop: "qlrxm", 68 prop: "qlrxm",
......
...@@ -37,9 +37,9 @@ class data extends filter { ...@@ -37,9 +37,9 @@ class data extends filter {
37 render: (h, scope) => { 37 render: (h, scope) => {
38 switch (scope.row.cxlx) { 38 switch (scope.row.cxlx) {
39 case '1': 39 case '1':
40 return <div>家庭房产</div> 40 return <div>家庭房产查询</div>
41 case '2': 41 case '2':
42 return <div>房屋明细</div> 42 return <div>不动产明细查询</div>
43 } 43 }
44 } 44 }
45 }, 45 },
......
1 <!--
2 * @Description: 交易合同
3 * @Autor: renchao
4 * @LastEditTime: 2024-03-21 16:58:45
5 -->
6 <template> 1 <template>
7 <div class='jyht'> 2 <div class='jyht'>
8 <el-form :model="queryForm"> 3 <el-form :model="queryForm">
9 <el-row :gutter="10"> 4 <el-row :gutter="10">
10 <el-col :span="6"> 5 <el-col :span="8">
11 <el-form-item label="合同号"> 6 <el-form-item label="行政区">
12 <el-input v-model="queryForm.htbh"></el-input>
13 </el-form-item>
14 </el-col>
15 <!-- <el-col :span="6">
16 <el-form-item label="证件号码">
17 <el-input v-model="queryForm.sfzjhm"></el-input> 7 <el-input v-model="queryForm.sfzjhm"></el-input>
18 </el-form-item> 8 </el-form-item>
19 </el-col> 9 </el-col>
20 <el-col :span="6"> 10 <el-col :span="8">
21 <el-form-item label="业务号"> 11 <el-form-item label="业务号">
22 <el-input v-model="queryForm.ywh"></el-input> 12 <el-input v-model="queryForm.ywh"></el-input>
23 </el-form-item> 13 </el-form-item>
24 </el-col> --> 14 </el-col>
25 <!-- <el-col :span="6" class="btnColRight"> 15 <el-col :span="8">
26 <el-button type="primary" @click="handleSearch">查询</el-button> 16 <el-form-item label="用户编号">
27 </el-col> --> 17 <el-input v-model="queryForm.ywh"></el-input>
18 </el-form-item>
19 </el-col>
20 </el-row>
21 <el-row :gutter="10">
22 <el-col :span="8">
23 <el-form-item label="房产证编号">
24 <el-input v-model="queryForm.ywh"></el-input>
25 </el-form-item>
26 </el-col>
27 <el-col :span="16">
28 <el-form-item label="房屋坐落(地址)">
29 <el-input v-model="queryForm.sfzjhm"></el-input>
30 </el-form-item>
31 </el-col>
28 </el-row> 32 </el-row>
29 </el-form> 33 </el-form>
30
31 <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key" 34 <lb-table ref="table" @row-click="handleRowClick" :pagination="false" :key="key"
32 :column="tableData.columns" 35 :column="tableData.columns"
33 :data="tableData.data"> 36 :data="tableData.data">
34 </lb-table> 37 </lb-table>
35 <div class="text-center"> 38 <div class="text-center">
36 <el-button @click="$popupCacel">取消</el-button> 39 <el-button @click="$popupCacel">取消</el-button>
37 <!-- <el-button type="primary" @click="handleSubmit" plain>保存</el-button> --> 40 <el-button type="primary" @click="handleSearch">保存</el-button>
38 <el-button type="primary" @click="handleSearch">查询</el-button>
39 </div> 41 </div>
40 </div> 42 </div>
41 </template> 43 </template>
......
...@@ -71,8 +71,7 @@ ...@@ -71,8 +71,7 @@
71 </el-row> 71 </el-row>
72 <div class="slxx_title title-block"> 72 <div class="slxx_title title-block">
73 电力过户信息 73 电力过户信息
74 74 <el-button type="primary" @click="handleDlxx">电力过户信息修改</el-button>
75 <el-button @click="showDialogDlxx">电力过户信息修改</el-button>
76 <div class="triangle"></div> 75 <div class="triangle"></div>
77 </div> 76 </div>
78 <el-row :gutter="10"> 77 <el-row :gutter="10">
...@@ -172,12 +171,6 @@ ...@@ -172,12 +171,6 @@
172 </div> 171 </div>
173 </div> 172 </div>
174 </el-form> 173 </el-form>
175 <el-dialog :visible.sync="dialogDlxx" title="电力过户信息修改">
176 <div class="text-center">
177 <el-button @click="$popupCacel">取消</el-button>
178 <el-button type="primary" @click="onSubmit" plain>保存</el-button>
179 </div>
180 </el-dialog>
181 </div> 174 </div>
182 </template> 175 </template>
183 <script> 176 <script>
...@@ -195,7 +188,6 @@ export default { ...@@ -195,7 +188,6 @@ export default {
195 }, 188 },
196 data() { 189 data() {
197 return { 190 return {
198 dialogDlxx: false,
199 loading: false, 191 loading: false,
200 //表单是否可操作 192 //表单是否可操作
201 viewEdit: false, 193 viewEdit: false,
...@@ -220,8 +212,18 @@ export default { ...@@ -220,8 +212,18 @@ export default {
220 }); 212 });
221 }, 213 },
222 onSubmit() {}, 214 onSubmit() {},
223 showDialogDlxx() { 215 handleDlxx() {
224 this.dialogDlxx = true; 216 let formData = {
217 bsmSldy: this.propsParam.bsmSldy,
218 qxdm: this.ruleForm.qlxx.qxdm,
219 bsmQlxx: this.ruleForm.qlxx.bsmQlxx,
220 };
221 if(this.ruleForm.wqht==null){
222 formData.htbh='';
223 }else{
224 formData.htbh=this.ruleForm.wqht.wqhth;
225 }
226 this.$popupDialog('房产电力过户详情', 'workflow/main/sdqxx/dlxx', formData, '60%', true)
225 }, 227 },
226 }, 228 },
227 }; 229 };
......
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
90 </el-row> 90 </el-row>
91 <el-row :gutter="10" v-if="ruleForm.fdcq2"> 91 <el-row :gutter="10" v-if="ruleForm.fdcq2">
92 <el-col :span="8"> 92 <el-col :span="8">
93 <el-form-item label="宗地面积:" prop="zdjbxx.zdmj"> 93 <el-form-item label="宗地面积:">
94 <div class="flex"> 94 <div class="flex">
95 <el-input :disabled="!viewEdit" v-model="ruleForm.zdjbxx.zdmj"></el-input> 95 <el-input disabled v-model="ruleForm.zdjbxx.zdmj"></el-input>
96 <el-select 96 <el-select
97 disabled 97 disabled
98 v-model="ruleForm.zdjbxx.mjdw" 98 v-model="ruleForm.zdjbxx.mjdw"
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
235 </el-form-item> 235 </el-form-item>
236 </el-col> 236 </el-col>
237 <el-col :span="8"> 237 <el-col :span="8">
238 <el-form-item label="房产交易价格:" prop="fdcq2.fdcjyjg"> 238 <el-form-item label="房产交易价格:" prop="fdcq2.fdcjyjg">
239 <div class="flex"> 239 <div class="flex">
240 <el-input 240 <el-input
241 maxlength="11" 241 maxlength="11"
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 <div class="slxx_title title-block"> 66 <div class="slxx_title title-block">
67 <el-row> 67 <el-row>
68 <el-col :span="24"> 房屋合同信息 68 <el-col :span="24"> 房屋合同信息
69 &nbsp;&nbsp;<el-button type="primary" @click="handleContract">查询房屋交易合同</el-button> </el-col> 69 &nbsp;&nbsp;<el-button type="primary" v-show="viewEdit" @click="handleContract">查询房屋交易合同</el-button> </el-col>
70 <!-- <el-col :span="4" class="btnColRight"> 70 <!-- <el-col :span="4" class="btnColRight">
71 71
72 </el-col> --> 72 </el-col> -->
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
183 183
184 <div class="slxx_title title-block"> 184 <div class="slxx_title title-block">
185 <el-row> 185 <el-row>
186 <el-col :span="24"> 缴税信息 <el-button type="primary" @click="handleSwwsxx">查询契税完税信息</el-button></el-col> 186 <el-col :span="24"> 缴税信息 <el-button type="primary" v-show="viewEdit" @click="handleSwwsxx">查询契税完税信息</el-button></el-col>
187 </el-row> 187 </el-row>
188 <div class="triangle"></div> 188 <div class="triangle"></div>
189 </div> 189 </div>
......