Browse Source

新分支

28169 1 year ago
parent
commit
325559b83b

+ 4 - 4
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -1311,11 +1311,11 @@
1311 1311
           >
1312 1312
           </DialysisPrintOrderSixtyeight>
1313 1313
 
1314
-          <!-- <DialysisPrintOrderZero
1314
+          <DialysisPrintOrderZero
1315 1315
             v-bind:childResponse="childResponse"
1316 1316
             v-if="org_template_info.template_id == 199"
1317 1317
           >
1318
-          </DialysisPrintOrderZero> -->
1318
+          </DialysisPrintOrderZero>
1319 1319
         </div>
1320 1320
       </el-container>
1321 1321
     </div>
@@ -2032,7 +2032,7 @@ export default {
2032 2032
           style: style12,
2033 2033
           scanStyles: false,
2034 2034
         });
2035
-       
2035
+        console.log("printjswowoowowowwoow",style12)
2036 2036
 
2037 2037
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
2038 2038
         printJS({
@@ -2058,7 +2058,7 @@ export default {
2058 2058
           style: style2,
2059 2059
           scanStyles: false,
2060 2060
         });
2061
-        // console.log('77777',this.org_template_info.template_id);
2061
+        console.log('77777',this.org_template_info.template_id);
2062 2062
       }
2063 2063
       else if (
2064 2064
         this.org_template_info.template_id == 53

+ 10 - 8
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue View File

@@ -940,6 +940,7 @@
940 940
                       :src="setAdminUserES(advice.advice_doctor)"
941 941
                       alt=""
942 942
                       srcset=""
943
+                      v-else
943 944
                     />
944 945
                   </td>
945 946
                   <td style="text-align: left; padding-left: 5px" width="344">
@@ -999,6 +1000,7 @@
999 1000
                       :src="setAdminUserES(advice.execution_staff)"
1000 1001
                       alt=""
1001 1002
                       srcset=""
1003
+                      v-else
1002 1004
                     />
1003 1005
                   </td>
1004 1006
                   <td style="line-height: 30px" width="90">
@@ -1326,6 +1328,7 @@
1326 1328
                       :src="setAdminUserES(advice.advice_doctor)"
1327 1329
                       alt=""
1328 1330
                       srcset=""
1331
+                      v-else
1329 1332
                     />
1330 1333
                   </td>
1331 1334
                   <td style="text-align: left; padding-left: 5px" width="344">
@@ -1385,6 +1388,7 @@
1385 1388
                       :src="setAdminUserES(advice.execution_staff)"
1386 1389
                       alt=""
1387 1390
                       srcset=""
1391
+                      v-else
1388 1392
                     />
1389 1393
                   </td>
1390 1394
                   <td style="line-height: 30px" width="90">
@@ -1752,17 +1756,15 @@ export default {
1752 1756
       return name;
1753 1757
     },
1754 1758
     setAdminUserES(id) {
1755
-      // console.log(id);
1756
-      if (id == 0 || id == "undefined") {
1759
+      console.log(id);
1760
+      if (id == 0) {
1757 1761
         return "";
1758
-      }else{
1759
-        if (id in this.operatorMaps) {
1762
+      }
1763
+      if (id in this.operatorMaps) {
1760 1764
         return this.operatorMaps[id].url;
1761
-        } else {
1762
-          return "";
1763
-        }
1765
+      } else {
1766
+        return "";
1764 1767
       }
1765
-     
1766 1768
     },
1767 1769
     modeName(mode_id) {
1768 1770
       return typeof this.modeOptions[mode_id] !== "undefined" &&

+ 3 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThreeAdvice.vue View File

@@ -377,6 +377,7 @@
377 377
                         v-if="setAdminUserES(advices[0].advice_doctor) == ''"
378 378
                       >
379 379
                         {{ getAdminUser(advices[0].advice_doctor) }}
380
+                      
380 381
                       </span>
381 382
                       <img
382 383
                         class="es-img"
@@ -867,6 +868,7 @@
867 868
                       :src="setAdminUserES(advice.advice_doctor)"
868 869
                       alt=""
869 870
                       srcset=""
871
+                      v-else
870 872
                     />
871 873
                   </td>
872 874
                   <td style="text-align: left; padding-left: 5px" width="340">
@@ -926,6 +928,7 @@
926 928
                       :src="setAdminUserES(advice.execution_staff)"
927 929
                       alt=""
928 930
                       srcset=""
931
+                      v-else
929 932
                     />
930 933
                   </td>
931 934
                   <td style="line-height: 30px" width="90">

+ 4 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue View File

@@ -1541,13 +1541,12 @@
1541 1541
                           />
1542 1542
                         </td>
1543 1543
                         <td v-else>
1544
-                          <span
1545
-                            v-if="setAdminUserES(advice.advice_doctor) == ''"
1546
-                            >{{ getAdminUser(advice.advice_doctor) }}</span
1547
-                          >
1544
+                          <span v-if="setAdminUserES(advice.doctor) == ''">{{
1545
+                            getAdminUser(advice.doctor)
1546
+                          }}</span>
1548 1547
                           <img
1549 1548
                             style="height: 30px"
1550
-                            :src="setAdminUserES(advice.advice_doctor)"
1549
+                            :src="setAdminUserES(advice.doctor)"
1551 1550
                             alt=""
1552 1551
                             srcset=""
1553 1552
                             v-else