0ce200f2 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents b5292135 b16ca7c3
1 @union:registry=http://core.pashanhoo.com:8932/repository/npm-hosted/
...\ No newline at end of file ...\ No newline at end of file
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
30 "vue-router": "3.0.2", 30 "vue-router": "3.0.2",
31 "vue-seamless-scroll": "^1.1.23", 31 "vue-seamless-scroll": "^1.1.23",
32 "vuex": "3.1.0", 32 "vuex": "3.1.0",
33 "x2js": "^3.4.4" 33 "x2js": "^3.4.4",
34 "@union/gis-sdk": "1.1.0"
34 }, 35 },
35 "devDependencies": { 36 "devDependencies": {
36 "@vue/cli-plugin-babel": "4.4.4", 37 "@vue/cli-plugin-babel": "4.4.4",
......
1 [
2 {
3 "label":"不动产",
4 "id":"1-1",
5 "alpha":100,
6 "children":[
7 {
8 "label":"行政区划",
9 "id": "XZQH",
10 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
11 "alpha":100,
12 "children":[
13 {
14 "label":"行政区",
15 "id": "XZQH_0",
16 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
17 "alpha":100
18 },
19 {
20 "label":"行政区界限",
21 "id": "XZQH_1",
22 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/XZQH/MapServer",
23 "alpha":100
24 }
25 ]
26 },
27 {
28 "label":"地籍分区",
29 "id": "DJFQ",
30 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
31 "alpha":100,
32 "children":[
33 {
34 "label":"地籍区",
35 "id": "DJFQ_0",
36 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
37 "alpha":100
38 },
39 {
40 "label":"地籍子区",
41 "id": "DJFQ_1",
42 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/DJFQ/MapServer",
43 "alpha":100
44 }
45 ]
46 },
47 {
48 "label":"不动产单元",
49 "id": "bdcDY",
50 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
51 "alpha":100,
52 "children":[
53 {
54 "label":"界址点",
55 "id": "bdcDY_0",
56 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
57 "alpha":100
58 },
59 {
60 "label":"界址线",
61 "id": "bdcDY_1",
62 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
63 "alpha":100
64 },
65 {
66 "label":"林权",
67 "id": "bdcDY_2",
68 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
69 "alpha":100
70 },
71 {
72 "label":"自然幢",
73 "id": "ZRZ",
74 "name": "zrz",
75 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
76 "alpha":100
77 },
78 {
79 "label":"构筑物",
80 "id": "bdcDY_4",
81 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
82 "alpha":100
83 },
84 {
85 "label":"点状定着物",
86 "id": "bdcDY_5",
87 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
88 "alpha":100
89 },
90 {
91 "label":"线状定着物",
92 "id": "bdcDY_6",
93 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
94 "alpha":100
95 },
96 {
97 "label":"面状定着物",
98 "id": "bdcDY_7",
99 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/bdcDY_610100/MapServer",
100 "alpha":100
101 },
102 {
103 "label":"宗地",
104 "id": "ZDJBXX",
105 "name": "zd",
106 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
107 "alpha":100,
108 "fields": [ "YSDM", "ZDDM", "BDCDYH", "ZDTZM", "ZL", "ZDMJ", "MJDW", "QLLX", "QLXZ" ]
109 },
110 {
111 "label":"宗地历史",
112 "id": "ZDJBXXLS",
113 "name": "zdls",
114 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
115 "alpha":100,
116 "fields": [ "YSDM", "ZDDM", "BDCDYH", "ZDTZM", "ZL", "ZDMJ", "MJDW", "QLLX", "QLXZ" ]
117 },
118 {
119 "label":"宗海",
120 "id": "ZHJBXX",
121 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/BDCDY/MapServer",
122 "alpha":100
123 }
124
125 ]
126 },
127 {
128 "label":"自然地理",
129 "id": "ZRDL",
130 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
131 "alpha":100,
132 "children":[
133 {
134 "label":"水系",
135 "id": "ZRDL_0",
136 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
137 "alpha":100
138 },
139 {
140 "label":"植被",
141 "id": "ZRDL_1",
142 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
143 "alpha":100
144 },
145 {
146 "label":"辅助面",
147 "id": "ZRDL_2",
148 "url": "http://192.168.2.252:6080/arcgis/rest/services/bdc/ZRDL/MapServer",
149 "alpha":100
150 }
151 ]
152 }
153 ]
154 },
155 {
156 "label":"厦门数据",
157 "id":"2-1",
158 "alpha":100,
159 "children":[
160 {
161 "label":"规划用地",
162 "id": "ghyd",
163 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ghyd/MapServer",
164 "alpha":100,
165 "children":[
166 {
167 "label":"规划用地",
168 "id": "ghyd_0",
169 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ghyd/MapServer",
170 "alpha":100,
171 "fields": [ "地块编号", "规划现状", "行政区", "维护文号", "规划用地性质代号", "规划用地性质名称", "所属管理单元", "所属编制单元" ]
172 }
173 ]
174 },
175 {
176 "label":"基本农田",
177 "id": "jbnt",
178 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/jbnt/MapServer",
179 "alpha":100,
180 "children":[
181 {
182 "label":"基本农田",
183 "id": "jbnt_0",
184 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/jbnt/MapServer",
185 "alpha":100,
186 "fields": [ "编制单位", "权属单位代码", "权属单位名称", "座落单位代码", "座落单位名称", "地类名称", "基本农田面积" ]
187 }
188 ]
189 },
190 {
191 "label":"行政区划",
192 "id": "xmxzq",
193 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
194 "alpha":100,
195 "children":[
196 {
197 "label":"村级行政区划",
198 "id": "xmxzq_0",
199 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
200 "alpha":100
201 },
202 {
203 "label":"镇级行政区划",
204 "id": "xmxzq_1",
205 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
206 "alpha":100
207 },
208 {
209 "label":"区级行政区划",
210 "id": "xmxzq_2",
211 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xmxzq/MapServer",
212 "alpha":100
213 }
214 ]
215 },
216 {
217 "label":"现状建筑",
218 "id": "xzjz",
219 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xzjz/MapServer",
220 "alpha":100,
221 "children":[
222 {
223 "label":"现状建筑",
224 "id": "xzjz_0",
225 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/xzjz/MapServer",
226 "alpha":100,
227 "fields": [ "SJLY", "PRODATE", "GXSJ", "DWMC", "AQDJ", "DWDM", "ZXDX", "ZXDY" ]
228 }
229 ]
230 },
231 {
232 "label":"用地",
233 "id": "ypyd",
234 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
235 "alpha":100,
236 "children":[
237 {
238 "label":"用地",
239 "id": "ypyd_0",
240 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
241 "alpha":100
242 },
243 {
244 "label":"选址",
245 "id": "ypyd_0",
246 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
247 "alpha":100
248 },
249 {
250 "label":"红线",
251 "id": "ypyd_0",
252 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
253 "alpha":100
254 },
255 {
256 "label":"道路",
257 "id": "ypyd_0",
258 "url": "http://192.168.2.252:6080/arcgis/rest/services/xiamen/ypyd/MapServer",
259 "alpha":100
260 }
261 ]
262 }
263 ]
264 }
265 ]
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-27 10:05:25 4 * @LastEditTime: 2023-08-09 14:32:38
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -280,3 +280,14 @@ export function startTogetherFlow (data) { ...@@ -280,3 +280,14 @@ export function startTogetherFlow (data) {
280 data 280 data
281 }) 281 })
282 } 282 }
283 /**
284 * @description: 据不动产单元号查询宗地基本信息
285 * @param {*} data
286 * @author: renchao
287 */
288 export function getZdInfo (bdcdyid) {
289 return request({
290 url: SERVER.SERVERAPI + '/rest/business/workFlow/getZdInfo?bdcdyid=' + bdcdyid,
291 method: 'post'
292 })
293 }
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
18 inline-message 18 inline-message
19 :show-message="false" 19 :show-message="false"
20 :class="{ readonly: editDisabled }" 20 :class="{ readonly: editDisabled }"
21 class="loadingtext"> 21 class="loadingtext"
22 >
22 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 23 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
23 <div class="slxx_title title-block"> 24 <div class="slxx_title title-block">
24 补录信息 25 补录信息
...@@ -47,24 +48,29 @@ ...@@ -47,24 +48,29 @@
47 <el-form-item 48 <el-form-item
48 label="查封不动产权信息:" 49 label="查封不动产权信息:"
49 prop="ztQlxx.bdcqzh" 50 prop="ztQlxx.bdcqzh"
50 :rules="rules.ztQlxxrules"> 51 :rules="rules.ztQlxxrules"
52 >
51 <select-table 53 <select-table
52 v-model="ruleForm.ztQlxx" 54 v-model="ruleForm.ztQlxx"
53 :table-width="730" 55 :table-width="730"
54 :tableData="ztQlxxList" 56 :tableData="ztQlxxList"
55 :props="props" 57 :props="props"
56 @change="ztQlxxchange"> 58 @change="ztQlxxchange"
59 >
57 <el-table-column 60 <el-table-column
58 prop="qllxmc" 61 prop="qllxmc"
59 width="130" 62 width="130"
60 label="权利类型"></el-table-column> 63 label="权利类型"
64 ></el-table-column>
61 <el-table-column 65 <el-table-column
62 prop="bdcqzh" 66 prop="bdcqzh"
63 width="160" 67 width="160"
64 label="不动产权证书"></el-table-column> 68 label="不动产权证书"
69 ></el-table-column>
65 <el-table-column 70 <el-table-column
66 prop="qlrmc" 71 prop="qlrmc"
67 label="被执行人"></el-table-column> 72 label="被执行人"
73 ></el-table-column>
68 <el-table-column prop="mjmc" label="面积"></el-table-column> 74 <el-table-column prop="mjmc" label="面积"></el-table-column>
69 <el-table-column prop="ytmc" label="用途"></el-table-column> 75 <el-table-column prop="ytmc" label="用途"></el-table-column>
70 <el-table-column prop="zl" label="坐落"></el-table-column> 76 <el-table-column prop="zl" label="坐落"></el-table-column>
...@@ -75,9 +81,7 @@ ...@@ -75,9 +81,7 @@
75 <div class="triangle"></div> 81 <div class="triangle"></div>
76 </div> 82 </div>
77 83
78 <el-row :gutter="10"> 84 <el-row :gutter="10"> </el-row>
79
80 </el-row>
81 <el-row :gutter="10" v-if="ruleForm.ztQlxx != null"> 85 <el-row :gutter="10" v-if="ruleForm.ztQlxx != null">
82 <el-col :span="8"> 86 <el-col :span="8">
83 <el-form-item label="权利人:"> 87 <el-form-item label="权利人:">
...@@ -136,21 +140,25 @@ ...@@ -136,21 +140,25 @@
136 label="上手权利信息:" 140 label="上手权利信息:"
137 prop="ssQlxx.bdcqzh" 141 prop="ssQlxx.bdcqzh"
138 :rules="rules.ssQlxxrules" 142 :rules="rules.ssQlxxrules"
139 v-if="ruleForm.cfdj.sfbxf == '1'"> 143 v-if="ruleForm.cfdj.sfbxf == '1'"
144 >
140 <select-table 145 <select-table
141 v-model="ruleForm.ssQlxx" 146 v-model="ruleForm.ssQlxx"
142 :table-width="730" 147 :table-width="730"
143 :tableData="ssQlxxList" 148 :tableData="ssQlxxList"
144 :props="props" 149 :props="props"
145 @change="ssQlxxchange"> 150 @change="ssQlxxchange"
151 >
146 <el-table-column 152 <el-table-column
147 prop="qllxmc" 153 prop="qllxmc"
148 width="130" 154 width="130"
149 label="权利类型"></el-table-column> 155 label="权利类型"
156 ></el-table-column>
150 <el-table-column 157 <el-table-column
151 prop="bdcqzh" 158 prop="bdcqzh"
152 width="160" 159 width="160"
153 label="不动产权证书"></el-table-column> 160 label="不动产权证书"
161 ></el-table-column>
154 <el-table-column prop="qlrmc" label="权利人"></el-table-column> 162 <el-table-column prop="qlrmc" label="权利人"></el-table-column>
155 <el-table-column prop="mjmc" label="面积"></el-table-column> 163 <el-table-column prop="mjmc" label="面积"></el-table-column>
156 <el-table-column prop="ytmc" label="用途"></el-table-column> 164 <el-table-column prop="ytmc" label="用途"></el-table-column>
...@@ -170,7 +178,8 @@ ...@@ -170,7 +178,8 @@
170 <el-form-item 178 <el-form-item
171 label="业务号:" 179 label="业务号:"
172 prop="qlxx.ywh" 180 prop="qlxx.ywh"
173 :rules="rules.ywhrules"> 181 :rules="rules.ywhrules"
182 >
174 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 183 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
175 </el-form-item> 184 </el-form-item>
176 </el-col> 185 </el-col>
...@@ -189,8 +198,12 @@ ...@@ -189,8 +198,12 @@
189 <el-col :span="8"> 198 <el-col :span="8">
190 <el-form-item label="是否被续封:" 199 <el-form-item label="是否被续封:"
191 prop="cfdj.sfbxf" 200 prop="cfdj.sfbxf"
192 :rules="rules.sfbxfrules"> 201 :rules="rules.sfbxfrules"
193 <el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange"> 202 >
203 <el-radio-group
204 v-model="ruleForm.cfdj.sfbxf"
205 @change="djlxchange"
206 >
194 <el-radio label="1"></el-radio> 207 <el-radio label="1"></el-radio>
195 <el-radio label="2"></el-radio> 208 <el-radio label="2"></el-radio>
196 </el-radio-group> 209 </el-radio-group>
...@@ -208,7 +221,8 @@ ...@@ -208,7 +221,8 @@
208 v-for="item in qsztlist" 221 v-for="item in qsztlist"
209 :key="item.dcode" 222 :key="item.dcode"
210 :label="item.dname" 223 :label="item.dname"
211 :value="item.dcode"></el-option> 224 :value="item.dcode"
225 ></el-option>
212 </el-select> 226 </el-select>
213 </el-form-item> 227 </el-form-item>
214 </el-col> 228 </el-col>
...@@ -233,7 +247,8 @@ ...@@ -233,7 +247,8 @@
233 v-for="item in dictData['A32']" 247 v-for="item in dictData['A32']"
234 :key="item.dcode" 248 :key="item.dcode"
235 :label="item.dname" 249 :label="item.dname"
236 :value="item.dcode"></el-option> 250 :value="item.dcode"
251 ></el-option>
237 </el-select> 252 </el-select>
238 </el-form-item> 253 </el-form-item>
239 </el-col> 254 </el-col>
...@@ -250,7 +265,8 @@ ...@@ -250,7 +265,8 @@
250 type="date" 265 type="date"
251 placeholder="选择日期" 266 placeholder="选择日期"
252 value-format="yyyy-MM-dd HH:mm:ss" 267 value-format="yyyy-MM-dd HH:mm:ss"
253 format="yyyy-MM-dd"></el-date-picker> 268 format="yyyy-MM-dd"
269 ></el-date-picker>
254 </el-form-item> 270 </el-form-item>
255 </el-col> 271 </el-col>
256 <el-col :span="8"> 272 <el-col :span="8">
...@@ -261,7 +277,8 @@ ...@@ -261,7 +277,8 @@
261 type="date" 277 type="date"
262 placeholder="选择日期" 278 placeholder="选择日期"
263 value-format="yyyy-MM-dd HH:mm:ss" 279 value-format="yyyy-MM-dd HH:mm:ss"
264 format="yyyy-MM-dd"></el-date-picker> 280 format="yyyy-MM-dd"
281 ></el-date-picker>
265 </el-form-item> 282 </el-form-item>
266 </el-col> 283 </el-col>
267 <el-col :span="8"> 284 <el-col :span="8">
...@@ -287,7 +304,8 @@ ...@@ -287,7 +304,8 @@
287 <el-form-item 304 <el-form-item
288 label="登记机构:" 305 label="登记机构:"
289 prop="qlxx.djjg" 306 prop="qlxx.djjg"
290 :rules="rules.djjgrules"> 307 :rules="rules.djjgrules"
308 >
291 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 309 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
292 </el-form-item> 310 </el-form-item>
293 </el-col> 311 </el-col>
...@@ -296,7 +314,8 @@ ...@@ -296,7 +314,8 @@
296 <el-form-item 314 <el-form-item
297 label="登簿人:" 315 label="登簿人:"
298 prop="qlxx.dbr" 316 prop="qlxx.dbr"
299 :rules="rules.dbrrules"> 317 :rules="rules.dbrrules"
318 >
300 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 319 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
301 </el-form-item> 320 </el-form-item>
302 </el-col> 321 </el-col>
...@@ -304,14 +323,16 @@ ...@@ -304,14 +323,16 @@
304 <el-form-item 323 <el-form-item
305 label="登记时间:" 324 label="登记时间:"
306 prop="qlxx.djsj" 325 prop="qlxx.djsj"
307 :rules="rules.djsjrules"> 326 :rules="rules.djsjrules"
327 >
308 <el-date-picker 328 <el-date-picker
309 v-model="ruleForm.qlxx.djsj" 329 v-model="ruleForm.qlxx.djsj"
310 type="date" 330 type="date"
311 placeholder="选择日期" 331 placeholder="选择日期"
312 class="width100" 332 class="width100"
313 value-format="yyyy-MM-dd HH:mm:ss" 333 value-format="yyyy-MM-dd HH:mm:ss"
314 format="yyyy-MM-dd"> 334 format="yyyy-MM-dd"
335 >
315 </el-date-picker> 336 </el-date-picker>
316 </el-form-item> 337 </el-form-item>
317 </el-col> 338 </el-col>
...@@ -355,7 +376,8 @@ ...@@ -355,7 +376,8 @@
355 type="date" 376 type="date"
356 placeholder="选择日期" 377 placeholder="选择日期"
357 value-format="yyyy-MM-dd HH:mm:ss" 378 value-format="yyyy-MM-dd HH:mm:ss"
358 format="yyyy-MM-dd"> 379 format="yyyy-MM-dd"
380 >
359 </el-date-picker> 381 </el-date-picker>
360 </el-form-item> 382 </el-form-item>
361 </el-col> 383 </el-col>
...@@ -370,18 +392,24 @@ ...@@ -370,18 +392,24 @@
370 </div> 392 </div>
371 </template> 393 </template>
372 <script> 394 <script>
373 import { mapGetters } from "vuex"; 395 import { mapGetters } from "vuex";
374 import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js"; 396 import {
375 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 397 init,
376 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 398 getSsQlxx,
377 import tdytTable from "@/views/workflow/components/tdytTable"; 399 getZtQlxx,
378 import selectTable from "@/components/selectTable/index.vue"; 400 getQlxxByQlxxBsm,
379 export default { 401 save,
402 } from "@/api/djbRepair.js";
403 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
404 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
405 import tdytTable from "@/views/workflow/components/tdytTable";
406 import selectTable from "@/components/selectTable/index.vue";
407 export default {
380 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable }, 408 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
381 computed: { 409 computed: {
382 ...mapGetters(["dictData", "flag"]), 410 ...mapGetters(["dictData", "flag"]),
383 // 根据流程判断表单是否为只读 411 // 根据流程判断表单是否为只读
384 editDisabled () { 412 editDisabled() {
385 if (!this.ableOperation) { 413 if (!this.ableOperation) {
386 //只读状态 414 //只读状态
387 return true; 415 return true;
...@@ -389,7 +417,7 @@ ...@@ -389,7 +417,7 @@
389 return false; 417 return false;
390 }, 418 },
391 }, 419 },
392 data () { 420 data() {
393 return { 421 return {
394 //表单是否可操作 422 //表单是否可操作
395 props: { 423 props: {
...@@ -480,10 +508,10 @@ ...@@ -480,10 +508,10 @@
480 }, 508 },
481 }; 509 };
482 }, 510 },
483 created () { 511 created() {
484 this.loadData(); 512 this.loadData();
485 }, 513 },
486 mounted () { 514 mounted() {
487 this.ableOperation = this.$parent.ableOperation; 515 this.ableOperation = this.$parent.ableOperation;
488 }, 516 },
489 methods: { 517 methods: {
...@@ -492,7 +520,7 @@ ...@@ -492,7 +520,7 @@
492 * @param {*} val 520 * @param {*} val
493 * @author: renchao 521 * @author: renchao
494 */ 522 */
495 ztQlxxchange (val) { 523 ztQlxxchange(val) {
496 this.ruleForm.ztQlxx = val; 524 this.ruleForm.ztQlxx = val;
497 }, 525 },
498 /** 526 /**
...@@ -500,20 +528,21 @@ ...@@ -500,20 +528,21 @@
500 * @param {*} val 528 * @param {*} val
501 * @author: renchao 529 * @author: renchao
502 */ 530 */
503 ssQlxxchange (val) { 531 ssQlxxchange(val) {
504 this.ruleForm.ssQlxx = val; 532 this.ruleForm.ssQlxx = val;
505 this.ruleForm.qlxx.ssywh = val.ywh; 533 this.ruleForm.qlxx.ssywh = val.ywh;
506 this.ssQlxxchangediolog(val); 534 this.ssQlxxchangediolog(val);
507 }, 535 },
508 // 弹框事件 536 // 弹框事件
509 ssQlxxchangediolog (val) { 537 ssQlxxchangediolog(val) {
510 this.$confirm("是否将上手权利信息同步到表单", "提示", { 538 this.$confirm("是否将上手权利信息同步到表单", "提示", {
511 iconClass: "el-icon-question", //自定义图标样式 539 iconClass: "el-icon-question", //自定义图标样式
512 confirmButtonText: "确认", //确认按钮文字更换 540 confirmButtonText: "确认", //确认按钮文字更换
513 cancelButtonText: "取消", //取消按钮文字更换 541 cancelButtonText: "取消", //取消按钮文字更换
514 showClose: true, //是否显示右上角关闭按钮 542 showClose: true, //是否显示右上角关闭按钮
515 type: "warning", 543 type: "warning",
516 }).then(() => { 544 })
545 .then(() => {
517 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => { 546 getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
518 if (res.code == 200) { 547 if (res.code == 200) {
519 this.nowlist = res.result; 548 this.nowlist = res.result;
...@@ -541,19 +570,20 @@ ...@@ -541,19 +570,20 @@
541 }); 570 });
542 } 571 }
543 }); 572 });
544 }).catch(() => { 573 })
574 .catch(() => {
545 this.$message({ 575 this.$message({
546 type: "info", 576 type: "info",
547 message: "已取消同步", 577 message: "已取消同步",
548 }); 578 });
549 }) 579 });
550 }, 580 },
551 /** 581 /**
552 * @description: djlxchange 582 * @description: djlxchange
553 * @param {*} val 583 * @param {*} val
554 * @author: renchao 584 * @author: renchao
555 */ 585 */
556 djlxchange (val) { 586 djlxchange(val) {
557 if (val == null || val == 100) { 587 if (val == null || val == 100) {
558 this.ssqlxxshow = false; 588 this.ssqlxxshow = false;
559 } else { 589 } else {
...@@ -564,7 +594,7 @@ ...@@ -564,7 +594,7 @@
564 * @description: loadData 594 * @description: loadData
565 * @author: renchao 595 * @author: renchao
566 */ 596 */
567 loadData () { 597 loadData() {
568 this.$startLoading(); 598 this.$startLoading();
569 this.propsParam.isEdit = this.$parent.isEdit; 599 this.propsParam.isEdit = this.$parent.isEdit;
570 init(this.propsParam).then((res) => { 600 init(this.propsParam).then((res) => {
...@@ -619,7 +649,7 @@ ...@@ -619,7 +649,7 @@
619 * @description: onSubmit 649 * @description: onSubmit
620 * @author: renchao 650 * @author: renchao
621 */ 651 */
622 onSubmit () { 652 onSubmit() {
623 this.$refs.ruleForm.validate((valid) => { 653 this.$refs.ruleForm.validate((valid) => {
624 console.log("valid", valid); 654 console.log("valid", valid);
625 if (valid) { 655 if (valid) {
...@@ -646,9 +676,9 @@ ...@@ -646,9 +676,9 @@
646 }); 676 });
647 }, 677 },
648 }, 678 },
649 }; 679 };
650 </script> 680 </script>
651 <style scoped lang="scss"> 681 <style scoped lang="scss">
652 @import "~@/styles/public.scss"; 682 @import "~@/styles/public.scss";
653 @import "~@/styles/slxx/slxx.scss"; 683 @import "~@/styles/slxx/slxx.scss";
654 </style> 684 </style>
......
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
375 </el-radio-group> 375 </el-radio-group>
376 </el-form-item> 376 </el-form-item>
377 </el-col> 377 </el-col>
378 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> 378 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
379 <el-form-item label="是否分别持证:"> 379 <el-form-item label="是否分别持证:">
380 <el-radio-group 380 <el-radio-group
381 v-model="ruleForm.qlxx.sqfbcz" 381 v-model="ruleForm.qlxx.sqfbcz"
...@@ -401,7 +401,7 @@ ...@@ -401,7 +401,7 @@
401 </el-option> 401 </el-option>
402 </el-select> 402 </el-select>
403 </el-form-item> 403 </el-form-item>
404 </el-col> 404 </el-col> -->
405 </el-row> 405 </el-row>
406 <qlrCommonTable 406 <qlrCommonTable
407 :tableData="ruleForm.qlrData" 407 :tableData="ruleForm.qlrData"
......
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
345 </el-radio-group> 345 </el-radio-group>
346 </el-form-item> 346 </el-form-item>
347 </el-col> 347 </el-col>
348 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> 348 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
349 <el-form-item label="是否分别持证:"> 349 <el-form-item label="是否分别持证:">
350 <el-radio-group 350 <el-radio-group
351 v-model="ruleForm.qlxx.sqfbcz" 351 v-model="ruleForm.qlxx.sqfbcz"
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
375 </el-option> 375 </el-option>
376 </el-select> 376 </el-select>
377 </el-form-item> 377 </el-form-item>
378 </el-col> 378 </el-col> -->
379 </el-row> 379 </el-row>
380 <qlrCommonTable 380 <qlrCommonTable
381 :tableData="ruleForm.qlrData" 381 :tableData="ruleForm.qlrData"
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
408 </template> 408 </template>
409 <script> 409 <script>
410 import { mapGetters } from "vuex"; 410 import { mapGetters } from "vuex";
411 import ywmix from "@/views/ywbl/mixin/index"; 411 // import ywmix from "@/views/ywbl/mixin/index";
412 import { 412 import {
413 init, 413 init,
414 getSsQlxx, 414 getSsQlxx,
...@@ -421,7 +421,7 @@ import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; ...@@ -421,7 +421,7 @@ import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
421 import tdytTable from "@/views/workflow/components/tdytTable"; 421 import tdytTable from "@/views/workflow/components/tdytTable";
422 import selectTable from "@/components/selectTable/index.vue"; 422 import selectTable from "@/components/selectTable/index.vue";
423 export default { 423 export default {
424 mixins: [ywmix], 424 // mixins: [ywmix],
425 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable }, 425 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
426 computed: { 426 computed: {
427 ...mapGetters(["dictData", "flag"]), 427 ...mapGetters(["dictData", "flag"]),
...@@ -712,24 +712,17 @@ export default { ...@@ -712,24 +712,17 @@ export default {
712 return false; 712 return false;
713 } 713 }
714 this.ruleForm.qlrData[0].sfczr = "1"; 714 this.ruleForm.qlrData[0].sfczr = "1";
715 }
716 if (this.ruleForm.qlxx.gyfs == "1") {
717 //是否分别持证
718 if (this.ruleForm.qlxx.sqfbcz == "1") {
719 //是
720 this.ruleForm.qlrData.forEach((item, index) => {
721 item.sfczr = "1";
722 });
723 } else {
724 this.ruleForm.qlrData.forEach((item, index) => {
725 if (item.zjh == this.ruleForm.czr) {
726 item.sfczr = "1";
727 } else { 715 } else {
728 item.sfczr = "0"; 716 if (this.ruleForm.qlrData.length <= 1) {
729 } 717 this.$message({
718 showClose: true,
719 message: "共有方式:共同所有,按份所有,其他所有,权利人必须是两个以上",
720 type: "error",
730 }); 721 });
722 return false;
731 } 723 }
732 } 724 }
725
733 save(this.ruleForm).then((res) => { 726 save(this.ruleForm).then((res) => {
734 if (res.code === 200) { 727 if (res.code === 200) {
735 this.$message({ 728 this.$message({
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:11:31 4 * @LastEditTime: 2023-08-09 10:09:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <el-col :span="18" class="btnColRight"> 20 <el-col :span="18" class="btnColRight">
21 <el-form-item> 21 <el-form-item>
22 <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button> 22 <el-button type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
23 <el-button @click="moreQueryClick()">高级查询</el-button> 23 <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 14:20:58
5 -->
6 <template> 1 <template>
7 <div> 2 <div class="gis">
8 图形定位 3 <div class="main-container" ref="main">
4 <div class="flex-transverse" ref="transverse">
5 <div id="arcgisMap0" class="flex-single"></div>
6 </div>
7 <div class="flex-vertical" ref="vertical"></div>
8 </div>
9
10 <el-card class="box-card">
11 <div v-for="( item, i ) in curr" :key="i" class="text item">
12 <el-row>
13 <el-col :span="10">
14 <div class="grid-content">{{ item.key }}</div>
15 </el-col>
16 <el-col :span="14">
17 <div class="grid-content">{{ item.value }}</div>
18 </el-col>
19 </el-row>
20 </div>
21 </el-card>
9 </div> 22 </div>
10 </template> 23 </template>
24
11 <script> 25 <script>
26
27 import apiWrapper from '@union/gis-sdk';
28 import layerJson from '@/api/json/layer.json';
29 import axios from 'axios';
30 import { log } from 'bpmn-js-token-simulation';
31
12 export default { 32 export default {
13 props: { 33 props: {
14 formData: { 34 formData: {
15 type: Object, 35 type: Object,
16 default: {} 36 default: () => {
37 return {}
38 }
17 } 39 }
18 }, 40 },
19 data () { 41 data () {
20 return { 42 return {
43 curr: []
21 } 44 }
22 }, 45 },
46 mounted () {
47 let doc = document.querySelector('.gis');
48 this.$nextTick(() => {
49 Object.assign(doc.style, { width: doc.clientWidth + 'px', height: '700px' });
50 })
51 },
52 created () {
53 let { special2 } = apiWrapper.thematic, { wrapper } = apiWrapper, id = this.formData.bsmZd
54 wrapper.reduction(special2).then(() => {
55 let { children } = layerJson[0].children[2], i = 0, o, name, url, { Layer } = wrapper;
56 for (; o = children[i]; i++) if (o.id === 'ZDJBXX' && (name = o.name) === 'zd') { url = o.url + '/' + i; break; }
57
58 Layer.createLayer([{ type: 'FeatureServer', url, name, spatial: true, visible: false }]).then(() => {
59 this.positioning(id, name);
60 });
61 });
62 },
23 methods: { 63 methods: {
64 positioning (id, name) {
65 let { Layer } = apiWrapper.wrapper;
66 Layer.attrGraph({
67 grap: id, name, where: { id }, sym: { color: [0, 139, 0, 100], outline: { color: [0, 139, 0, 150], width: 2 } },
68 callback: d => {
69 d.length ? this.analysis(id) : this.$message.error(' 暂无图形');
70 }
71 });
72 },
73 analysis (id) {
74
75 let { Views, Action } = apiWrapper.wrapper;
76 Views.grapsExtent(id);
77 setTimeout(() => { Action.gighlight({ name: id, about: 1000 }) }, 1500);
78
79 axios.get(window._config.services.management + '/bdcqjdc/rest/zd/qjZdjbxx/getQjZdjbxxDetailById', { params: { id } }).then(d => {
80 if (d.status !== 200) return;
81 let { result = {} } = d.data, data = [];
82 Object.keys(result).forEach(e => { result[e] && data.push({ key: e, value: result[e] }) });
83 this.curr.splice(0, ...data);
84 document.querySelector('.box-card').style.display = 'block';
85 });
86 }
24 } 87 }
25 } 88 }
89
26 </script> 90 </script>
27 <style scoped lang='scss'> 91
92 <style>
93 .main-container {
94 display: -webkit-flex;
95 display: flex;
96 -webkit-flex-wrap: wrap;
97 flex-wrap: wrap;
98 width: 100%;
99 height: 100%;
100 }
101
102 .flex-transverse {
103 display: -webkit-flex;
104 display: flex;
105 -webkit-flex-wrap: wrap;
106 flex-wrap: wrap;
107 width: 100%;
108 height: 100%;
109 }
110
111 .flex-single {
112 width: 100%;
113 height: 100%;
114 background-color: white;
115 }
116
117 .box-card {
118 background-color: rgba(255, 255, 255, 0.5);
119 border-radius: 8px;
120 top: 30px;
121 right: 30px;
122 position: absolute;
123 width: 16%;
124 padding: 10px;
125 display: none;
126 }
127
128 .el-row {
129 margin-bottom: 20px;
130 }
131 .el-col {
132 border-radius: 4px;
133 }
134 .grid-content {
135 border-radius: 4px;
136 min-height: 20px;
137 font-family: "Helvetica Neue";
138 }
139 .row-bg {
140 padding: 10px 0;
141 background-color: #f9fafc;
142 }
28 </style> 143 </style>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 14:14:22 4 * @LastEditTime: 2023-08-09 15:13:38
5 */ 5 */
6 import { getPrintTemplateByCode } from "@/api/print"; 6 import { getPrintTemplateByCode } from "@/api/print";
7 import { uploadUndo } from "@/api/clxx"; 7 import { uploadUndo } from "@/api/clxx";
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
36 batchButtonName: '', 36 batchButtonName: '',
37 // 受理申请信息 37 // 受理申请信息
38 slsq: {}, 38 slsq: {},
39 dqhj:"" 39 dqhj: ""
40 } 40 }
41 }, 41 },
42 mounted () { 42 mounted () {
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
58 stepExpandInfo(formdata).then((res) => { 58 stepExpandInfo(formdata).then((res) => {
59 if (res.code === 200) { 59 if (res.code === 200) {
60 this.leftButtonList = res.result.button; 60 this.leftButtonList = res.result.button;
61 if (res.result.properties&&res.result.properties.length) { 61 if (res.result.properties && res.result.properties.length) {
62 this.dqhj = res.result.properties[0].value 62 this.dqhj = res.result.properties[0].value
63 } 63 }
64 this.rightButtonList = res.result.operation; 64 this.rightButtonList = res.result.operation;
...@@ -160,8 +160,8 @@ export default { ...@@ -160,8 +160,8 @@ export default {
160 if (res.code === 200) { 160 if (res.code === 200) {
161 this.$popupDialog('楼盘表', 'lpb/index', { 161 this.$popupDialog('楼盘表', 'lpb/index', {
162 bsm: res.result[0], 162 bsm: res.result[0],
163 onlyShow:false, 163 onlyShow: false,
164 unitData:window.unitData 164 unitData: window.unitData
165 }, '90%', true) 165 }, '90%', true)
166 } else { 166 } else {
167 this.$message.error(res.message) 167 this.$message.error(res.message)
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
173 break; 173 break;
174 // 图形定位 174 // 图形定位
175 case "B-TXDW": 175 case "B-TXDW":
176 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true) 176 this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', { bsmZd: this.bsmZd }, '80%', true)
177 break; 177 break;
178 case "back": //退回按钮 178 case "back": //退回按钮
179 this.$popupDialog("退回", "workflow/components/th", { 179 this.$popupDialog("退回", "workflow/components/th", {
...@@ -281,7 +281,7 @@ export default { ...@@ -281,7 +281,7 @@ export default {
281 */ 281 */
282 sendToNext (obj) { 282 sendToNext (obj) {
283 this.$popupDialog("转出", "djbworkflow/components/zc", { 283 this.$popupDialog("转出", "djbworkflow/components/zc", {
284 obj:obj, 284 obj: obj,
285 bsmSlsq: this.bsmSlsq, 285 bsmSlsq: this.bsmSlsq,
286 tabList: this.tabList 286 tabList: this.tabList
287 }, '800px', true) 287 }, '800px', true)
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,7 @@ export default {
294 */ 294 */
295 sendToEnd (obj) { 295 sendToEnd (obj) {
296 this.$popupDialog("转出", "djbworkflow/components/zc", { 296 this.$popupDialog("转出", "djbworkflow/components/zc", {
297 obj:"", 297 obj: "",
298 bsmSlsq: this.bsmSlsq, 298 bsmSlsq: this.bsmSlsq,
299 tabList: this.tabList 299 tabList: this.tabList
300 }, '800px', true) 300 }, '800px', true)
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 16:15:39 4 * @LastEditTime: 2023-08-09 14:54:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="container"> 7 <div class="container">
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 <script> 64 <script>
65 import WorkFlow from "./mixin/index" 65 import WorkFlow from "./mixin/index"
66 import publicFlow from "./mixin/public.js" 66 import publicFlow from "./mixin/public.js"
67 import { getStepFormInfo, unClaimTask } from "@/api/workFlow.js" 67 import { getStepFormInfo, unClaimTask, getZdInfo } from "@/api/workFlow.js"
68 import { getForm } from "./flowform" 68 import { getForm } from "./flowform"
69 import NoticeBar from "@/components/NoticeBar/index" 69 import NoticeBar from "@/components/NoticeBar/index"
70 // import ProcessViewer from "./components/processViewer.vue" 70 // import ProcessViewer from "./components/processViewer.vue"
...@@ -108,7 +108,9 @@ ...@@ -108,7 +108,9 @@
108 clxxTab: {}, 108 clxxTab: {},
109 ableOperation: false, 109 ableOperation: false,
110 //页面监听时间 110 //页面监听时间
111 _beforeUnload_time: "" 111 _beforeUnload_time: "",
112 // 宗地id
113 bsmZd: ''
112 } 114 }
113 }, 115 },
114 mounted () { 116 mounted () {
...@@ -131,6 +133,13 @@ ...@@ -131,6 +133,13 @@
131 */ 133 */
132 getCurrentSelectProps (val) { 134 getCurrentSelectProps (val) {
133 this.currentSelectProps = val 135 this.currentSelectProps = val
136
137 getZdInfo(val.bdcdyid).then(res => {
138 this.bsmZd = res?.result[0]?.bsmZd
139 })
140 // getZdInfo(val.bdcdyid).then(res => {
141 // this.bsmZd = res?.result[0]?.bsmZd
142 // })
134 }, 143 },
135 /** 144 /**
136 * @description: beforeunloadHandler 145 * @description: beforeunloadHandler
...@@ -210,7 +219,7 @@ ...@@ -210,7 +219,7 @@
210 * @param {*} handleClick 219 * @param {*} handleClick
211 * @author: renchao 220 * @author: renchao
212 */ 221 */
213 handleClick(a) { 222 handleClick (a) {
214 let p = Object.keys(this.tabList[0]).filter( 223 let p = Object.keys(this.tabList[0]).filter(
215 (item) => item == "ableOperation" 224 (item) => item == "ableOperation"
216 ); 225 );
...@@ -222,10 +231,10 @@ ...@@ -222,10 +231,10 @@
222 } 231 }
223 </script> 232 </script>
224 <style scoped lang="scss"> 233 <style scoped lang="scss">
225 .rightContainer { 234 .rightContainer {
226 position: relative; 235 position: relative;
227 } 236 }
228 .count { 237 .count {
229 font-size: 14px; 238 font-size: 14px;
230 position: absolute; 239 position: absolute;
231 right: 25px; 240 right: 25px;
...@@ -235,5 +244,5 @@ ...@@ -235,5 +244,5 @@
235 font-weight: 600; 244 font-weight: 600;
236 color: #3498db; 245 color: #3498db;
237 } 246 }
238 } 247 }
239 </style> 248 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-13 10:32:28 4 * @LastEditTime: 2023-08-09 10:36:14
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </el-input> 21 </el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="4" class="btnColRight"> 24 <el-col :span="14" class="btnColRight">
25 <el-form-item> 25 <el-form-item>
26 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 26 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
27 </el-form-item> 27 </el-form-item>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-18 14:28:42 4 * @LastEditTime: 2023-08-09 10:36:31
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -30,7 +30,7 @@ class data extends filter { ...@@ -30,7 +30,7 @@ class data extends filter {
30 { 30 {
31 prop: "ywlx", 31 prop: "ywlx",
32 label: "业务类型", 32 label: "业务类型",
33 width: '90' 33 width: '100'
34 }, 34 },
35 { 35 {
36 prop: "cwdm", 36 prop: "cwdm",
......
1 import { log } from "bpmn-js-token-simulation"
2
1 /* 3 /*
2 * @Description: 4 * @Description:
3 * @Autor: renchao 5 * @Autor: renchao
...@@ -11,6 +13,7 @@ export default { ...@@ -11,6 +13,7 @@ export default {
11 watch: { 13 watch: {
12 'ruleForm.sldy.gyfs': { 14 'ruleForm.sldy.gyfs': {
13 handler: function (val, oldVal) { 15 handler: function (val, oldVal) {
16 console.log("单独所有",val,oldVal);
14 if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) { 17 if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) {
15 this.ruleForm.sldy.gyfs = oldVal 18 this.ruleForm.sldy.gyfs = oldVal
16 this.$message({ 19 this.$message({
......
...@@ -161,8 +161,8 @@ ...@@ -161,8 +161,8 @@
161 placeholder="持证人" 161 placeholder="持证人"
162 :disabled="!ableOperation"> 162 :disabled="!ableOperation">
163 <el-option 163 <el-option
164 v-for="item in czrOptions" 164 v-for="(item,index) in czrOptions"
165 :key="item.zjh" 165 :key="index"
166 :label="item.sqrmc" 166 :label="item.sqrmc"
167 :value="item.zjh"> 167 :value="item.zjh">
168 </el-option> 168 </el-option>
......