Explorar el Código

修改bug和需求

csx hace 5 años
padre
commit
7199c1c2ed

+ 1 - 0
src/store/modules/xt_permission.js Ver fichero

14
   actions: {
14
   actions: {
15
     xt_GenerateRoutes({ commit }, urls) {
15
     xt_GenerateRoutes({ commit }, urls) {
16
       return new Promise(resolve => {
16
       return new Promise(resolve => {
17
+
17
         setupRouters(urls)
18
         setupRouters(urls)
18
         var addRouters = xt_filterAsyncRouter(xt_asyncRouterMap)
19
         var addRouters = xt_filterAsyncRouter(xt_asyncRouterMap)
19
         commit('XT_SET_ROUTERS', { concatRouters:xt_constantRouterMap.concat(xt_asyncRouterMap), addRouters:addRouters })
20
         commit('XT_SET_ROUTERS', { concatRouters:xt_constantRouterMap.concat(xt_asyncRouterMap), addRouters:addRouters })

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Ver fichero

445
                         <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
445
                         <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
446
                           <span v-if="advice.parent_id > 0">---></span>
446
                           <span v-if="advice.parent_id > 0">---></span>
447
                           <span >{{advice.advice_name }}</span>
447
                           <span >{{advice.advice_name }}</span>
448
-                          <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
448
+                          <span v-if="advice&&advice.advice_desc">({{advice.advice_desc}}{{advice.drug_spec_unit}})</span>
449
                           <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
449
                           <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
450
                            <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
450
                            <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
451
                           <span v-if="advice.parent_id == 0 ">{{advice.delivery_way}}</span>
451
                           <span v-if="advice.parent_id == 0 ">{{advice.delivery_way}}</span>

+ 2 - 2
src/xt_pages/user/dialysisSolution.vue Ver fichero

293
           </el-col>
293
           </el-col>
294
 
294
 
295
 
295
 
296
-          <el-col :span="8" v-if="isShows('碳酸氢')">
297
-            <el-form-item label="碳酸氢(mmol/L): " prop="bicarbonate">
296
+          <el-col :span="8" v-if="isShows('碳酸氢')">
297
+            <el-form-item label="碳酸氢(mmol/L): " prop="bicarbonate">
298
               <el-input v-model="addPlan.bicarbonate"></el-input>
298
               <el-input v-model="addPlan.bicarbonate"></el-input>
299
             </el-form-item>
299
             </el-form-item>
300
           </el-col>
300
           </el-col>