Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

zhengpz

2021-11-26 6e2693dc21a9161018405e41bc0dfdbc6543d453

 src/views/qualificationExamination/qualificationExamination.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-10-22 17:27:47
 * @Last Modified time: 2021-11-26 09:53:14
 * menu-name 监管信息
 */
<template>
@@ -234,6 +234,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",
@@ -242,8 +253,8 @@
            //   labelWidth: 120,
            //   format: "yyyy-MM-dd",
            // },
            // // search: true,
            // searchSpan: 4,
            search: true,
            searchSpan: 4,
            // // display: false,
            // width: 180,
          },
@@ -513,16 +524,19 @@
        this.page.total = data.total;
        var d = data.records;
        for (var k in d) {
          if (d[k]["examinationType"] == "0") {
            d[k]["examinationMx"] = "正常";
            d[k]["examinationType"] = "正常";
          } else {
            // console.log(d[k]);
            d[k]["examinationType"] = "异常";
          }
          // if (d[k]["examinationType"] == "0") {
          //   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;
        }