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

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -125,7 +125,9 @@
     <el-table v-if="activeType == 2" :data="prescription.project" border style="width: 99%;"
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" type="index" width="40" label="序号">
+        <template slot-scope="scope">{{scope.$index+1}}</template>
+      </el-table-column>
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
         </template>
@@ -442,18 +444,14 @@
       getAllChange(scope) {
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           } else {
-            console.log(12)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
           }
         } else {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
           } else {
-            console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
           }
         }
@@ -574,7 +572,7 @@
 
         },
         deep: true
-      }
+      },
       // "prescription.project":{
       //   handler(newVal,oldVal){
       //     newVal.map((item,index) => {

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -176,7 +176,7 @@
             <td style="text-align:center;width:300px" colspan="1">
               出院诊断:
             </td>
-             <td style="text-align:center;width:170px" colspan="11">
+             <td style="text-align:center;" colspan="11">
              
               <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.discharge_diagnosis"></span>  
@@ -188,7 +188,7 @@
             <td style="text-align:center;width:300px" colspan="1">
               入院时病情:
             </td>
-           <td style="text-align:center;width:170px" colspan="11">
+           <td colspan="11">
             
               <span style="display:inline-block;margin-left:10px;text-align:left;">
                  <span v-html="hosDetail.diagnosis_admission"></span>
@@ -202,7 +202,7 @@
               诊断经过:
            
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
+            <td colspan="11">
               <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.treatment"></span> 
               </span>
@@ -213,7 +213,7 @@
             <td style="text-align:center;width:170px" colspan="1">
               出院时病情:
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
+            <td colspan="11">
             
               <span style="display:inline-block;margin-left:10px;text-align:left;">
                <span v-html="hosDetail.illness_discharge"></span> 
@@ -226,7 +226,7 @@
             <td style="text-align:center;width:300px" colspan="1">
               出院医嘱:
             </td>
-            <td style="text-align:center;width:170px" colspan="11">
+            <td colspan="11">
               <span style="display:inline-block;margin-left:10px;text-align:left;">
                 <span v-html="hosDetail.discharge_advice"></span> 
               </span>
@@ -234,12 +234,12 @@
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="4">
+            <td style="text-align:center;width:170px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
                
               </span>
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:170px" colspan="3">
               上级医师签名:
             </td>
             <td style="text-align:center;width:170px" colspan="2">