From 5f6d717c348b1ca9925110d8e6607800773d8102 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 29 Nov 2021 09:04:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/qualificationExamination/qualificationExamination.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index 06df4d4..884bf36 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:06:14
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-11-26 09:31:04
* menu-name 监管信息
*/
<template>
@@ -178,6 +178,17 @@
prop: "examinationType",
// overHidden: true,
sortable: true,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ },
+ ],
// type: "date",
// format: "yyyy-MM-dd",
// valueFormat: "yyyy-MM-dd",
@@ -186,12 +197,11 @@
// labelWidth: 120,
// format: "yyyy-MM-dd",
// },
- // // search: true,
- // searchSpan: 4,
+ search: true,
+ searchSpan: 4,
// // display: false,
// width: 180,
},
-
{
label: "审查明细",
prop: "examinationMx",
@@ -387,16 +397,19 @@
this.page.total = data.total;
var d = data.records;
for (var k in d) {
- if (d[k]["examinationMx"] == "") {
- d[k]["examinationMx"] = "正常";
- d[k]["examinationType"] = "正常";
- } else {
- console.log(d[k]);
- d[k]["examinationType"] = "异常";
- }
+ // if (d[k]["examinationMx"] == "") {
+ // d[k]["examinationMx"] = "正常";
+ // d[k]["examinationType"] = "正常";
+ // } else {
+ // console.log(d[k]);
+ // d[k]["examinationType"] = "异常";
+ // }
// if (d[k]["examinationType"] == "") {
// d[k]["examinationType"] = "正常";
// }
+ if (!d[k].examinationType) {
+ d[k].examinationType = "0";
+ }
var sfz = d[k].cardid.substring(6, 10);
d[k]["age"] = this.getyears() - sfz;
}
--
Gitblit v1.9.3