ui

src/components/follow/FollowCriticalCheck.vue

@@ -274,13 +274,25 @@ export default {
     this.loadOptsInit = Object.assign({}, this.loadOpts)
     // this.tableData=this.doctorCheck.RegisterCheck
     if(this.doctorCheck.combinationCriticalValue){
-        //   getapi(`/api/app/registercheck/getregistercheck?id=${this.doctorCheck.RegisterCheckId}`)
-        // .then(res => {
-        //   this.tableData=res.data
-        // })
-        this.tableData=this.doctorCheck.RegisterCheckEdit
+          getapi(`/api/app/registercheck/getregistercheck?id=${this.doctorCheck.RegisterCheckId}`)
+        .then(res => {
+          if(res.code>-1){
+            this.tableData=res.data
+          }
+        })
+        // this.tableData=this.doctorCheck.RegisterCheckEdit
     }else{
-      this.tableData=this.doctorCheck.singleDetailedProject
+      console.log(this.doctorCheck.singleDetailedProject)
+      postapi("/api/app/RegisterCheckItem/GetRegisterCheckItem",{
+        registerCheckId:this.doctorCheck.RegisterCheckId,
+        itemId:this.doctorCheck.singleDetailedProject.itemId
+      })
+        .then(res => {
+          if(res.code>-1){
+            this.tableData=res.data
+          }
+        })
+      // this.tableData=this.doctorCheck.singleDetailedProject
     }
   },
 

src/router/index.js

@@ -449,7 +449,7 @@ const routes = [{
                 path: "/busReservationImport",
                 name: "公交预约导入",
                 component: () =>
-                    import ("../views/customerOrg/BusReservationImport.vue"), //../views/doctorCheck/personnelBatch.vue
+                    import ("../views/customerOrg/busReservationImport.vue"), //../views/doctorCheck/personnelBatch.vue
             },
             {
                 path: "/patientRegisterRecover",

src/views/customerOrg/BusReservationImport.vue

@@ -615,7 +615,6 @@ export default {
         }
 
         data.forEach((item) => {
-          console.log("item,column.property", item, column.property);
           if (item[column.property]) {
             fail++;
           } else {
@@ -644,7 +643,6 @@ export default {
     },
     //清除所选文件
     fileGetFocus(e) {
-      console.log("fileGetFocus(e)", e);
       e.value = ""; //未起作用的
       // e.target.files = []
     },
@@ -719,7 +717,6 @@ export default {
       // 错误处理
       reader.onerror = function (event) {
         // 读取失败时执行的代码
-        console.error("File could not be read!" + event.target.error);
       };
 
       reader.readAsBinaryString(file);
@@ -771,7 +768,6 @@ export default {
       } else {
         // 未按住了ctrl 、shift 键
         //清除所有选择
-        console.log("清除所有选择");
         this.excelData.forEach((e, index) => {
           e.choosed = false;
           e.index = index;
@@ -804,7 +800,6 @@ export default {
 
       //分析标题信息
       let head = utils.sheet_to_json(worksheet, { header: 1 });
-      console.log(head)
       this.excelCols = [];
       head[this.readDataOpts.titleRow - 1].forEach((e) => {
         let lfind = arrayExistObj(this.dataCols, "dispTitle", e),
@@ -949,7 +944,7 @@ export default {
                     ? "0"
                     : ExcelData[e.dispLabel] == "已婚"
                     ? "1"
-                    : undefined;
+                    : ExcelData[e.dispLabel];
               break;
             case "empStatus":
               if (ExcelData[e.dispLabel])
@@ -958,7 +953,7 @@ export default {
                     ? "0"
                     : ExcelData[e.dispLabel] == "退休"
                     ? "1"
-                    : undefined;
+                    : ExcelData[e.dispLabel];
               break;
             default:
               body[e.val] = ExcelData[e.dispLabel];