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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                      @click="open(4)"
                      type="primary">收费
           </el-button>
+
           <el-button size="small" @click="open(5)" type="primary"
-                     v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2" >退费
+               v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2" >退费
           </el-button>
+          <!-- <el-button size="small" @click="open(5)" type="primary"
+                    >退费
+          </el-button> -->
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
           >结算单
           </el-button>
 
-          <el-button v-if="this.$store.getters.xt_user.org_id == 9919"
-                     size="small" @click="open(10)" type="primary"
-          >退号
-          </el-button>
+          <!--<el-button v-if="this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(10)" type="primary"-->
+          <!--&gt;退号-->
+          <!--</el-button>-->
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
           <!--size="small" @click="open(11)" type="primary"-->
 
         let params = {
           'record_date': val,
-          'patient_id': this.patientInfo.id,
-          'type': this.radio,
+          'patient_id': this.patientInfo.id
         }
         getChargeHisPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             order_id: this.order.id
           }
           this.orderObj = obj
+          // this.$refs.print.getInfo(this.order.id)
 
         } else if (index == 10) {
           let params = {
         for (let i = 0; i < month_prescriptions.length; i++) {
           if (month_prescriptions[i].type == 1) { //药品
             for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
-              let obj = {
-                id: month_prescriptions[i].advices[a].drug_id,
-                price:month_prescriptions[i].advices[a].price,
-
-              }
-              drug_ids.push(obj)
+              drug_ids.push(month_prescriptions[i].advices[a].drug_id)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
 
           } else if (month_prescriptions[i].type == 2) { //项目
             for (let a = 0; a < month_prescriptions[i].project.length; a++) {
-              let obj = {
-                id: month_prescriptions[i].project[a].project_id,
-                price:month_prescriptions[i].project[a].price,
-
-              }
-              project_ids.push(obj)
+              project_ids.push(month_prescriptions[i].project[a].project_id)
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
           //附加收费
           for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            let obj = {
-              id: month_prescriptions[i].addition[a].item_id,
-              price:month_prescriptions[i].addition[a].price,
-
-            }
-            additions_ids.push(obj)
+            additions_ids.push(month_prescriptions[i].addition[a].item_id)
             addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
           }
         const obj2 = {}
 
         drug_ids = drug_ids.reduce((cur, next) => {
-         obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
+          obj[next] ? '' : obj[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         project_ids = project_ids.reduce((cur, next) => {
-      obj[next.price] ? '' : obj[next.price] = true &&  cur.push(next)
+          obj1[next] ? '' : obj1[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         additions_ids = additions_ids.reduce((cur, next) => {
-         obj[next.price] ? '' : obj[next.price] = true  && cur.push(next)
+          obj2[next] ? '' : obj2[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            if (drug_ids[i] == drug_month_prescriptions.advices[a].drug_id) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if ( project_ids[i].price == project_month_prescriptions.project[a].price) {
+            if (project_ids[i] == project_month_prescriptions.project[a].project_id) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
           console.log(addition_month_prescriptions.addition)
           if (addition_month_prescriptions.addition) {
             for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-              if ( additions_ids[i].price == addition_month_prescriptions.addition[a].price) {
+              if (project_ids[i] == addition_month_prescriptions.addition[a].item_id) {
                 obj['item_name'] = addition_month_prescriptions.addition[a].item_name
                 obj['id'] = addition_month_prescriptions.addition[a].id
                 obj['item_id'] = addition_month_prescriptions.addition[a].item_id
 
       },
 
-      // setMonthPrescription(month_prescriptions) {
-      //   this.month_prescriptions = []
-      //
-      //   let drug_month_prescriptions = {
-      //     advices: []
-      //   }
-      //   let drug_ids = []
-      //   let project_month_prescriptions = {
-      //     project: []
-      //
-      //   }
-      //   let project_ids = []
-      //
-      //   let addition_month_prescriptions = {
-      //     addition: []
-      //
-      //   }
-      //   let additions_ids = []
-      //
-      //   for (let i = 0; i < month_prescriptions.length; i++) {
-      //     if (month_prescriptions[i].type == 1) { //药品
-      //       for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
-      //         let obj = {
-      //           id: month_prescriptions[i].advices[a].drug_id,
-      //           price:month_prescriptions[i].advices[a].price,
-      //
-      //         }
-      //         drug_ids.push(obj)
-      //         drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
-      //       }
-      //
-      //     } else if (month_prescriptions[i].type == 2) { //项目
-      //       for (let a = 0; a < month_prescriptions[i].project.length; a++) {
-      //         let obj = {
-      //           id: month_prescriptions[i].project[a].project_id,
-      //           price:month_prescriptions[i].project[a].price,
-      //
-      //         }
-      //         project_ids.push(obj)
-      //         project_month_prescriptions.project.push(month_prescriptions[i].project[a])
-      //       }
-      //     }
-      //     //附加收费
-      //     for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-      //       let obj = {
-      //         id: month_prescriptions[i].addition[a].item_id,
-      //         price:month_prescriptions[i].addition[a].price,
-      //
-      //       }
-      //       additions_ids.push(obj)
-      //       addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-      //
-      //     }
-      //
-      //   }
-      //
-      //   const obj = {}
-      //   const obj1 = {}
-      //   const obj2 = {}
-      //
-      //   drug_ids = drug_ids.reduce((cur, next) => {
-      //     obj[next.id] ? '' : obj[next.id] = true && obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-      //     return cur
-      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-      //   project_ids = project_ids.reduce((cur, next) => {
-      //     obj1[next] ? '' : obj1[next] = true &&  obj[next.price] ? '' : obj[next.price] = true &&  cur.push(next)
-      //     return cur
-      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-      //   additions_ids = additions_ids.reduce((cur, next) => {
-      //     obj2[next] ? '' : obj2[next] = true &&  obj[next.price] ? '' : obj[next.price] = true  && cur.push(next)
-      //     return cur
-      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-      //
-      //   console.log(drug_ids)
-      //   console.log(project_ids)
-      //   console.log(additions_ids)
-      //
-      //   console.log(additions_ids)
-      //
-      //   let drugs = []
-      //   let projects = []
-      //   let additions = []
-      //
-      //   for (let i = 0; i < drug_ids.length; i++) {
-      //     let obj = {}
-      //     let count = 0
-      //     for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-      //       if (drug_ids[i].id == drug_month_prescriptions.advices[a].drug_id && drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
-      //         obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
-      //         obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
-      //         obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
-      //         obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
-      //         obj['day'] = drug_month_prescriptions.advices[a].day
-      //         // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
-      //         obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
-      //         obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
-      //         obj['id'] = drug_month_prescriptions.advices[a].drug_id
-      //         // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
-      //         obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
-      //         count = count + drug_month_prescriptions.advices[a].prescribing_number
-      //
-      //       }
-      //     }
-      //     obj['prescribing_number'] = count
-      //     drugs.push(obj)
-      //   }
-      //
-      //   for (let i = 0; i < project_ids.length; i++) {
-      //     let obj = {}
-      //     let count = 0
-      //     for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-      //       if (project_ids[i].id == project_month_prescriptions.project[a].project_id  && project_ids[i].price == drug_month_prescriptions.project[a].price) {
-      //         obj['project_name'] = project_month_prescriptions.project[a].project.project_name
-      //         obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
-      //         obj['single_dose'] = project_month_prescriptions.project[a].single_dose
-      //         obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
-      //         obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
-      //         obj['number_days'] = project_month_prescriptions.project[a].day
-      //         obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
-      //         obj['unit'] = project_month_prescriptions.project[a].unit
-      //         obj['project_id'] = project_month_prescriptions.project[a].project_id
-      //         count = count + project_month_prescriptions.project[a].count
-      //         // price = price + project_month_prescriptions.project[a].price
-      //         obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
-      //
-      //       }
-      //     }
-      //     obj['total'] = count
-      //     projects.push(obj)
-      //   }
-      //
-      //   for (let i = 0; i < additions_ids.length; i++) {
-      //     let obj = {}
-      //     let count = 0
-      //     console.log(addition_month_prescriptions.addition)
-      //     if (addition_month_prescriptions.addition) {
-      //       for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-      //         if (project_ids[i].id == addition_month_prescriptions.addition[a].item_id  && project_ids[i].price == drug_month_prescriptions.addition[a].price) {
-      //           obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-      //           obj['id'] = addition_month_prescriptions.addition[a].id
-      //           obj['item_id'] = addition_month_prescriptions.addition[a].item_id
-      //           count = count + addition_month_prescriptions.addition[a].count
-      //           obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
-      //         }
-      //       }
-      //       obj['count'] = count
-      //       additions.push(obj)
-      //     }
-      //   }
-      //
-      //   console.log(drugs)
-      //   console.log(projects)
-      //   console.log(additions)
-      //
-      //   let p1 = {
-      //     name: '处方' + 1,
-      //     advices: drugs,
-      //     project: [],
-      //     type: 1,
-      //     addition: additions
-      //   }
-      //   let p2 = {
-      //     name: '处方' + 2,
-      //     type: 2,
-      //     project: projects,
-      //     advices: [],
-      //     addition: []
-      //
-      //   }
-      //   console.log(this.month_prescriptions)
-      //   console.log(this.curMonthPrescriptions)
-      //
-      //   this.month_prescriptions.push(p1)
-      //   this.month_prescriptions.push(p2)
-      //
-      //   this.curMonthPrescriptions = this.month_prescriptions[0]
-      //
-      // },
-
       unique(arr) {
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
           'patient_id': id,
           'number': batch_number,
           'start_time': this.other_start_time,
-          'end_time': this.other_end_time,
-          'type': this.radio,
-
+          'end_time': this.other_end_time
         }
         this.loading = true
 

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

         this.isVisibility = true
       }, 
       comfirm: function(val) {
-
+        console.log("Val2222222",val)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
               this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-              // this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
+              this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
             } else {
               const tempForm = {}
               tempForm["id"] = 0;
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
-              tempForm['min_unit']=''
+              tempForm['min_unit']= val.selectedGoodInfo[i].min_unit
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
           loading.close()
 
         })
-      }, typeName: function(drug_id) {
+      },
+       typeName: function(drug_id) {
+        
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      },
+       handleEdit: function(index, row) {
         const tempObj = {}
         tempObj['drug_id'] = 0
         tempObj['number'] = ''
         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['min_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

             tempForm['price'] =  val.selectedGoodInfo[i].last_price.toString()
             tempForm['count'] = ''
             tempForm['remark'] = ''
+            tempForm['min_unit'] = val.selectedGoodInfo[i].min_unit
             this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
           }
         }
       });
     },
     typeName: function(drug_id) {
+    
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
         }
       }
       return name;
-    }, specificationName: function(drug_id) {
+    },
+     specificationName: function(drug_id) {
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == drug_id) {
       tempObj["price"] = "";
       tempObj["retail_price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["min_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
       }
     },
     showDialog(index, row) {
+      
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-
+    tempObj["min_unit"] = "";
 
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

 
       },
       comfirm: function(formName) {
+       
         this.goodInfoTableData = []
         this.$emit('dialog-comfirm', this.getValue())
         this.$refs.multipleTable.clearSelection()
       },
       getValue: function() {
         this.multipleSelection = []
+        console.log("库存22222",this.propForm.goods)
         for (let i = 0; i < this.propForm.goods.length; i++) {
           for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
                 if (this.propForm.goods[i].drug_specs[a].isSelected) {
         }
         console.log(obj)
         return obj
-      }, goodTypeSelect: function(id) {
+      },
+       goodTypeSelect: function(id) {
         this.tempGoodInfo = []
         this.goodInfo = []
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {

src/xt_pages/stock/stockInOrderAdd.vue

         tempObj['remark'] = ''
         tempObj['dealer'] = ''
         tempObj['manufacturer'] = ''
+        tempObj['good_unit'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
         this.recordInfo.recordData = []
         getWarehouseInfoByOrdeNumber(params).then(response => {
           if (response.data.state != 0) {
-             console.log("8888888888mma",response.data.data.info)
+            
             for (let i = 0; i < response.data.data.info.length; i++) {
               this.recordInfo.recordData.push(response.data.data.info[i])
             }

src/xt_pages/stock/stockOutOrderAdd.vue

       tempObj["count"] = "";
       tempObj["price"] = "";
       tempObj["remark"] = "";
-
+      tempObj["good_unit"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {