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/outpatientDoctorStation/components/deskPrescription.vue

@@ -2676,7 +2676,7 @@
 
             }
           }
-          
+
           if(this.$store.getters.xt_user.org_id == 10138){
             let arr = this.teamList
             let newArr = []
@@ -2691,8 +2691,8 @@
             this.teamList = newArr
           }
         }
-        
-        
+
+
 
         if (this.curDrugs.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
@@ -2872,7 +2872,12 @@
                   remark: '',
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
-                  type: temp2[b].type
+                  type: temp2[b].type,
+                }
+                if(temp2[b].team_id == undefined){
+                  obj["team_id"] = 0
+                }else{
+                  obj["team_id"] = temp2[b].team_id
                 }
                 if (obj.total == 0 || obj.total == undefined) {
                   obj.total = 1
@@ -3006,99 +3011,111 @@
       },
       selectTeam(row) {
         console.log(row)
-        var arr = []
-        for (let i = 0; i < row.length; i++) {
-          arr.push(row[i].item_id)
-        }
-        console.log(arr)
-        var ids = arr.join(',')
-        console.log(ids)
-        var strArr = ids.split(',')
-        console.log(strArr)
-        var res = []//接收不重复的数据
-
-        for (var i = 0; i < strArr.length; i++) {
-          var flag = true
+        // var arr = []
+        // for (let i = 0; i < row.length; i++) {
+        //   arr.push(row[i].item_id)
+        // }
+        // console.log(arr)
+        // var ids = arr.join(',')
+        // console.log(ids)
+        // var strArr = ids.split(',')
+        // console.log(strArr)
+        // var res = []//接收不重复的数据
+        //
+        // for (var i = 0; i < strArr.length; i++) {
+        //   var flag = true
+        //
+        //   for (var j = 0; j < i; j++) {
+        //     if (strArr[i] === strArr[j]) {
+        //       flag = false
+        //       break
+        //     }
+        //   }
+        //   if (flag) {
+        //     res.push(strArr[i])
+        //   }
+        // }
+        // console.log(res)
+        // var idstr = res.join(',')
 
-          for (var j = 0; j < i; j++) {
-            if (strArr[i] === strArr[j]) {
-              flag = false
-              break
-            }
+        let teamList = []
+        for(let i = 0;i < row.length; i++){
+          let team_id = row[i].id
+          console.log(team_id)
+          const params = {
+            project_id:  row[i].item_id
           }
-          if (flag) {
-            res.push(strArr[i])
-          }
-        }
-        console.log(res)
-        var idstr = res.join(',')
-        const params = {
-          project_id: idstr
-        }
-        getPojectListById(params).then(response => {
-          if (response.data.state == 1) {
-            this.teamList = []
-            var project = response.data.data.project
-            let num = 0
-            for (let i = 0; i < project.length; i++) {
-              if (project[i].type == 2 && project[i].status == 1) {
+          getPojectListById(params).then(response => {
+            if (response.data.state == 1) {
+              var project = response.data.data.project
+              let num = 0
+              for (let i = 0; i < project.length; i++) {
+                if (project[i].type == 2 && project[i].status == 1) {
+                  let obj = {
+                    id: project[i].project_id,
+                    project_name: project[i].project.project_name,
+                    statistical_classification: project[i].project.statistical_classification,
+                    single_dose: project[i].project.single_dose,
+                    delivery_way: project[i].project.delivery_way,
+                    execution_frequency: project[i].project.execution_frequency,
+                    number_days: project[i].project.number_days,
+                    cus_total: project[i].number,
+                    price: project[i].project.price,
+                    remark: '',
+                    medical_code: project[i].project.medical_code,
+                    unit: project[i].project.unit,
+                    type: project[i].type,
+                    is_special_diseases: project[i].project.disease_directory,
+                    team_id:team_id
+                  }
+                  if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                    obj.cus_total = 1
+                  }
 
-                let obj = {
-                  id: project[i].project_id,
-                  project_name: project[i].project.project_name,
-                  statistical_classification: project[i].project.statistical_classification,
-                  single_dose: project[i].project.single_dose,
-                  delivery_way: project[i].project.delivery_way,
-                  execution_frequency: project[i].project.execution_frequency,
-                  number_days: project[i].project.number_days,
-                  cus_total: project[i].number,
-                  price: project[i].project.price,
-                  remark: '',
-                  medical_code: project[i].project.medical_code,
-                  unit: project[i].project.unit,
-                  type: project[i].type,
-                  is_special_diseases: project[i].project.disease_directory
-                }
-                if (obj.cus_total == 0 || obj.cus_total == undefined) {
-                  obj.cus_total = 1
-                }
+                  teamList.push(obj)
+                } else if (project[i].type == 3 && project[i].status == 1) {
+                  if(project[i].good_info.total <= 0){
+                    num++
+                    this.$refs.tabProjectTeam.toggleRowSelection(row);
+                    this.$message.error(project[i].good_info.good_name + '库存不足')
+                  }
+                  if(num > 0){
+                    this.$refs.tabProjectTeam.clearSelection();
+                  }
+                  let obj = {
+                    id: project[i].project_id,
+                    project_name: project[i].good_info.good_name,
+                    statistical_classification: '',
+                    single_dose: '',
+                    delivery_way: '',
+                    execution_frequency: '',
+                    number_days: '',
+                    cus_total: project[i].number,
+                    price: project[i].good_info.retail_price,
+                    remark: '',
+                    medical_code: project[i].good_info.medical_insurance_number,
+                    unit: project[i].good_info.unit,
+                    type: project[i].type,
+                    is_special_diseases: project[i].good_info.is_special_diseases,
+                    team_id:team_id
 
-                this.teamList.push(obj)
-              } else if (project[i].type == 3 && project[i].status == 1) {
-                if(project[i].good_info.total <= 0){
-                  num++
-                  this.$refs.tabProjectTeam.toggleRowSelection(row);
-                  this.$message.error(project[i].good_info.good_name + '库存不足')
-                }
-                if(num > 0){
-                  this.$refs.tabProjectTeam.clearSelection();
-                }
-                let obj = {
-                  id: project[i].project_id,
-                  project_name: project[i].good_info.good_name,
-                  statistical_classification: '',
-                  single_dose: '',
-                  delivery_way: '',
-                  execution_frequency: '',
-                  number_days: '',
-                  cus_total: project[i].number,
-                  price: project[i].good_info.retail_price,
-                  remark: '',
-                  medical_code: project[i].good_info.medical_insurance_number,
-                  unit: project[i].good_info.unit,
-                  type: project[i].type,
-                  is_special_diseases: project[i].good_info.is_special_diseases
-                }
-                if (obj.cus_total == 0 || obj.cus_total == undefined) {
-                  obj.cus_total = 1
+                  }
+                  if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                    obj.cus_total = 1
+                  }
+                  teamList.push(obj)
                 }
-                this.teamList.push(obj)
-
               }
+
+              this.teamList = this.teamList.concat(teamList)
+              console.log(this.teamList)
             }
+          })
+        }
+
+
+
 
-          }
-        })
 
       }, changeDoctor(val) {
         for (let i = 0; i < this.doctors.length; i++) {