Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
51b1d35a by “miaofang
Options

Merge branch 'dev'

2 parents 2f7aea23 42ebafed
Inline Side-by-side
Showing 18 changed files with 195 additions and 122 deletions
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
4 * @LastEditTime: 2023-09-25 10:56:39 4 * @LastEditTime: 2023-09-25 10:56:39
5 */ 5 */
6 import store from '@/store' 6 import store from '@/store'
7 import { log } from 'bpmn-js-token-simulation'
7 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器 8 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
8 export default class filter { 9 export default class filter {
9 /** 10 /**
...@@ -153,17 +154,37 @@ export default class filter { ...@@ -153,17 +154,37 @@ export default class filter {
153 ygmmzt: "已预告买卖", 154 ygmmzt: "已预告买卖",
154 ygdyzt: "已预告抵押", 155 ygdyzt: "已预告抵押",
155 dyzt: "已抵押", 156 dyzt: "已抵押",
156 sfbl: "正在补录" 157 sfbl: "正在补录",
158 qqzt:"已确权"
157 }; 159 };
158 160
159 for (let key in row) { 161 for (let key in row) {
160 if (row[key] === 1 && strategies[key]) { 162 if (row[key] === 1 && strategies[key]) {
161 keys++; 163 keys++;
162 if (keys == 1) { 164 if (keys == 1) {
163 text += strategies[key]; 165 if(text){
166 text += ',' +strategies[key];
167 }else{
168 text += strategies[key];
169 }
170
164 } else { 171 } else {
165 text += ',' + strategies[key]; 172 text += ',' + strategies[key];
166 } 173 }
174 }else if(row[key] ==2 && key=="qqzt"){
175 if(text){
176 text += ','+"已灭失";
177 }else{
178 text += "已灭失";
179 }
180
181 }else if(row[key] ==0 && key=="qqzt"){
182 if(text){
183 text += ','+"未确权";
184 }else{
185 text += "未确权";
186 }
187
167 } 188 }
168 } 189 }
169 190
......
...@@ -78,9 +78,9 @@ export default { ...@@ -78,9 +78,9 @@ export default {
78 type: Number, 78 type: Number,
79 default: 0, 79 default: 0,
80 }, 80 },
81 sqywInfo: { 81 sqywInfo: {
82 type: Object, 82 type: Object,
83 default: () => { } 83 default: () => { }
84 }, 84 },
85 isJump: { type: Boolean, default: false }, 85 isJump: { type: Boolean, default: false },
86 }, 86 },
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
130 /** 130 /**
131 * @description: 保存当前楼盘表 131 * @description: 保存当前楼盘表
132 * @author: renchao 132 * @author: renchao
133 */ 133 */
134 saveLpb(){ 134 saveLpb(){
135 if (this.bsmList.length == 0) { 135 if (this.bsmList.length == 0) {
136 this.$message.error("请至少选择一条数据"); 136 this.$message.error("请至少选择一条数据");
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
138 } 138 }
139 this.loading = true; 139 this.loading = true;
140 againAddSldy({ 140 againAddSldy({
141 bsmSqyw: this.sqywInfo.bsmSqyw, 141 bsmSqyw: this.sqywInfo.bsmSqyw,
142 bsmSlsq: this.sqywInfo.bsmSlsq, 142 bsmSlsq: this.sqywInfo.bsmSlsq,
143 bdcdysz: this.bsmList, 143 bdcdysz: this.bsmList,
144 sjlx: "houses" 144 sjlx: "houses"
...@@ -208,6 +208,12 @@ export default { ...@@ -208,6 +208,12 @@ export default {
208 * @author: renchao 208 * @author: renchao
209 */ 209 */
210 getLpb(zrzbsm, scyclx, actual) { 210 getLpb(zrzbsm, scyclx, actual) {
211 if(!zrzbsm){
212 this.$message({
213 message: "暂无楼盘表",
214 type: "warning",
215 });
216 }else{
211 getLpb(zrzbsm, scyclx).then((res) => { 217 getLpb(zrzbsm, scyclx).then((res) => {
212 if (res.code == 200) { 218 if (res.code == 200) {
213 if(scyclx){ 219 if(scyclx){
...@@ -226,6 +232,8 @@ export default { ...@@ -226,6 +232,8 @@ export default {
226 }); 232 });
227 } 233 }
228 }); 234 });
235 }
236
229 }, 237 },
230 //户右键点击事件 238 //户右键点击事件
231 /** 239 /**
......
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
237 237
238 td:first-child { 238 td:first-child {
239 flex: inherit !important; 239 flex: inherit !important;
240 // min-width: 180px !important; 240 width:180px !important;
241 } 241 }
242 242
243 >tr:nth-child(odd) td { 243 >tr:nth-child(odd) td {
...@@ -266,4 +266,4 @@ ...@@ -266,4 +266,4 @@
266 margin-left: 2px; 266 margin-left: 2px;
267 } 267 }
268 } 268 }
269 }
...\ No newline at end of file ...\ No newline at end of file
269 }
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 正在注销 67 正在注销
68 </div> 68 </div>
69 69
70 <p v-if="!['djyy', 'fj'].includes(item.prop)"> 70 <p v-if="!['djyy', 'fj','zl'].includes(item.prop)">
71 <span v-if="item.prop == 'qszt'"> 71 <span v-if="item.prop == 'qszt'">
72 {{ getQsztName(row[item.prop]) }} 72 {{ getQsztName(row[item.prop]) }}
73 </span> 73 </span>
...@@ -194,12 +194,11 @@ ...@@ -194,12 +194,11 @@
194 type: "html", 194 type: "html",
195 maxWidth: 800, // 最大宽度 195 maxWidth: 800, // 最大宽度
196 font_size: "", // 不设置则使用默认字体大小 196 font_size: "", // 不设置则使用默认字体大小
197 style: `@font-face { 197
198 font-family: "STZHONGS"; 198
199 src: url(${window.ttf}) format("truetype");
200 }`,
201 // 继承原来的所有样式 199 // 继承原来的所有样式
202 targetStyles: ["*"], 200 targetStyles: ["*"],
201 scanStyle:false,
203 }); 202 });
204 this.render = false 203 this.render = false
205 }, 204 },
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 style="page-break-after: always"> 12 style="page-break-after: always">
13 <div class="title">{{ title }}</div> 13 <div class="title">{{ title }}</div>
14 <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div> 14 <div class="num">共{{ datass.length }}页，第{{ indexx + 1 }}页</div>
15 <table class="xxTable"> 15 <table class="xxxTable">
16 <tr v-for="item in columns" :key="item.name"> 16 <tr v-for="item in columns" :key="item.name">
17 <td> 17 <td>
18 {{ item.despriction }} 18 {{ item.despriction }}
...@@ -109,10 +109,12 @@ ...@@ -109,10 +109,12 @@
109 </script> 109 </script>
110 110
111 <style lang="scss" scoped> 111 <style lang="scss" scoped>
112
112 .tbalede { 113 .tbalede {
113 width: 100%; 114 width: 100%;
114 margin: auto; 115 margin: auto;
115 position: relative; 116 position: relative;
117 background-color: salmon;
116 .num { 118 .num {
117 position: absolute; 119 position: absolute;
118 right: 10px; 120 right: 10px;
...@@ -128,12 +130,12 @@ ...@@ -128,12 +130,12 @@
128 position: relative; 130 position: relative;
129 margin: 0 3px; 131 margin: 0 3px;
130 } 132 }
131 .xxTable { 133 .xxxTable {
132 width: 100%; 134 width: 100%;
133 border-collapse: collapse; 135 border-collapse: collapse;
134 136
135 tr td { 137 tr td {
136 border: 2px solid rgb(227, 226, 226); 138 border: 1px solid rgb(139, 137, 137);
137 text-align: center; 139 text-align: center;
138 height: 40px; 140 height: 40px;
139 font-size: 13px; 141 font-size: 13px;
...@@ -148,4 +150,6 @@ ...@@ -148,4 +150,6 @@
148 } 150 }
149 } 151 }
150 } 152 }
153
154
151 </style> 155 </style>
......
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
236 236
237 td:first-child { 237 td:first-child {
238 flex: inherit !important; 238 flex: inherit !important;
239 // min-width: 180px !important; 239 width: 180px !important;
240 } 240 }
241 241
242 >tr:nth-child(odd) td { 242 >tr:nth-child(odd) td {
...@@ -265,4 +265,4 @@ ...@@ -265,4 +265,4 @@
265 margin-left: 2px; 265 margin-left: 2px;
266 } 266 }
267 } 267 }
268 }
...\ No newline at end of file ...\ No newline at end of file
268 }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </tr> 33 </tr>
34 <tr> 34 <tr>
35 <td>等级</td> 35 <td>等级</td>
36 <td>{{ zdjbxx.djmc }}</td> 36 <td>{{ zdjbxx.dj|dictionary("A50") }}</td>
37 <td>价格</td> 37 <td>价格</td>
38 <td>{{ zdjbxx.jg }}</td> 38 <td>{{ zdjbxx.jg }}</td>
39 </tr> 39 </tr>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-19 09:40:39 4 * @LastEditTime: 2024-03-05 16:03:50
5 --> 5 -->
6 <template> 6 <template>
7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> 7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
...@@ -169,11 +169,11 @@ ...@@ -169,11 +169,11 @@
169 that.loadStatus = '1'; 169 that.loadStatus = '1';
170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) { 171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
172 // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4 172 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
173 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
174 } else { 173 } else {
175 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 174 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
176 } 175 }
176 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
178 //窗口关闭后，回调函数中保存的设计代码 178 //窗口关闭后，回调函数中保存的设计代码
179 if (LODOP.CVERSION) 179 if (LODOP.CVERSION)
......
...@@ -30,30 +30,30 @@ ...@@ -30,30 +30,30 @@
30 <el-row> 30 <el-row>
31 <el-col :span="3"> 31 <el-col :span="3">
32 <el-form-item label="身份证读卡器"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button> 33 <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="5"> 36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px"> 37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
38 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="5"> 41 <el-col :span="5">
42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="5"> 49 <el-col :span="5">
50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
51 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="5"> 54 <el-col :span="5">
55 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
56 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
133 total: 0, 133 total: 0,
134 columns: datas.columns().lzgrid, 134 columns: datas.columns().lzgrid,
135 data: [] 135 data: []
136 } 136 },
137 show:true
137 } 138 }
138 }, 139 },
139 mounted () { 140 mounted () {
...@@ -202,6 +203,7 @@ ...@@ -202,6 +203,7 @@
202 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { 203 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
203 if (res.code === 200) { 204 if (res.code === 200) {
204 this.tableData.data = res.result.list; 205 this.tableData.data = res.result.list;
206 this.show=!res.result.list.length>0;
205 this.$nextTick(() => { 207 this.$nextTick(() => {
206 this.tableData.data.forEach(item => { 208 this.tableData.data.forEach(item => {
207 that.$refs.table.toggleRowSelection(item) 209 that.$refs.table.toggleRowSelection(item)
......
...@@ -6,17 +6,39 @@ ...@@ -6,17 +6,39 @@
6 <template> 6 <template>
7 <div> 7 <div>
8 <div> 8 <div>
9 <el-form-item label="共有方式："> 9 <div>
10 <el-radio-group :disabled="!viewEdit" v-model="ruleForm.sldy.gyfs"> 10 <el-form-item label="共有方式：">
11 <el-radio label="0">单独所有</el-radio> 11 <el-radio-group :disabled="!disabled" v-model="sldyData.gyfs" change="gyfsChange">
12 <el-radio label="1">共同共有</el-radio> 12 <el-radio label="0">单独所有</el-radio>
13 <el-radio label="2">按份所有</el-radio> 13 <el-radio label="1">共同共有</el-radio>
14 <el-radio label="3">其它共有</el-radio> 14 <el-radio label="2">按份所有</el-radio>
15 </el-radio-group> 15 <el-radio label="3">其它共有</el-radio>
16 </el-form-item> 16 </el-radio-group>
17 </el-form-item>
18 </div>
19 <div v-show="sldyData.gyfs != '0'">
20 <el-form-item label="是否分别持证：">
21 <el-radio-group v-model="sldyData.sqfbcz" :disabled="!disabled">
22 <el-radio :label="1">是</el-radio>
23 <el-radio :label="0">否</el-radio>
24 </el-radio-group>
25 </el-form-item>
26 <el-form-item label="持证人：" v-show="sldyData.sqfbcz == '0'">
27 <el-select v-model="czr" placeholder="持证人" :disabled="!disabled">
28 <el-option
29 v-for="(item, index) in tableDataList"
30 :key="index"
31 :label="item.sqrmc"
32 :value="item.id"
33 >
34 </el-option>
35 </el-select>
36 </el-form-item>
37 </div>
17 </div> 38 </div>
18 <lb-table 39 <lb-table
19 :column="column" :pagination="false" 40 :column="column"
41 :pagination="false"
20 :key="key" 42 :key="key"
21 :heightNumSetting="true" 43 :heightNumSetting="true"
22 :minHeight="0" 44 :minHeight="0"
...@@ -24,7 +46,7 @@ ...@@ -24,7 +46,7 @@
24 :data="tableDataList" 46 :data="tableDataList"
25 > 47 >
26 </lb-table> 48 </lb-table>
27 <addQlr 49 <addSqr
28 v-model="dialog" 50 v-model="dialog"
29 :details="details" 51 :details="details"
30 :showButton="disabled" 52 :showButton="disabled"
...@@ -35,24 +57,24 @@ ...@@ -35,24 +57,24 @@
35 <script> 57 <script>
36 import { mapGetters } from "vuex"; 58 import { mapGetters } from "vuex";
37 import { getIdCardInfo } from "@/utils/operation.js"; 59 import { getIdCardInfo } from "@/utils/operation.js";
38 import addQlr from "./addSqr.vue"; 60 import addSqr from "./addSqr.vue";
39 export default { 61 export default {
40 components: { 62 components: { addSqr },
41 addQlr,
42 },
43 computed: { 63 computed: {
44 ...mapGetters(["dictData"]), 64 ...mapGetters(["dictData"]),
45 }, 65 },
46 props: { 66 props: {
47 tableData: { 67 qlrData: {
48 type: Array, 68 type: Array,
49 default: function () { 69 default: function () {
50 return []; 70 return [];
51 }, 71 },
52 }, 72 },
53 gyfs: { 73 sldyData: {
54 type: String, 74 type: Object,
55 default: "1", 75 default: function () {
76 return {};
77 },
56 }, 78 },
57 disabled: { 79 disabled: {
58 type: Boolean, 80 type: Boolean,
...@@ -105,24 +127,6 @@ export default { ...@@ -105,24 +127,6 @@ export default {
105 }, 127 },
106 }, 128 },
107 { 129 {
108 label: "身份证读卡器",
109 align: "center",
110 render: (h, scope) => {
111 return (
112 <el-button
113 type="text"
114 icon="el-icon-tickets"
115 disabled={!this.disabled}
116 onClick={() => {
117 this.readClick(scope.row);
118 }}
119 >
120 读取
121 </el-button>
122 );
123 },
124 },
125 {
126 prop: "sqrmc", 130 prop: "sqrmc",
127 label: "姓名/名称", 131 label: "姓名/名称",
128 }, 132 },
...@@ -181,10 +185,11 @@ export default { ...@@ -181,10 +185,11 @@ export default {
181 }, 185 },
182 ], 186 ],
183 column: [], 187 column: [],
188 czr: "",
184 }; 189 };
185 }, 190 },
186 watch: { 191 watch: {
187 tableData: { 192 qlrData: {
188 handler: function (val, oldVal) { 193 handler: function (val, oldVal) {
189 let that = this; 194 let that = this;
190 this.$nextTick(() => { 195 this.$nextTick(() => {
...@@ -198,12 +203,24 @@ export default { ...@@ -198,12 +203,24 @@ export default {
198 immediate: true, 203 immediate: true,
199 deep: true, 204 deep: true,
200 }, 205 },
201 gyfs: { 206 //监听共有方式
207 "sldyData.gyfs": {
202 handler(newVal, oldValue) { 208 handler(newVal, oldValue) {
203 let dataList = _.cloneDeep(this.InformationTable); 209 let dataList = _.cloneDeep(this.InformationTable);
204 if (newVal == 0) { 210 if (newVal == "0") {
211 if (this.tableDataList.length > 1) {
212 this.$message({
213 showClose: true,
214 message: "单独所有，只能添加一条权利人记录",
215 type: "error",
216 });
217 sldyData.gyfs = oldValue;
218
219 return false;
220 }
221 this.ruleForm.qlrList[0].sfczr = "1";
205 this.column = _.cloneDeep(dataList); 222 this.column = _.cloneDeep(dataList);
206 this.tableDataList = _.cloneDeep(this.tableData); 223 this.tableDataList = _.cloneDeep(this.qlrData);
207 this.key++; 224 this.key++;
208 } else if (newVal == "1" || newVal == "3") { 225 } else if (newVal == "1" || newVal == "3") {
209 this.column = dataList; 226 this.column = dataList;
...@@ -217,6 +234,39 @@ export default { ...@@ -217,6 +234,39 @@ export default {
217 }, 234 },
218 immediate: true, 235 immediate: true,
219 }, 236 },
237 //监听申请分别持证
238 "sldyData.sqfbcz": {
239 handler(newVal, oldValue) {
240 if (newVal == 0) {
241 let that = this;
242 if (sldyData.gyfs != "0") {
243 this.tableDataList.forEach((item) => {
244 if (item.bsmSqr == that.czr) {
245 item.sfczr = "1";
246 } else {
247 item.sfczr = "0";
248 }
249 });
250 }
251 } else {
252 this.tableDataList.forEach((item, index) => {
253 item.sfczr = "1";
254 });
255 this.czr = "";
256 }
257 },
258 immediate: true,
259 },
260 },
261 mounted() {
262 let that = this;
263 if (this.sldyData.gyfs != "0" && this.sldyData.sqfbcz == 0) {
264 this.qlrData.forEach((item) => {
265 if (item.sfczr == "1") {
266 that.czr = item.bsmSqr;
267 }
268 });
269 }
220 }, 270 },
221 methods: { 271 methods: {
222 /** 272 /**
...@@ -227,25 +277,6 @@ export default { ...@@ -227,25 +277,6 @@ export default {
227 handleupdateDetail(value) { 277 handleupdateDetail(value) {
228 let that = this; 278 let that = this;
229 let arr = this.tableData.map((item) => item.zjh); 279 let arr = this.tableData.map((item) => item.zjh);
230 // if (this.isaddupdate) {
231 // if (!arr.includes(value.zjh)) {
232 // this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
233 // this.$emit('upDateQlrxxList', this.tableDataList)
234 // } else {
235 // setTimeout(() => {
236 // that.$message.error('证件号不能重复')
237 // }, 1500)
238 // }
239 // } else {
240 // if (!arr.includes(value.zjh) || this.tableData[this.dataIndex].zjh == value.zjh) {
241 // this.tableDataList[this.dataIndex] = _.cloneDeep(value);
242 // this.$emit('upDateQlrxxList', this.tableDataList)
243 // } else {
244 // setTimeout(() => {
245 // that.$message.error('证件号不能重复')
246 // }, 1500)
247 // }
248 // }
249 280
250 if (this.isaddupdate) { 281 if (this.isaddupdate) {
251 if (!_.isEqual(value, this.tableData)) { 282 if (!_.isEqual(value, this.tableData)) {
......
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
380 </el-col> 380 </el-col>
381 </el-row> 381 </el-row>
382 <qlrCommonTable 382 <qlrCommonTable
383 :tableData="ruleForm.qlrList"
383 @upDateQlrxxList="upDateQlrxxList" 384 @upDateQlrxxList="upDateQlrxxList"
384 :disabled="!viewEdit" 385 :disabled="viewEdit"
385 :tableData="ruleForm.qlrList"
386 :gyfs="ruleForm.sldy.gyfs" /> 386 :gyfs="ruleForm.sldy.gyfs" />
387 <div class="slxx_title title-block"> 387 <div class="slxx_title title-block">
388 登记原因 388 登记原因
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-01-30 15:46:45 4 * @LastEditTime: 2024-03-04 16:30:49
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 <span>{{ item.bdcdyh }}</span> 29 <span>{{ item.bdcdyh }}</span>
30 </div> 30 </div>
31 <div class="text color_iray"> 31 <div class="text color_iray">
32 <span>{{ item.zl }}</span> 32 <span style="word-break:break-all;">{{ item.zl }}</span>
33 </div> 33 </div>
34 <div class="text color_red"> 34 <div class="text color_red">
35 <span>{{ item.yt }}</span> 35 <span>{{ item.yt }}</span>
...@@ -298,7 +298,6 @@ ...@@ -298,7 +298,6 @@
298 .text { 298 .text {
299 margin-bottom: 8px; 299 margin-bottom: 8px;
300 text-align: left; 300 text-align: left;
301 text-indent: 16px;
302 } 301 }
303 .text.tac { 302 .text.tac {
304 text-align: center; 303 text-align: center;
...@@ -323,9 +322,9 @@ ...@@ -323,9 +322,9 @@
323 } 322 }
324 323
325 .card_padding { 324 .card_padding {
326 padding-top: 8px;
327 font-size: 14px; 325 font-size: 14px;
328 line-height: 22px; 326 line-height: 22px;
327 padding: 8px 15px;
329 } 328 }
330 /deep/.el-card__body { 329 /deep/.el-card__body {
331 padding: 0px; 330 padding: 0px;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:26:37 4 * @LastEditTime: 2024-03-05 16:43:23
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
635 // 保存当前字体设置 635 // 保存当前字体设置
636 const originalFont = context.font; 636 const originalFont = context.font;
637 // 设置新的字体大小 637 // 设置新的字体大小
638 context.font = '16px 楷体'; // 替换为你想要的字体和大小 638 context.font = '15px 楷体'; // 替换为你想要的字体和大小
639 // 绘制 bdcdyh 639 // 绘制 bdcdyh
640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
641 // 恢复原始字体设置 641 // 恢复原始字体设置
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:23:44 4 * @LastEditTime: 2024-03-05 16:42:30
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
558 // 保存当前字体设置 558 // 保存当前字体设置
559 const originalFont = context.font; 559 const originalFont = context.font;
560 // 设置新的字体大小 560 // 设置新的字体大小
561 context.font = '16px 楷体'; // 替换为你想要的字体和大小 561 context.font = '15px 楷体'; // 替换为你想要的字体和大小
562 // 绘制 bdcdyh 562 // 绘制 bdcdyh
563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
564 // 恢复原始字体设置 564 // 恢复原始字体设置
......
...@@ -235,10 +235,10 @@ ...@@ -235,10 +235,10 @@
235 if (res.code === 200) { 235 if (res.code === 200) {
236 let { total, records } = res.result; 236 let { total, records } = res.result;
237 records.forEach((item) => { 237 records.forEach((item) => {
238 item.qlrmc = item.qlrmc.join(","); 238 // item.qlrmc = item.qlrmc.join(",");
239 item.ywh = item.ywh.join(","); 239 // item.ywh = item.ywh.join(",");
240 item.zl = item.zl.join(","); 240 // item.zl = item.zl.join(",");
241 item.outstepdate = item.outstepdate[0]; 241 // item.outstepdate = item.outstepdate[0];
242 }); 242 });
243 this.tableData.total = total ? total : 0; 243 this.tableData.total = total ? total : 0;
244 this.tableData.data = records ? records : []; 244 this.tableData.data = records ? records : [];
...@@ -270,9 +270,10 @@ ...@@ -270,9 +270,10 @@
270 ); 270 );
271 window.open(href, `djbworkFrameview${item.bsmSlsq}`); 271 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
272 } else { 272 } else {
273 let bestepid=item.bestepid==null?"":item.bestepid;
273 const { href } = this.$router.resolve( 274 const { href } = this.$router.resolve(
274 "/workFrameView?bsmSlsq=" + item.bsmSlsq + 275 "/workFrameView?bsmSlsq=" + item.bsmSlsq +
275 "&bestepid=" + item.bestepid 276 "&bestepid=" + bestepid
276 ); 277 );
277 window.open(href, `workFrameView${item.bsmSlsq}`) 278 window.open(href, `workFrameView${item.bsmSlsq}`)
278 } 279 }
......
...@@ -42,14 +42,11 @@ class data extends filter { ...@@ -42,14 +42,11 @@ class data extends filter {
42 if (scope.row.yygqzt == '1') { 42 if (scope.row.yygqzt == '1') {
43 return <div class='suspend'>异议挂起</div> 43 return <div class='suspend'>异议挂起</div>
44 } 44 }
45 switch (scope.row.lczt) { 45 if (scope.row.jssj == null) {
46 case '1': 46 return <div class='allow'>进行中</div>
47 return <div class='allow'>进行中</div> 47 }else{
48 case '2': 48 return <div class='prohibit'>已结束</div>
49 return <div class='prohibit'>已结束</div> 49 }
50 case '3':
51 return <span>进行中</span>
52 }
53 } 50 }
54 }, 51 },
55 { 52 {
...@@ -70,6 +67,11 @@ class data extends filter { ...@@ -70,6 +67,11 @@ class data extends filter {
70 width: '200' 67 width: '200'
71 }, 68 },
72 { 69 {
70 prop: "bdcdyh",
71 label: "不动产单元号",
72 minWidth: '150',
73 },
74 {
73 label: "权利人", 75 label: "权利人",
74 width: '120', 76 width: '120',
75 render: (h, scope) => { 77 render: (h, scope) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-16 16:48:57 4 * @LastEditTime: 2024-03-04 14:13:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 label="选择" 58 label="选择"
59 width="50"> 59 width="50">
60 <template slot-scope="scope"> 60 <template slot-scope="scope">
61 <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio> 61 <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bhqkbsm">{{''}}</el-radio>
62 </template> 62 </template>
63 </el-table-column> 63 </el-table-column>
64 <el-table-column 64 <el-table-column
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 property="syqmj" 106 property="syqmj"
107 label="面积"> 107 label="面积">
108 </el-table-column> 108 </el-table-column>
109 <el-table-column 109 <el-table-column
110 property="qlytmc" 110 property="qlytmc"
111 label="用途"> 111 label="用途">
112 </el-table-column> 112 </el-table-column>
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
207 queryClick () { 207 queryClick () {
208 this.$startLoading(); 208 this.$startLoading();
209 this.queryForm.sqywbm = this.sqywInfo.djywbm; 209 this.queryForm.sqywbm = this.sqywInfo.djywbm;
210 this.queryForm.bhqkbsm = ""
210 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => { 211 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
211 this.$endLoading(); 212 this.$endLoading();
212 if (res.code === 200) { 213 if (res.code === 200) {
...@@ -287,7 +288,7 @@ ...@@ -287,7 +288,7 @@
287 */ 288 */
288 handleRowClick (row) { 289 handleRowClick (row) {
289 this.queryForm.bhqkbsm = row.bhqkbsm 290 this.queryForm.bhqkbsm = row.bhqkbsm
290 //this.radioVal = row.bdcdyh 291 this.radioVal = row.bhqkbsm
291 //row.bglx = '1' 292 //row.bglx = '1'
292 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => { 293 selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
293 this.$endLoading(); 294 this.$endLoading();
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 import table from "@/utils/mixin/table"; 98 import table from "@/utils/mixin/table";
99 import { datas, sendThis } from "./djbcxdata"; 99 import { datas, sendThis } from "./djbcxdata";
100 import { getDjbBysearch } from "@/api/search.js"; 100 import { getDjbBysearch } from "@/api/search.js";
101 import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
101 102
102 export default { 103 export default {
103 name: "djbcx", 104 name: "djbcx",
...@@ -137,7 +138,8 @@ ...@@ -137,7 +138,8 @@
137 }, 138 },
138 qllxs: [], 139 qllxs: [],
139 isDialog: false, 140 isDialog: false,
140 djbxxData: {} 141 djbxxData: {},
142 zrzbsm:""
141 } 143 }
142 }, 144 },
143 computed: { 145 computed: {
...@@ -188,15 +190,18 @@ ...@@ -188,15 +190,18 @@
188 * @author: renchao 190 * @author: renchao
189 */ 191 */
190 handleLpbClick (item) { 192 handleLpbClick (item) {
191 this.$popup('楼盘表', 'lpb/index', { 193 let params = {zdbsm:item.bsmZd};
192 width: '85%', 194 getZrzListByBsmSlsq(params).then((res) => {
193 formData: { 195 if (res.code === 200) {
194 bsm: item.zrzbsm, 196 }
197 });
198 console.log("zrzbsm",item,item.zrzbsm);
199 this.$popupDialog('楼盘表', 'lpb/index', {
200 bsm: item.zrzbsm,
195 zrzbsm: item.zrzbsm, 201 zrzbsm: item.zrzbsm,
196 zdbsm: item.zrzbsm, 202 zdbsm: item.zrzbsm,
197 onlyShow: true 203 onlyShow: true
198 } 204 }, '90%', true)
199 })
200 } 205 }
201 } 206 }
202 } 207 }
......