80fa1fe7 by renchao@pashanhoo.com

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

2 parents 8df9b39e f333b736
...@@ -154,12 +154,17 @@ export default { ...@@ -154,12 +154,17 @@ export default {
154 }, 154 },
155 /** 155 /**
156 * 监听右侧选中 156 * 监听右侧选中
157 * @param {*} value
158 * @author: renchao
157 */ 159 */
158 choose(value) { 160 choose(value) {
159 this.item = value; 161 this.item = value;
160 }, 162 },
161 /** 163 /**
162 * 右侧数据点击排序 164 * 右侧数据点击排序
165 * @param {*} direction
166 * @param {*} key
167 * @author: renchao
163 */ 168 */
164 publicMobileMethod(direction, key) { 169 publicMobileMethod(direction, key) {
165 const self = this; 170 const self = this;
......
...@@ -438,6 +438,12 @@ ...@@ -438,6 +438,12 @@
438 } 438 }
439 }, 439 },
440 methods: { 440 methods: {
441 /**
442 * @description: handleClick
443 * @param {*} event
444 * @param {*} tab
445 * @author: renchao
446 */
441 handleClick (event, tab) { 447 handleClick (event, tab) {
442 if (this.activeName != 1) { 448 if (this.activeName != 1) {
443 this.isShow = false 449 this.isShow = false
...@@ -445,17 +451,30 @@ ...@@ -445,17 +451,30 @@
445 this.isShow = true 451 this.isShow = true
446 } 452 }
447 }, 453 },
454 /**
455 * @description: 身份证打卡器
456 * @param {*} row
457 * @author: renchao
458 */
448 handlesYhSelect (row) { 459 handlesYhSelect (row) {
449 this.$emit("updateDetail", _.cloneDeep(row)); 460 this.$emit("updateDetail", _.cloneDeep(row));
450 this.$emit("input", false); 461 this.$emit("input", false);
451 }, 462 },
463 /**
464 * @description: handleSearch
465 * @author: renchao
466 */
452 handleSearch () { }, 467 handleSearch () { },
468 /**
469 * @description: handleCurrentChange
470 * @param {*} val
471 * @author: renchao
472 */
453 handleCurrentChange (val) { 473 handleCurrentChange (val) {
454 console.log(val); 474 console.log(val);
455 }, 475 },
456 /** 476 /**
457 * @description: 身份证打卡器 477 * @description: 身份证打卡器
458 * @param {*} row
459 * @author: renchao 478 * @author: renchao
460 */ 479 */
461 readClick () { 480 readClick () {
......
...@@ -503,7 +503,6 @@ ...@@ -503,7 +503,6 @@
503 // 是否持证人变化 503 // 是否持证人变化
504 /** 504 /**
505 * @description: 是否持证人变化 505 * @description: 是否持证人变化
506 * @param {*} val
507 * @author: renchao 506 * @author: renchao
508 */ 507 */
509 updaterow () { 508 updaterow () {
......
...@@ -371,7 +371,6 @@ ...@@ -371,7 +371,6 @@
371 }, 371 },
372 /** 372 /**
373 * @description: 是否持证人变化 373 * @description: 是否持证人变化
374 * @param {*} val
375 * @author: renchao 374 * @author: renchao
376 */ 375 */
377 updaterow () { 376 updaterow () {
......