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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
             }
           }
-          
+
           if(this.$store.getters.xt_user.org_id == 10138){
             let arr = this.teamList
             let newArr = []
             this.teamList = newArr
           }
         }
-        
-        
+
+
 
         if (this.curDrugs.length == 0) {
           if (this.$store.getters.xt_user.org_id == 10138) {
                   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
       },
       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++) {

src/xt_pages/stock/detail/stockInDetail.vue

        
         for(let i=0;i<this.tableInfo.length;i++){
           this.tableInfo[i].index = i+1  
-          this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].packing_price).toFixed(2) 
+          this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
         }
         console.log("总共条数555",this.tableInfo)   
         import('@/vendor/Export2Excel').then(excel => {

src/xt_pages/stock/drugs/query.vue

       handleSizeChange(val) {
         this.limit = val
         this.getlist()
+        this.getDrugCountList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
+        this.getDrugCountList()
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
       search: function() {
         this.getlist()
+        this.getDrugCountList()
       }, 
       setting: function() {
         this.$refs.dialog.show()

src/xt_pages/stock/stockQuery.vue

       this.limit = val;
 
       this.getlist()
+      this.getStockDrugCount()
       
     },
     handleCurrentChange(val) {
       this.page = val;
        this.getlist()
+        this.getStockDrugCount()
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     showCancelStockDetailDialog: function() {},
     search: function() {
       this.getlist()
+      this.getStockDrugCount()
     },
 
     exportList(){