修改

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -236,14 +236,47 @@
                     <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
                     <td style="height:40px;line-height:40px">{{ getTime(advice[0].start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                     <td class="parent" style="max-width:400px">
-                        <span v-if="advice[0].parent_id > 0">---></span>
-                        <span>{{ advice[0].advice_name }}</span>
-                        <span v-if="advice[0] && advice[0].advice_desc">({{ advice[0].advice_desc }}{{ advice[0].drug_spec_unit }})</span>
-                        <span v-if="advice[0].prescribing_number"> &nbsp;&nbsp; {{ advice[0].prescribing_number }}{{ advice[0].prescribing_number_unit }}</span>
-                        <span v-if="advice[0].single_dose != 0">{{ advice[0].single_dose }}{{ advice[0].single_dose_unit }}</span>
-                        <span v-if="advice[0].parent_id == 0">{{ advice[0].delivery_way }}</span>
-                        <span v-if="advice[0].parent_id == 0">{{ advice[0].execution_frequency }}</span>
-                        <span v-if="advice[0].parent_id == 0 && advice[0].remark.length > 0">({{ advice[0].remark }})</span>
+                        <span v-for="(item,index) in advice" :key="index">
+                            <!-- <span v-if="item.children.length > 0"> -->
+                                <span v-if="item.parent_id > 0">---></span>
+                                <span>{{ item.advice_name }}</span>
+                                <span v-if="item && item.advice_desc">({{ item.advice_desc }}{{ item.drug_spec_unit }})</span>
+                                <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number }}{{ item.prescribing_number_unit }}</span>
+                                <span v-if="item.single_dose != 0">{{ item.single_dose }}{{ item.single_dose_unit }}</span>
+                                <span v-if="item.parent_id == 0">{{ item.delivery_way }}</span>
+                                <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span>
+                                <span v-if="item.parent_id == 0 && item.remark.length > 0">({{ advice.remark }})</span>
+                                <span v-if="item.children && !Array.isArray(item)" style="display:block;border-top: 1px solid #000" v-for="(child, childindex) in item.children" :key="childindex" class="advice-children">
+                                    <span>---></span>
+                                    <span>
+                                    <span>{{ child.advice_name }}</span>
+                                    <span v-if="child.advice_desc">{{ child.advice_desc }}{{ child.drug_spec_unit }}</span>
+                                    <span v-if="child.prescribing_number">* {{ child.prescribing_number }}{{ child.prescribing_number_unit }}</span>
+                                    <span v-if="child.single_dose != 0">单次用量 {{ child.single_dose }}{{ child.single_dose_unit }}</span>
+                                    </span>
+                                </span>
+                            <!-- </span> -->
+                            <div v-else>
+                                <span v-if="item.parent_id > 0">---></span>
+                                <span>{{ item.advice_name }}</span>
+                                <span v-if="item && item.advice_desc">({{ item.advice_desc }}{{ item.drug_spec_unit }})</span>
+                                <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number }}{{ item.prescribing_number_unit }}</span>
+                                <span v-if="item.single_dose != 0">{{ item.single_dose }}{{ item.single_dose_unit }}</span>
+                                <span v-if="item.parent_id == 0">{{ item.delivery_way }}</span>
+                                <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span>
+                                <span v-if="item.parent_id == 0 && item.remark.length > 0">({{ advice.remark }})</span>
+                                <span v-if="item.children && !Array.isArray(item)" style="display:block;border-top: 1px solid #000;" v-for="(child, childindex) in item.children" :key="childindex" class="advice-children">
+                                    <span>---></span>
+                                    <span>
+                                    <span>{{ child.advice_name }}</span>
+                                    <span v-if="child.advice_desc">{{ child.advice_desc }}{{ child.drug_spec_unit }}</span>
+                                    <span v-if="child.prescribing_number">* {{ child.prescribing_number }}{{ child.prescribing_number_unit }}</span>
+                                    <span v-if="child.single_dose != 0">单次用量 {{ child.single_dose }}{{ child.single_dose_unit }}</span>
+                                    </span>
+                                </span>
+                            </div>
+                            
+                        </span>
                     </td>
                     <td>
                         <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">
@@ -348,7 +381,7 @@
                         <td width="50" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
-                            {{ record.assessment_before_dislysis.pulse_frequency ? record.assessment_before_dislysis.pulse_frequency : "" }}
+                            {{ record.assessment_after_dislysis.pulse_frequency ? record.assessment_after_dislysis.pulse_frequency : "" }}
                             </span>次/分
                         </div>
                         </td>

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -340,7 +340,7 @@
             <td width="50" style="text-align:left;border:none;">
               <div>
                 <span class="under_line" style="width:50px;display:inline-block">
-                  {{ predialysis.pulse_frequency ? predialysis.pulse_frequency : "" }}
+                  {{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }}
                 </span>次/分
               </div>
             </td>

