Browse Source

518合并代码

XMLWAN 3 years ago
parent
commit
8ccd7f1c03

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

1006
             v-if="org_template_info.template_id == 41"
1006
             v-if="org_template_info.template_id == 41"
1007
           >
1007
           >
1008
           </DialysisPrintOrderFortyOne>
1008
           </DialysisPrintOrderFortyOne>
1009
-          <DialysisPrintOrderFortyThree
1009
+          <DialysisPrintOrderFortyTwo
1010
             v-bind:childResponse="childResponse"
1010
             v-bind:childResponse="childResponse"
1011
             v-if="org_template_info.template_id == 42"
1011
             v-if="org_template_info.template_id == 42"
1012
           >
1012
           >
1013
-          </DialysisPrintOrderFortyThree>
1013
+          </DialysisPrintOrderFortyTwo>
1014
+
1014
           <DialysisPrintOrderFortyThree
1015
           <DialysisPrintOrderFortyThree
1015
             v-bind:childResponse="childResponse"
1016
             v-bind:childResponse="childResponse"
1016
             v-if="org_template_info.template_id == 43"
1017
             v-if="org_template_info.template_id == 43"
1017
           >
1018
           >
1018
           </DialysisPrintOrderFortyThree>
1019
           </DialysisPrintOrderFortyThree>
1020
+
1019
           <DialysisPrintOrderFortyFour
1021
           <DialysisPrintOrderFortyFour
1020
             v-bind:childResponse="childResponse"
1022
             v-bind:childResponse="childResponse"
1021
             v-if="org_template_info.template_id == 44"
1023
             v-if="org_template_info.template_id == 44"
1022
           >
1024
           >
1023
           </DialysisPrintOrderFortyFour>
1025
           </DialysisPrintOrderFortyFour>
1026
+          
1024
           <DialysisPrintOrderFortyFive
1027
           <DialysisPrintOrderFortyFive
1025
             v-bind:childResponse="childResponse"
1028
             v-bind:childResponse="childResponse"
1026
             v-if="org_template_info.template_id == 45"
1029
             v-if="org_template_info.template_id == 45"

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue View File

1435
         <table class="print-table-no" border="1" count="0">
1435
         <table class="print-table-no" border="1" count="0">
1436
           <tbody>
1436
           <tbody>
1437
             <tr>
1437
             <tr>
1438
-              <td width="40px">时间</td>
1438
+              <td width="40px">时间2</td>
1439
               <td width="120px">医嘱<br />内容</td>
1439
               <td width="120px">医嘱<br />内容</td>
1440
               <td width="80px">医生<br />签名</td>
1440
               <td width="80px">医生<br />签名</td>
1441
               <td width="80px">执行<br />护士</td>
1441
               <td width="80px">执行<br />护士</td>