b4865ddb by tianhaohao@pashanhoo.com

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

2 parents b817299f 66f57e60
1 <svg t="1661331325273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2167" width="200" height="200"><path d="M521.309091 158.254545a27.927273 27.927273 0 0 1 27.927273 27.927273v586.472727a27.927273 27.927273 0 0 1-27.927273 27.927273h-372.363636a83.781818 83.781818 0 0 1-83.781819-83.781818V242.036364a83.781818 83.781818 0 0 1 83.781819-83.781819z m400.290909 0a83.781818 83.781818 0 0 1 83.502545 76.893091l0.279273 6.888728v474.763636a83.781818 83.781818 0 0 1-76.893091 83.502545l-6.888727 0.279273h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 744.727273h260.654545a27.927273 27.927273 0 0 0 27.554909-23.412364l0.372364-4.514909V242.036364a27.927273 27.927273 0 0 0-23.412364-27.554909L921.6 214.109091h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 158.254545h260.654545z m-428.218182 55.854546H148.945455a27.927273 27.927273 0 0 0-27.55491 23.412364L121.018182 242.036364v474.763636a27.927273 27.927273 0 0 0 27.927273 27.927273h344.436363V214.109091z" p-id="2168"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-09 09:20:10
5 -->
6 <template>
7 <el-dialog
8 :close-on-click-modal="false"
9 title="选择权利类型"
10 class="qllxdialog"
11 :visible.sync="dialogVisible"
12 custom-class="insetDialog"
13 append-to-body
14 width="20%"
15 >
16 <el-select v-model="qllxvalue" placeholder="请选择">
17 <el-option
18 v-for="item in options"
19 :key="item.value"
20 :label="item.label"
21 :value="item.value"
22 >
23 </el-option>
24 </el-select>
25 <!-- <el-radio-group v-model="radio">
26 <el-radio :label="1">111</el-radio>
27 <el-radio :label="2">111</el-radio>
28 </el-radio-group> -->
29 <el-button type="primary" @click="handleSubmit">确定</el-button>
30 <el-button type="primary" @click="closeDialog">取消</el-button>
31 </el-dialog>
32 </template>
33
34 <script>
35 export default {
36
37 data () {
38 return {
39 dialogVisible:false,
40 options: [
41 {
42 value: "选项1",
43 label: "抵押权",
44 },
45 {
46 value: "选项2",
47 label: "地役权",
48 },
49 {
50 value: "选项3",
51 label: "预告登记",
52 },
53 {
54 value: "选项4",
55 label: "异议登记",
56 },
57 {
58 value: "选项5",
59 label: "查封登记",
60 },
61 ],
62 qllxvalue: "",
63 radio:3,
64 qllxobj:{
65 qllx:"",
66 bsmQlxx
67
68 }
69 };
70 },
71 methods: {
72 closeDialog () {
73 this.dialogVisible=false
74 },
75 handleSubmit () {
76 let qllxobj={
77 qllx:this.value,
78 bsmQlxx:this.value
79
80 }
81 // this.$parent.addRepairRecord(qllxobj)
82 },
83 },
84 };
85 </script>
86 <style scoped lang="scss">
87 .qllxdialog{
88 margin-top: 200px;
89 /deep/.el-dialog__body{
90 margin-top: 10px;
91 height: 100px;
92 }
93 .el-button{
94 margin-top: 10px;
95 margin-left: 20px;
96 }
97 }
98 </style>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
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 }}</td> 29 <td style="width:30%">{{ zdjbxx.zdmj }}</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.ghytmc }}</td>
32 </tr> 32 </tr>
...@@ -193,11 +193,11 @@ ...@@ -193,11 +193,11 @@
193 }, 193 },
194 methods: { 194 methods: {
195 loadData () { 195 loadData () {
196 console.log("this.$attrs",this.$attrs); 196 console.log("this.$attrs", this.$attrs);
197 console.log("this.propsParam",this.propsParam); 197 console.log("this.propsParam", this.propsParam);
198 if(this.propsParam.bsmSldy){ 198 if (this.propsParam.bsmSldy) {
199 console.log("宗地基本信息"); 199 console.log("宗地基本信息");
200 }else{ 200 } else {
201 console.log("登记簿里宗地基本信息"); 201 console.log("登记簿里宗地基本信息");
202 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 202 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
203 if (res.code === 200) { 203 if (res.code === 200) {
......
...@@ -56,46 +56,79 @@ export function getForm (tabName, djywbm) { ...@@ -56,46 +56,79 @@ export function getForm (tabName, djywbm) {
56 // case "zdt": 56 // case "zdt":
57 // form = require("@/views/djbworkflow/components/zdt.vue"); 57 // form = require("@/views/djbworkflow/components/zdt.vue");
58 // break; 58 // break;
59 // 宗地基本信息
60 case "zdjbxx": 59 case "zdjbxx":
61 form = require("@/views/djbworkflow/djbBook/zdjbxx.vue"); 60 form = require("@/views/registerBook/zdjbxx.vue");
62 break; 61 break;
63 // 查封登记
64 case "cfdj": 62 case "cfdj":
65 form = require("@/views/djbworkflow/djbBook/cfdj.vue"); 63 form = require("@/views/registerBook/cfdj.vue");
66 break; 64 break;
67 // 国有建设用地使用权
68 case "jsydsyq": 65 case "jsydsyq":
69 form = require("@/views/djbworkflow/djbBook/jsydsyq.vue"); 66 form = require("@/views/registerBook/jsydsyq.vue");
70 break; 67 break;
71 // 农用地使用权
72 case "nydsyq": 68 case "nydsyq":
73 form = require("@/views/djbworkflow/djbBook/nydsyq.vue"); 69 form = require("@/views/registerBook/nydsyq.vue");
74 break; 70 break;
75 // 房屋产权2
76 case "fdcq2": 71 case "fdcq2":
77 form = require("@/views/djbworkflow/djbBook/fdcq2.vue"); 72 form = require("@/views/registerBook/fdcq2.vue");
78 break; 73 break;
79 // 抵押权
80 case "diyaq": 74 case "diyaq":
81 form = require("@/views/djbworkflow/djbBook/diyaq.vue"); 75 form = require("@/views/registerBook/diyaq.vue");
82 break; 76 break;
83 // 预告登记
84 case "ygdj": 77 case "ygdj":
85 form = require("@/views/djbworkflow/djbBook/ygdj.vue"); 78 form = require("@/views/registerBook/ygdj.vue");
86 break; 79 break;
87 // 地役权 80 // 地役权
88 case "diyiq": 81 case "diyiq":
89 form = require("@/views/djbworkflow/djbBook/diyiq.vue"); 82 form = require("@/views/registerBook/diyiq.vue");
90 break; 83 break;
91 // 登记簿封面 84 // 登记簿封面
92 case "djbfm": 85 case "djbfm":
93 form = require("@/views/djbworkflow/djbBook/djbfm.vue"); 86 form = require("@/views/registerBook/djbfm.vue");
94 break; 87 break;
95 // 异议登记 88 // 异议登记
96 case "yydj": 89 case "yydj":
97 form = require("@/views/djbworkflow/djbBook/yydj.vue"); 90 form = require("@/views/registerBook/yydj.vue");
98 break; 91 break;
92 // // 宗地基本信息
93 // case "zdjbxx":
94 // form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
95 // break;
96 // // 查封登记
97 // case "cfdj":
98 // form = require("@/views/djbworkflow/djbBook/cfdj.vue");
99 // break;
100 // // 国有建设用地使用权
101 // case "jsydsyq":
102 // form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
103 // break;
104 // // 农用地使用权
105 // case "nydsyq":
106 // form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
107 // break;
108 // // 房屋产权2
109 // case "fdcq2":
110 // form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
111 // break;
112 // // 抵押权
113 // case "diyaq":
114 // form = require("@/views/djbworkflow/djbBook/diyaq.vue");
115 // break;
116 // // 预告登记
117 // case "ygdj":
118 // form = require("@/views/djbworkflow/djbBook/ygdj.vue");
119 // break;
120 // // 地役权
121 // case "diyiq":
122 // form = require("@/views/djbworkflow/djbBook/diyiq.vue");
123 // break;
124 // // 登记簿封面
125 // case "djbfm":
126 // form = require("@/views/djbworkflow/djbBook/djbfm.vue");
127 // break;
128 // // 异议登记
129 // case "yydj":
130 // form = require("@/views/djbworkflow/djbBook/yydj.vue");
131 // break;
99 // 受理信息 132 // 受理信息
100 case "slxx": 133 case "slxx":
101 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue"); 134 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 break; 80 break;
81 case "B2": //材料分屏按钮 81 case "B2": //材料分屏按钮
82 this.splitScreen = this.splitScreen ? false : true; 82 this.splitScreen = this.splitScreen ? false : true;
83 this.$store.dispatch("app/settScreen", this.splitScreen); 83 this.$store.dispatch("app/set1tScreen", this.splitScreen);
84 if (this.splitScreen) { 84 if (this.splitScreen) {
85 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容 85 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容
86 if (this.tabName == this.clxxTab.value) { 86 if (this.tabName == this.clxxTab.value) {
...@@ -100,59 +100,44 @@ export default { ...@@ -100,59 +100,44 @@ export default {
100 case "B4": 100 case "B4":
101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true) 101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
102 break; 102 break;
103 case "B5": 103 // case "B5":
104 const h = this.$createElement; 104 // const h = this.$createElement;
105 this.$msgbox({ 105 // this.$msgbox({
106 title: '消息', 106 // title: '请选择新增权利类型',
107 message: h('p', null, [ 107 // message: h('p', null, [
108 h('span', null, '内容可以是 '), 108 // h('span', null, '内容可以是 '),
109 h('i', { style: 'color: teal' }, 'VNode') 109 // h('el-button', { style: 'color: teal' }, 'VNode'),
110 ]), 110 // h('i', { style: 'color: teal' }, 'VNode')
111 showCancelButton: true, 111 // ]),
112 confirmButtonText: '确定', 112 // showCancelButton: true,
113 cancelButtonText: '取消',
114 beforeClose: (action, instance, done) => {
115 if (action === 'confirm') {
116 instance.confirmButtonLoading = true;
117 instance.confirmButtonText = '执行中...';
118 setTimeout(() => {
119 done();
120 setTimeout(() => {
121 instance.confirmButtonLoading = false;
122 }, 300);
123 }, 3000);
124 } else {
125 done();
126 }
127 }
128 }).then(action => {
129 this.addRepairRecord()
130 this.$message({
131 type: 'info',
132 message: 'action: ' + action
133 });
134 });
135 // this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
136 // bsmSlsq: this.bsmSlsq,
137 // entryType: '1'
138 // }, '65%', true)
139 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
140 // confirmButtonText: '确定', 113 // confirmButtonText: '确定',
141 // cancelButtonText: '取消', 114 // cancelButtonText: '取消',
142 // type: 'warning' 115 // beforeClose: (action, instance, done) => {
143 // }).then(() => { 116 // if (action === 'confirm') {
117 // instance.confirmButtonLoading = true;
118 // instance.confirmButtonText = '执行中...';
119 // setTimeout(() => {
120 // done();
121 // setTimeout(() => {
122 // instance.confirmButtonLoading = false;
123 // }, 300);
124 // }, 3000);
125 // } else {
126 // done();
127 // }
128 // }
129 // }).then(action => {
144 // this.addRepairRecord() 130 // this.addRepairRecord()
145 // this.$message({ 131 // this.$message({
146 // type: 'success',
147 // message: '补录成功!'
148 // });
149 // }).catch(() => {
150 // this.$message({
151 // type: 'info', 132 // type: 'info',
152 // message: '取消编辑' 133 // message: 'action: ' + action
153 // }); 134 // });
154 // }); 135 // });
155 136
137 // break;
138 case "B5":
139 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
140 this.$refs.qllxlist.dialogVisible=true
156 break; 141 break;
157 case "B6": 142 case "B6":
158 //根据编号获取对应信息 143 //根据编号获取对应信息
......
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 </div> 64 </div>
65 <!-- 新增补录信息勾选权利类型 -->
66 <qllxDailog ref="qllxlist"/>
65 </div> 67 </div>
66 </template> 68 </template>
67 <style scoped lang="scss"> 69 <style scoped lang="scss">
...@@ -70,18 +72,18 @@ ...@@ -70,18 +72,18 @@
70 </style> 72 </style>
71 <script> 73 <script>
72 import WorkFlow from "./mixin/index"; 74 import WorkFlow from "./mixin/index";
73 import { getForm } from "./flowform" 75 import { getForm } from "./flowform";
74 import NoticeBar from "@/components/NoticeBar/index"; 76 import NoticeBar from "@/components/NoticeBar/index";
75 import { unClaimTask } from "@/api/ywbl.js";
76 import ProcessViewer from "./components/processViewer.vue"; 77 import ProcessViewer from "./components/processViewer.vue";
77 // 引入左侧菜单 78 // 引入左侧菜单
78 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 79 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
80 import qllxDailog from "./djbBook/components/qllxDailog";
79 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 81 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
80 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js"; 82 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
81 // 登记簿数据信息 83 // 登记簿数据信息
82 import { addRepairRecord } from "@/api/djbbl.js" 84 import { addRepairRecord } from "@/api/djbbl.js";
83 // 获取权利类型数组 85 // 获取权利类型数组
84 import { getQllxByBdcdyid } from "@/api/djbbl.js" 86 import { getQllxByBdcdyid } from "@/api/djbbl.js";
85 87
86 import { getBdcqljqtsx } from "@/api/registerBook.js"; 88 import { getBdcqljqtsx } from "@/api/registerBook.js";
87 export default { 89 export default {
...@@ -90,6 +92,7 @@ export default { ...@@ -90,6 +92,7 @@ export default {
90 NoticeBar, 92 NoticeBar,
91 ProcessViewer, 93 ProcessViewer,
92 ordinaryMenu, 94 ordinaryMenu,
95 qllxDailog,
93 }, 96 },
94 mixins: [WorkFlow], 97 mixins: [WorkFlow],
95 data() { 98 data() {
...@@ -104,8 +107,10 @@ export default { ...@@ -104,8 +107,10 @@ export default {
104 qllx: this.$route.query.qllx, 107 qllx: this.$route.query.qllx,
105 //设置那个表单选中 108 //设置那个表单选中
106 tabName: "", 109 tabName: "",
110 // 弹框显示
111 dialogVisible: true,
107 // 权利类型数组 112 // 权利类型数组
108 qllxlist:[], 113 qllxlist: [],
109 //表单集合 114 //表单集合
110 tabList: [], 115 tabList: [],
111 //选择加载哪一个组件 116 //选择加载哪一个组件
...@@ -118,37 +123,35 @@ export default { ...@@ -118,37 +123,35 @@ export default {
118 clxxTab: {}, 123 clxxTab: {},
119 //页面监听时间 124 //页面监听时间
120 _beforeUnload_time: "", 125 _beforeUnload_time: "",
121 treedata:{}, 126 treedata: {},
122 tabdata:[], 127 tabdata: [],
123 defaultNode:{} 128 defaultNode: {},
124 };
125 },
126 mounted() {
127 129
130 };
128 }, 131 },
132 mounted() {},
129 133
130 methods: { 134 methods: {
131 getQllxByBdcdyid(){ 135 getQllxByBdcdyid() {
132 console.log("this.currentSelectProps.bdcdyid",this.currentSelectProps.bdcdyid); 136 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
133 getQllxByBdcdyid({bdcdyid:this.currentSelectProps.bdcdyid}).then((res) => { 137 (res) => {
134 if (res.code === 200) { 138 if (res.code === 200) {
135 console.log("Qllxlist",res); 139 console.log("Qllxlist", res);
136
137 } 140 }
138 }); 141 }
142 );
139 }, 143 },
140 // 获取右侧选项卡 144 // 获取右侧选项卡
141 getCurrentSelectProps (val) { 145 getCurrentSelectProps(val) {
142 this.currentSelectProps = val 146 this.currentSelectProps = val;
143 if(this.currentSelectProps.bsmRepair){ 147 if (this.currentSelectProps.bsmRepair) {
144 this.tabset(val) 148 this.tabset(val);
145 }else{ 149 } else {
146 this.getdjblist() 150 this.getdjblist();
147 } 151 }
148
149 }, 152 },
150 // 获取渲染登记簿列表 153 // 获取渲染登记簿列表
151 getdjblist(){ 154 getdjblist() {
152 getBdcqljqtsx({ 155 getBdcqljqtsx({
153 bdcdyid: this.currentSelectProps.bdcdyid, 156 bdcdyid: this.currentSelectProps.bdcdyid,
154 bdcdyh: this.currentSelectProps.bdcdyh, 157 bdcdyh: this.currentSelectProps.bdcdyh,
...@@ -156,32 +159,36 @@ export default { ...@@ -156,32 +159,36 @@ export default {
156 if (res.code === 200) { 159 if (res.code === 200) {
157 this.treedata = loadTreeData(res.result, this.bdcdyh); 160 this.treedata = loadTreeData(res.result, this.bdcdyh);
158 this.$nextTick(function () { 161 this.$nextTick(function () {
159 console.log("this.currentSelectProps.qllx",this.currentSelectProps); 162 this.defaultNode = getNode(
160 this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 163 this.currentSelectProps.qllx,
161 console.log("this.defaultNode",this.defaultNode); 164 { linShi: 0, xianShi: 0, liShi: 0 },
162 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点 165 ""
166 );
167 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
163 }); 168 });
164 } 169 }
165 }); 170 });
166 171
167 setTimeout(() => { 172 setTimeout(() => {
168 let settree=JSON.parse(JSON.stringify(this.treedata)) 173 let settree = JSON.parse(JSON.stringify(this.treedata));
169 this.tabdata=[...settree,...settree[1].children[0].children[0].children] 174 this.tabdata = [
170 this.tabdata.forEach((item,index,arr) => { 175 ...settree,
171 arr[index].name=item.label; 176 ...settree[1].children[0].children[0].children,
172 arr[index].value=item.id 177 ];
173 }) 178 this.tabdata.forEach((item, index, arr) => {
174 this.tabList=this.tabdata 179 arr[index].name = item.label;
175 this.getQllxByBdcdyid() 180 arr[index].value = item.id;
176 }, 200) 181 });
177 182 this.tabList = this.tabdata;
183 this.getQllxByBdcdyid();
184 }, 200);
178 }, 185 },
179 186
180 tabset(val){ 187 tabset(val) {
181 this.tabName = ''; 188 this.tabName = "";
182 this.tabList = [ 189 this.tabList = [
183 { 190 {
184 name:val.qllxmc+ "补录信息", 191 name: val.qllxmc + "补录信息",
185 value: "slxx", 192 value: "slxx",
186 sort: 1, 193 sort: 1,
187 }, 194 },
...@@ -198,20 +205,19 @@ export default { ...@@ -198,20 +205,19 @@ export default {
198 ]; 205 ];
199 206
200 this.$nextTick(function () { 207 this.$nextTick(function () {
201 this.tabName = 'slxx'; 208 this.tabName = "slxx";
202 }); 209 });
203
204 }, 210 },
205 211
206 //右侧表单选项卡事件 212 //右侧表单选项卡事件
207 beforeLeave (activeName, oldActiveName) { 213 beforeLeave(activeName, oldActiveName) {
208 if (activeName && activeName != 0) this.getFromRouter(activeName) 214 if (activeName && activeName != 0) this.getFromRouter(activeName);
209 }, 215 },
210 //切换选项卡内容组件 216 //切换选项卡内容组件
211 getFromRouter (tabname) { 217 getFromRouter(tabname) {
212 for (let item of this.tabList) { 218 for (let item of this.tabList) {
213 if (item.value === tabname) { 219 if (item.value === tabname) {
214 this.currentSelectTab = item 220 this.currentSelectTab = item;
215 break; 221 break;
216 } 222 }
217 } 223 }
...@@ -219,19 +225,18 @@ export default { ...@@ -219,19 +225,18 @@ export default {
219 }, 225 },
220 226
221 // 增加补录记录 227 // 增加补录记录
222 addRepairRecord(row){ 228 addRepairRecord(row) {
223 console.log("this.currentSelectProps",this.currentSelectProps); 229 let from = {
224 let from={ 230 bsmQlxx: "",
225 bsmQlxx:"", 231 bsmSlsq: this.bsmSlsq,
226 bsmSlsq:this.bsmSlsq, 232 bsmSldy: this.currentSelectProps.bsmSldy,
227 bsmSldy:this.currentSelectProps.bsmSldy, 233 operate: "C",
228 operate:"C", 234 qllx: this.currentSelectProps.qllx,
229 qllx:this.currentSelectProps.qllx 235 };
230 } 236 if (row) {
231 if(row){ 237 from.bsmQlxx = row.bsmQlxx;
232 from.bsmQlxx=row.bsmQlxx 238 from.operate = "U";
233 from.operate="U" 239 from.qllx = row.qllx;
234 from.qllx=row.qllx
235 } 240 }
236 241
237 addRepairRecord(from).then((res) => { 242 addRepairRecord(from).then((res) => {
...@@ -240,6 +245,9 @@ export default { ...@@ -240,6 +245,9 @@ export default {
240 }); 245 });
241 }); 246 });
242 }, 247 },
248
243 }, 249 },
244 }; 250 };
245 </script> 251 </script>
252 <style scoped lang="scss">
253 </style>
......
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
26 item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '', 26 item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
27 ]" 27 ]"
28 > 28 >
29 <div class="setbut" v-if="item.prop == 'cz'">
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
31 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
32 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div> 33 <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
30 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span> 34 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
31 35
...@@ -63,6 +67,11 @@ export default { ...@@ -63,6 +67,11 @@ export default {
63 }, 67 },
64 methods: { 68 methods: {
65 loadData() { 69 loadData() {
70 if(this.$parent.addRepairRecord){
71 this.columns.unshift({prop:"cz",
72 label:"操作"
73 })
74 }
66 getCfdjList({ 75 getCfdjList({
67 bdcdyid: this.propsParam.bdcdyid, 76 bdcdyid: this.propsParam.bdcdyid,
68 qllx: this.propsParam.qllx, 77 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 22 ]">
23 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
...@@ -61,6 +65,11 @@ export default { ...@@ -61,6 +65,11 @@ export default {
61 }, 65 },
62 methods: { 66 methods: {
63 loadData () { 67 loadData () {
68 if(this.$parent.addRepairRecord){
69 this.columns.unshift({prop:"cz",
70 label:"操作"
71 })
72 }
64 getDiyaqList({ 73 getDiyaqList({
65 bdcdyid: this.propsParam.bdcdyid, 74 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 75 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 22 ]">
23 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
...@@ -61,6 +65,11 @@ export default { ...@@ -61,6 +65,11 @@ export default {
61 }, 65 },
62 methods: { 66 methods: {
63 loadData () { 67 loadData () {
68 if(this.$parent.addRepairRecord){
69 this.columns.unshift({prop:"cz",
70 label:"操作"
71 })
72 }
64 getDiyiqList({ 73 getDiyiqList({
65 bdcdyid: this.propsParam.bdcdyid, 74 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 75 qllx: this.propsParam.qllx,
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
24 ]"> 24 ]">
25 <div class="setbut" v-if="item.prop == 'cz'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -66,6 +70,11 @@ ...@@ -66,6 +70,11 @@
66 }, 70 },
67 methods: { 71 methods: {
68 loadData () { 72 loadData () {
73 if(this.$parent.addRepairRecord){
74 this.columns.unshift({prop:"cz",
75 label:"操作"
76 })
77 }
69 getJsydsyqList({ 78 getJsydsyqList({
70 bdcdyid: this.propsParam.bdcdyid, 79 bdcdyid: this.propsParam.bdcdyid,
71 qllx: this.propsParam.qllx, 80 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 22 ]">
23 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
...@@ -61,6 +65,11 @@ export default { ...@@ -61,6 +65,11 @@ export default {
61 }, 65 },
62 methods: { 66 methods: {
63 loadData () { 67 loadData () {
68 if(this.$parent.addRepairRecord){
69 this.columns.unshift({prop:"cz",
70 label:"操作"
71 })
72 }
64 getFdcq2List({ 73 getFdcq2List({
65 bdcdyid: this.propsParam.bdcdyid, 74 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 75 qllx: this.propsParam.qllx,
...@@ -95,6 +104,62 @@ export default { ...@@ -95,6 +104,62 @@ export default {
95 } 104 }
96 return name; 105 return name;
97 }, 106 },
107 // 编辑
108 editDialog(row){
109 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
110 confirmButtonText: '确定',
111 cancelButtonText: '取消',
112 type: 'warning'
113 }).then(() => {
114 this.$parent.addRepairRecord(row)
115
116 this.$message({
117 type: 'success',
118 message: '补录成功!'
119 });
120 }).catch(() => {
121 this.$message({
122 type: 'info',
123 message: '取消编辑'
124 });
125 });
126
127 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
128 // datalist:this.columns,
129 // data: row,
130
131 // })
132
133 },
134 // 删除
135 deleteDialog(row){
136 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
137 confirmButtonText: '确定',
138 cancelButtonText: '取消',
139 type: 'warning'
140 }).then(() => {
141 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
142 // deleteClmx(bsmClmx).then(res => {
143 // if (res.code == 200) {
144 // that.$emit('updateList', res.result)
145 // that.$message({
146 // message: '删除成功!',
147 // type: 'success'
148 // })
149 // }
150 // })
151 this.$message({
152 type: 'success',
153 message: '删除成功!'
154 });
155 }).catch(() => {
156 this.$message({
157 type: 'info',
158 message: '已取消删除'
159 });
160 });
161
162 }
98 }, 163 },
99 }; 164 };
100 </script> 165 </script>
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
24 ]"> 24 ]">
25 <div class="setbut" v-if="item.prop == 'cz'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -66,6 +70,11 @@ ...@@ -66,6 +70,11 @@
66 }, 70 },
67 methods: { 71 methods: {
68 loadData () { 72 loadData () {
73 if(this.$parent.addRepairRecord){
74 this.columns.unshift({prop:"cz",
75 label:"操作"
76 })
77 }
69 getJsydsyqList({ 78 getJsydsyqList({
70 bdcdyid: this.propsParam.bdcdyid, 79 bdcdyid: this.propsParam.bdcdyid,
71 qllx: this.propsParam.qllx, 80 qllx: this.propsParam.qllx,
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
24 ]"> 24 ]">
25 <div class="setbut" v-if="item.prop == 'cz'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -95,6 +99,11 @@ ...@@ -95,6 +99,11 @@
95 }, 99 },
96 methods: { 100 methods: {
97 loadData () { 101 loadData () {
102 if(this.$parent.addRepairRecord){
103 this.columns.unshift({prop:"cz",
104 label:"操作"
105 })
106 }
98 getNydsyqList({ 107 getNydsyqList({
99 bdcdyid: this.propsParam.bdcdyid, 108 bdcdyid: this.propsParam.bdcdyid,
100 qllx: this.propsParam.qllx, 109 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 22 ]">
23 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
...@@ -61,6 +65,12 @@ export default { ...@@ -61,6 +65,12 @@ export default {
61 }, 65 },
62 methods: { 66 methods: {
63 loadData () { 67 loadData () {
68 // 判断是否在登记簿补录调的子页面
69 if(this.$parent.addRepairRecord){
70 this.columns.unshift({prop:"cz",
71 label:"操作"
72 })
73 }
64 getYgdjList({ 74 getYgdjList({
65 bdcdyid: this.propsParam.bdcdyid, 75 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 76 qllx: this.propsParam.qllx,
......
...@@ -61,6 +61,11 @@ export default { ...@@ -61,6 +61,11 @@ export default {
61 }, 61 },
62 methods: { 62 methods: {
63 loadData () { 63 loadData () {
64 if(this.$parent.addRepairRecord){
65 this.columns.unshift({prop:"cz",
66 label:"操作"
67 })
68 }
64 getYydjList({ 69 getYydjList({
65 bdcdyid: this.propsParam.bdcdyid, 70 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 71 qllx: this.propsParam.qllx,
...@@ -95,6 +100,62 @@ export default { ...@@ -95,6 +100,62 @@ export default {
95 } 100 }
96 return name; 101 return name;
97 }, 102 },
103 // 编辑
104 editDialog(row){
105 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
106 confirmButtonText: '确定',
107 cancelButtonText: '取消',
108 type: 'warning'
109 }).then(() => {
110 this.$parent.addRepairRecord(row)
111
112 this.$message({
113 type: 'success',
114 message: '补录成功!'
115 });
116 }).catch(() => {
117 this.$message({
118 type: 'info',
119 message: '取消编辑'
120 });
121 });
122
123 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
124 // datalist:this.columns,
125 // data: row,
126
127 // })
128
129 },
130 // 删除
131 deleteDialog(row){
132 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
133 confirmButtonText: '确定',
134 cancelButtonText: '取消',
135 type: 'warning'
136 }).then(() => {
137 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
138 // deleteClmx(bsmClmx).then(res => {
139 // if (res.code == 200) {
140 // that.$emit('updateList', res.result)
141 // that.$message({
142 // message: '删除成功!',
143 // type: 'success'
144 // })
145 // }
146 // })
147 this.$message({
148 type: 'success',
149 message: '删除成功!'
150 });
151 }).catch(() => {
152 this.$message({
153 type: 'info',
154 message: '已取消删除'
155 });
156 });
157
158 }
98 }, 159 },
99 }; 160 };
100 </script> 161 </script>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
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 }}</td> 29 <td style="width:30%">{{ zdjbxx.zdmj }}</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.ghytmc }}</td>
32 </tr> 32 </tr>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </template> 42 </template>
43 <script> 43 <script>
44 import { mapGetters } from "vuex"; 44 import { mapGetters } from "vuex";
45 import clxxAddDialog from "./dialog/clxxAddDialog.vue"; 45 import clxxAddDialog from "../dialog/clxxAddDialog.vue";
46 import imagePreview from '@/views/components/imagePreview.vue' 46 import imagePreview from '@/views/components/imagePreview.vue'
47 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 47 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
48 export default { 48 export default {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:40:38 4 * @LastEditTime: 2023-06-19 13:15:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -24,18 +24,17 @@ ...@@ -24,18 +24,17 @@
24 </div> 24 </div>
25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button> 25 <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
26 </div> 26 </div>
27 <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview" 27 <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
28 @prevPriview="prevPriview" /> 28 @prevPriview="prevPriview" />
29 </div> 29 </div>
30 </div> 30 </div>
31 <clxxAddDialog v-model="isDialog" /> 31 <clxxAddDialog v-model="isDialog" />
32 <!-- <clxxDetailDialog v-model="detailDialog" :data="tableData" /> -->
33 </div> 32 </div>
34 </template> 33 </template>
35 <script> 34 <script>
36 import { mapGetters } from "vuex"; 35 import { mapGetters } from "vuex";
37 import clxxAddDialog from "./dialog/clxxAddDialog.vue"; 36 import clxxAddDialog from "../dialog/clxxAddDialog.vue";
38 import clxxDetailDialog from "./dialog/clxxDetailDialog.vue"; 37 import clxxDetailDialog from "../dialog/clxxDetailDialog.vue";
39 import imagePreview from '@/views/components/imagePreview.vue' 38 import imagePreview from '@/views/components/imagePreview.vue'
40 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 39 import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
41 import { popupDialog } from "@/utils/popup.js"; 40 import { popupDialog } from "@/utils/popup.js";
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-07 13:32:24 4 * @LastEditTime: 2023-06-19 13:16:53
5 */ 5 */
6 //流程环节操作按钮 6 //流程环节操作按钮
7 export function getForm (tabName, djywbm) { 7 export function getForm (tabName, djywbm) {
...@@ -42,7 +42,7 @@ export function getForm (tabName, djywbm) { ...@@ -42,7 +42,7 @@ export function getForm (tabName, djywbm) {
42 form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue"); 42 form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
43 break; 43 break;
44 case "clxx": 44 case "clxx":
45 form = require("@/views/workflow/components/clxxUnify.vue"); 45 form = require("@/views/workflow/components/clxx/clxxUnify.vue");
46 break; 46 break;
47 case "spyj": 47 case "spyj":
48 form = require("@/views/workflow/components/spyj.vue"); 48 form = require("@/views/workflow/components/spyj.vue");
......
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
6 :model="queryForm" 6 :model="queryForm"
7 ref="queryForm" 7 ref="queryForm"
8 @submit.native.prevent 8 @submit.native.prevent
9 label-width="80px" 9 label-width="80px">
10 >
11 <el-row> 10 <el-row>
12 <el-col :span="5"> 11 <el-col :span="5">
13 <el-form-item label="业务来源" label-width="70px"> 12 <el-form-item label="业务来源" label-width="70px">
...@@ -18,14 +17,12 @@ ...@@ -18,14 +17,12 @@
18 class="width100" 17 class="width100"
19 filterable 18 filterable
20 clearable 19 clearable
21 placeholder="请选择业务来源" 20 placeholder="请选择业务来源">
22 >
23 <el-option 21 <el-option
24 v-for="item in dictData['ywly']" 22 v-for="item in dictData['ywly']"
25 :key="item.dcode" 23 :key="item.dcode"
26 :label="item.dname" 24 :label="item.dname"
27 :value="item.dcode" 25 :value="item.dcode">
28 >
29 </el-option> 26 </el-option>
30 </el-select> 27 </el-select>
31 </el-form-item> 28 </el-form-item>
...@@ -39,14 +36,12 @@ ...@@ -39,14 +36,12 @@
39 class="width100" 36 class="width100"
40 filterable 37 filterable
41 clearable 38 clearable
42 placeholder="请选择权利类型" 39 placeholder="请选择权利类型">
43 >
44 <el-option 40 <el-option
45 v-for="item in dictData['A8']" 41 v-for="item in dictData['A8']"
46 :key="item.dcode" 42 :key="item.dcode"
47 :label="item.dname" 43 :label="item.dname"
48 :value="item.dcode" 44 :value="item.dcode">
49 >
50 </el-option> 45 </el-option>
51 </el-select> 46 </el-select>
52 </el-form-item> 47 </el-form-item>
...@@ -60,14 +55,12 @@ ...@@ -60,14 +55,12 @@
60 class="width100" 55 class="width100"
61 filterable 56 filterable
62 clearable 57 clearable
63 placeholder="请选择登记类型" 58 placeholder="请选择登记类型">
64 >
65 <el-option 59 <el-option
66 v-for="item in dictData['A21']" 60 v-for="item in dictData['A21']"
67 :key="item.dcode" 61 :key="item.dcode"
68 :label="item.dname" 62 :label="item.dname"
69 :value="item.dcode" 63 :value="item.dcode">
70 >
71 </el-option> 64 </el-option>
72 </el-select> 65 </el-select>
73 </el-form-item> 66 </el-form-item>
...@@ -78,17 +71,14 @@ ...@@ -78,17 +71,14 @@
78 placeholder="请输入业务号" 71 placeholder="请输入业务号"
79 v-model="queryForm.ywh" 72 v-model="queryForm.ywh"
80 clearable 73 clearable
81 class="width200px" 74 class="width200px">
82 >
83 </el-input> 75 </el-input>
84 </el-form-item> 76 </el-form-item>
85 </el-col> 77 </el-col>
86 78
87 <el-col :span="4" class="btnColRight"> 79 <el-col :span="4" class="btnColRight">
88 <el-form-item> 80 <el-form-item>
89 <el-button type="primary" native-type="submit" @click="handleSearch" 81 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
90 >查询</el-button
91 >
92 <el-button @click="moreQueryClick">高级查询</el-button> 82 <el-button @click="moreQueryClick">高级查询</el-button>
93 </el-form-item> 83 </el-form-item>
94 </el-col> 84 </el-col>
...@@ -100,16 +90,14 @@ ...@@ -100,16 +90,14 @@
100 {{ item.name }}:{{ item.value }} 90 {{ item.name }}:{{ item.value }}
101 <i 91 <i
102 class="el-icon-circle-close" 92 class="el-icon-circle-close"
103 @click="handelItem(item, index)" 93 @click="handelItem(item, index)"></i>
104 ></i>
105 </li> 94 </li>
106 </ul> 95 </ul>
107 <el-button 96 <el-button
108 class="clean-btn" 97 class="clean-btn"
109 type="text" 98 type="text"
110 v-if="searchList.length > 0" 99 v-if="searchList.length > 0"
111 @click.native="hanldeCleanAll" 100 @click.native="hanldeCleanAll">清除全部
112 >清除全部
113 </el-button> 101 </el-button>
114 </el-row> 102 </el-row>
115 </el-form> 103 </el-form>
...@@ -126,25 +114,24 @@ ...@@ -126,25 +114,24 @@
126 @size-change="handleSizeChange" 114 @size-change="handleSizeChange"
127 @p-current-change="handleCurrentChange" 115 @p-current-change="handleCurrentChange"
128 :column="tableData.columns" 116 :column="tableData.columns"
129 :data="tableData.data" 117 :data="tableData.data">
130 >
131 </lb-table> 118 </lb-table>
132 </div> 119 </div>
133 <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" /> 120 <searchBox v-model="isSearch" @getSearch="getSearch" :advancedForm="otherForm" />
134 </div> 121 </div>
135 </template> 122 </template>
136 <script> 123 <script>
137 import { mapGetters } from "vuex"; 124 import { mapGetters } from "vuex";
138 import searchMin from "../components/mixin/index"; 125 import searchMin from "../components/mixin/index";
139 import table from "@/utils/mixin/table"; 126 import table from "@/utils/mixin/table";
140 import { datas, sendThis } from "./ybxdata"; 127 import { datas, sendThis } from "./ybxdata";
141 import { searchTaskDone } from "@/api/ywbl"; 128 import { searchTaskDone } from "@/api/ywbl";
142 import searchBox from "../components/search.vue"; 129 import searchBox from "../components/search.vue";
143 export default { 130 export default {
144 name: "ybx", 131 name: "ybx",
145 components: { searchBox }, 132 components: { searchBox },
146 mixins: [table, searchMin], 133 mixins: [table, searchMin],
147 mounted() { 134 mounted () {
148 window["getBpageList"] = () => { 135 window["getBpageList"] = () => {
149 this.queryClick(); 136 this.queryClick();
150 }; 137 };
...@@ -153,7 +140,7 @@ export default { ...@@ -153,7 +140,7 @@ export default {
153 computed: { 140 computed: {
154 ...mapGetters(["dictData"]), 141 ...mapGetters(["dictData"]),
155 }, 142 },
156 data() { 143 data () {
157 return { 144 return {
158 queryForm: { 145 queryForm: {
159 ywly: "", 146 ywly: "",
...@@ -176,7 +163,7 @@ export default { ...@@ -176,7 +163,7 @@ export default {
176 }, 163 },
177 methods: { 164 methods: {
178 // 列表渲染接口 165 // 列表渲染接口
179 queryClick() { 166 queryClick () {
180 this.$startLoading(); 167 this.$startLoading();
181 this.searchForm.ywh = this.queryForm.ywh; 168 this.searchForm.ywh = this.queryForm.ywh;
182 this.iterationData(); 169 this.iterationData();
...@@ -199,12 +186,12 @@ export default { ...@@ -199,12 +186,12 @@ export default {
199 } 186 }
200 }); 187 });
201 }, 188 },
202 handleSort(val) { 189 handleSort (val) {
203 this.queryForm.sortField = val.prop; 190 this.queryForm.sortField = val.prop;
204 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc"; 191 this.queryForm.sortOrder = val.order == "ascending" ? "asc" : "desc";
205 this.queryClick(); 192 this.queryClick();
206 }, 193 },
207 ywhClick(item) { 194 ywhClick (item) {
208 const { href } = this.$router.resolve( 195 const { href } = this.$router.resolve(
209 "/workFrameView?bsmSlsq=" + 196 "/workFrameView?bsmSlsq=" +
210 item.bsmSlsq + 197 item.bsmSlsq +
...@@ -216,8 +203,8 @@ export default { ...@@ -216,8 +203,8 @@ export default {
216 window.open(href, `urlname${item.bsmSlsq}`); 203 window.open(href, `urlname${item.bsmSlsq}`);
217 }, 204 },
218 }, 205 },
219 }; 206 };
220 </script> 207 </script>
221 <style scoped lang="scss"> 208 <style scoped lang="scss">
222 @import "~@/styles/public.scss"; 209 @import "~@/styles/public.scss";
223 </style> 210 </style>
......
...@@ -113,22 +113,22 @@ export default { ...@@ -113,22 +113,22 @@ export default {
113 bsm: '' 113 bsm: ''
114 }, '85%') 114 }, '85%')
115 }, 115 },
116 ywhClick (item) { 116 // ywhClick (item) {
117 const { href } = this.$router.resolve( 117 // const { href } = this.$router.resolve(
118 "/djbworkFrame?bdcdyid=" + 118 // "/djbworkFrame?bdcdyid=" +
119 item.bdcdyid+ 119 // item.bdcdyid+
120 "&bdcdyh=" + 120 // "&bdcdyh=" +
121 item.bdcdyh+ 121 // item.bdcdyh+
122 "&qllx="+ 122 // "&qllx="+
123 item.qllx+ 123 // item.qllx+
124 "&bsmQlxx="+ 124 // "&bsmQlxx="+
125 item.bsmQlxx+ 125 // item.bsmQlxx+
126 "&viewtype=1" 126 // "&viewtype=1"
127 ); 127 // );
128 localStorage.setItem('ywbl', JSON.stringify(item)); 128 // localStorage.setItem('ywbl', JSON.stringify(item));
129 window.open(href, `urlname${item.bdcdyid}`); 129 // window.open(href, `urlname${item.bdcdyid}`);
130 130
131 }, 131 // },
132 } 132 }
133 } 133 }
134 </script> 134 </script>
......
...@@ -67,9 +67,9 @@ class data extends filter { ...@@ -67,9 +67,9 @@ class data extends filter {
67 prop: "ywh", 67 prop: "ywh",
68 label: "业务号", 68 label: "业务号",
69 width: '110', 69 width: '110',
70 render: (h, scope) => { 70 // render: (h, scope) => {
71 return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button> 71 // return <el-button type="text" onClick={() => { vm.ywhClick(scope.row) }}>{scope.row.ywh}</el-button>
72 } 72 // }
73 }, 73 },
74 { 74 {
75 prop: "qllxmc", 75 prop: "qllxmc",
......
...@@ -102,11 +102,6 @@ ...@@ -102,11 +102,6 @@
102 djlx: "", 102 djlx: "",
103 ywh: "", 103 ywh: "",
104 }, 104 },
105 // pageData: {
106 // currentPage: 1,
107 // pageSize: 10,
108 // total: 0,
109 // },
110 tableData: { 105 tableData: {
111 total: 0, 106 total: 0,
112 columns: datas.columns(), 107 columns: datas.columns(),
...@@ -122,24 +117,6 @@ ...@@ -122,24 +117,6 @@
122 this.$endLoading() 117 this.$endLoading()
123 if (res.code === 200) { 118 if (res.code === 200) {
124 let { total, records } = res.result 119 let { total, records } = res.result
125 // let str = ''
126 // records.forEach(item => {
127 // if (item.userNameList.length != 0) {
128 // str = String(item.userNameList)
129 // item.blStatus = item.zbhj + '(' + str.replace(/,/g, "+") + ')'
130 // }
131 // if (item.qlrmc.length != 0) {
132 // item.qlrmcStr = String(item.qlrmc)
133 // }
134 // if (item.ywrmc.length != 0) {
135 // item.ywrmcStr = String(item.ywrmc)
136 // }
137 // if (item.zlList.length != 0) {
138 // item.zlStr = String(item.zlList)
139 // }
140 // })
141 // this.pageData.total = total;
142 // this.tableData.data = records
143 this.tableData.total = total ? total : 0; 120 this.tableData.total = total ? total : 0;
144 this.tableData.data = records ? records : []; 121 this.tableData.data = records ? records : [];
145 } 122 }
...@@ -148,10 +125,10 @@ ...@@ -148,10 +125,10 @@
148 handleSort (name, sort) { 125 handleSort (name, sort) {
149 console.log(name, sort); 126 console.log(name, sort);
150 }, 127 },
128 moreQueryClick () { },
151 openDialog (item) { 129 openDialog (item) {
152 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3') 130 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&viewtype=3')
153 // window.open(href, '_blank'); 131 window.open(href, `urlname${item.bsmSlsq}`)
154 window.open(href, `urlname${item.bsmSlsq}`);
155 } 132 }
156 } 133 }
157 } 134 }
......
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
48 </div> 48 </div>
49 </template> 49 </template>
50 <script> 50 <script>
51 import table from "@/utils/mixin/table"; 51 import table from "@/utils/mixin/table";
52 import { datas, sendThis } from "./lpcxdata"; 52 import { datas, sendThis } from "./lpcxdata";
53 import { getLpZrz } from "@/api/lpb.js"; 53 import { getLpZrz } from "@/api/lpb.js";
54 export default { 54 export default {
55 name: "lpcx", 55 name: "lpcx",
56 components: {}, 56 components: {},
57 mixins: [table], 57 mixins: [table],
...@@ -66,16 +66,12 @@ export default { ...@@ -66,16 +66,12 @@ export default {
66 zddm: "", 66 zddm: "",
67 zrzh: "", 67 zrzh: "",
68 }, 68 },
69 pageData: {
70 currentPage: 1,
71 pageSize: 10,
72 total: 0,
73 },
74 tableData: { 69 tableData: {
70 total: 0,
75 columns: datas.columns(), 71 columns: datas.columns(),
76 data: [], 72 data: [],
77 }, 73 }
78 }; 74 }
79 }, 75 },
80 methods: { 76 methods: {
81 // 初始化数据 77 // 初始化数据
...@@ -84,7 +80,7 @@ export default { ...@@ -84,7 +80,7 @@ export default {
84 getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => { 80 getLpZrz({ ...this.queryForm, ...this.pageData }).then((res) => {
85 this.$endLoading(); 81 this.$endLoading();
86 if (res.code === 200) { 82 if (res.code === 200) {
87 this.pageData.total = res.result.total; 83 this.tableData.total = total ? total : 0;
88 this.tableData.data = res.result.records; 84 this.tableData.data = res.result.records;
89 } 85 }
90 }); 86 });
...@@ -92,9 +88,9 @@ export default { ...@@ -92,9 +88,9 @@ export default {
92 handleSort (name, sort) { 88 handleSort (name, sort) {
93 console.log(name, sort); 89 console.log(name, sort);
94 }, 90 },
91 moreQueryClick () { },
95 //打开楼盘表 92 //打开楼盘表
96 openlpbClick (scope) { 93 openlpbClick (scope) {
97 // var zrzbsm = scope.row.bsm;
98 this.$popup('楼盘表', 'lpb/index', { 94 this.$popup('楼盘表', 'lpb/index', {
99 width: '90%', 95 width: '90%',
100 height: "92%", 96 height: "92%",
...@@ -102,10 +98,10 @@ export default { ...@@ -102,10 +98,10 @@ export default {
102 bsm: scope.row.bsm 98 bsm: scope.row.bsm
103 } 99 }
104 }) 100 })
105 }, 101 }
106 }, 102 }
107 }; 103 }
108 </script> 104 </script>
109 <style scoped lang="scss"> 105 <style scoped lang="scss">
110 @import "~@/styles/public.scss"; 106 @import "~@/styles/public.scss";
111 </style> 107 </style>
......
...@@ -40,22 +40,19 @@ ...@@ -40,22 +40,19 @@
40 </div> 40 </div>
41 <!-- 表格 --> 41 <!-- 表格 -->
42 <div class="from-clues-content"> 42 <div class="from-clues-content">
43 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total" 43 <lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
44 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 44 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
45 :data="tableData.data"> 45 :data="tableData.data">
46 </lb-table> 46 </lb-table>
47 </div> 47 </div>
48 <!-- <el-dialog :visible.sync="dialogVisible" width="52%" :before-close="handleClose">
49
50 </el-dialog> -->
51 </div> 48 </div>
52 </template> 49 </template>
53 <script> 50 <script>
54 import table from "@/utils/mixin/table"; 51 import table from "@/utils/mixin/table";
55 import { datas, sendThis } from "./zslqcx"; 52 import { datas, sendThis } from "./zslqcx";
56 import { getBdcqzReceiveList } from "@/api/zhcx" 53 import { getBdcqzReceiveList } from "@/api/zhcx"
57 import { bdcqzPreview } from "@/api/bdcqz" 54 import { bdcqzPreview } from "@/api/bdcqz"
58 export default { 55 export default {
59 components: {}, 56 components: {},
60 mixins: [table], 57 mixins: [table],
61 mounted () { 58 mounted () {
...@@ -103,8 +100,8 @@ export default { ...@@ -103,8 +100,8 @@ export default {
103 this.dialogVisible = false; 100 this.dialogVisible = false;
104 } 101 }
105 }, 102 },
106 }; 103 };
107 </script> 104 </script>
108 <style scoped lang="scss"> 105 <style scoped lang="scss">
109 @import "~@/styles/public.scss"; 106 @import "~@/styles/public.scss";
110 </style> 107 </style>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-19 13:32:04
5 -->
1 <template> 6 <template>
2 <div class="from-clues"> 7 <div class="from-clues">
3 <!-- 表单部分 --> 8 <!-- 表单部分 -->
...@@ -33,7 +38,7 @@ ...@@ -33,7 +38,7 @@
33 </div> 38 </div>
34 <!-- 表格 --> 39 <!-- 表格 -->
35 <div class="from-clues-content"> 40 <div class="from-clues-content">
36 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total" 41 <lb-table :page-size="pageData.size" class="loadingtext" :current-page.sync="pageData.current" :total="tableData.total"
37 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 42 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
38 :data="tableData.data"> 43 :data="tableData.data">
39 </lb-table> 44 </lb-table>
...@@ -41,10 +46,10 @@ ...@@ -41,10 +46,10 @@
41 </div> 46 </div>
42 </template> 47 </template>
43 <script> 48 <script>
44 import table from "@/utils/mixin/table"; 49 import table from "@/utils/mixin/table";
45 import { datas, sendThis } from "./zxgcdycx"; 50 import { datas, sendThis } from "./zxgcdycx";
46 import { getZjgcdyList } from "@/api/zhcx" 51 import { getZjgcdyList } from "@/api/zhcx"
47 export default { 52 export default {
48 components: {}, 53 components: {},
49 mixins: [table], 54 mixins: [table],
50 mounted () { 55 mounted () {
...@@ -72,15 +77,15 @@ export default { ...@@ -72,15 +77,15 @@ export default {
72 this.$endLoading() 77 this.$endLoading()
73 if (res.code === 200) { 78 if (res.code === 200) {
74 let { total, records } = res.result 79 let { total, records } = res.result
75 this.tableData.total = total; 80 this.tableData.total = total ? total : 0
76 this.tableData.data = records ? records : [] 81 this.tableData.data = records ? records : []
77 } 82 }
78 }) 83 })
79 }, 84 },
80 85 moreQueryClick () { }
81 }, 86 }
82 }; 87 }
83 </script> 88 </script>
84 <style scoped lang="scss"> 89 <style scoped lang="scss">
85 @import "~@/styles/public.scss"; 90 @import "~@/styles/public.scss";
86 </style> 91 </style>
......