Skip to content

bdc / bdcdj-web

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

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

2 parents f96d4091 f27b61d3
Expand all
Inline Side-by-side
Showing 18 changed files with 106 additions and 43 deletions
...@@ -12,6 +12,7 @@ const getters = { ...@@ -12,6 +12,7 @@ const getters = {
12 token: state => state.user.token, 12 token: state => state.user.token,
13 avatar: state => state.user.avatar, 13 avatar: state => state.user.avatar,
14 name: state => state.user.name, 14 name: state => state.user.name,
15 userInfo: state => state.user.userInfo,
15 userData: state => state.user.userData, 16 userData: state => state.user.userData,
16 permission_routes: state => state.permission.routes, 17 permission_routes: state => state.permission.routes,
17 addRoutes: state => state.permission.addRoutes, 18 addRoutes: state => state.permission.addRoutes,
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
4 * @LastEditTime: 2023-07-28 15:45:21 4 * @LastEditTime: 2023-07-28 15:45:21
5 */ 5 */
6 import { getUserInfo } from '@/api/user' 6 import { getUserInfo } from '@/api/user'
7 import { log } from 'bpmn-js-token-simulation'
7 const state = { 8 const state = {
8 name: '', 9 name: '',
10 userInfo:{},
9 avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png', 11 avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
10 isRefresh: false, 12 isRefresh: false,
11 // 业务流程刷新 13 // 业务流程刷新
...@@ -14,8 +16,10 @@ const state = { ...@@ -14,8 +16,10 @@ const state = {
14 const mutations = { 16 const mutations = {
15 SET_NAME: (state, data) => { 17 SET_NAME: (state, data) => {
16 state.name = data.loginName 18 state.name = data.loginName
19 state.userInfo = data
17 }, 20 },
18 REFRESH: (state, data) => { 21 REFRESH: (state, data) => {
22
19 state.isRefresh = data 23 state.isRefresh = data
20 }, 24 },
21 SETWORKFRESH: (state, data) => { 25 SETWORKFRESH: (state, data) => {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
29 <div> 29 <div>
30 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p> 30 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
31 <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 31 <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
32 <div class="ywh">（业务号：{{ item.blywh}}）</div>
32 </div> 33 </div>
33 <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i> 34 <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
34 </el-menu-item> 35 </el-menu-item>
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
75 qllx: this.$route.query.qllx, 76 qllx: this.$route.query.qllx,
76 // 默认选中 77 // 默认选中
77 activeIndex: "0", 78 activeIndex: "0",
79 clickindex:"",
78 // 折叠 80 // 折叠
79 isShowdrawer: true, 81 isShowdrawer: true,
80 delel: true, 82 delel: true,
...@@ -138,7 +140,6 @@ ...@@ -138,7 +140,6 @@
138 * @author: renchao 140 * @author: renchao
139 */ 141 */
140 getleftMenubl (row) { 142 getleftMenubl (row) {
141
142 leftMenubl(this.bsmSlsq).then((res) => { 143 leftMenubl(this.bsmSlsq).then((res) => {
143 this.supplementarylist = res.result; 144 this.supplementarylist = res.result;
144 if (row) { 145 if (row) {
...@@ -149,6 +150,10 @@ ...@@ -149,6 +150,10 @@
149 this.unitClick(index) 150 this.unitClick(index)
150 } 151 }
151 }) 152 })
153 if(row=="change"){
154 this.unitClick(this.clickindex)
155
156 }
152 }else{ 157 }else{
153 if (this.supplementarylist.length) { 158 if (this.supplementarylist.length) {
154 this.unitClick(0) 159 this.unitClick(0)
...@@ -183,6 +188,7 @@ ...@@ -183,6 +188,7 @@
183 * @author: renchao 188 * @author: renchao
184 */ 189 */
185 unitClick (index) { 190 unitClick (index) {
191 this.clickindex=index
186 this.currentSelectProps = this.supplementarylist[index]; 192 this.currentSelectProps = this.supplementarylist[index];
187 this.$emit("getCurrentSelectProps", this.currentSelectProps); 193 this.$emit("getCurrentSelectProps", this.currentSelectProps);
188 }, 194 },
...@@ -317,7 +323,11 @@ ...@@ -317,7 +323,11 @@
317 color: red; 323 color: red;
318 line-height: 22px; 324 line-height: 22px;
319 } 325 }
326 .ywh{
327 font-size: 12px;
328 }
320 .el-icon-delete { 329 .el-icon-delete {
330 margin-top: 10px;
321 margin-right: 3px; 331 margin-right: 3px;
322 // background-color: saddlebrown; 332 // background-color: saddlebrown;
323 height: 27px; 333 height: 27px;
......
...@@ -47,7 +47,11 @@ ...@@ -47,7 +47,11 @@
47 </div> 47 </div>
48 <el-row :gutter="10"> 48 <el-row :gutter="10">
49 <el-col :span="8"> 49 <el-col :span="8">
50 <el-form-item label="查封不动产权信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules"> 50 <el-form-item
51 label="查封不动产权信息："
52 prop="ztQlxx.bdcqzh"
53 :rules="rules.ztQlxxrules"
54 >
51 <select-table 55 <select-table
52 v-model="ruleForm.ztQlxx" 56 v-model="ruleForm.ztQlxx"
53 :table-width="550" 57 :table-width="550"
...@@ -165,7 +169,11 @@ ...@@ -165,7 +169,11 @@
165 </el-form-item> 169 </el-form-item>
166 </el-col> 170 </el-col>
167 <el-col :span="8"> 171 <el-col :span="8">
168 <el-form-item label="业务号："> 172 <el-form-item
173 label="业务号："
174 prop="qlxx.ywh"
175 :rules="rules.ywhrules"
176 >
169 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 177 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
170 </el-form-item> 178 </el-form-item>
171 </el-col> 179 </el-col>
...@@ -182,9 +190,11 @@ ...@@ -182,9 +190,11 @@
182 </el-form-item> 190 </el-form-item>
183 </el-col> 191 </el-col>
184 <el-col :span="8"> 192 <el-col :span="8">
185 <el-form-item label="是否被续封：" 193 <el-form-item
194 label="是否被续封："
186 prop="cfdj.sfbxf" 195 prop="cfdj.sfbxf"
187 :rules="rules.sfbxfrules"> 196 :rules="rules.sfbxfrules"
197 >
188 <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange"> 198 <el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
189 <el-option 199 <el-option
190 v-for="item in sfbxflist" 200 v-for="item in sfbxflist"
...@@ -478,7 +488,10 @@ export default { ...@@ -478,7 +488,10 @@ export default {
478 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }], 488 djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
479 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }], 489 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
480 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }], 490 djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
481 sfbxfrules: [{ required: true, message: "是否被续封", trigger: "change" }], 491 ywhrules: [{ required: true, message: "业务号", trigger: "blur" }],
492 sfbxfrules: [
493 { required: true, message: "是否被续封", trigger: "change" },
494 ],
482 }, 495 },
483 }; 496 };
484 }, 497 },
...@@ -620,6 +633,7 @@ export default { ...@@ -620,6 +633,7 @@ export default {
620 message: "保存成功！", 633 message: "保存成功！",
621 type: "success", 634 type: "success",
622 }); 635 });
636 this.$parent.changeywh()
623 this.$store.dispatch("user/refreshPage", true); 637 this.$store.dispatch("user/refreshPage", true);
624 } else { 638 } else {
625 this.$message({ 639 this.$message({
......
...@@ -792,6 +792,7 @@ export default { ...@@ -792,6 +792,7 @@ export default {
792 message: "保存成功！", 792 message: "保存成功！",
793 type: "success", 793 type: "success",
794 }); 794 });
795 this.$parent.changeywh()
795 this.$store.dispatch("user/refreshPage", true); 796 this.$store.dispatch("user/refreshPage", true);
796 } else { 797 } else {
797 this.$message({ 798 this.$message({
......
...@@ -676,6 +676,7 @@ export default { ...@@ -676,6 +676,7 @@ export default {
676 message: "保存成功！", 676 message: "保存成功！",
677 type: "success", 677 type: "success",
678 }); 678 });
679 this.$parent.changeywh()
679 this.$store.dispatch("user/refreshPage", true); 680 this.$store.dispatch("user/refreshPage", true);
680 } else { 681 } else {
681 this.$message({ 682 this.$message({
......
...@@ -561,7 +561,6 @@ ...@@ -561,7 +561,6 @@
561 this.ssqlxxshow = true; 561 this.ssqlxxshow = true;
562 } 562 }
563 }, 563 },
564
565 /** 564 /**
566 * @description: loadData 565 * @description: loadData
567 * @author: renchao 566 * @author: renchao
...@@ -699,6 +698,7 @@ ...@@ -699,6 +698,7 @@
699 message: "保存成功！", 698 message: "保存成功！",
700 type: "success", 699 type: "success",
701 }); 700 });
701 this.$parent.changeywh()
702 this.$store.dispatch("user/refreshPage", true); 702 this.$store.dispatch("user/refreshPage", true);
703 } else { 703 } else {
704 this.$message({ 704 this.$message({
......
...@@ -539,6 +539,7 @@ export default { ...@@ -539,6 +539,7 @@ export default {
539 message: "保存成功！", 539 message: "保存成功！",
540 type: "success", 540 type: "success",
541 }); 541 });
542 this.$parent.changeywh()
542 this.$store.dispatch("user/refreshPage", true); 543 this.$store.dispatch("user/refreshPage", true);
543 } else { 544 } else {
544 this.$message({ 545 this.$message({
......
...@@ -650,6 +650,7 @@ export default { ...@@ -650,6 +650,7 @@ export default {
650 message: "保存成功！", 650 message: "保存成功！",
651 type: "success", 651 type: "success",
652 }); 652 });
653 this.$parent.changeywh()
653 this.$store.dispatch("user/refreshPage", true); 654 this.$store.dispatch("user/refreshPage", true);
654 } else { 655 } else {
655 this.$message({ 656 this.$message({
......
...@@ -719,6 +719,7 @@ export default { ...@@ -719,6 +719,7 @@ export default {
719 message: "保存成功！", 719 message: "保存成功！",
720 type: "success", 720 type: "success",
721 }); 721 });
722 this.$parent.changeywh()
722 this.$store.dispatch("user/refreshPage", true); 723 this.$store.dispatch("user/refreshPage", true);
723 } else { 724 } else {
724 this.$message({ 725 this.$message({
......
...@@ -618,6 +618,7 @@ export default { ...@@ -618,6 +618,7 @@ export default {
618 message: "保存成功！", 618 message: "保存成功！",
619 type: "success", 619 type: "success",
620 }); 620 });
621 this.$parent.changeywh()
621 this.$store.dispatch("user/refreshPage", true); 622 this.$store.dispatch("user/refreshPage", true);
622 } else { 623 } else {
623 this.$message({ 624 this.$message({
......
...@@ -616,6 +616,7 @@ export default { ...@@ -616,6 +616,7 @@ export default {
616 message: "保存成功！", 616 message: "保存成功！",
617 type: "success", 617 type: "success",
618 }); 618 });
619 this.$parent.changeywh()
619 this.$store.dispatch("user/refreshPage", true); 620 this.$store.dispatch("user/refreshPage", true);
620 } else { 621 } else {
621 this.$message({ 622 this.$message({
......
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
275 height: 100%; 275 height: 100%;
276 line-height: 80px; 276 line-height: 80px;
277 border: 1px solid $borderColor; 277 border: 1px solid $borderColor;
278 text-align: center; 278 margin: auto;
279 font-size: 22px; 279 font-size: 22px;
280 font-weight: 400; 280 font-weight: 400;
281 } 281 }
......
...@@ -262,13 +262,9 @@ export default { ...@@ -262,13 +262,9 @@ export default {
262 getFromRouter(tabname) { 262 getFromRouter(tabname) {
263 this.componentTag = getForm(tabname); 263 this.componentTag = getForm(tabname);
264 }, 264 },
265 // closefp () { 265 changeywh () {
266 // this.splitScreen = this.splitScreen ? false : true; 266 this.$refs.Menu.getleftMenubl("change");
267 // this.$store.dispatch("app/set1tScreen", this.splitScreen); 267 },
268 // this.getFromRouter(this.tabList[0].value);
269 // this.clxxForm = getForm(this.tabList[1].value);
270 // this.tabName = this.tabList[0].value
271 // },
272 // 增加补录记录 268 // 增加补录记录
273 /** 269 /**
274 * @description: 增加补录记录 270 * @description: 增加补录记录
......
1 <!-- 1 <!--
2 * @Description :宗地基本信息 2 * @Description :宗地基本信息
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-05-24 15:08:51 4 * @LastEditTime : 2023-07-31 17:21:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableDivCss"> 7 <div class="tableDivCss">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </tr> 11 </tr>
12 <tr> 12 <tr>
13 <td>单位</td> 13 <td>单位</td>
14 <td colspan="4">{{ zdjbxx.mjdw | dictionary('A7') }}</td> 14 <td colspan="4">{{ zdjbxx.mjdw | dictionary("A7") }}</td>
15 </tr> 15 </tr>
16 <tr> 16 <tr>
17 <td>不动产类型</td> 17 <td>不动产类型</td>
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
25 <td rowspan="8">土地状况</td> 25 <td rowspan="8">土地状况</td>
26 </tr> 26 </tr>
27 <tr> 27 <tr>
28 <td style="width:15%">宗地面积</td> 28 <td style="width: 15%">宗地面积</td>
29 <td style="width:30%">{{ zdjbxx.zdmj }}m²</td> 29 <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td>
30 <td style="width:15%">用途</td> 30 <td style="width: 15%">用途</td>
31 <td style="width:30%">{{ zdjbxx.ghytmc }}</td> 31 <td style="width: 30%">{{ zdjbxx.yt | dicyt("tdyt") }}</td>
32 </tr> 32 </tr>
33 <tr> 33 <tr>
34 <td>等级</td> 34 <td>等级</td>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </tr> 44 </tr>
45 <tr> 45 <tr>
46 <td>权利设定方式</td> 46 <td>权利设定方式</td>
47 <td>{{zdjbxx.qlsdfs | dictionary('A10')}}</td> 47 <td>{{ zdjbxx.qlsdfs | dictionary("A10") }}</td>
48 <td>容积率</td> 48 <td>容积率</td>
49 <td>{{ zdjbxx.rjl }}</td> 49 <td>{{ zdjbxx.rjl }}</td>
50 </tr> 50 </tr>
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
111 <td class="bhqkTh">{{ item.label }}</td> 111 <td class="bhqkTh">{{ item.label }}</td>
112 </tr> 112 </tr>
113 </table> --> 113 </table> -->
114
115 </tr> 114 </tr>
116 115
117 <tr v-if="showGroup"> 116 <tr v-if="showGroup">
...@@ -126,17 +125,16 @@ ...@@ -126,17 +125,16 @@
126 <td>{{ zdbhqks[0].djsj }}</td> 125 <td>{{ zdbhqks[0].djsj }}</td>
127 <td>{{ zdbhqks[0].dbr }}</td> 126 <td>{{ zdbhqks[0].dbr }}</td>
128 </tr> --> 127 </tr> -->
129
130 </table> 128 </table>
131 </div> 129 </div>
132 </template> 130 </template>
133 131
134 <script> 132 <script>
135 import store from '@/store/index.js' 133 import store from "@/store/index.js";
136 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; 134 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
137 135
138 export default { 136 export default {
139 data () { 137 data() {
140 return { 138 return {
141 bhqkColumns: [ 139 bhqkColumns: [
142 { 140 {
...@@ -177,26 +175,53 @@ ...@@ -177,26 +175,53 @@
177 zdbhqks: [], 175 zdbhqks: [],
178 propsParam: this.$attrs, 176 propsParam: this.$attrs,
179 showGroup: false, 177 showGroup: false,
180 bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"] 178 bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"],
181 } 179 foundItemaa: {},
180 foundItemaaa: {},
181 };
182 }, 182 },
183 filters: { 183 filters: {
184 dictionary: function (value, param) { 184 dictionary: function (value, param) {
185 const foundItem = store.getters.dictData[param].find(item => item.dcode === String(value)) 185 const foundItem = store.getters.dictData[param].find(
186 (item) => item.dcode === String(value)
187 );
186 if (foundItem) { 188 if (foundItem) {
187 return foundItem.dname 189 return foundItem.dname;
190 }
191 },
192 dicyt: function (value, param) {
193 const res = store.getters.dictData[param].filter((item) => {
194 if (item.dcode === String(value)) {
195 return item;
196 } else {
197 if (item.children.length) {
198 const res2 = item.children.filter((items) => {
199 if (items.dcode === String(value)) {
200 return items;
201 }
202 });
203 if (res2.length) {
204 return res2;
205
206 }
207
208 }
188 } 209 }
210 });
211 if (res[0]) {
212 return res[0].dname
189 } 213 }
190 }, 214 },
191 created () { 215 },
192 this.loadData() 216 created() {
217 this.loadData();
193 }, 218 },
194 methods: { 219 methods: {
195 /** 220 /**
196 * @description: loadData 221 * @description: loadData
197 * @author: renchao 222 * @author: renchao
198 */ 223 */
199 loadData () { 224 loadData() {
200 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 225 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
201 if (res.code === 200) { 226 if (res.code === 200) {
202 this.zdjbxx = res.result.zdjbxx; 227 this.zdjbxx = res.result.zdjbxx;
...@@ -205,11 +230,11 @@ ...@@ -205,11 +230,11 @@
205 this.showGroup = true; 230 this.showGroup = true;
206 } 231 }
207 } 232 }
208 }) 233 });
209 } 234 },
210 } 235 },
211 } 236 };
212 </script> 237 </script>
213 <style lang="scss" scoped> 238 <style lang="scss" scoped>
214 @import "~@/styles/tablecss.scss"; 239 @import "~@/styles/tablecss.scss";
215 </style> 240 </style>
......
...@@ -73,8 +73,9 @@ ...@@ -73,8 +73,9 @@
73 * @author: renchao 73 * @author: renchao
74 */ 74 */
75 onSubmit () { 75 onSubmit () {
76 console.log(this.formData.bsmSlsq); 76 if(!this.outstepopinion){
77 console.log(this.selectItem); 77 this.$message.error("请填写退回意见");
78 }else{
78 sendBackTask({ 79 sendBackTask({
79 bsmSlsq: this.formData.bsmSlsq, 80 bsmSlsq: this.formData.bsmSlsq,
80 backNodeList: [this.selectItem], 81 backNodeList: [this.selectItem],
...@@ -92,6 +93,7 @@ ...@@ -92,6 +93,7 @@
92 this.$emit("input", false); 93 this.$emit("input", false);
93 }, 1000); 94 }, 1000);
94 }); 95 });
96 }
95 }, 97 },
96 /** 98 /**
97 * @description: changeSelectItem 99 * @description: changeSelectItem
......
...@@ -35,7 +35,8 @@ export default { ...@@ -35,7 +35,8 @@ export default {
35 //批量按钮名称 35 //批量按钮名称
36 batchButtonName: '', 36 batchButtonName: '',
37 // 受理申请信息 37 // 受理申请信息
38 slsq: {} 38 slsq: {},
39 dqhj:""
39 } 40 }
40 }, 41 },
41 mounted () { 42 mounted () {
...@@ -57,6 +58,9 @@ export default { ...@@ -57,6 +58,9 @@ export default {
57 stepExpandInfo(formdata).then((res) => { 58 stepExpandInfo(formdata).then((res) => {
58 if (res.code === 200) { 59 if (res.code === 200) {
59 this.leftButtonList = res.result.button; 60 this.leftButtonList = res.result.button;
61 if (res.result.properties&&res.result.properties.length) {
62 this.dqhj = res.result.properties[0].value
63 }
60 this.rightButtonList = res.result.operation; 64 this.rightButtonList = res.result.operation;
61 this.slsq = res.result.slsq 65 this.slsq = res.result.slsq
62 } 66 }
......