Преглед на файлове

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

杨青 преди 2 години
родител
ревизия
f2d9e08e76

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue Целия файл

1016
                       <div class="under_line" style="width: 80px">
1016
                       <div class="under_line" style="width: 80px">
1017
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
1017
                         <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
1018
 
1018
 
1019
-                        <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
1020
-                        <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
1019
+                        <span v-if="setAdminUserES(prescription.creater) == ''">{{ getAdminUser(prescription.creater) }}</span>
1020
+                        <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else />
1021
                       </div>
1021
                       </div>
1022
                     </div>
1022
                     </div>
1023
                     <div class="inline_block" style="flex:1;">
1023
                     <div class="inline_block" style="flex:1;">

+ 1 - 1
src/xt_pages/stock/inventoryDetails.vue Целия файл

49
 
49
 
50
             <el-table-column  prop="name" label="有效日期" width="200" align="center">
50
             <el-table-column  prop="name" label="有效日期" width="200" align="center">
51
                <template slot-scope="scope">
51
                <template slot-scope="scope">
52
-                 {{getTime(scope.row.product_date)}}
52
+                 {{getTime(scope.row.expire_date)}}
53
                </template>
53
                </template>
54
             </el-table-column>
54
             </el-table-column>
55
 
55
 

+ 1 - 0
src/xt_pages/user/hospitalSummaryPrint.vue Целия файл

277
               </span>
277
               </span>
278
               </span>
278
               </span>
279
             </td>
279
             </td>
280
+            <td  style="text-align:center;width:170px" colspan="2"></td>
280
           </tr>
281
           </tr>
281
         </table>
282
         </table>
282
      </div>
283
      </div>