6d7f9384 by 单帅旗

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

2 parents be281ee6 14ba91ec
...@@ -32,8 +32,6 @@ ...@@ -32,8 +32,6 @@
32 <div> 32 <div>
33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p> 33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
35
36 <!-- <p class="title-detail">{{ item.zl }}</p> -->
37 </div> 35 </div>
38 <i 36 <i
39 class="el-icon-delete" 37 class="el-icon-delete"
...@@ -106,9 +104,10 @@ export default { ...@@ -106,9 +104,10 @@ export default {
106 }; 104 };
107 }, 105 },
108 mounted() { 106 mounted() {
109
110 this.loadBdcdylist(); 107 this.loadBdcdylist();
111 this.getleftMenubl(); 108 this.getleftMenubl();
109
110
112 }, 111 },
113 computed: { 112 computed: {
114 // ...mapGetters(["isRefresh"]), 113 // ...mapGetters(["isRefresh"]),
...@@ -130,7 +129,6 @@ export default { ...@@ -130,7 +129,6 @@ export default {
130 leftMenu(formdata).then((res) => { 129 leftMenu(formdata).then((res) => {
131 if (res.code === 200 && res.result) { 130 if (res.code === 200 && res.result) {
132 this.currentSelectProps = res.result[0]; 131 this.currentSelectProps = res.result[0];
133 console.log("读取申请单元信息");
134 this.$emit("getCurrentSelectProps", this.currentSelectProps); 132 this.$emit("getCurrentSelectProps", this.currentSelectProps);
135 if(add){ 133 if(add){
136 this.$parent.getQllxByBdcdyid() 134 this.$parent.getQllxByBdcdyid()
...@@ -143,8 +141,6 @@ export default { ...@@ -143,8 +141,6 @@ export default {
143 getleftMenubl(row) { 141 getleftMenubl(row) {
144 leftMenubl(this.bsmSlsq).then((res) => { 142 leftMenubl(this.bsmSlsq).then((res) => {
145 this.supplementarylist = res.result; 143 this.supplementarylist = res.result;
146 console.log("获取右侧菜单");
147 this.unitClick(0)
148 if(row){ 144 if(row){
149 this.supplementarylist.forEach((item,index) => { 145 this.supplementarylist.forEach((item,index) => {
150 if(item.bsmRepair==row.bsmRepair){ 146 if(item.bsmRepair==row.bsmRepair){
...@@ -154,6 +150,11 @@ export default { ...@@ -154,6 +150,11 @@ export default {
154 } 150 }
155 }) 151 })
156 } 152 }
153 if(this.supplementarylist.length){
154 this.unitClick(0)
155 }else{
156 this.$emit("getCurrentSelectProps", this.currentSelectProps);
157 }
157 }); 158 });
158 }, 159 },
159 handleNodeClick(data, node, elem) { 160 handleNodeClick(data, node, elem) {
...@@ -162,7 +163,6 @@ export default { ...@@ -162,7 +163,6 @@ export default {
162 }, 163 },
163 //申请单元点击事件 164 //申请单元点击事件
164 unitClick(index) { 165 unitClick(index) {
165 console.log("申请单元点击事件");
166 this.currentSelectProps = this.supplementarylist[index]; 166 this.currentSelectProps = this.supplementarylist[index];
167 this.$emit("getCurrentSelectProps", this.currentSelectProps); 167 this.$emit("getCurrentSelectProps", this.currentSelectProps);
168 }, 168 },
...@@ -185,6 +185,11 @@ export default { ...@@ -185,6 +185,11 @@ export default {
185 }); 185 });
186 this.$nextTick(() => { 186 this.$nextTick(() => {
187 this.getleftMenubl(); 187 this.getleftMenubl();
188 this.blxxClick()
189 if(!this.supplementarylist.length){
190 getdjblist()
191 }
192
188 }); 193 });
189 }); 194 });
190 }) 195 })
...@@ -197,7 +202,10 @@ export default { ...@@ -197,7 +202,10 @@ export default {
197 }, 202 },
198 //补录信息点击事件默认展示第一条补录记录 203 //补录信息点击事件默认展示第一条补录记录
199 blxxClick() { 204 blxxClick() {
205 if(this.supplementarylist.length){
200 this.unitClick(0); 206 this.unitClick(0);
207 }
208
201 }, 209 },
202 }, 210 },
203 }; 211 };
...@@ -269,9 +277,21 @@ export default { ...@@ -269,9 +277,21 @@ export default {
269 277
270 } 278 }
271 .blxx { 279 .blxx {
280 .el-menu-item{
281 display: flex;
282 justify-content: space-between;
283 }
272 border: #b0d9f8 solid 1px; 284 border: #b0d9f8 solid 1px;
273 .tpcolor{ 285 .tpcolor{
274 color: red; 286 color: red;
287 line-height: 22px;
288 }
289 .el-icon-delete{
290 margin-right: 3px;
291 // background-color: saddlebrown;
292 height: 27px;
293 float: left;
294
275 } 295 }
276 } 296 }
277 </style> 297 </style>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="120px" 16 label-width="127px"
17 > 17 >
18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
19 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
...@@ -93,32 +93,24 @@ ...@@ -93,32 +93,24 @@
93 </el-form-item> 93 </el-form-item>
94 </el-col> 94 </el-col>
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="土地用途:"> 96 <!-- 下拉框 -->
97 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 97 <el-form-item label="土地性质:">
98 </el-form-item> 98 <el-select v-model="ruleForm.fdcq2.jedw">
99 </el-col> 99 <el-option v-for="item in dictData['A45']" :key="item.dcode" :label="item.dname" :value="item.dcode">
100 <el-col :span="8"> 100 </el-option>
101 <el-form-item label="土地使用起始时间:"> 101 </el-select>
102 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
103 </el-form-item>
104 </el-col>
105 <el-col :span="8">
106 <el-form-item label="土地使用结束时间:">
107 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
108 </el-form-item>
109 </el-col>
110 <el-col :span="8">
111 <el-form-item label="土地使用期限:">
112 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
113 </el-form-item> 102 </el-form-item>
114 </el-col> 103 </el-col>
115 <el-col :span="8"> 104 <el-col :span="8">
105
116 <el-form-item label="房地产交易价格:"> 106 <el-form-item label="房地产交易价格:">
117 <el-input v-model="ruleForm.fdcq2.qjjg"></el-input> 107 <div style="display:flex">
108 <el-input v-model="ruleForm.fdcq2.qjjg" style="width:500%"></el-input>
118 <el-select v-model="ruleForm.fdcq2.jedw"> 109 <el-select v-model="ruleForm.fdcq2.jedw">
119 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 110 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode">
120 </el-option> 111 </el-option>
121 </el-select> 112 </el-select>
113 </div>
122 </el-form-item> 114 </el-form-item>
123 </el-col> 115 </el-col>
124 <el-col :span="8"> 116 <el-col :span="8">
...@@ -231,10 +223,9 @@ ...@@ -231,10 +223,9 @@
231 <div class="triangle"></div> 223 <div class="triangle"></div>
232 </div> 224 </div>
233 <tdytTable 225 <tdytTable
234 :tableData="ruleForm.tdxxList" 226 :tableData="ruleForm.tdytqxList"
235 @upDateQlrxxList="upDateQlrxxList" 227 @upDateQlrxxList="upDateTdytxxList"
236 :viewtype="$route.query.viewtype" 228 :viewtype="$route.query.viewtype"
237 :gyfs="ruleForm.qlxx.gyfs"
238 /> 229 />
239 <div class="slxx_title title-block"> 230 <div class="slxx_title title-block">
240 权利人信息 231 权利人信息
...@@ -332,12 +323,11 @@ export default { ...@@ -332,12 +323,11 @@ export default {
332 mounted() {}, 323 mounted() {},
333 methods: { 324 methods: {
334 loadData() { 325 loadData() {
335 console.log("房地产权"); 326 console.log("房地产权",this.propsParam);
336 init(this.propsParam.bsmRepair).then((res) => { 327 init(this.propsParam.bsmRepair).then((res) => {
337 if (res.code == 200) { 328 if (res.code == 200) {
338 329
339 this.ruleForm = res.result; 330 this.ruleForm = res.result;
340 console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
341 this.isShow = true; 331 this.isShow = true;
342 // this.tableData = res.result; 332 // this.tableData = res.result;
343 // if (this.tableData.length < datas.columns().emptycolNum) { 333 // if (this.tableData.length < datas.columns().emptycolNum) {
...@@ -349,6 +339,12 @@ export default { ...@@ -349,6 +339,12 @@ export default {
349 } 339 }
350 }); 340 });
351 }, 341 },
342 // 更新土地用途信息
343 upDateTdytxxList(val) {
344 console.log("VAL",val);
345 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
346 this.key++;
347 },
352 // 更新权利人信息 348 // 更新权利人信息
353 upDateQlrxxList(val) { 349 upDateQlrxxList(val) {
354 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val)); 350 this.ruleForm.qlrList && (this.ruleForm.qlrList = _.cloneDeep(val));
...@@ -361,6 +357,7 @@ export default { ...@@ -361,6 +357,7 @@ export default {
361 this.key++; 357 this.key++;
362 }, 358 },
363 onSubmit() { 359 onSubmit() {
360 console.log("this.ruleForm大信息",this.ruleForm);
364 if (this.ruleForm.qlrList.length == 0) { 361 if (this.ruleForm.qlrList.length == 0) {
365 this.$message({ 362 this.$message({
366 showClose: true, 363 showClose: true,
......
...@@ -13,13 +13,17 @@ ...@@ -13,13 +13,17 @@
13 append-to-body 13 append-to-body
14 width="60%" 14 width="60%"
15 > 15 >
16 <el-radio-group v-model="radio"> 16 <!-- <el-radio-group v-model="radio">
17 <el-radio-button 17 <el-radio-button
18 v-for="(value, key) in qllxlistdata" 18 v-for="(value, key) in qllxlistdata"
19 :key="key" 19 :key="key"
20 :label="value" 20 :label="value"
21 ></el-radio-button> 21 ></el-radio-button>
22 </el-radio-group> 22
23 </el-radio-group> -->
24 <el-button class="gettypebutton" v-for="(value, key) in qllxlistdata"
25 :key="key"
26 :label="value" @click="clicksss(key)" plain>确定{{value}}</el-button>
23 <div class="btn"> 27 <div class="btn">
24 <el-button type="primary" @click="handleSubmit">确定</el-button> 28 <el-button type="primary" @click="handleSubmit">确定</el-button>
25 <el-button type="primary" @click="closeDialog">取消</el-button> 29 <el-button type="primary" @click="closeDialog">取消</el-button>
...@@ -42,12 +46,13 @@ export default { ...@@ -42,12 +46,13 @@ export default {
42 closeDialog() { 46 closeDialog() {
43 this.dialogVisible = false; 47 this.dialogVisible = false;
44 }, 48 },
49
50 clicksss(el){
51 console.log("el",el);
52 this.qllx=el
53 },
45 handleSubmit() { 54 handleSubmit() {
46 for (const key in this.qllxlistdata) { 55
47 if (this.qllxlistdata[key] === this.radio) {
48 this.qllx= key;
49 }
50 }
51 if(this.qllx){ 56 if(this.qllx){
52 let qllxobj = { 57 let qllxobj = {
53 qllx:this.qllx, 58 qllx:this.qllx,
...@@ -61,7 +66,7 @@ export default { ...@@ -61,7 +66,7 @@ export default {
61 message: "请选择权利类型!", 66 message: "请选择权利类型!",
62 }); 67 });
63 } 68 }
64 69 this.qllx=""
65 }, 70 },
66 }, 71 },
67 }; 72 };
...@@ -74,6 +79,29 @@ export default { ...@@ -74,6 +79,29 @@ export default {
74 // height: 100px; 79 // height: 100px;
75 padding: 30px; 80 padding: 30px;
76 } 81 }
82 .gettypebutton{
83 cursor: pointer;
84 line-height: 20px;
85 background-color: #ebebeb;
86 margin-top: 10px;
87 padding-left: 10px;
88 border-radius: 2px;
89 -webkit-box-sizing: border-box;
90 box-sizing: border-box;
91 border: 1px solid #ebebeb;
92 -webkit-transition: all 0.3s;
93 transition: all 0.3s;
94 color: #000;
95 }
96 .gettypebutton:hover{
97 border: 1px solid #0F93F6;
98 color: #0F93F6;
99 }
100 .gettypebutton:focus{
101 background-color: #0F93F6;
102 border: 1px solid #0F93F6;
103 color: #ebebeb;
104 }
77 .btn{ 105 .btn{
78 margin:30px; 106 margin:30px;
79 text-align: center; 107 text-align: center;
......
...@@ -77,6 +77,7 @@ import { getStepFormInfo } from "@/api/fqsq.js" ...@@ -77,6 +77,7 @@ import { getStepFormInfo } from "@/api/fqsq.js"
77 import NoticeBar from "@/components/NoticeBar/index"; 77 import NoticeBar from "@/components/NoticeBar/index";
78 import ProcessViewer from "./components/processViewer.vue"; 78 import ProcessViewer from "./components/processViewer.vue";
79 // 引入左侧菜单 79 // 引入左侧菜单
80 import { leftMenubl } from "@/api/djbbl.js";
80 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 81 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
81 import qllxDailog from "./djbBook/components/qllxDailog"; 82 import qllxDailog from "./djbBook/components/qllxDailog";
82 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 83 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
...@@ -131,22 +132,29 @@ export default { ...@@ -131,22 +132,29 @@ export default {
131 }; 132 };
132 }, 133 },
133 mounted() { 134 mounted() {
134 135 // this.getleftMenubl()
135 }, 136 },
136 137
137 methods: { 138 methods: {
138 139
139 stepForm (qllx) { 140 stepForm (qllx) {
140 this.oneSelectProps.qllx=qllx 141 this.oneSelectProps.qllx=qllx
142 if(this.$refs.Menu.supplementarylist.length){
141 getStepFormInfo(this.oneSelectProps).then((res) => { 143 getStepFormInfo(this.oneSelectProps).then((res) => {
142 this.tabList=res.result
143 this.$nextTick(function () { 144 this.$nextTick(function () {
145 this.tabList=res.result
144 this.tabName =this.tabList[0].value; 146 this.tabName =this.tabList[0].value;
145 console.log("this.tabName",this.tabName); 147 this.getFromRouter(this.tabName)
146 }); 148 });
147 }) 149 })
150 }
148 }, 151 },
149 152 // 获取右侧菜单
153 // getleftMenubl() {
154 // leftMenubl(this.bsmSlsq).then((res) => {
155 // this.supplementarylist = res.result;
156 // })
157 // },
150 getQllxByBdcdyid() { 158 getQllxByBdcdyid() {
151 if(this.currentSelectProps.bdcdyid){ 159 if(this.currentSelectProps.bdcdyid){
152 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 160 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
...@@ -162,25 +170,19 @@ export default { ...@@ -162,25 +170,19 @@ export default {
162 }, 170 },
163 // 获取右侧选项卡 171 // 获取右侧选项卡
164 getCurrentSelectProps(val) { 172 getCurrentSelectProps(val) {
165 console.log("vallllllllllllllllll",val);
166 if(val.bdcdyid){ 173 if(val.bdcdyid){
167 this.oneSelectProps = val; 174 this.oneSelectProps = val;
168 } 175 }
169 console.log("this.oneSelectProps",this.oneSelectProps);
170
171 this.currentSelectProps = val; 176 this.currentSelectProps = val;
172 if (this.currentSelectProps.bsmRepair) { 177 if (this.currentSelectProps.bsmRepair) {
173 console.log("进入补录"); 178 this.stepForm (this.currentSelectProps.qllx)
174 this.tabset(val);
175 } else if(!this.oneget){ 179 } else if(!this.oneget){
176 console.log("进入登记簿");
177 this.getdjblist(); 180 this.getdjblist();
178 181
179 } 182 }
180 if(this.oneget){ 183 if(this.oneget){
181 console.log("进入补录");
182 this.oneget=false 184 this.oneget=false
183 this.tabset(val); 185 this.stepForm (this.currentSelectProps.qllx)
184 186
185 } 187 }
186 188
...@@ -197,14 +199,9 @@ export default { ...@@ -197,14 +199,9 @@ export default {
197 this.defaultNode = getNode( 199 this.defaultNode = getNode(
198 this.currentSelectProps.qllx, 200 this.currentSelectProps.qllx,
199 { linShi: 0, xianShi: 0, liShi: 0 }, 201 { linShi: 0, xianShi: 0, liShi: 0 },
200 ""
201 ); 202 );
202 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点 203 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
203 }); 204 });
204 }
205 });
206
207 setTimeout(() => {
208 let settree = JSON.parse(JSON.stringify(this.treedata)); 205 let settree = JSON.parse(JSON.stringify(this.treedata));
209 this.tabdata = [ 206 this.tabdata = [
210 ...settree, 207 ...settree,
...@@ -215,66 +212,15 @@ export default { ...@@ -215,66 +212,15 @@ export default {
215 arr[index].value = item.id; 212 arr[index].value = item.id;
216 }); 213 });
217 this.tabList = this.tabdata; 214 this.tabList = this.tabdata;
218 }, 200); 215 }
219 }, 216 });
220 tabset(val) {
221 console.log("valsweqweqrfwqerqweq",val);
222 // console.log("this.currentSelectProps2222222222222",this.currentSelectProps);
223 this.stepForm (this.currentSelectProps.qllx)
224
225 // this.tabList = [
226 // {
227 // name: val.qllxmc + "补录信息",
228 // value: "slxx",
229 // sort: 1,
230 // },
231 // {
232 // name: "审批意见",
233 // value: "spyj",
234 // sort: 2,
235 // },
236 // {
237 // name: "材料信息",
238 // value: "clxx",
239 // sort: 2,
240 // },
241 // ];
242
243
244 }, 217 },
245 // tabset(val) {
246 // this.tabName = "";
247 // this.tabList = [
248 // {
249 // name: val.qllxmc + "补录信息",
250 // value: "slxx",
251 // sort: 1,
252 // },
253 // {
254 // name: "审批意见",
255 // value: "spyj",
256 // sort: 2,
257 // },
258 // {
259 // name: "材料信息",
260 // value: "clxx",
261 // sort: 2,
262 // },
263 // ];
264
265 // this.$nextTick(function () {
266 // this.tabName = "slxx";
267 // });
268 // },
269
270 //右侧表单选项卡事件 218 //右侧表单选项卡事件
271 beforeLeave(activeName, oldActiveName) { 219 beforeLeave(activeName) {
272 console.log("右侧表单选项卡事件",activeName);
273 if (activeName && activeName != 0) this.getFromRouter(activeName); 220 if (activeName && activeName != 0) this.getFromRouter(activeName);
274 }, 221 },
275 //切换选项卡内容组件 222 //切换选项卡内容组件
276 getFromRouter(tabname) { 223 getFromRouter(tabname) {
277 console.log("tabnameaaaaaaaaaaaaaaaaaaaa",tabname);
278 this.componentTag = getForm(tabname); 224 this.componentTag = getForm(tabname);
279 }, 225 },
280 226
...@@ -314,7 +260,7 @@ export default { ...@@ -314,7 +260,7 @@ export default {
314 } 260 }
315 }).catch((res) => { 261 }).catch((res) => {
316 262
317 console.log("错i了哦",res); 263 console.log("错",res);
318 });; 264 });;
319 }, 265 },
320 }, 266 },
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:39:47
5 -->
6 <template>
7 <dialogBox title="土地用途信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
8 @closeDialog="closeDialog" :isButton="showButton">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="138px">
10 <el-row>
11 <el-col :span="12">
12 <el-form-item label="土地用途" prop="tdyt">
13 <el-input v-model="ruleForm.tdyt"></el-input>
14 </el-form-item>
15 </el-col>
16 <el-col :span="12">
17 <el-form-item label="土地使用权限" prop="syqx">
18 <el-input v-model="ruleForm.syqx"></el-input>
19 </el-form-item>
20 </el-col>
21 </el-row>
22 <el-row>
23 <el-col :span="12">
24 <el-form-item label="土地使用结束时间" prop="jssj">
25 <el-date-picker
26 v-model="ruleForm.jssj"
27 type="daterange"
28 range-separator="至"
29 start-placeholder="开始日期"
30 end-placeholder="结束日期"
31 value-format="yyyy-MM-dd">>
32 </el-date-picker>
33 </el-form-item>
34 </el-col>
35 <el-col :span="12">
36 <el-form-item label="土地使用起止时间" prop="qzsj">
37 <el-date-picker
38 v-model="ruleForm.qzsj"
39 type="daterange"
40 range-separator="至"
41 start-placeholder="开始日期"
42 end-placeholder="结束日期"
43 value-format="yyyy-MM-dd">>
44 </el-date-picker>
45 </el-form-item>
46 </el-col>
47 </el-row>
48 </el-form>
49 </dialogBox>
50 </template>z x addTdyt
51 <script>
52 import { mapGetters } from "vuex";
53 export default {
54 props: {
55 value: { type: Boolean, default: false },
56 details: { type: Object, default: {} },
57 showButton: { type: Boolean, default: false }
58 },
59 data () {
60 return {
61 myValue: this.value,
62 ruleForm: {
63 tdyt:"",
64 syqx:"",
65 jssj:"",
66 qzsj:""
67 },
68 rules: {
69 tdyt: [{ required: true, message: "土地用途", trigger: "blur" }],
70 syqx: [{ required: true, message: "土地使用权限", trigger: "blur" }],
71 jssj: [{ required: true, message: "土地使用结束时间", trigger: "blur" }],
72 qzsj: [{ required: true, message: "土地使用起止时间", trigger: "blur" }],
73 },
74 };
75 },
76 watch: {
77 value (val) {
78 console.log("val",val);
79 this.myValue = _.cloneDeep(val);
80 },
81 details: {
82 handler: function (val, oldVal) {
83 console.log("val2",val);
84 this.ruleForm = val;
85 },
86 deep: true,
87 },
88 },
89 methods: {
90 closeDialog () {
91 this.$emit("input", false);
92 this.$refs["ruleForm"].resetFields();
93 },
94 submitForm () {
95 console.log("this.ruleForm",this.ruleForm);
96 this.$refs.ruleForm.validate((valid) => {
97 if (valid) {
98 this.$emit("input", false);
99 this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
100 } else {
101 return false;
102 }
103 });
104 },
105 },
106 };
107 </script>
108 <style scoped lang="scss">
109 @import "~@/styles/dialogBoxheader.scss";
110 .submit-button {
111 text-align: center;
112 height: 52px;
113 padding-top: 10px;
114 background-color: #fff;
115 }
116 </style>
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:40:09 4 * @LastEditTime: 2023-06-25 11:13:07
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <div class="zsdy-content loadingtext"> 8 <div class="zsdy-content" v-Loading="loading">
9 <el-form 9 <el-form
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
22 </el-select> 22 </el-select>
23 </el-form-item> 23 </el-form-item>
24 </el-form> 24 </el-form>
25 <img :src="previewImage" style="width: 100%"> 25 <div class="zs-content">
26 <canvas ref="zs" width="1000" class="zsyl" height="700"></canvas>
27 </div>
26 </div> 28 </div>
27 <div class="text-center pt-10"> 29 <div class="text-center pt-10">
28 <el-button @click="$popupCacel">取消</el-button> 30 <el-button @click="$popupCacel">取消</el-button>
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
34 <script> 36 <script>
35 import store from '@/store/index.js' 37 import store from '@/store/index.js'
36 import { datas } from "../../javascript/zsyl.js"; 38 import { datas } from "../../javascript/zsyl.js";
37 import { readYsxlh, certificate, bdcqzPreview } from "@/api/bdcqz.js"; 39 import { readYsxlh, certificate, getSlsqBdcqzList } from "@/api/bdcqz.js";
38 export default { 40 export default {
39 props: { 41 props: {
40 formData: { 42 formData: {
...@@ -46,10 +48,12 @@ ...@@ -46,10 +48,12 @@
46 }, 48 },
47 data () { 49 data () {
48 return { 50 return {
51 // 不动产证书图片地址
52 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
53 loading: false,
54 bdcqz: [],
49 //印刷序列号集合 55 //印刷序列号集合
50 ysxlh: [], 56 ysxlh: [],
51 //证书预览图片
52 previewImage: '',
53 //列名称对象 57 //列名称对象
54 columns: [], 58 columns: [],
55 ruleForm: { 59 ruleForm: {
...@@ -70,7 +74,7 @@ ...@@ -70,7 +74,7 @@
70 store.dispatch('user/refreshPage', false) 74 store.dispatch('user/refreshPage', false)
71 this.columns = datas.columns() 75 this.columns = datas.columns()
72 this.ysxlhList() 76 this.ysxlhList()
73 this.getBdcqzPreview() 77 this.getHeadTabBdcqz()
74 }, 78 },
75 methods: { 79 methods: {
76 //获取印刷序列号列表 80 //获取印刷序列号列表
...@@ -81,22 +85,69 @@ ...@@ -81,22 +85,69 @@
81 } 85 }
82 }) 86 })
83 }, 87 },
84 handleSubmit () { 88 //获取受理申请下全部不动产权证
85 this.savePrintRecord() 89 getHeadTabBdcqz () {
86 }, 90 this.loading = true
87 //获取证书内容 91 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
88 getRowValue (code) { 92 if (res.code == 200) {
89 var value = this.bdcqz[code]; 93 if (res.result && res.result.length > 0) {
90 return value; 94 this.bdcqz = res.result[0]
95 this.drawTextOnImage()
96 }
97 }
98 this.loading = false
99 })
91 }, 100 },
92 getBdcqzPreview () { 101 // 不动产证书
93 this.$startLoading() 102 drawTextOnImage () {
94 bdcqzPreview(this.formData.bdcqz).then(res => { 103 const canvas = this.$refs.zs;
95 this.$endLoading() 104 const context = canvas.getContext('2d');
96 let blob = new Blob([res]); 105 const image = new Image();
97 let url = window.URL.createObjectURL(blob); 106 image.onload = () => {
98 this.previewImage = url; 107 context.drawImage(image, 0, 0);
108 context.font = '18px 楷体';
109 context.fillStyle = '#000000';
110 context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
111 context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
112 context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 180, 56);
113 context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 370, 56);
114 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 138, 97);
115 context.fillText(this.bdcqz.gyqk ? this.bdcqz.gyqk : '', 138, 138);
116 context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 138, 180);
117 context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 138, 223);
118 context.fillText(this.bdcqz.qllx ? this.bdcqz.qllx : '', 138, 263);
119 context.fillText(this.bdcqz.qlxz ? this.bdcqz.qlxz : '', 138, 303);
120 context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346);
121 context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 138, 386);
122 context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429);
123 // qlqtzk
124 const maxWidth = 280; // 最大宽度限制
125 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
126 lines.forEach((line, index) => {
127 const y = 469 + (index * 37); // 每行文本的垂直位置
128 let currentLine = '';
129 let arr = [];
130 for (let word of line) {
131 const testLine = currentLine + word;
132 const lineWidth = context.measureText(testLine).width;
133 if (lineWidth <= maxWidth) {
134 currentLine = testLine;
135 } else {
136 arr.push(currentLine);
137 currentLine = word;
138 }
139 }
140 arr.push(currentLine);
141 arr.forEach((line, index) => {
142 context.fillText(line, 138, y + (index * 20)); // 调整行高
143 })
99 }) 144 })
145 context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 580, 100);
146 }
147 image.src = this.imgSrc
148 },
149 handleSubmit () {
150 this.savePrintRecord()
100 }, 151 },
101 //保存打印记录 152 //保存打印记录
102 savePrintRecord () { 153 savePrintRecord () {
...@@ -108,14 +159,14 @@ ...@@ -108,14 +159,14 @@
108 this.$popupCacel() 159 this.$popupCacel()
109 this.$message.success("提交成功") 160 this.$message.success("提交成功")
110 //刷新列表 161 //刷新列表
111 store.dispatch('user/refreshPage', true); 162 store.dispatch('user/refreshPage', true)
112 } else { 163 } else {
113 this.$message.error(res.message) 164 this.$message.error(res.message)
114 } 165 }
115 }); 166 })
116 }, 167 }
117 }, 168 }
118 }; 169 }
119 </script> 170 </script>
120 <style scoped lang="scss"> 171 <style scoped lang="scss">
121 @import "~@/styles/mixin.scss"; 172 @import "~@/styles/mixin.scss";
...@@ -123,125 +174,7 @@ ...@@ -123,125 +174,7 @@
123 height: 80vh; 174 height: 80vh;
124 overflow-y: scroll; 175 overflow-y: scroll;
125 } 176 }
126 .aaaa { 177 .zs-content {
127 width: 1024px;
128 height: 739px;
129 font-family: KaiTi;
130 font-weight: 700;
131 }
132 .bdcdjzm {
133 width: 1123px;
134 height: 794px;
135 font-family: KaiTi;
136 font-weight: 700;
137 }
138 .zmyl-box {
139 //position: relative;
140 position: absolute;
141 height: 600px;
142 width: 280px;
143 margin-left: 775px;
144 font-size: 16px;
145 justify-content: space-between;
146 }
147 .bdcqzh {
148 height: 70px;
149 left: 0;
150 bottom: 0;
151 font-size: 18px;
152 }
153 .zsyl-box {
154 display: flex;
155 justify-content: space-between;
156 // padding: 20px;
157 font-size: 16px;
158 height: 100%;
159 $left: 131px;
160
161 .zsyl-left {
162 width: 460px;
163 position: relative;
164 .qlr {
165 position: absolute;
166 top: 40px;
167 left: $left;
168 }
169 .gyqk {
170 position: absolute;
171 top: 80px;
172 left: $left;
173 }
174 .zl {
175 position: absolute;
176 top: 120px;
177 left: $left;
178 }
179 .bdcdyh {
180 position: absolute;
181 top: 160px;
182 left: $left;
183 }
184 .qllx {
185 position: absolute;
186 top: 205px;
187 left: $left;
188 }
189 .qlxz {
190 position: absolute;
191 top: 250px;
192 left: $left;
193 }
194 .yt {
195 position: absolute;
196 top: 290px;
197 left: $left;
198 }
199 .mj {
200 position: absolute;
201 top: 330px;
202 left: $left;
203 }
204 .syqx {
205 position: absolute;
206 top: 370px;
207 left: $left;
208 }
209 .qt {
210 position: absolute;
211 top: 420px;
212 left: $left;
213 }
214 }
215 .zsyl-right {
216 flex: 1;
217 text-align: left;
218 position: relative;
219 .fj {
220 position: absolute;
221 left: 115px;
222 top: 5px;
223 }
224 }
225 .zsyl-title {
226 margin-bottom: 12px;
227 }
228 /deep/.el-table__row {
229 background: #fafbe5 !important;
230 }
231 }
232 .middle_padding {
233 padding-bottom: 10px;
234 }
235 .zsyl-button {
236 text-align: center; 178 text-align: center;
237 margin-top: 20px;
238 .operation_button {
239 width: 100px;
240 border: 1px solid rgb(0, 121, 254);
241 }
242 .dy-button {
243 color: white;
244 background-color: rgb(0, 121, 254);
245 }
246 } 179 }
247 </style> 180 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-20 16:09:31 4 * @LastEditTime: 2023-06-25 10:33:16
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
11 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane> 11 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
12 </el-tabs> 12 </el-tabs>
13 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div> 13 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
14 <canvas ref="zs" width="1000" v-if="activeName==1" height="700"></canvas> 14 <canvas ref="zs" width="1000" v-show="activeName=='1'" height="700"></canvas>
15 <canvas ref="zm" width="1180" v-else height="780"></canvas> 15 <canvas ref="zm" width="1180" v-show="activeName!='1'" height="780"></canvas>
16 </div> 16 </div>
17 </template> 17 </template>
18 18
19 <script> 19 <script>
20 import { datas } from "../../javascript/zsyl.js"; 20 import { datas } from "../../javascript/zsyl.js";
21 import { getSlsqBdcqzList, bdcqzPreview } from "@/api/bdcqz.js" 21 import { getSlsqBdcqzList } from "@/api/bdcqz.js"
22 export default { 22 export default {
23 name: "zsyl", 23 name: "zsyl",
24 props: { 24 props: {
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 handleClick (e) { 94 handleClick (e) {
95 this.bdcqz = this.headTabBdcqz[e.index - 0] 95 this.bdcqz = this.headTabBdcqz[e.index - 0]
96 this.activeName = this.headTabBdcqz.bdcqzlx 96 this.activeName = this.headTabBdcqz.bdcqzlx
97 if (this.activeName == 1) { 97 if (this.activeName == '1') {
98 this.drawTextOnImage() 98 this.drawTextOnImage()
99 } else { 99 } else {
100 this.drawTextzmImage() 100 this.drawTextzmImage()
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:41:49 4 * @LastEditTime: 2023-06-25 11:15:01
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
119 openZsylDialog (item, type) { 119 openZsylDialog (item, type) {
120 if (type == 1) { 120 if (type == 1) {
121 //证书预览 121 //证书预览
122 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item }, "70%", true); 122 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
123 } else { 123 } else {
124 this.$popupDialog("不动产权证书", "workflow/components/dialog/zsdy", { bdcqz: item }, "70%", true); 124 this.$popupDialog("不动产权证书", "workflow/components/dialog/zsdy", { bdcqz: item, bsmSlsq: this.$route.query.bsmSlsq }, "70%", true);
125 } 125 }
126 }, 126 },
127 //再次打印 127 //再次打印
......
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150" 8 <lb-table :column="InformationTable" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
9 :data="tableDataList"> 9 :data="tableDataList">
10 </lb-table> 10 </lb-table>
11 <addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" /> 11 <addTdyt v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import { mapGetters } from 'vuex' 15 import { mapGetters } from 'vuex'
16 import { getIdCardInfo } from '@/utils/operation.js' 16 import { getIdCardInfo } from '@/utils/operation.js'
17 import addQlr from './dialog/addQlr.vue' 17 import addTdyt from './dialog/addTdyt.vue'
18 export default { 18 export default {
19 components: { 19 components: {
20 addQlr 20 addTdyt
21 }, 21 },
22 computed: { 22 computed: {
23 ...mapGetters(["dictData"]), 23 ...mapGetters(["dictData"]),
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
29 return [] 29 return []
30 } 30 }
31 }, 31 },
32 gyfs: {
33 type: String,
34 default: '1'
35 }
36 }, 32 },
37 data () { 33 data () {
38 return { 34 return {
...@@ -67,37 +63,60 @@ ...@@ -67,37 +63,60 @@
67 label: '土地用途', 63 label: '土地用途',
68 align: 'center', 64 align: 'center',
69 render: (h, scope) => { 65 render: (h, scope) => {
70 return <el-input v-model={scope.row.zjzl} ></el-input> 66 return (
67 <el-select value={scope.row.yt}
68 onChange={(val) => { scope.row.yt = val }} clearable>
69 {
70 this.dictData['tdyt'].map(option => {
71 return (
72 <el-option label={option.dname} value={option.dcode}></el-option>
73 )
74 })
75 }
76 </el-select>
77 )
71 } 78 }
72 }, 79 },
73 { 80 {
74 prop: "sqrmc", 81 prop: "sqrmc",
75 label: "土地使用起始时间", 82 label: "土地使用起始时间",
76 render: (h, scope) => { 83 render: (h, scope) => {
77 return <el-input v-model={scope.row.zjzl} ></el-input> 84 return (
85 <el-date-picker
86 v-model={scope.row.qssj}
87 type="date"
88 placeholder="选择日期"
89 ></el-date-picker>
90 );
78 } 91 }
79 }, 92 },
80 { 93 {
81 prop: "zjzl", 94 prop: "zjzl",
82 label: "土地使用结束时间", 95 label: "土地使用结束时间",
83 render: (h, scope) => { 96 render: (h, scope) => {
84 return <el-input v-model={scope.row.zjzl} ></el-input> 97 return (
98 <el-date-picker
99 v-model={scope.row.jssj}
100 type="date"
101 placeholder="选择日期"
102 ></el-date-picker>
103 );
85 } 104 }
86 }, 105 },
87 { 106 {
88 prop: "zjh", 107 prop: "zjh",
89 label: "土地使用期限", 108 label: "土地使用期限",
90 render: (h, scope) => { 109 render: (h, scope) => {
91 return <el-input v-model={scope.row.zjzl} ></el-input> 110 return <el-input v-model={scope.row.syqx} ></el-input>
92 } 111 }
93 } 112 }
94 ], 113 ],
95 column: []
96 } 114 }
97 }, 115 },
98 watch: { 116 watch: {
99 tableData: { 117 tableData: {
100 handler: function (val, oldVal) { 118 handler: function (val, oldVal) {
119 console.log("什么事件111",val);
101 let that = this 120 let that = this
102 this.$nextTick(() => { 121 this.$nextTick(() => {
103 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
...@@ -115,29 +134,28 @@ ...@@ -115,29 +134,28 @@
115 immediate: true, 134 immediate: true,
116 deep: true 135 deep: true
117 }, 136 },
118 gyfs: { 137 // gyfs: {
119 handler (newVal, oldValue) { 138 // handler (newVal, oldValue) {
120 let dataList = _.cloneDeep(this.InformationTable) 139 // console.log("什么事件222",newVal);
121 if (newVal == 0) { 140 // let dataList = _.cloneDeep(this.InformationTable)
122 // this.column = _.cloneDeep(dataList).slice(1, dataList.length) 141 // let dataList = _.cloneDeep(this.InformationTable)
123 this.column = _.cloneDeep(dataList) 142 // if (newVal == 0) {
143 // // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
144 // this.column = _.cloneDeep(dataList)
124 145
125 } else if ((newVal == '1' || newVal == '3')) { 146 // } else if ((newVal == '1' || newVal == '3')) {
126 this.column = dataList 147 // this.column = dataList
127 } else { 148 // } else {
128 this.column = _.cloneDeep(dataList) 149 // this.column = _.cloneDeep(dataList)
129 this.column.splice( 150 // }
130 2, 0, { 151 // },
131 prop: "fs", 152 // immediate: true
132 label: "份数" 153 // }
133 })
134 }
135 },
136 immediate: true
137 }
138 }, 154 },
139 methods: { 155 methods: {
156 // 新增提交事件
140 handleupdateDetail (value) { 157 handleupdateDetail (value) {
158 console.log("什么事件33",this.tableData);
141 if (this.isaddupdate) { 159 if (this.isaddupdate) {
142 if (!_.isEqual(value, this.tableData)) { 160 if (!_.isEqual(value, this.tableData)) {
143 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value); 161 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
...@@ -154,7 +172,7 @@ ...@@ -154,7 +172,7 @@
154 // 新增 172 // 新增
155 addClick () { 173 addClick () {
156 if (this.gyfs == '0' && this.tableDataList.length > 0) { 174 if (this.gyfs == '0' && this.tableDataList.length > 0) {
157 this.$message.warning("当前共有方式为单独所有,无法添加多个权利人") 175 this.$message.warning("1")
158 } else { 176 } else {
159 this.dialog = true 177 this.dialog = true
160 this.isaddupdate = true 178 this.isaddupdate = true
...@@ -172,36 +190,12 @@ ...@@ -172,36 +190,12 @@
172 }).catch(() => { 190 }).catch(() => {
173 }); 191 });
174 }, 192 },
175
176 // 身份证读取
177 readClick (row) {
178 getIdCardInfo().then(res => {
179 if (res.data.code == 0) {
180 let data = res.data.IDCardInfo
181 row.sqrmc = data.name
182 row.zjzl = '1'
183 row.zjh = data.cardID
184 row.xb = data.sexCode
185 row.txdz = data.address
186 row.fzjg = data.issueOrgan
187 this.$message({
188 message: '读取成功!',
189 type: 'success'
190 })
191 } else {
192 this.$message({
193 message: res.data.message,
194 type: 'warning'
195 })
196 }
197 })
198 },
199 // 修改 193 // 修改
200 editClick (index, row) { 194 editClick (index, row) {
201 // popupDialog("申请人信息", "workflow/components/addQlr", { 195 // popupDialog("申请人信息", "workflow/components/addQlr", {
202 // showButton: this.$route.query.viewtype ? false : true, 196 // showButton: this.$route.query.viewtype ? false : true,
203 // dataIndex :index, 197 // dataIndex :index,
204 // details :row, 198 // details :row,/[^\d]/g
205 // isaddupdate :false 199 // isaddupdate :false
206 // }); 200 // });
207 this.dataIndex = index 201 this.dataIndex = index
......