update\

src/style/patient-manager/new-patient/new-patient.less

@@ -169,7 +169,7 @@
             height: 237px;
             margin-top: 15px;
             .first{
-              width: 290px;
+              width: 250px;
               // width: 30%;
               height: 200px;
               float: left;
@@ -193,7 +193,7 @@
                 .border{
                   display: inline-block;
                   // width: 200px;
-                  width: 65%;
+                  width: 60%;
                   height: 0px;
                   border-bottom: 1px solid #449284;
                   vertical-align: middle;
@@ -222,7 +222,7 @@
                 .procedure{
                   .border{
                     // width: 250px;
-                    width: 65%;
+                    width: 63%;
                   }
                 }
                 .under-info{

src/views/patients/new-manage/components/batch-import.vue

@@ -71,6 +71,7 @@
     <div class="component-content screenSet upload-history-wrap">
       <p class="septal-line"></p>
       <p class="upload-record">上传历史记录：{{searchData.totalCount}}</p>
+        <!-- :cell-style="aaa" -->
       <el-table
         :data="searchData.tableData"
         class="upload-table"
@@ -80,7 +81,7 @@
           align="left"
           prop="fileName"
           label="文件名"
-          width="180">
+          width="250">
         </el-table-column>
         <el-table-column
           align="left"
@@ -168,6 +169,14 @@
       ]),
     },
     methods: {
+      // aaa(obj){
+      //   console.log('%c cell-style obj>>>>>>', 'color: red;', obj);
+      //   if(obj.column.property == 'reason'){
+      //     return 'red>>>'
+      //   }else{
+      //     return 'pink'
+      //   }
+      // },
       notUseDefaultUpload(){
         // console.log('just console>>>>>>>>')
       },
@@ -241,9 +250,17 @@
         getUploadHistory(params).then(res => {
           // console.log('获取上传历史记录：', res);
           if(res.code == "000000"){
-            if(res.data.importRecordsModelList && res.data.importRecordsModelList.length > 0){
-              this.searchData.tableData = res.data.importRecordsModelList;
+            let data = res.data.importRecordsModelList;
+            if(data && data.length > 0){
+              data = data.map(item => {
+                if(!item.reason) {
+                  item.reason = '-'
+                }
+                return item;
+              });
+              this.searchData.tableData = data;
               this.searchData.totalCount = res.data.count;
+
             }
           }else{
             // 获取失败