Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
cce5318d by xiaomiao
Options

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

2 parents e5653fa5 06660443
Inline Side-by-side
Showing 23 changed files with 74 additions and 27 deletions
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </lb-column> 24 </lb-column>
25 </el-table> 25 </el-table>
26 26
27 <el-table v-else ref="elTable" id="heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" 27 <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '50px' }"
28 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs" 28 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
29 :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%" 29 :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
30 :span-method="this.merge ? this.mergeMethod : this.spanMethod"> 30 :span-method="this.merge ? this.mergeMethod : this.spanMethod">
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { log } from 'bpmn-js-token-simulation'
50 import LbColumn from './lb-column' 51 import LbColumn from './lb-column'
51 export default { 52 export default {
52 props: { 53 props: {
...@@ -185,9 +186,11 @@ ...@@ -185,9 +186,11 @@
185 _this.tableHeight = window.innerHeight - _this.heightNum 186 _this.tableHeight = window.innerHeight - _this.heightNum
186 } 187 }
187 } else { 188 } else {
188 // this.tableHeight = this.heightNum
189 this.$nextTick(() => { 189 this.$nextTick(() => {
190 this.minHeight && (document.getElementById('heightNumSetting').style.minHeight = this.minHeight + 'px') 190 let arr = document.getElementsByClassName('heightNumSetting');
191 [...arr].forEach(item => {
192 this.minHeight && (item.style.minHeight = this.minHeight + 'px')
193 })
191 }) 194 })
192 } 195 }
193 }, 196 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-01 15:24:10 4 * @LastEditTime: 2023-08-02 09:53:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -197,6 +197,8 @@ ...@@ -197,6 +197,8 @@
197 this.$popupCacel() 197 this.$popupCacel()
198 store.dispatch('user/reWorkFresh', true) 198 store.dispatch('user/reWorkFresh', true)
199 } 199 }
200 }).catch(() => {
201 this.loading = false
200 }) 202 })
201 }, 203 },
202 /** 204 /**
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150" 8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true"
9 :data="tableDataList"> 9 :data="tableDataList">
10 </lb-table> 10 </lb-table>
11 <addQlr v-model="dialog" :details="details" :showButton="!isDisabled" @updateDetail="handleupdateDetail" /> 11 <addQlr v-model="dialog" :details="details" :showButton="!isDisabled" @updateDetail="handleupdateDetail" />
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 08:34:59 4 * @LastEditTime: 2023-08-02 09:31:38
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 <el-input v-else disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input> 116 <el-input v-else disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input>
117 </el-form-item> 117 </el-form-item>
118 </el-col> 118 </el-col>
119 <el-col :span="8"> 119 <el-col :span="7">
120 <el-form-item label="抵押方式："> 120 <el-form-item label="抵押方式：">
121 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs"> 121 <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
122 <el-radio label="1">一般抵押权</el-radio> 122 <el-radio label="1">一般抵押权</el-radio>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
124 </el-radio-group> 124 </el-radio-group>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 <el-col :span="8"> 127 <el-col :span="9">
128 <el-form-item label="是否存在禁止或者限制转让抵押不动产的约定：" label-width="350px"> 128 <el-form-item label="是否存在禁止或者限制转让抵押不动产的约定：" label-width="350px">
129 <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz" :disabled="!ableOperation|| isJfOperation"> 129 <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz" :disabled="!ableOperation|| isJfOperation">
130 <el-radio label="1">启用</el-radio> 130 <el-radio label="1">启用</el-radio>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:11:52 4 * @LastEditTime: 2023-08-02 09:53:35
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -155,6 +155,8 @@ ...@@ -155,6 +155,8 @@
155 } else { 155 } else {
156 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 156 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
157 } 157 }
158 }).catch(() => {
159 this.loading = false
158 }) 160 })
159 } else { 161 } else {
160 this.loading = true 162 this.loading = true
...@@ -174,7 +176,9 @@ ...@@ -174,7 +176,9 @@
174 this.$message.error(res.message); 176 this.$message.error(res.message);
175 } 177 }
176 this.$popupCacel(); 178 this.$popupCacel();
177 }); 179 }).catch(() => {
180 this.loading = false
181 })
178 } 182 }
179 }, 183 },
180 /** 184 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:15:01 4 * @LastEditTime: 2023-08-02 09:57:31
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 抵押权利信息查询 --> 7 <!-- 抵押权利信息查询 -->
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 <el-col :span="2" class="btnColRight"> 39 <el-col :span="2" class="btnColRight">
40 <el-form-item> 40 <el-form-item>
41 <el-button type="primary" @click="handleSearch" :loading="loading">查询</el-button> 41 <el-button type="primary" @click="handleSearch" :loading="loading">查询</el-button>
42 <el-button type="primary" @click="resetForm(true)">重置</el-button> 42 <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
43 </el-form-item> 43 </el-form-item>
44 </el-col> 44 </el-col>
45 </el-row> 45 </el-row>
...@@ -139,6 +139,8 @@ ...@@ -139,6 +139,8 @@
139 } else { 139 } else {
140 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 140 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
141 } 141 }
142 }).catch(() => {
143 this.loading = false
142 }) 144 })
143 }, 145 },
144 /** 146 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:16:13 4 * @LastEditTime: 2023-08-02 09:58:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -266,6 +266,8 @@ ...@@ -266,6 +266,8 @@
266 } else { 266 } else {
267 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 267 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
268 } 268 }
269 }).catch(() => {
270 this.loading = false
269 }) 271 })
270 } else { 272 } else {
271 this.loading = true 273 this.loading = true
...@@ -285,6 +287,8 @@ ...@@ -285,6 +287,8 @@
285 } else { 287 } else {
286 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 288 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
287 } 289 }
290 }).catch(() => {
291 this.loading = false
288 }) 292 })
289 } 293 }
290 }, 294 },
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:16:53 4 * @LastEditTime: 2023-08-02 09:58:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -128,6 +128,8 @@ ...@@ -128,6 +128,8 @@
128 } else { 128 } else {
129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 129 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
130 } 130 }
131 }).catch(() => {
132 this.loading = false
131 }) 133 })
132 }, 134 },
133 /** 135 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:17:54 4 * @LastEditTime: 2023-08-02 09:56:26
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -125,6 +125,8 @@ ...@@ -125,6 +125,8 @@
125 } else { 125 } else {
126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 126 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
127 } 127 }
128 }).catch(() => {
129 this.loading = false
128 }) 130 })
129 }, 131 },
130 /** 132 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:18:37 4 * @LastEditTime: 2023-08-02 09:58:35
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -153,6 +153,8 @@ ...@@ -153,6 +153,8 @@
153 } else { 153 } else {
154 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 154 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
155 } 155 }
156 }).catch(() => {
157 this.loading = false
156 }) 158 })
157 }, 159 },
158 /** 160 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:19:26 4 * @LastEditTime: 2023-08-02 09:58:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -184,6 +184,8 @@ ...@@ -184,6 +184,8 @@
184 } else { 184 } else {
185 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 185 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
186 } 186 }
187 }).catch(() => {
188 this.loading = false
187 }) 189 })
188 }, 190 },
189 /** 191 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:20:26 4 * @LastEditTime: 2023-08-02 09:58:53
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -130,6 +130,8 @@ ...@@ -130,6 +130,8 @@
130 } else { 130 } else {
131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
132 } 132 }
133 }).catch(() => {
134 this.loading = false
133 }) 135 })
134 }, 136 },
135 /** 137 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-21 11:18:39 4 * @LastEditTime: 2023-08-02 09:59:05
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
131 } 131 }
132 }).catch(() => {
133 this.loading = false
132 }) 134 })
133 }, 135 },
134 /** 136 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:22:11 4 * @LastEditTime: 2023-08-02 09:56:33
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -138,6 +138,8 @@ ...@@ -138,6 +138,8 @@
138 } else { 138 } else {
139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
140 } 140 }
141 }).catch(() => {
142 this.loading = false
141 }) 143 })
142 }, 144 },
143 /** 145 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:34:30 4 * @LastEditTime: 2023-08-02 09:56:41
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -258,6 +258,8 @@ ...@@ -258,6 +258,8 @@
258 } else { 258 } else {
259 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 259 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
260 } 260 }
261 }).catch(() => {
262 this.loading = false
261 }) 263 })
262 }, 264 },
263 /** 265 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:35:29 4 * @LastEditTime: 2023-08-02 09:59:18
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -135,6 +135,8 @@ ...@@ -135,6 +135,8 @@
135 } else { 135 } else {
136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 136 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
137 } 137 }
138 }).catch(() => {
139 this.loading = false
138 }) 140 })
139 }, 141 },
140 /** 142 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:36:26 4 * @LastEditTime: 2023-08-02 09:59:25
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -138,6 +138,8 @@ ...@@ -138,6 +138,8 @@
138 } else { 138 } else {
139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 139 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
140 } 140 }
141 }).catch(() => {
142 this.loading = false
141 }) 143 })
142 }, 144 },
143 /** 145 /**
......
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
131 } 131 }
132 }).catch(() => {
133 this.loading = false
132 }) 134 })
133 }, 135 },
134 /** 136 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:38:00 4 * @LastEditTime: 2023-08-02 09:59:39
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -127,6 +127,8 @@ ...@@ -127,6 +127,8 @@
127 } else { 127 } else {
128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 128 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
129 } 129 }
130 }).catch(() => {
131 this.loading = false
130 }) 132 })
131 }, 133 },
132 /** 134 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-27 10:04:28 4 * @LastEditTime: 2023-08-02 09:59:44
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
131 } 131 }
132 }).catch(() => {
133 this.loading = false
132 }) 134 })
133 }, 135 },
134 /** 136 /**
......
...@@ -129,6 +129,8 @@ ...@@ -129,6 +129,8 @@
129 } else { 129 } else {
130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 130 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
131 } 131 }
132 }).catch(() => {
133 this.loading = false
132 }) 134 })
133 }, 135 },
134 /** 136 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:40:25 4 * @LastEditTime: 2023-08-02 09:59:52
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -130,6 +130,8 @@ ...@@ -130,6 +130,8 @@
130 } else { 130 } else {
131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 131 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
132 } 132 }
133 }).catch(() => {
134 this.loading = false
133 }) 135 })
134 }, 136 },
135 /** 137 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 09:40:53 4 * @LastEditTime: 2023-08-02 09:59:58
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 主体权利信息查询 --> 7 <!-- 主体权利信息查询 -->
...@@ -131,6 +131,8 @@ ...@@ -131,6 +131,8 @@
131 } else { 131 } else {
132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%') 132 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message, result: res.result }, '36%')
133 } 133 }
134 }).catch(() => {
135 this.loading = false
134 }) 136 })
135 }, 137 },
136 /** 138 /**
......