显示修改

src/components/autoTest/AutoBillCommonTest.vue

@@ -158,7 +158,7 @@
           className="collectTwo"
         >
           <template slot-scope="scope">
-            <div v-html="returnDom(scope.row.baseRules,'ruleBaseInputValue')"></div>
+            <div v-html="returnDom(scope.row.baseRules,'ruleBaseInputValue','ruleBaseUnit')"></div>
           </template>
         </el-table-column>
         <el-table-column
@@ -252,7 +252,7 @@ export default {
     this.getDroplistData(params);
   },
   methods: {
-    returnDom(list,name){
+    returnDom(list,name,unit){
       let str = ''
       if(name === 'ruleBaseType'){
         const params = JSON.parse(localStorage.getItem("zskDicts"));
@@ -260,7 +260,7 @@ export default {
           for(let j = 0;j < params.length;j++){
             if(list[i].ruleBaseType == params[j].val){
               // if(params[j].name){
-                str += `<p style="padding:0 10px;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
+                str += `<p style="border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
                       ${params[j].name||'&nbsp;'}
                   </p>`
               // }
@@ -270,8 +270,8 @@ export default {
       }else{
         for(let i = 0;i < list.length;i++){
           // if(list[i][name]){
-            str += `<p style="padding:0 10px;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
-                  ${list[i][name]||'&nbsp;'}
+            str += `<p style="border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
+                  ${list[i][name]?list[i][unit]?(list[i][name]+list[i][unit]):list[i][name]:'&nbsp;'}
               </p>`
           // }
         }
@@ -370,7 +370,7 @@ export default {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(
                 res.data,
-                `${parm.hospitalName}-开单合理性提醒规则测试结果.xlsx`
+                `${parm.hospitalName}-开单合理性提醒规则测试结果.xls`
               );
             }
           });
@@ -383,7 +383,7 @@ export default {
 
 <style lang="less">
 .collectTwo .cell {
-  padding:0;
+  padding:0 8px;
 }
 </style>
 <style lang="less" scoped>
@@ -406,7 +406,6 @@ export default {
   .cell {
     padding:0 !important;
     .collTxt {
-      padding:0 10px;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;

vue.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
-const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:80';
+const proxy_path = 'http://192.168.2.241:88';
 // const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