Merge remote-tracking branch 'origin/dev' into dev
Showing
3 changed files
with
86 additions
and
161 deletions
1 | /* | ||
2 | * @Description: | ||
3 | * @Autor: renchao | ||
4 | * @LastEditTime: 2023-06-14 15:05:38 | ||
5 | */ | ||
1 | import Vue from 'vue' | 6 | import Vue from 'vue' |
2 | import Popup from './index.vue' | 7 | import Popup from './index.vue' |
3 | const PopupBox = Vue.extend(Popup) | 8 | const PopupBox = Vue.extend(Popup) |
... | @@ -36,9 +41,9 @@ const Popup1 = (title, editItem, data, formData) => { | ... | @@ -36,9 +41,9 @@ const Popup1 = (title, editItem, data, formData) => { |
36 | document.body.appendChild(instance.$el) | 41 | document.body.appendChild(instance.$el) |
37 | Vue.nextTick(() => { | 42 | Vue.nextTick(() => { |
38 | instance.isShow = true | 43 | instance.isShow = true |
44 | // 将组件实例赋值给loading | ||
45 | popuping = instance | ||
39 | }) | 46 | }) |
40 | // 将组件实例赋值给loading | ||
41 | popuping = instance | ||
42 | return instance | 47 | return instance |
43 | } | 48 | } |
44 | export default Popup1 | 49 | export default Popup1 | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="from-clues-header"> | 2 | <div class="from-clues-header"> |
3 | <div>收件信息</div> | 3 | <div>收件信息</div> |
4 | <!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''" :inline="flag" | 4 | <el-form :model="form" label-width="120px"> |
5 | label-width="120px"> | 5 | <div class="slxx_con"> |
6 | <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> | ||
7 | <div class="slxx_title title-block"> | 6 | <div class="slxx_title title-block"> |
8 | 受理信息 | 7 | 受理信息 |
9 | <div class="triangle"></div> | 8 | <div class="triangle"></div> |
10 | </div> | 9 | </div> |
11 | <el-row :gutter="10" v-if="ruleForm.slsq"> | 10 | <el-row :gutter="10" v-if="form.slsq"> |
12 | <el-col :span="8"> | 11 | <el-col :span="8"> |
13 | <el-form-item label="业务号:"> | 12 | <el-form-item label="补录编号:"> |
14 | <el-input disabled v-model="ruleForm.slsq.ywh"></el-input> | 13 | <el-input disabled v-model="form.Repair.ywh"></el-input> |
15 | </el-form-item> | 14 | </el-form-item> |
16 | </el-col> | 15 | </el-col> |
17 | <el-col :span="8"> | 16 | <el-col :span="8"> |
18 | <el-form-item label="受理人员:"> | 17 | <el-form-item label="补录人员:"> |
19 | <el-input disabled v-model="ruleForm.slsq.slry"></el-input> | 18 | <el-input disabled v-model="form.Repair.slry"></el-input> |
20 | </el-form-item> | 19 | </el-form-item> |
21 | </el-col> | 20 | </el-col> |
22 | <el-col :span="8"> | 21 | <el-col :span="8"> |
23 | <el-form-item label="受理时间:"> | 22 | <el-form-item label="补录时间:"> |
24 | <el-input disabled v-model="ruleForm.slsq.slsj"></el-input> | 23 | <el-input disabled v-model="form.Repair.slsj"></el-input> |
25 | </el-form-item> | 24 | </el-form-item> |
26 | </el-col> | 25 | </el-col> |
27 | </el-row> | 26 | </el-row> |
28 | <el-row :gutter="10" v-if="ruleForm.slsq"> | 27 | <el-row :gutter="10"> |
29 | <el-col :span="8"> | 28 | <el-col :span="8"> |
30 | <el-form-item label="权利类型:"> | 29 | <el-form-item label="权利类型:"> |
31 | <el-input disabled v-model="ruleForm.slsq.qllxmc"></el-input> | 30 | <el-input disabled v-model="form.Repair.qllxmc"></el-input> |
32 | </el-form-item> | 31 | </el-form-item> |
33 | </el-col> | 32 | </el-col> |
34 | <el-col :span="8"> | 33 | <el-col :span="8"> |
35 | <el-form-item label="登记类型:"> | 34 | <el-form-item label="登记类型:"> |
36 | <el-input disabled v-model="ruleForm.slsq.djlxmc"></el-input> | 35 | <el-input disabled v-model="form.Repair.djlxmc"></el-input> |
37 | </el-form-item> | ||
38 | </el-col> | ||
39 | <el-col :span="8"> | ||
40 | <el-form-item label="登记情形:"> | ||
41 | <el-input disabled v-model="ruleForm.slsq.djqxmc"></el-input> | ||
42 | </el-form-item> | 36 | </el-form-item> |
43 | </el-col> | 37 | </el-col> |
44 | </el-row> | 38 | </el-row> |
45 | </div> | 39 | </div> |
46 | </el-form>--> | 40 | </el-form> |
47 | <div class="btn"> | 41 | <div class="btn"> |
48 | <el-button type="primary" @click="slxxsubmitForm">保存</el-button> | 42 | <el-button type="primary" @click="slxxsubmitForm">保存</el-button> |
49 | <el-button @click="closeDialog">取消</el-button> | 43 | <el-button @click="closeDialog">取消</el-button> |
... | @@ -86,7 +80,7 @@ export default { | ... | @@ -86,7 +80,7 @@ export default { |
86 | ...mapGetters(["dictData"]), | 80 | ...mapGetters(["dictData"]), |
87 | }, | 81 | }, |
88 | created() { | 82 | created() { |
89 | this.init() | 83 | this.loadData(); |
90 | // this.clmlInitList(1) | 84 | // this.clmlInitList(1) |
91 | }, | 85 | }, |
92 | mounted() { | 86 | mounted() { |
... | @@ -110,9 +104,10 @@ export default { | ... | @@ -110,9 +104,10 @@ export default { |
110 | }, | 104 | }, |
111 | 105 | ||
112 | methods: { | 106 | methods: { |
113 | init() { | 107 | loadData() { |
114 | init(this.propsParam.bsmRepair).then((res) => { | 108 | init(this.propsParam.bsmRepair).then((res) => { |
115 | if (res.code === 200) { | 109 | if (res.code == 200) { |
110 | this.form=res.result; | ||
116 | console.log("/rest/djbRepair/init",res); | 111 | console.log("/rest/djbRepair/init",res); |
117 | // this.tableData = res.result; | 112 | // this.tableData = res.result; |
118 | // if (this.tableData.length < datas.columns().emptycolNum) { | 113 | // if (this.tableData.length < datas.columns().emptycolNum) { | ... | ... |
... | @@ -26,9 +26,67 @@ | ... | @@ -26,9 +26,67 @@ |
26 | </lb-table> | 26 | </lb-table> |
27 | <!-- 权利人 --> | 27 | <!-- 权利人 --> |
28 | <b class="title">权利人</b> | 28 | <b class="title">权利人</b> |
29 | <lb-table :column="qlrColumns" :data="form.qlrList" heightNumSetting :heightNum="300" | 29 | <el-table |
30 | :pagination="false"> | 30 | :data="form.qlrList" |
31 | </lb-table> | 31 | height="160" |
32 | border | ||
33 | :cell-style="{ textAlign: 'center' }" | ||
34 | :header-cell-style="{textAlign: 'center'}" | ||
35 | style="width: 100%"> | ||
36 | <el-table-column width="60"> | ||
37 | <template slot="header"> | ||
38 | <i class="el-icon-plus pointer" @click="handleAddqlr"></i> | ||
39 | </template> | ||
40 | <template slot-scope="scope"> | ||
41 | <i class="el-icon-minus pointer" @click="remove(scope.$index, scope.row, 'qlr')"></i> | ||
42 | </template> | ||
43 | </el-table-column> | ||
44 | <el-table-column | ||
45 | label="身份证读卡器" | ||
46 | width="150"> | ||
47 | <template slot-scope="scope"> | ||
48 | <el-button | ||
49 | type="text" | ||
50 | icon="el-icon-edit-outline" | ||
51 | @click="handleRead(scope.row, 'qlr')"> | ||
52 | 读取 | ||
53 | </el-button> | ||
54 | </template> | ||
55 | </el-table-column> | ||
56 | <el-table-column | ||
57 | label="姓名/名称" | ||
58 | width="150"> | ||
59 | <template slot-scope="scope"> | ||
60 | <el-input v-model="scope.row.sqrxm"></el-input> | ||
61 | </template> | ||
62 | </el-table-column> | ||
63 | <el-table-column | ||
64 | label="证件种类"> | ||
65 | <template slot-scope="scope"> | ||
66 | <el-select v-model="scope.row.sqrzjlxbm" class="width100"> | ||
67 | <el-option | ||
68 | v-for="item in zjzlData" | ||
69 | :key="item.value" | ||
70 | :label="item.label" | ||
71 | :value="item.value"> | ||
72 | </el-option> | ||
73 | </el-select> | ||
74 | </template> | ||
75 | </el-table-column> | ||
76 | <el-table-column | ||
77 | label="证件号"> | ||
78 | <template slot-scope="scope"> | ||
79 | <el-input v-model="scope.row.sqrzjhm"></el-input> | ||
80 | </template> | ||
81 | </el-table-column> | ||
82 | |||
83 | <el-table-column | ||
84 | label="联系电话"> | ||
85 | <template slot-scope="scope"> | ||
86 | <el-input type="tel" v-model="scope.row.lxdh"></el-input> | ||
87 | </template> | ||
88 | </el-table-column> | ||
89 | </el-table> | ||
32 | <div v-show="isSearch"> | 90 | <div v-show="isSearch"> |
33 | <b class="title">查询结果</b> | 91 | <b class="title">查询结果</b> |
34 | <p>查询编号:{{ form.djSqcxDO.cxbh }}</p> | 92 | <p>查询编号:{{ form.djSqcxDO.cxbh }}</p> |
... | @@ -71,6 +129,7 @@ | ... | @@ -71,6 +129,7 @@ |
71 | data () { | 129 | data () { |
72 | return { | 130 | return { |
73 | key: 0, | 131 | key: 0, |
132 | zjzlData: store.getters.dictData['A30'], | ||
74 | //是否查询 | 133 | //是否查询 |
75 | isSearch: false, | 134 | isSearch: false, |
76 | //查询结果列表字段 | 135 | //查询结果列表字段 |
... | @@ -210,140 +269,6 @@ | ... | @@ -210,140 +269,6 @@ |
210 | ); | 269 | ); |
211 | }, | 270 | }, |
212 | }], | 271 | }], |
213 | //权利人列表字段 | ||
214 | qlrColumns: [{ | ||
215 | width: "60", | ||
216 | renderHeader: (h, scope) => { | ||
217 | return ( | ||
218 | <i | ||
219 | class="el-icon-plus pointer" | ||
220 | onClick={() => { | ||
221 | this.handleAddqlr(); | ||
222 | }} | ||
223 | style="color:#409EFF" | ||
224 | ></i> | ||
225 | ); | ||
226 | }, | ||
227 | render: (h, scope) => { | ||
228 | return ( | ||
229 | <i | ||
230 | class="el-icon-minus pointer" | ||
231 | onClick={() => { | ||
232 | this.remove(scope.$index, scope.row, "qlr"); | ||
233 | }} | ||
234 | ></i> | ||
235 | ); | ||
236 | }, | ||
237 | }, | ||
238 | { | ||
239 | width: "150", | ||
240 | label: "身份证读卡器", | ||
241 | render: (h, scope) => { | ||
242 | return ( | ||
243 | <div> | ||
244 | <el-button | ||
245 | type="text" | ||
246 | icon="el-icon-edit-outline" | ||
247 | onClick={() => { | ||
248 | this.handleRead(scope.row, 'qlr'); | ||
249 | }} | ||
250 | > | ||
251 | 读取 | ||
252 | </el-button> | ||
253 | </div> | ||
254 | ); | ||
255 | }, | ||
256 | }, | ||
257 | { | ||
258 | width: "150", | ||
259 | prop: "sqrxm", | ||
260 | label: "姓名/名称", | ||
261 | render: (h, scope) => { | ||
262 | return ( | ||
263 | <el-input | ||
264 | placeholder="姓名/名称" | ||
265 | value={scope.row[scope.column.property]} | ||
266 | onInput={(val) => { | ||
267 | scope.row[scope.column.property] = val; | ||
268 | }} | ||
269 | ></el-input> | ||
270 | ); | ||
271 | }, | ||
272 | }, | ||
273 | { | ||
274 | prop: "sqrzjlxbm", | ||
275 | label: "证件种类", | ||
276 | render: (h, scope) => { | ||
277 | return ( | ||
278 | <el-select | ||
279 | class="width100" | ||
280 | value={scope.row[scope.column.property]} | ||
281 | onChange={(val) => { | ||
282 | scope.row[scope.column.property] = val; | ||
283 | }} | ||
284 | > | ||
285 | {this.getDictData('A30').map((option) => { | ||
286 | return ( | ||
287 | <el-option | ||
288 | label={option.dname} | ||
289 | value={option.dcode} | ||
290 | ></el-option> | ||
291 | ); | ||
292 | })} | ||
293 | </el-select> | ||
294 | ); | ||
295 | }, | ||
296 | }, | ||
297 | { | ||
298 | prop: "sqrzjhm", | ||
299 | label: "证件号", | ||
300 | render: (h, scope) => { | ||
301 | return ( | ||
302 | <el-input | ||
303 | placeholder="证件号" | ||
304 | value={scope.row[scope.column.property]} | ||
305 | onInput={(val) => { | ||
306 | scope.row[scope.column.property] = val; | ||
307 | }} | ||
308 | maxlength="21" | ||
309 | ></el-input> | ||
310 | ); | ||
311 | }, | ||
312 | }, | ||
313 | { | ||
314 | prop: "lxdh", | ||
315 | label: "联系电话", | ||
316 | render: (h, scope) => { | ||
317 | return ( | ||
318 | <div class="typePhone"> | ||
319 | <el-input | ||
320 | placeholder="联系电话" | ||
321 | value={scope.row[scope.column.property]} | ||
322 | onInput={(val) => { | ||
323 | scope.row[scope.column.property] = val; | ||
324 | }} | ||
325 | onBlur={(val) => { | ||
326 | this.teltest(scope.row); | ||
327 | }} | ||
328 | type="tel" | ||
329 | maxlength="11" | ||
330 | ></el-input> | ||
331 | <span | ||
332 | v-show={scope.row.inputErr} | ||
333 | style={{ | ||
334 | fontSize: "12px", | ||
335 | color: "red", | ||
336 | position: "absolute", | ||
337 | bottom: "-2px", | ||
338 | left: "0", | ||
339 | }} | ||
340 | > | ||
341 | 请输入正确手机号 | ||
342 | </span> | ||
343 | </div> | ||
344 | ); | ||
345 | }, | ||
346 | }], | ||
347 | newData: { | 272 | newData: { |
348 | sqrxm: "", | 273 | sqrxm: "", |
349 | sqrzjlxbm: "", | 274 | sqrzjlxbm: "", | ... | ... |
-
Please register or sign in to post a comment