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/batch_print/batch_print_order_twentyEight.vue

@@ -153,8 +153,10 @@
                         <tbody>
                         <tr>
                             <td width="100">导管穿刺口:</td>
-                            <td width="280">
+                            <td width="380">
                             <div style="display:flex;justify-content:space-between;">
+                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('正常') > -1 ? true : false" showValue="正常"></label-box>
+                                &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
                                 &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
@@ -164,15 +166,23 @@
                                 <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
                             </div>
                             </td>
-                            <td width="40"></td>
+                            <td width=""></td>
                             
-                            <td width="50">体位:</td>
-                            <td style="text-align:left;">
-                              <label-box v-for="(item, index) in posture_arr" :key="index" :isChecked="record.receive_assessment.posture == item.id ? true : false" :showValue="item.name"></label-box>
-                            </td>
                         </tr>
                         </tbody>
                         </table>
+                        <table class="table-box">
+                          <tbody>
+                            <tr>
+                              <td width="50">体位:</td>
+                              <td style="text-align:left;">
+                                <label-box style="margin-right:10px;" v-for="(item, index) in posture_arr" :key="index" :isChecked="record.receive_assessment.posture == item.id ? true : false" :showValue="item.name"></label-box>
+                              </td>
+                              <td></td>
+                            </tr>
+                          </tbody>
+                        </table>
+                          
 
                         <table class="table-box">
                         <tbody>
@@ -214,7 +224,7 @@
                         <tbody>
                         <tr>
                             <td width="50">皮肤:</td>
-                            <td width="660">
+                            <td width="760">
                             <div>
                                 <label-box showValue="完整" :isChecked="record.assessment_before_dislysis.skin.indexOf('完整')>-1 ? true : false"></label-box>
                                 <label-box showValue="干燥" :isChecked="record.assessment_before_dislysis.skin.indexOf('干燥')>-1? true : false"></label-box>
@@ -225,6 +235,7 @@
                                 <label-box showValue="出血点" :isChecked="record.assessment_before_dislysis.skin.indexOf('出血点')>-1 ? true : false"></label-box>
                                 <label-box showValue="压疮" :isChecked="record.assessment_before_dislysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
                                 <label-box showValue="皮下淤血" :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
+                                <label-box showValue="皮下出血" :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下出血')>-1 ? true : false"></label-box>
                             </div>
                             </td>
                            

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -158,18 +158,15 @@
               <tbody>
               <tr>
                 <td width="100">导管穿刺口:</td>
-                <td width="280">
+                <td width="330">
                   <div style="display:flex;justify-content:space-between;">
+                    <label-box :isChecked="predialysis.catheter.indexOf('正常') > -1 ? true : false" showValue="正常"></label-box>
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-分泌物') > -1 ? true : false" showValue="分泌物"></label-box>
-                    &nbsp;
                     <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
                   </div>
                 </td>
-                <td width="40"></td>
                 <!-- <td width="65">导管打折</td>
                 <td width="10">(</td>
                 <td width="80">
@@ -193,6 +190,13 @@
                 <td></td> -->
 
                 <!-- 体位 -->
+                <td></td>
+              </tr>
+              </tbody>
+            </table>
+            <table class="table-box">
+              <tbody>
+              <tr>
                 <td width="50">体位:</td>
                 <td width="440">
                   <div style="display:flex;justify-content:space-between;">
@@ -219,7 +223,6 @@
               </tr>
               </tbody>
             </table>
-
             <table class="table-box">
               <tbody>
               <tr>
@@ -256,7 +259,7 @@
               <tbody>
                 <tr>
                   <td width="50">皮肤:</td>
-                  <td width="700">
+                  <td width="780">
                     <div style="display:flex;justify-content:space-between;">
                       <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
                       <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
@@ -276,6 +279,7 @@
                       <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点')>-1 ? true : false"></label-box>
                       <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
                       <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
+                      <label-box showValue="皮下出血" :isChecked="predialysis.skin.indexOf('皮下出血')>-1 ? true : false"></label-box>
                       &ensp;
                     </div>
                   </td>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -152,7 +152,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
 
           var that = this
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -136,13 +136,13 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 "
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671"
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
 
                         <el-button
-                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
+                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671"
                                 size="small" @click="open(11)" type="primary"
                         >撤销明细
                         </el-button>
@@ -633,7 +633,7 @@
                   that.radio = 2
                   that.$refs.charge.hide()
                   that.state = '已收费'
-                  that.$message({ message: '收费成功', type: 'success' })
+                  that.$message({ message: '收费成功', type: 'success'})
                   that.loadingtwo = false
                   that.cal_one = this.cal_one - 1
                   that.cal_two = this.cal_two + 1
@@ -645,7 +645,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -666,7 +666,7 @@
                 that.$refs.charge.hide()
                 that.loadingtwo = false
                 that.state = '已收费'
-                that.$message({ message: '收费成功', type: 'success' })
+                that.$message({ message: '收费成功', type: 'success',duration:5000 })
                 that.loadingtwo = false
                 that.cal_one = this.cal_one - 1
                 that.cal_two = this.cal_two + 1
@@ -867,7 +867,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -943,7 +943,7 @@
               return false
             } else {
               this.getPatientList()
-              this.$message({ message: '挂号成功', type: 'success' })
+              this.$message({ message: '挂号成功', type: 'success',duration:5000 })
               this.$refs.register.hide()
               this.loadingone = false
               var his_info = response.data.data.his_info
@@ -1487,7 +1487,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1514,7 +1514,7 @@
                     return false
                   } else {
                     that.changeRadio(1)
-                    that.$message({ message: '退费成功', type: 'success' })
+                    that.$message({ message: '退费成功', type: 'success',duration:5000 })
                     that.loadingtwo = false
 
                   }

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,8 +150,8 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
-
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671) {
+         
         var that = this
 
         axios.get('http://127.0.0.1:9532/api/settle/query', {