Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/workforce/components/tableWeeks.vue

@@ -108,38 +108,44 @@
 
             <el-table-column label="透析模式" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getModeDesc(scope.row.list)}}
+                    <!--{{getModeDesc(scope.row.list)}}-->
+                    <div v-html>{{getModeDesc(scope.row.list)}}</div>
+
                 </template>
             </el-table-column>
             <el-table-column label="透析液" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getDialysisLiquidDesc(scope.row.list)}}
+                    <div v-html>{{getDialysisLiquidDesc(scope.row.list)}}</div>
                 </template>
             </el-table-column>
 
             <el-table-column label="透析管路" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getDialysisPipeDesc(scope.row.list)}}
+                    <div v-html>{{getDialysisPipeDesc(scope.row.list)}}</div>
+
                 </template>
             </el-table-column>
 
             <el-table-column label="穿刺针" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getPunctureNeedleDesc(scope.row.list)}}
+                    <div v-html>{{getPunctureNeedleDesc(scope.row.list)}}</div>
+
                 </template>
             </el-table-column>
 
 
             <el-table-column label="抗凝剂" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getAnticoagulantDesc(scope.row.list)}}
+                    <div v-html>{{getAnticoagulantDesc(scope.row.list)}}</div>
+
                 </template>
             </el-table-column>
 
 
             <el-table-column label="促红素" min-width="100" align="center">
                 <template slot-scope="scope">
-                    {{getEPODesc(scope.row.list)}}
+                    <div v-html>{{getEPODesc(scope.row.list)}}</div>
+
                 </template>
             </el-table-column>
 
@@ -627,7 +633,7 @@
 
           } else {
 
-            desc = desc + ' \n\r ' + modes[i].mode_name + ': ' + modes[i].count + '次'
+            desc = desc + '              ' + modes[i].mode_name + ': ' + modes[i].count + '次'
 
           }
 
@@ -661,7 +667,7 @@
           if (desc.length == 0) {
             desc = modes[b].name + ': ' + modes[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '支'
+            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
 
@@ -710,7 +716,7 @@
           if (desc.length == 0) {
             desc = dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
+            desc = desc + '              ' + dialysisPipe[b].name + ': ' + dialysisPipe[b].count + '支'
           }
         }
 
@@ -756,7 +762,7 @@
           if (desc.length == 0) {
             desc = punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
+            desc = desc + '              ' + punctureNeedle[b].name + ': ' + punctureNeedle[b].count + '支'
           }
         }
 
@@ -788,7 +794,7 @@
           if (desc.length == 0) {
             desc = modes[b].name + ': ' + modes[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '支'
+            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count + '支'
           }
         }
         return desc
@@ -829,7 +835,7 @@
           if (desc.length == 0) {
             desc = EPO[b].name + ': ' + EPO[b].count + '支'
           } else {
-            desc = desc + ' \n\r ' + EPO[b].name + ': ' + EPO[b].count + '支'
+            desc = desc + '              ' + EPO[b].name + ': ' + EPO[b].count + '支'
           }
         }