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

src/router/modules/dialysis.js

@@ -351,17 +351,17 @@ export default {
       noCache: true
     },
     // 透析记录2
-    {
-      path: '/dialysis/details/indexs',
-      component: () => import('@/xt_pages/dialysis/details/indexs'),
-      name: 'details',
-      meta: {
-        title: 'details'
-      },
-      hidden: true,
-      is_menu: false,
-      noCache: true
-    },
+    // {
+    //   path: '/dialysis/details/indexs',
+    //   component: () => import('@/xt_pages/dialysis/details/indexs'),
+    //   name: 'details',
+    //   meta: {
+    //     title: 'details'
+    //   },
+    //   hidden: true,
+    //   is_menu: false,
+    //   noCache: true
+    // },
 
     {
       path: '/dialysis/print/batch',

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2235,16 +2235,18 @@
                 </td> -->
                   <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                   <td height="32px">
-                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
-                      getAdminUser(advice.advice_doctor)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.advice_doctor)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
+                    <span v-if="advice!=null && advice.advice_doctor>0">
+                      <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
+                        getAdminUser(advice.advice_doctor)
+                      }}</span>
+                      <img
+                        style="height: 30px"
+                        :src="setAdminUserES(advice.advice_doctor)"
+                        alt=""
+                        srcset=""
+                        v-else
+                      />
+                   </span>
                   </td>
                   <!-- <td height="35px">
                   <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
@@ -3199,7 +3201,8 @@
                         class="under_line"
                         style="width: 80px; text-align: center"
                       >
-                      <span
+                      <span v-if="doctor_advices[0]!=null && doctor_advices[0].advice_doctor>0">
+                        <span
                             style="height: 30px; display: inline-block"
                             v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
                           >
@@ -3212,6 +3215,8 @@
                             srcset=""
                             v-else
                           />
+                      </span>
+                      
                       </div>
                     </div>
                   </div>

src/xt_pages/user/Informed/Informedconsent.vue

@@ -14,7 +14,7 @@
                     prefix-icon="el-icon-search"
                     v-model="input2" style="width: 200px;">
                   </el-input>
-                  <el-button type="primary">查看图片</el-button>
+                  <!-- <el-button type="primary">查看图片</el-button> -->
                 </div>
                 <div>
                   <el-table