b99759f6 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 6528b17e 01cf91f7
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-20 10:27:25 4 * @LastEditTime: 2023-10-23 16:46:47
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableBox"> 7 <div class="tableBox">
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
247 getXtParamsByYwh(ywh).then(res => { 247 getXtParamsByYwh(ywh).then(res => {
248 let data = res.result 248 let data = res.result
249 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 249 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
250 window.open(href, `urlname${data.bsmSlsq}`) 250 window.open(href, `urlname${new Date().getTime()}`)
251 }) 251 })
252 } else { 252 } else {
253 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 253 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-10-20 10:28:07 4 * @LastEditTime: 2023-10-23 16:48:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
302 getXtParamsByYwh(ywh).then(res => { 302 getXtParamsByYwh(ywh).then(res => {
303 let data = res.result 303 let data = res.result
304 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness) 304 const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
305 window.open(href, `urlname${data.bsmSlsq}`) 305 window.open(href, `urlname${new Date().getTime()}`)
306 }) 306 })
307 } else { 307 } else {
308 getBlParamsByYwh(ywh, bsmQlxx).then(res => { 308 getBlParamsByYwh(ywh, bsmQlxx).then(res => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: miaofang 3 * @Autor: miaofang
4 * @LastEditTime: 2023-09-19 14:04:13 4 * @LastEditTime: 2023-10-23 16:16:24
5 --> 5 -->
6 <template> 6 <template>
7 <div 7 <div
...@@ -178,9 +178,8 @@ ...@@ -178,9 +178,8 @@
178 getCertificateList(this.formdata).then((res) => { 178 getCertificateList(this.formdata).then((res) => {
179 if (res.code === 200) { 179 if (res.code === 200) {
180 this.tableDatas.data = res.result ? res.result : []; 180 this.tableDatas.data = res.result ? res.result : [];
181 console.log("this.tableDatas", this.tableDatas);
182 } 181 }
183 }); 182 })
184 }, 183 },
185 /** 184 /**
186 * @description: query 185 * @description: query
...@@ -192,7 +191,7 @@ ...@@ -192,7 +191,7 @@
192 this.szxxtableData.data = res.result; 191 this.szxxtableData.data = res.result;
193 this.key++; 192 this.key++;
194 } 193 }
195 }); 194 })
196 }, 195 },
197 /** 196 /**
198 * @description: 获取证书内容 197 * @description: 获取证书内容
...@@ -208,13 +207,11 @@ ...@@ -208,13 +207,11 @@
208 * @author: miaofang 207 * @author: miaofang
209 */ 208 */
210 getHeadTabBdcqz () { 209 getHeadTabBdcqz () {
211 console.log("formData", this.formData);
212 this.loading = true; 210 this.loading = true;
213 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then((res) => { 211 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then((res) => {
214 if (res.code == 200) { 212 if (res.code == 200) {
215 this.noData = true; 213 this.noData = true;
216 if (res.result && res.result.length > 0) { 214 if (res.result && res.result.length > 0) {
217 console.log("res.resultttttttttttttttttttt", res.result);
218 this.bdcqz = res.result[0]; 215 this.bdcqz = res.result[0];
219 this.headTabBdcqz = res.result; 216 this.headTabBdcqz = res.result;
220 if (this.bdcqz.bdcqzlx == 1) { 217 if (this.bdcqz.bdcqzlx == 1) {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-06 09:09:45 4 * @LastEditTime: 2023-10-23 14:08:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class='sfxx'> 7 <div class='sfxx'>
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
67 </div> 67 </div>
68 </template> 68 </template>
69 <script> 69 <script>
70
71 export default { 70 export default {
72 components: {}, 71 components: {},
73 data () { 72 data () {
......
1 <!-- 1 <!--
2 * @Description: 审批意见 2 * @Description: 审批意见
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-08 14:48:32 4 * @LastEditTime: 2023-10-23 17:19:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="spyj loadingtext"> 7 <div class="spyj" v-Loading="loading">
8 <div class="box"> 8 <div class="box">
9 <div class="spyj_title"> 9 <div class="spyj_title">
10 <div class="righttitle">审批表</div> 10 <div class="righttitle">审批表</div>
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
59 <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button> 59 <el-button type="primary" :disabled="shows" @click="onSubmit()">保存</el-button>
60 </div> 60 </div>
61 </div> 61 </div>
62 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
63 </div> 62 </div>
64 </template> 63 </template>
65 <script> 64 <script>
...@@ -72,6 +71,7 @@ ...@@ -72,6 +71,7 @@
72 }, 71 },
73 data () { 72 data () {
74 return { 73 return {
74 loading: false,
75 currentindex: 0, 75 currentindex: 0,
76 refresh: 10, 76 refresh: 10,
77 viewEdit: false, 77 viewEdit: false,
...@@ -103,7 +103,6 @@ ...@@ -103,7 +103,6 @@
103 }, 103 },
104 104
105 }, 105 },
106 created () { },
107 methods: { 106 methods: {
108 /** 107 /**
109 * @description: dataset 108 * @description: dataset
...@@ -112,20 +111,6 @@ ...@@ -112,20 +111,6 @@
112 */ 111 */
113 dataset () { 112 dataset () {
114 this.viewEdit = this.$parent.currentSelectTab.ableOperation; 113 this.viewEdit = this.$parent.currentSelectTab.ableOperation;
115 // switch (this.$parent.dqhj) {
116 // case "cs":
117 // this.indexdqlc = 0;
118 // this.jdmc = "初审";
119 // break;
120 // case "fs":
121 // this.indexdqlc = 1;
122 // this.jdmc = "复审";
123 // break;
124 // case "hd":
125 // this.indexdqlc = 2;
126 // this.jdmc = "核定";
127 // break;
128 // }
129 }, 114 },
130 /** 115 /**
131 * @description: getShList 116 * @description: getShList
...@@ -133,19 +118,17 @@ ...@@ -133,19 +118,17 @@
133 * @author: renchao 118 * @author: renchao
134 */ 119 */
135 getShList () { 120 getShList () {
136 this.$startLoading(); 121 this.loading = true
137 var formdata = new FormData(); 122 var formdata = new FormData();
138 formdata.append("bsmBusiness", this.propsParam.bsmBusiness); 123 formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
139 formdata.append("bestepid", this.$route.query.bestepid); 124 formdata.append("bestepid", this.$route.query.bestepid);
140 125
141 getSpyjList(formdata).then((res) => { 126 getSpyjList(formdata).then((res) => {
142
143 if (res.code === 200 && res.result) { 127 if (res.code === 200 && res.result) {
144 this.tableData = res.result; 128 this.tableData = res.result;
145 if (this.shows) { 129 if (this.shows) {
146 this.shows = false; 130 this.shows = false;
147 } 131 }
148
149 var index = this.tableData.findIndex( 132 var index = this.tableData.findIndex(
150 (item) => item.jddm === this.$parent.dqhj 133 (item) => item.jddm === this.$parent.dqhj
151 ); 134 );
...@@ -176,12 +159,9 @@ ...@@ -176,12 +159,9 @@
176 } 159 }
177 console.log("this.tableData333",this.tableData); 160 console.log("this.tableData333",this.tableData);
178 }); 161 });
179 this.$endLoading(); 162 this.loading = false
180
181 } 163 }
182 164 })
183 });
184
185 }, 165 },
186 /** 166 /**
187 * @description: onSubmit 167 * @description: onSubmit
......
...@@ -73,6 +73,11 @@ class data extends filter { ...@@ -73,6 +73,11 @@ class data extends filter {
73 width: '200' 73 width: '200'
74 }, 74 },
75 { 75 {
76 prop: "djqxmc",
77 label: "登记情形",
78 width: '200'
79 },
80 {
76 prop: "bdcdyh", 81 prop: "bdcdyh",
77 label: "不动产单元号", 82 label: "不动产单元号",
78 minWidth: '150', 83 minWidth: '150',
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-09 09:50:37 4 * @LastEditTime: 2023-10-23 17:17:34
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
89 <div class="flex"> 89 <div class="flex">
90 <el-input 90 <el-input
91 maxlength="12" 91 maxlength="12"
92 :disabled="!viewEdit"
92 v-model="ruleForm.jsydsyq.syqmj" 93 v-model="ruleForm.jsydsyq.syqmj"
93 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> 94 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
94 <el-select disabled v-model="mjdw" style="width: 68px"> 95 <el-select disabled v-model="mjdw" style="width: 68px">
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
104 </el-col> 105 </el-col>
105 <el-col :span="8"> 106 <el-col :span="8">
106 <el-form-item label="权利设定方式:"> 107 <el-form-item label="权利设定方式:">
107 <el-input maxlength="25" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> 108 <el-input maxlength="25" :disabled="!viewEdit" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
108 </el-form-item> 109 </el-form-item>
109 </el-col> 110 </el-col>
110 <el-col :span="8"> 111 <el-col :span="8">
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
112 <div style="display: flex"> 113 <div style="display: flex">
113 <el-input 114 <el-input
114 maxlength="11" 115 maxlength="11"
116 :disabled="!viewEdit"
115 v-model="ruleForm.jsydsyq.qdjg" 117 v-model="ruleForm.jsydsyq.qdjg"
116 style="width: 500%" 118 style="width: 500%"
117 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input> 119 oninput="value = (value.match(/^\d*(\.?\d{0,2})/g)[0]) || null"></el-input>
...@@ -129,7 +131,7 @@ ...@@ -129,7 +131,7 @@
129 131
130 <el-col :span="16"> 132 <el-col :span="16">
131 <el-form-item label="坐落:"> 133 <el-form-item label="坐落:">
132 <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input> 134 <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
133 </el-form-item> 135 </el-form-item>
134 </el-col> 136 </el-col>
135 </el-row> 137 </el-row>
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
141 this.sqywQllxList = res.result; 141 this.sqywQllxList = res.result;
142 }) 142 })
143 }, 143 },
144 //申请业务类型菜单事件
145 /** 144 /**
146 * @description: 申请业务类型菜单事件 145 * @description: 申请业务类型菜单事件
147 * @param {*} item 146 * @param {*} item
......
...@@ -73,6 +73,11 @@ class data extends filter { ...@@ -73,6 +73,11 @@ class data extends filter {
73 minWidth: '150', 73 minWidth: '150',
74 }, 74 },
75 { 75 {
76 prop: "djqxmc",
77 label: "登记情形",
78 minWidth: '150',
79 },
80 {
76 prop: "bdcdyh", 81 prop: "bdcdyh",
77 label: "不动产单元号", 82 label: "不动产单元号",
78 minWidth: '150', 83 minWidth: '150',
......