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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -508,19 +508,29 @@
           </tr>
           <tr>
             <td colspan="8" style="text-align: left">
-              <span style="display: inline-block; margin-left: 15px" v-if="predialysis.blood_access_part_opera_name!=''">
+              <span
+                style="display: inline-block; margin-left: 15px"
+                v-if="predialysis.blood_access_part_opera_name != ''"
+              >
                 血管通路:
                 <!-- {{predialysis.blood_access_part_opera_name ?'' :predialysis.blood_access_part_opera_name}}&nbsp;&nbsp; -->
-               <span
-                  v-for="(item, index) in arrtwo"
-                  :key="index"
-                >
-                {{predialysis.blood_access_part_opera_id == item.id ? item.name :''}}
+                <span v-for="(item, index) in arrtwo" :key="index">
+                  {{
+                    predialysis.blood_access_part_opera_id == item.id
+                      ? item.name
+                      : ""
+                  }}
                 </span>
                 部位：
-                {{predialysis.blood_access_part_id ? predialysis.blood_access_part_id : ''}}&nbsp;&nbsp;
-
-                内瘘：{{predialysis.internal_fistula == ""?'无':predialysis.internal_fistula}}
+                {{
+                  predialysis.blood_access_part_id
+                    ? predialysis.blood_access_part_id
+                    : ""
+                }}&nbsp;&nbsp; 内瘘：{{
+                  predialysis.internal_fistula == ""
+                    ? "无"
+                    : predialysis.internal_fistula
+                }}
                 <!-- <label-box
                   v-for="(item, index) in arrtwo"
                   :key="index"
@@ -539,34 +549,50 @@
           </tr>
           <tr>
             <td colspan="8" style="text-align: left">
-              <span v-if="predialysis.venous_catheterization==1||predialysis.venous_catheterization==2">
+              <span
+                v-if="
+                  predialysis.venous_catheterization == 1 ||
+                  predialysis.venous_catheterization == 2
+                "
+              >
                 <span style="display: inline-block; margin-left: 15px"
-                >中心静脉导管: {{predialysis.venous_catheterization == 1?'长期':'短期'}}</span
-              >&nbsp;&nbsp;
-              <!-- (部位：{{ getPartName(predialysis.blood_access_part_id) }}) -->
-              部位：{{ predialysis.blood_access_part_id }}&nbsp;&nbsp;
-              
-              感染：<span v-if="predialysis.is_infect==1">
-                无
-              </span>
-              <span v-if="predialysis.is_infect==2">
-                有
-              </span>&nbsp;&nbsp;
-              
-              流畅度：
+                  >中心静脉导管:
+                  {{
+                    predialysis.venous_catheterization == 1 ? "长期" : "临时"
+                  }}</span
+                >&nbsp;&nbsp;
+                <!-- (部位：{{ getPartName(predialysis.blood_access_part_id) }}) -->
+                部位：{{ predialysis.blood_access_part_id }}&nbsp;&nbsp;
+                <span v-if="predialysis.is_infect != 0">
+                  感染：<span v-if="predialysis.is_infect == 1"> 无 </span>
+                  <span v-if="predialysis.is_infect == 2"> 有 </span> </span
+                >&nbsp;&nbsp;
+
+                <!-- <span v-if="predialysis.catheter.indexOf('通畅度-好') > -1||predialysis.catheter.indexOf('通畅度-差') > -1||predialysis.catheter.indexOf('通畅度-一般') > -1">
+                流畅度：
               <span v-if="predialysis.catheter.indexOf('通畅度-好') > -1">
                 好
               </span>
               <span v-if="predialysis.catheter.indexOf('通畅度-差') > -1">
                 差
+              </span>
+              <span v-if="predialysis.catheter.indexOf('通畅度-一般') > -1">
+                一般
+              </span>
               </span>&nbsp;&nbsp;
+              
              
              <span v-if="predialysis.catheter.indexOf('溶栓-有') > -1 ||predialysis.catheter.indexOf('溶栓-无') > -1">
                溶栓：<span v-if="predialysis.catheter.indexOf('溶栓-有') > -1">有</span>
                      <span v-if="predialysis.catheter.indexOf('溶栓-无') > -1">无</span>
-             </span>
-              
-              &nbsp;&nbsp;外露：{{ predialysis.exposed }}cm
+             </span>&nbsp;&nbsp; -->
+
+                <span v-if="predialysis.catheter != ''">
+                  导管情况：<span>{{ predialysis.catheter }}</span> </span
+                >&nbsp;&nbsp;
+                <span v-if="predialysis.exposed != 0">
+                  外露：{{ predialysis.exposed }}cm
+                </span>
               </span>
               <span style="display: inline-block; margin-left: 15px" v-else>
                 中心静脉导管:无
@@ -964,7 +990,7 @@
             </td>
             <td style="min-width: 80px">
               置换量
-              <br />ml
+              <br />L
             </td>
             <td style="min-width: 80px">
               血压
@@ -1053,7 +1079,7 @@
                 >&nbsp;&nbsp;
               </span>
             </td>
-            <td style="text-align: left" colspan="3">
+            <td style="text-align: left" colspan="5">
               <span>
                 <span
                   v-if="finshForm.url === ''"
@@ -1085,26 +1111,23 @@
             </td>
           </tr>
           <tr>
-            <td style="text-align: left" colspan="3">
-              <span>
-                <span style="display: flex; align-items: center; height: 36px"
-                  >负责护士:<span
-                    v-if="
-                      setAdminUserES(
-                        dialysisOrder == null ? 0 : dialysisOrder.start_nurse
-                      ) == ''
-                    "
-                  >
-                    {{
-                      getAdminUser(
-                        dialysisOrder == null ? 0 : dialysisOrder.start_nurse
-                      )
-                    }}
-                  </span></span
-                >
+            <td style="text-align: left" colspan="4">
+              <span style="display: inline-block; margin-left: 15px">
+                <span
+                  v-if="orderForm.url === ''"
+                  style="display: flex; align-items: center"
+                  >责任护士:{{ orderForm.start_nurse }}
+                </span>
+                
+                <span
+                  v-if="orderForm.url !== ''"
+                  style="display: flex; align-items: center; height: 36px">
+                  责任护士:
+                  <img :src="orderForm.url" style="height: 30px" />
+                </span>
               </span>
             </td>
-            <td style="text-align: left" colspan="3">
+            <td style="text-align: left" colspan="4">
               <span>
                 <span style="display: flex; align-items: center; height: 36px"
                   >核对护士:
@@ -1115,6 +1138,22 @@
                   >
                     {{ getAdminUser(check == null ? 0 : check.modifier) }}
                   </span>
+                  <span
+                    v-else
+                    style="
+                      display: flex;
+                      align-items: center;
+                      justify-content: space-around;
+                      height: 36px;
+                    "
+                  >
+                    <img
+                      style="height: 30px"
+                      :src="setAdminUserES(check.modifier)"
+                      alt
+                      srcset
+                    />
+                  </span>
                 </span>
               </span>
             </td>
@@ -1733,6 +1772,7 @@ export default {
       return name;
     },
     setAdminUserES(id) {
+      console.log(this.operatorMaps, "this.operatorMaps");
       if (id === 0) {
         return "";
       }

src/xt_pages/stock/inventoryTransfer/index.vue

@@ -48,7 +48,6 @@
         </div>
       </div>
       <el-table
-        :row-style="changColor"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',