src/xt_pages/qcd/components/LineChart.vue

@@ -152,7 +152,7 @@ export default {
           },
           axisLine: {
             lineStyle: {
-              color: "pink" //x轴颜色
+              color: "#E5E5E5" //x轴颜色
             }
           },
           axisLabel: {
@@ -176,6 +176,9 @@ export default {
               } else {
                 return value;
               }
+            },
+            textStyle: {
+              color:"#2F3133"
             }
           }
         },
@@ -199,7 +202,12 @@ export default {
           },
           axisLine: {
             lineStyle: {
-              color: "pink" //y轴颜色
+              color: "#E5E5E5" //y轴颜色
+            },
+          },
+          axisLabel: {
+            textStyle: {
+              color:"#2F3133"
             }
           }
         },

src/xt_pages/qcd/indicatorControlAnalysis/analysisDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -53,7 +53,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>
@@ -67,7 +67,7 @@
               <div class="tableTitle">统计表</div>
             </div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed prop="date" label="日期"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>
@@ -74,7 +74,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed prop="date" label="日期"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column prop="province" label="省份"></el-table-column>
@@ -238,9 +238,9 @@ export default {
             //配置样式
             itemStyle: {
               normal: {
-                color: "#dd7383", //折点颜色
+                color: "#f56c6c", //折点颜色
                 lineStyle: {
-                  color: "#dd7383" //折线颜色
+                  color: "#f56c6c" //折线颜色
                 }
               }
             }

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -78,7 +78,7 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" style="width: 100%" border>
+      <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
         <el-table-column fixed prop="date" label="日期"></el-table-column>
         <el-table-column prop="name" label="姓名"></el-table-column>
         <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

@@ -81,7 +81,7 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500">
+        <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="日期" width="70"></el-table-column>
           <el-table-column prop="name" label="姓名" width="80"></el-table-column>
         </el-table>

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -53,7 +53,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>
@@ -65,7 +65,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed prop="date" label="日期"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -53,7 +53,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>
@@ -65,7 +65,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed prop="date" label="日期"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -16,7 +16,7 @@
         <el-container>
           <div style="width:150px">
             <div class="tableTitle">患者列表</div>
-            <el-table :data="tableData" border style="width: 100%;" height="500">
+            <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
               <el-table-column prop="date" label="日期" width="70"></el-table-column>
               <el-table-column prop="name" label="姓名" width="80"></el-table-column>
             </el-table>
@@ -74,7 +74,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData1" style="width: 100%" border>
+              <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed prop="date" label="日期"></el-table-column>
                 <el-table-column prop="name" label="姓名"></el-table-column>
                 <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -59,7 +59,7 @@
           <p class="chartTitle">统计表</p>
         </div>
         <div>
-          <el-table :data="tableData" border style="width: 100%">
+          <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
             <el-table-column prop="name" label="姓名" width="120"></el-table-column>
             <el-table-column prop="province" label="省份" width="120"></el-table-column>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

@@ -47,14 +47,14 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500">
+        <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="日期" width="70"></el-table-column>
           <el-table-column prop="name" label="姓名" width="80"></el-table-column>
         </el-table>
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
-        <el-table :data="tableData1" style="width: 100%" border>
+        <el-table :data="tableData1" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column fixed prop="date" label="日期"></el-table-column>
           <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

@@ -47,7 +47,7 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500">
+        <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="日期" width="70"></el-table-column>
           <el-table-column prop="name" label="姓名" width="80"></el-table-column>
         </el-table>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -49,7 +49,7 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" style="width: 100%" border>
+      <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
         <el-table-column fixed prop="date" label="日期"></el-table-column>
         <el-table-column prop="name" label="姓名"></el-table-column>
         <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -47,14 +47,14 @@
     <el-container>
       <div style="width:150px">
         <div class="tableTitle">患者列表</div>
-        <el-table :data="tableData" border style="width: 100%;" height="500">
+        <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="日期" width="70"></el-table-column>
           <el-table-column prop="name" label="姓名" width="80"></el-table-column>
         </el-table>
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
-        <el-table :data="tableData1" style="width: 100%" border>
+        <el-table :data="tableData1" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column fixed prop="date" label="日期"></el-table-column>
           <el-table-column prop="name" label="姓名"></el-table-column>
           <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -66,7 +66,7 @@
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary>
+          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed prop="date" label="日期"></el-table-column>
             <el-table-column prop="name" label="姓名"></el-table-column>
             <el-table-column prop="province" label="省份"></el-table-column>

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -66,7 +66,7 @@
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" border show-summary>
+          <el-table :data="tableData" style="width: 100%" border show-summary :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed prop="date" label="日期"></el-table-column>
             <el-table-column prop="name" label="姓名"></el-table-column>
             <el-table-column prop="province" label="省份"></el-table-column>