Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1289,18 +1289,6 @@
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">核对</p>
                   </td>
-                  <!-- <td style="height: 20px" width="144">
-                    <p style="height: 20px; line-height: 20px">上次透后体重</p>
-                  </td> -->
-                  <!-- <td style="height: 20px" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? patientInfo.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
                 </tr>
               </table>
             </td>
@@ -1310,7 +1298,7 @@
             :key="advice_index"
             style="transform: translateY(3px)"
           >
-            <td>
+            <td v-if="advice.advice_name!=''">
               <table class="print-table" border="1">
                 <tr>
                   <td width="60">
@@ -1364,21 +1352,6 @@
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
-                  <!-- <td
-                    style="line-height: 30px"
-                    width="90"
-                    v-if="org_id == 10249 || org_id == 0"
-                  >
-                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">
-                      {{ getAdminUser(advice.advice_doctor) }}
-                    </span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.advice_doctor)"
-                      alt=""
-                      srcset=""
-                    />
-                  </td> -->
                   <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
@@ -1404,86 +1377,7 @@
                     />
                   </td>
 
-                  <!-- <td v-if="advice_index === 0" width="145">透前体重:</td> -->
-                  <!-- <td v-if="advice_index === 0" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? patientInfo.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 1" width="145">体重增加量:</td> -->
-                  <!-- <td v-if="advice_index === 1" width="60">
-                    {{
-                      assessmentafter.weight_after == 0 ||
-                      predialysis.weight_before == 0
-                        ? 0
-                        : (
-                            predialysis.weight_before -
-                            assessmentafter.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 2" width="145">干体重(DW):</td> -->
-                  <!-- <td v-if="advice_index === 2" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? predialysis.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 3" width="145">较干体重增加量:</td> -->
-                  <!-- <td v-if="advice_index === 3" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                        0 && afterdialysis.weight_after != 0
-                        ? (
-                            afterdialysis.weight_after - predialysis.dry_weight
-                          ).toFixed(2)
-                        : 0
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
-                  <td v-if="advice_index === 4" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? afterdialysis.actual_ultrafiltration
-                        : "/"
-                    }}ml
-                  </td> -->
-                  <!-- <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? afterdialysis.weight_after
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 6" width="145">
-                    本次透析体重下降量:
-                  </td>
-                  <td v-if="advice_index === 6" width="60">
-                    {{
-                      afterdialysis.weight_after == 0 ||
-                      predialysis.weight_before == 0
-                        ? 0
-                        : (
-                            predialysis.weight_before -
-                            afterdialysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6" width="60"></td> -->
+                 
                 </tr>
               </table>
             </td>

src/xt_pages/stock/stockFlow.vue

@@ -96,6 +96,12 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
+
+        <el-table-column prop="drug_name" label="出库日期" align="center">
+           <template slot-scope="scope">
+             {{getTime(scope.row.system_time)}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="仓库名称"  align="center">
            <template slot-scope="scope">
              <span>{{getHouseName(scope.row.storehouse_id)}}</span>