Browse Source

新分支

28169 1 year ago
parent
commit
7b2cbef700

+ 8 - 0
src/api/role/admin.js View File

@@ -85,3 +85,11 @@ export function submitDialysisRecordPermissionUsers(ids_str) {
85 85
   })
86 86
 }
87 87
 
88
+
89
+export function toSign(params){
90
+  return request({
91
+    url:"/api/sign/getsign",
92
+    method:"get",
93
+    params:params
94
+  })
95
+}

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue View File

@@ -1532,7 +1532,7 @@
1532 1532
                             <td style="font-size: 16px" width="10%">医生签名</td>
1533 1533
                             <!--  -->
1534 1534
                             <td style="font-size: 16px" width="10%">
1535
-                              执行护士
1535
+                              执行人签名
1536 1536
                             </td>
1537 1537
                             <td style="font-size: 16px" width="10%">执行时间</td>
1538 1538
                             <td style="font-size: 16px" width="10%">核对人</td>
@@ -1615,11 +1615,11 @@
1615 1615
                               </td>
1616 1616
                             <!-- 执行护士 -->
1617 1617
                               <td height="35px">
1618
-                                <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
1619
-                                {{getAdminUser(advice, 'execution_staff')}}
1618
+                                <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">
1619
+                                {{getAdminUser(advice[0], 'execution_staff')}}
1620 1620
                                 </span>
1621 1621
                                 <span v-else>
1622
-                                    <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
1622
+                                    <img style="height:30px;" :src="setAdminUserES(advice[0], 'execution_staff')" alt srcset />
1623 1623
                                 </span>
1624 1624
                               </td>
1625 1625
                               <td height="35px">

+ 1 - 2
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -1977,11 +1977,10 @@ export default {
1977 1977
         });
1978 1978
         
1979 1979
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
1980
-        console.log("进来")
1981 1980
         printJS({
1982 1981
           printable: "dialysis-print-box-1",
1983 1982
           type: "html",
1984
-          style: style12,
1983
+          style: style2,
1985 1984
           scanStyles: false,
1986 1985
         });
1987 1986