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

src/xt_pages/outpatientCharges/statementTemplate/printTen.vue

@@ -285,7 +285,7 @@
               <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.hosp_part_amt}}</td>
             </tr>
           </table>
-          <div style="width: 51%; margin: 5px 90px; text-align: left;">
+          <div style="width: 51%; margin: 5px 100px; text-align: center;">
            <span style="display: inline-block;"> 备注：其它包含军转、财政、慈善、其他商报等支付来源</span>
           </div>
         </div>
@@ -374,35 +374,5 @@ export default {
   margin-bottom: 20px;
   padding: 20px 10px;
 }
-// *{
-//   padding:0;
-//   margin: 0;
-//   border: 0;
-// }
-// .print-content{
-//   display: flex;
-//   justify-content: center;
-//   flex-direction:column
-// }
-// h1{
-//   text-align: center;
-// }
-// .yiliao{
-//   display: inline-block;
-//   margin: 10px 80px 10px 0px ;
-// }
-// .print-tab{
-//   margin: 0px auto;
-// }
-// .jiesuan{
-//   border-collapse: collapse;
-//   text-align: center;
-// }
-// .jiesuan tr td{
-//   border: 1px solid gray;
-//   width: 150px;
-//   height: 30px;
-// }
-
 
 </style>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -61,11 +61,13 @@
             <span v-if="advicePrint[0].patient.gender == 1">男</span>
             <span v-if="advicePrint[0].patient.gender == 2">女</span>
           </div>
-          <div>
-            年龄：{{
-              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""
-            }}岁
-          </div>
+<!--          <div>-->
+<!--            年龄：{{-->
+<!--              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""-->
+<!--            }}岁-->
+<!--          </div>-->
+          <div>年龄：{{getAge(advicePrint[0].patient)?getAge(advicePrint[0].patient):""}}岁</div>
+
         </div>
         <div style="margin-bottom: 20px; padding: 10px 10px 0">
           病史摘要：{{
@@ -188,6 +190,23 @@ export default {
     };
   },
   methods: {
+    getAge(patient){
+      var thisLen = patient.id_card_no.length
+      var birth = ''
+      if (thisLen == 15) {
+        birth = '19' + patient.id_card_no.substr(6, 6)
+      } else {
+        birth = patient.id_card_no.substr(6, 8)
+      }
+      var births =
+        birth.substr(0, 4) +
+        '-' +
+        birth.substr(4, 2) +
+        '-' +
+        birth.substr(6, 2)
+      return jsGetAge(births, '-')
+
+    },
     getPatientCaseHistory() {
       const params = {
         patient_id: this.patient_id,

src/xt_pages/workforce/components/editTableData.vue

@@ -4761,7 +4761,7 @@ export default {
     async CreateSchedule(id, data) {
       this.creating_schedule = true;
       let response =await CreateSchedule(id, data)
-
+      this.dialogTableVisible=false
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
       } else {
@@ -5383,8 +5383,11 @@ export default {
         )
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
+              
             })
-            .catch(() => {});
+            .catch(() => {
+              this.dialogTableVisible=false
+            });
       } else {
         this.CreateSchedule(this.currentData.patient_id, this.currentData);
       }