Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 3aa73533 482b1aaa
Inline Side-by-side
Showing 17 changed files with 179 additions and 69 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
......
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
130 130
131 .ls-title { 131 .ls-title {
132 padding: 16px; 132 padding: 16px;
133 color: #ffffff; 133 color: #4a4e56;
134 background: linear-gradient(3deg, #409eff, #a7cbee); 134 // background: linear-gradient(3deg, #edf0f7, #f4f5f6);
135 font-size: 16px; 135 font-size: 16px;
136 } 136 }
137 137
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 right: 26px; 167 right: 26px;
168 font-size: 24px; 168 font-size: 24px;
169 cursor: pointer; 169 cursor: pointer;
170 color: #409eff; 170 color: #4a4e56;
171 } 171 }
172 172
173 /deep/.el-loading-mask { 173 /deep/.el-loading-mask {
......
...@@ -459,7 +459,7 @@ aside { ...@@ -459,7 +459,7 @@ aside {
459 .icon { 459 .icon {
460 position: absolute; 460 position: absolute;
461 top: 12px; 461 top: 12px;
462 right: 0px; 462 right: -4px;
463 transform: rotate(45deg); 463 transform: rotate(45deg);
464 color: #fff; 464 color: #fff;
465 font-size: 12px; 465 font-size: 12px;
......
...@@ -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" @click.stop="handleDel(item)" 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>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
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";
8 import { getPrintApplicationInfo } from "@/api/fqsq"; 8 import { getPrintApplicationInfo } from "@/api/fqsq";
9 import { getQllxByBdcdyid } from "@/api/djbbl.js";
9 import { uploadUndo } from "@/api/clxx"; 10 import { uploadUndo } from "@/api/clxx";
10 import { deleteFlow } from "@/api/djbbl"; 11 import { deleteFlow } from "@/api/djbbl";
11 import { getLodop } from "@/utils/LodopFuncs" 12 import { getLodop } from "@/utils/LodopFuncs"
...@@ -137,7 +138,17 @@ export default { ...@@ -137,7 +138,17 @@ export default {
137 138
138 // break; 139 // break;
139 case "B5": 140 case "B5":
140 this.$refs.Menu.loadBdcdylist("add") 141 if (this.currentSelectProps.bdcdyid) {
142 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
143 (res) => {
144 if (res.code === 200) {
145 this.$refs.qllxlist.qllxlistdata = res.result;
146 this.$refs.qllxlist.dialogVisible = true;
147 }
148 }
149 );
150 }
151 // this.$refs.Menu.loadBdcdylist("add")
141 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true) 152 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
142 153
143 154
......
...@@ -149,18 +149,18 @@ ...@@ -149,18 +149,18 @@
149 // this.supplementarylist = res.result; 149 // this.supplementarylist = res.result;
150 // }) 150 // })
151 // }, 151 // },
152 getQllxByBdcdyid () { 152 // getQllxByBdcdyid () {
153 if (this.currentSelectProps.bdcdyid) { 153 // if (this.currentSelectProps.bdcdyid) {
154 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 154 // getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
155 (res) => { 155 // (res) => {
156 if (res.code === 200) { 156 // if (res.code === 200) {
157 this.$refs.qllxlist.qllxlistdata = res.result; 157 // this.$refs.qllxlist.qllxlistdata = res.result;
158 this.$refs.qllxlist.dialogVisible = true; 158 // this.$refs.qllxlist.dialogVisible = true;
159 } 159 // }
160 } 160 // }
161 ); 161 // );
162 } 162 // }
163 }, 163 // },
164 // 获取右侧选项卡 164 // 获取右侧选项卡
165 getCurrentSelectProps (val) { 165 getCurrentSelectProps (val) {
166 this.bsmRepair= val.bsmRepair 166 this.bsmRepair= val.bsmRepair
......
...@@ -155,18 +155,18 @@ export default { ...@@ -155,18 +155,18 @@ export default {
155 // this.supplementarylist = res.result; 155 // this.supplementarylist = res.result;
156 // }) 156 // })
157 // }, 157 // },
158 getQllxByBdcdyid() { 158 // getQllxByBdcdyid() {
159 if (this.currentSelectProps.bdcdyid) { 159 // if (this.currentSelectProps.bdcdyid) {
160 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 160 // getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
161 (res) => { 161 // (res) => {
162 if (res.code === 200) { 162 // if (res.code === 200) {
163 this.$refs.qllxlist.qllxlistdata = res.result; 163 // this.$refs.qllxlist.qllxlistdata = res.result;
164 this.$refs.qllxlist.dialogVisible = true; 164 // this.$refs.qllxlist.dialogVisible = true;
165 } 165 // }
166 } 166 // }
167 ); 167 // );
168 } 168 // }
169 }, 169 // },
170 // 获取右侧选项卡 170 // 获取右侧选项卡
171 getCurrentSelectProps(val) { 171 getCurrentSelectProps(val) {
172 this.bsmRepair= val.bsmRepair 172 this.bsmRepair= val.bsmRepair
......
...@@ -197,6 +197,7 @@ export default { ...@@ -197,6 +197,7 @@ export default {
197 djywmc: '', 197 djywmc: '',
198 enabled: '1', 198 enabled: '1',
199 flowid: '', 199 flowid: '',
200 flowparams: '',
200 djqxcl: '', 201 djqxcl: '',
201 sfqydjyymb: '1', 202 sfqydjyymb: '1',
202 djyy: '' 203 djyy: ''
......
...@@ -50,6 +50,11 @@ ...@@ -50,6 +50,11 @@
50 <el-input v-model="form.ywDetail.flowid"></el-input> 50 <el-input v-model="form.ywDetail.flowid"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="8">
54 <el-form-item label="流程参数" prop="flowparams">
55 <el-input v-model="form.ywDetail.flowparams"></el-input>
56 </el-form-item>
57 </el-col>
53 </el-row> 58 </el-row>
54 59
55 <el-row> 60 <el-row>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 16:33:18
5 -->
6 <template>
7 <div class='dblistDialog'>
8 <el-table
9 v-if="formData.result"
10 :data="formData.result"
11 height="200">
12 <el-table-column
13 prop="ywh"
14 width="110"
15 label="业务号">
16 </el-table-column>
17 <el-table-column
18 prop="msg"
19 label="详细信息">
20 </el-table-column>
21 </el-table>
22 </div>
23 </template>
24 <script>
25 export default {
26 props: {
27 formData: {
28 type: Object,
29 default: {}
30 }
31 }
32 }
33 </script>
34 <style scoped lang='scss'>
35 @import "~@/styles/public.scss";
36 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 14:20:58
5 -->
6 <template>
7 <div>
8 图形定位
9 </div>
10 </template>
11 <script>
12 export default {
13 props: {
14 formData: {
15 type: Object,
16 default: {}
17 }
18 },
19 data () {
20 return {
21 }
22 },
23 methods: {
24 }
25 }
26 </script>
27 <style scoped lang='scss'>
28 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -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-06-26 17:03:07 4 * @LastEditTime: 2023-07-12 16:33:59
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";
...@@ -16,7 +16,8 @@ import { ...@@ -16,7 +16,8 @@ import {
16 getNextLinkInfo, 16 getNextLinkInfo,
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 { getZrzbsm } from "@/api/lpb";
20 import { ywPopupDialog } from "@/utils/popup.js";
20 export default { 21 export default {
21 data () { 22 data () {
22 return { 23 return {
...@@ -76,7 +77,7 @@ export default { ...@@ -76,7 +77,7 @@ export default {
76 rejectedTaskSet: {}, 77 rejectedTaskSet: {},
77 finishedSequenceFlowSet: result.finishedSequenceFlowIds 78 finishedSequenceFlowSet: result.finishedSequenceFlowIds
78 }, 79 },
79 handlinglist:result.runningTasks, 80 handlinglist: result.runningTasks,
80 allCommentList: result.finishedTasks 81 allCommentList: result.finishedTasks
81 }, '80%', true) 82 }, '80%', true)
82 }) 83 })
...@@ -114,7 +115,6 @@ export default { ...@@ -114,7 +115,6 @@ export default {
114 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { 115 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
115 if (res.code == 200) { 116 if (res.code == 200) {
116 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => { 117 getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
117 console.log(infoRes, 'infoRes');
118 if (infoRes.code == 200) { 118 if (infoRes.code == 200) {
119 //打开模板设计 119 //打开模板设计
120 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 120 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
...@@ -139,9 +139,22 @@ export default { ...@@ -139,9 +139,22 @@ export default {
139 ) 139 )
140 break; 140 break;
141 case "B8": 141 case "B8":
142 this.$popupDialog('楼盘表', 'lpb/index', { 142 getZrzbsm(this.bsmSlsq).then((res) => {
143 bsm: '' 143 if (res.code === 200) {
144 }, '90%', true) 144 this.$popupDialog('楼盘表', 'lpb/index', {
145 bsm: res.result[0]
146 }, '90%', true)
147 } else {
148 this.$message.error(res.message)
149 }
150 })
151 .catch((err) => {
152 this.$message.error(err)
153 });
154 break;
155 // 图形定位
156 case "B-TXDW":
157 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true)
145 break; 158 break;
146 case "back": //退回按钮 159 case "back": //退回按钮
147 this.$popupDialog("退回", "workflow/components/th", { 160 this.$popupDialog("退回", "workflow/components/th", {
...@@ -179,7 +192,7 @@ export default { ...@@ -179,7 +192,7 @@ export default {
179 formdata.append("bsmSlsq", this.bsmSlsq); 192 formdata.append("bsmSlsq", this.bsmSlsq);
180 formdata.append("bestepid", this.bestepid); 193 formdata.append("bestepid", this.bestepid);
181 this.$confirm("请确认是否登簿", "提示", { 194 this.$confirm("请确认是否登簿", "提示", {
182 iconClass: "el-icon-question", //自定义图标样式 195 iconClass: "el-icon-info", //自定义图标样式
183 confirmButtonText: "确认", //确认按钮文字更换 196 confirmButtonText: "确认", //确认按钮文字更换
184 cancelButtonText: "取消", //取消按钮文字更换 197 cancelButtonText: "取消", //取消按钮文字更换
185 showClose: true, //是否显示右上角关闭按钮 198 showClose: true, //是否显示右上角关闭按钮
...@@ -188,18 +201,20 @@ export default { ...@@ -188,18 +201,20 @@ export default {
188 record(formdata).then((res) => { 201 record(formdata).then((res) => {
189 if (res.code === 200) { 202 if (res.code === 200) {
190 if (res.result.length === 1) { 203 if (res.result.length === 1) {
191 res.result[0].state ? that.$alert("登簿成功!") : that.$alert(res.result[0].msg);; 204 console.log(res.result, 'res.result');
205 res.result[0].state ? that.$message({
206 message: '登簿成功',
207 type: 'success'
208 }) : ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
192 } 209 }
193 else { 210 else {
194 that.$alert('<div>' + res.result[0].ywh + ',' + res.result[0].msg + '</div>', '登簿明细', { 211 ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
195 dangerouslyUseHTMLString: true
196 });
197 } 212 }
198 } else { 213 } else {
199 that.$alert(res.message); 214 that.$message.error(res.message)
200 } 215 }
201 }); 216 })
202 }); 217 })
203 break; 218 break;
204 case "rm": 219 case "rm":
205 this.del() 220 this.del()
......