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/details/NavIgation.vue

@@ -137,6 +137,7 @@
       :admin_users="admin_users"
       :dialysis_order="dialysis_order"
       :his_is_open="his_is_open"
+      :predialysis="predialysis_evaluation"
     ></doctor-advice-dialog>
 
     <computer-dialog

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -641,6 +641,7 @@
     </el-dialog>
 
     <add-group-advice
+      :predialysis="predialysis"
       :adviceTemplates="adviceTemplates"
       :executionFrequencyOptions="executionFrequencyOptions"
       :unitsOption="unitsOption"
@@ -714,7 +715,13 @@
         default: () => {
           return []
         }
-      }
+      },
+      predialysis: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
     },
     data() {
       return {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -680,6 +680,12 @@ export default {
         return [];
       }
     },
+    predialysis: {
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
    
   },
   methods: {
@@ -1483,6 +1489,54 @@ export default {
       var xtuser = this.$store.getters.xt_user;
       // this.orgname = xtuser.org.org_name;
       this.adminusername = xtuser.user.user_name;
+      if(this.$store.getters.xt_user.org.id == 10101){
+        if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
+          var date = new Date(this.predialysis.created_time * 1000)
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          
+          this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+        } else {
+          var date = new Date()
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+        }
+      }
     },
     selectAllTemplateAdvice(selection) {
       console.log("params",selection)

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1954,7 +1954,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre, schedual, last, his_is_open) {
-        console.log('pre222222', pre)
+        console.log('pre222222', this.predialysis)
         if (pre != undefined) {
           if (pre.oxygen_uptake == 1) {
             this.oxygenShow = true
@@ -1968,37 +1968,87 @@
         if (his_is_open == 1) {
           this.is_open = 0
         }
-        var date = new Date()
-        var year = date.getFullYear()
-        var month = date.getMonth() + 1
-        var day = date.getDate()
+        
+        if(this.$store.getters.xt_user.org.id == 10101){
+          if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
+            var date = new Date(this.predialysis.created_time * 1000)
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
 
-        var hours = date.getHours()
-        var minites = date.getMinutes()
+            var hours = date.getHours()
+            var minites = date.getMinutes()
 
-        if (month < 10) {
-          month = '0' + month
-        }
-        if (day < 10) {
-          day = '0' + day
-        }
-        if (hours < 10) {
-          hours = '0' + hours
-        }
-        if (minites < 10) {
-          minites = '0' + minites
-        }
-        if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10101) {
-          this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
-        } else {
-          if (schedual.schedule_type == 1) {
-            this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
-          } else if (schedual.schedule_type == 2) {
-            this.start_time = year + '-' + month + '-' + day + ' ' + '12:00'
-          } else if (schedual.schedule_type == 3) {
-            this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+          } else {
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+          }
+        }else{
+          var date = new Date()
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.$store.getters.xt_user.org.id == 10016) {
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+          } else {
+            if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '12:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
           }
         }
+        
 
         if (pre.anticoagulant == 3) {
           this.dialysisPrescription.anticoagulant = '低分子肝素'

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -88,8 +88,8 @@
                                 <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                                     <p class="chargeP">
                                         <span v-if='item.type == 1'>{{item.advice.advice_name}}</span>
-                                        <span v-if='item.type == 2'>{{item.project.project.project_name}}</span>
-                                        <span v-if='item.type == 3'>{{item.project.good_info.specification_name}}</span>
+                                        <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
+                                        <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
                                     </p>
                                 </div>
                                 <div style="border-right:1px solid #000;width:15%;text-align:center;">
@@ -111,7 +111,7 @@
                                 </div>
                                 <div style="width:15%;text-align:center;">
                                     <p class="chargeP">
-                                        <span>{{item.cnt * item.pric}}元</span>
+                                        <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
                                     </p>
                                 </div>
                             </div>
@@ -216,7 +216,7 @@
                               </div>
                               <div style="width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span>{{item.cnt * item.pric}}元</span>
+                                      <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
                                   </p>
                               </div>
                           </div>

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -29,7 +29,7 @@
                 <div style="display:flex;margin-bottom:20px;padding:0 10px;">
                     <div>检验项目：</div>
                     <div>
-                        <div v-for="item in projectPrint" style="margin-bottom:10px;">{{ item.project.project_name }}</div>
+                        <div v-for="item in projectPrint" style="margin-bottom:10px;">{{ item.team.project_team }}</div>
                     </div>
                 </div>
                 <div style="display:flex;justify-content: space-between;border-top:1px solid #000;line-height:40px;padding:0 10px;">
@@ -152,11 +152,22 @@ export default {
                 
               }
             })
+            let data = []
+            projectPrint.map(item => {
+              if(item.team.id != 0){
+                let status = data.some(it => (it.team.id == item.team.id))
+                if(!status){
+                  data.push(item)
+                }
+              }
+              
+            })
+          
             this.total = total
             this.pre_time = this.advicePrint[0].pre_time
             this.doctor = this.advicePrint[0].doctor
-            this.projectPrint = projectPrint
-            console.log('this.projectPrint',projectPrint)
+            this.projectPrint = data
+            console.log('99999999999999999',projectPrint)
             var projectlist =  response.data.data.projectlist
 
             var projectlist =  response.data.data.projectlist

src/xt_pages/workforce/components/tableWeeks.vue

@@ -234,14 +234,14 @@
 
             <el-table-column label="抗凝剂(商品名称)" min-width="70" align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 2">普通肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 3">低分子肝素</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 4">阿加曲班</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 5">枸橼酸钠</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 6">低分子肝素钙</span>
-                    <span v-if="scope.row.prescription.anticoagulant === 7">低分子肝素钠</span>
-                    <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 1">无肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 2">普通肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 3">低分子肝素</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 4">阿加曲班</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 5">枸橼酸钠</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 6">低分子肝素钙</span>
+                    <span v-if="scope.row.dialysissolution.anticoagulant === 7">低分子肝素钠</span>
+                    <span v-if="scope.row.dialysissolution.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
                 </template>