Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
c22e935d by renchao@pashanhoo.com
Options

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

2 parents 18d44c78 bf61913f
Inline Side-by-side
Showing 8 changed files with 53 additions and 29 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-11 09:51:07 4 * @LastEditTime: 2023-07-12 13:26:37
5 */ 5 */
6 import request from "@/utils/request"; 6 import request from "@/utils/request";
7 let SERVER = window.config 7 let SERVER = window.config
...@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) { ...@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) {
71 method: "get", 71 method: "get",
72 }); 72 });
73 } 73 }
74
75 /**
76 * @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
77 * @param {*} data
78 * @author: renchao
79 */
80 export function getZrzbsm(bsm) {
81 return request({
82 url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
83 method: "post",
84 data: bsm,
85 });
86 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -33,10 +33,7 @@ ...@@ -33,10 +33,7 @@
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 </div> 35 </div>
36 <i 36 <i class="el-icon-delete" v-if="delel"></i>
37 class="el-icon-delete"
38 @click.stop="handleDel(item)"
39 ></i>
40 </el-menu-item> 37 </el-menu-item>
41 </el-menu> 38 </el-menu>
42 </div> 39 </div>
...@@ -86,6 +83,7 @@ export default { ...@@ -86,6 +83,7 @@ export default {
86 activeIndex: "0", 83 activeIndex: "0",
87 // 折叠 84 // 折叠
88 isShowdrawer: true, 85 isShowdrawer: true,
86 delel: true,
89 //批量操作按钮名称 87 //批量操作按钮名称
90 batchButtonName: "", 88 batchButtonName: "",
91 //左侧菜单数据集合 89 //左侧菜单数据集合
...@@ -104,6 +102,7 @@ export default { ...@@ -104,6 +102,7 @@ export default {
104 }; 102 };
105 }, 103 },
106 mounted() { 104 mounted() {
105 this.delel=this.$parent.isEdit
107 this.loadBdcdylist(); 106 this.loadBdcdylist();
108 this.getleftMenubl(); 107 this.getleftMenubl();
109 108
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 } 70 }
71 }, 71 },
72 { 72 {
73 prop: "sqrmc", 73 prop: "ywrmc",
74 label: "姓名/名称" 74 label: "姓名/名称"
75 }, 75 },
76 { 76 {
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 this.$nextTick(() => { 121 this.$nextTick(() => {
122 if (val.length == 0 || !val) { 122 if (val.length == 0 || !val) {
123 that.tableDataList = _.cloneDeep([{ 123 that.tableDataList = _.cloneDeep([{
124 sqrmc: '', 124 ywrmc: '',
125 dlrzjlx: '', 125 dlrzjlx: '',
126 dlrzjh: '', 126 dlrzjh: '',
127 fr: '' 127 fr: ''
......
...@@ -282,9 +282,9 @@ ...@@ -282,9 +282,9 @@
282 <el-date-picker 282 <el-date-picker
283 v-model="ruleForm.diyaq.zwlxqssj" 283 v-model="ruleForm.diyaq.zwlxqssj"
284 type="date" 284 type="date"
285 placeholder="选择日期" 285 placeholder="选择日期"
286 value-format="yyyy/MM/dd HH:mm:ss" 286 value-format="yyyy-MM-dd HH:mm:ss"
287 format="yyyy/MM/dd" 287 format="yyyy-MM-dd"
288 > 288 >
289 </el-date-picker> 289 </el-date-picker>
290 </el-form-item> 290 </el-form-item>
...@@ -294,9 +294,9 @@ ...@@ -294,9 +294,9 @@
294 <el-date-picker 294 <el-date-picker
295 v-model="ruleForm.diyaq.zwlxjssj" 295 v-model="ruleForm.diyaq.zwlxjssj"
296 type="date" 296 type="date"
297 placeholder="选择日期" 297 placeholder="选择日期"
298 value-format="yyyy/MM/dd HH:mm:ss" 298 value-format="yyyy-MM-dd HH:mm:ss"
299 format="yyyy/MM/dd" 299 format="yyyy-MM-dd"
300 > 300 >
301 </el-date-picker> 301 </el-date-picker>
302 </el-form-item> 302 </el-form-item>
...@@ -419,8 +419,8 @@ ...@@ -419,8 +419,8 @@
419 v-model="ruleForm.qlxx.zxsj" 419 v-model="ruleForm.qlxx.zxsj"
420 type="date" 420 type="date"
421 placeholder="选择日期" 421 placeholder="选择日期"
422 value-format="yyyy/MM/dd HH:mm:ss" 422 value-format="yyyy-MM-dd HH:mm:ss"
423 format="yyyy/MM/dd" 423 format="yyyy-MM-dd"
424 > 424 >
425 </el-date-picker> 425 </el-date-picker>
426 </el-form-item> 426 </el-form-item>
......
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
175 </el-form-item> 175 </el-form-item>
176 </el-col> 176 </el-col>
177 <el-col :span="8"> 177 <el-col :span="8">
178 <el-form-item label="房屋结构："> 178 <el-form-item label="房屋结构：" prop="fdcq2.fwjg" :rules="rules.fwjgrules">
179 <el-select v-model="ruleForm.fdcq2.fwjg"> 179 <el-select v-model="ruleForm.fdcq2.fwjg">
180 <el-option 180 <el-option
181 v-for="item in dictData['A46']" 181 v-for="item in dictData['A46']"
...@@ -407,6 +407,7 @@ export default { ...@@ -407,6 +407,7 @@ export default {
407 ruleForm: {}, 407 ruleForm: {},
408 //传递参数\ 408 //传递参数\
409 rules: { 409 rules: {
410
410 bdcqzhrules:[ 411 bdcqzhrules:[
411 { required: true, message: "不动产权证号：", trigger: "change" }, 412 { required: true, message: "不动产权证号：", trigger: "change" },
412 ], 413 ],
...@@ -414,6 +415,7 @@ export default { ...@@ -414,6 +415,7 @@ export default {
414 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }], 415 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
415 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }], 416 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
416 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }], 417 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
418 fwjgrules: [{ required: true, message: "房屋结构", trigger: "change" }],
417 }, 419 },
418 }; 420 };
419 }, 421 },
......
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
62 <el-date-picker 62 <el-date-picker
63 v-model="item.shkssj" 63 v-model="item.shkssj"
64 type="date" 64 type="date"
65 placeholder="选择日期" 65 placeholder="选择日期"
66 value-format="yyyy/MM/dd HH:mm:ss" 66 value-format="yyyy-MM-dd HH:mm:ss"
67 format="yyyy/MM/dd" 67 format="yyyy-MM-dd"
68 > 68 >
69 </el-date-picker> 69 </el-date-picker>
70 </el-form-item> 70 </el-form-item>
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
44 v-model='scope.row.qssj' 44 v-model='scope.row.qssj'
45 type="date" 45 type="date"
46 :disabled="disabled" 46 :disabled="disabled"
47 placeholder="选择日期" 47 placeholder="选择日期"
48 value-format="yyyy/MM/dd HH:mm:ss" 48 value-format="yyyy-MM-dd HH:mm:ss"
49 format="yyyy/MM/dd" 49 format="yyyy-MM-dd"
50 @blur="addrow(scope.row)"> 50 @blur="addrow(scope.row)">
51 </el-date-picker> 51 </el-date-picker>
52 </template> 52 </template>
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
57 v-model='scope.row.jssj' 57 v-model='scope.row.jssj'
58 type="date" 58 type="date"
59 :disabled="disabled" 59 :disabled="disabled"
60 placeholder="选择日期" 60 placeholder="选择日期"
61 value-format="yyyy/MM/dd HH:mm:ss" 61 value-format="yyyy-MM-dd HH:mm:ss"
62 format="yyyy/MM/dd" 62 format="yyyy-MM-dd"
63 @blur="addrow(scope.row)"> 63 @blur="addrow(scope.row)">
64 </el-date-picker> 64 </el-date-picker>
65 </template> 65 </template>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 14:20:44 4 * @LastEditTime: 2023-07-12 14:23:25
5 */ 5 */
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
...@@ -17,6 +17,7 @@ import { ...@@ -17,6 +17,7 @@ import {
17 } from "@/api/fqsq.js"; 17 } from "@/api/fqsq.js";
18 import { mapGetters } from 'vuex' 18 import { mapGetters } from 'vuex'
19 import { log } from "bpmn-js-token-simulation"; 19 import { log } from "bpmn-js-token-simulation";
20 import { getZrzbsm } from "@/api/lpb";
20 export default { 21 export default {
21 data () { 22 data () {
22 return { 23 return {
...@@ -139,9 +140,18 @@ export default { ...@@ -139,9 +140,18 @@ export default {
139 ) 140 )
140 break; 141 break;
141 case "B8": 142 case "B8":
142 this.$popupDialog('楼盘表', 'lpb/index', { 143 getZrzbsm(this.bsmSlsq).then((res) => {
143 bsm: '' 144 if (res.code === 200) {
144 }, '90%', true) 145 this.$popupDialog('楼盘表', 'lpb/index', {
146 bsm: res.result[0]
147 }, '90%', true)
148 } else {
149 this.$message.error(res.message)
150 }
151 })
152 .catch((err) => {
153 this.$message.error(err)
154 });
145 break; 155 break;
146 // 图形定位 156 // 图形定位
147 case "B-TXDW": 157 case "B-TXDW":
......