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

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -119,6 +119,7 @@
                     :trigger-on-focus="false"
                     placeholder="请输入药品名称"
                     @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
                     style="width:160px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -695,6 +696,7 @@ export default {
             searchArray = response.data.data.list;
             
              var list = response.data.data.list
+             console.log("list99999999",list)
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
@@ -711,64 +713,88 @@ export default {
           }
         })
       },
+      changeGoodName(val){
+        this.currentIndex = val
+      },
       handleSelect(val){
-         if(this.recordInfo.recordData.length == 1){
-            this.recordInfo.recordData[0].drug_id = val.id
-            this.recordInfo.recordData[0].drug_name = val.drug_name
-            this.recordInfo.recordData[0].drug_type = val.drug_type
-            this.recordInfo.recordData[0].dosage = val.dosage
-            this.recordInfo.recordData[0].max_unit = val.max_unit
-            this.recordInfo.recordData[0].unval = val.unval
-            this.recordInfo.recordData[0].min_unit = val.min_unit
-            this.recordInfo.recordData[0].packing_unit = val.packing_unit
-            this.recordInfo.recordData[0].number = val.number
-            this.recordInfo.recordData[0].last_price = val.last_price
-            this.recordInfo.recordData[0].manufacturer = val.manufacturer
-         for(let i=0;i<this.recordInfo.recordData.length;i++){       
-           this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
-           this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
-           for(let j=0;j<this.drugTypeList.length;j++){
-               if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
-                  this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
-               } 
-           }
-         }
-         }else{
-            var arr = []
-            for(let i=0;i<this.recordInfo.recordData.length;i++){ 
-              if(this.recordInfo.recordData[i].drug_id> 0){
-                 arr.push(this.recordInfo.recordData[i])
-              }
-            } 
-            this.recordInfo.recordData = arr
-            const tempObj = {}
-            tempObj['drug_name'] = val.drug_name
-            tempObj['drug_id'] = val.id
-            tempObj['number'] = ''
-            tempObj['product_date'] = ''
-            tempObj['expiry_date'] = ''
-            tempObj['warehousing_count'] = ''
-            tempObj['retail_price'] = ''
-            tempObj['price'] = ''
-            tempObj['remark'] = ''
-            tempObj['dealer'] = ''
-            tempObj['manufacturer'] = ''
-            tempObj['min_unit'] = ''
-            tempObj['batch_number'] = ''
-            tempObj['drug_type'] = ''
-            this.recordInfo.recordData.push(tempObj) 
-         }
-
-        for(let i=0;i<this.recordInfo.recordData.length;i++){       
-          this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
-          this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
-          for(let j=0;j<this.drugTypeList.length;j++){
-             if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
-                this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
-              } 
-           }
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].drug_id = val.id
+            this.recordInfo.recordData[i].drug_name = val.drug_name
+            this.recordInfo.recordData[i].drug_type = val.drug_type
+            this.recordInfo.recordData[i].dose = val.dose
+            this.recordInfo.recordData[i].dose_unit = val.dose_unit
+            this.recordInfo.recordData[i].max_unit = val.max_unit
+            this.recordInfo.recordData[i].min_number = val.min_number
+            this.recordInfo.recordData[i].min_unit = val.min_unit
+            this.recordInfo.recordData[i].packing_unit = val.packing_unit
+            this.recordInfo.recordData[i].number = val.number
+            this.recordInfo.recordData[i].last_price = val.last_price
+            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
+          }
         }
-      },
+      }, 
+      // handleSelect(val){
+      //     console.log("val222222",val)
+      //    if(this.recordInfo.recordData.length == 1){
+      //       this.recordInfo.recordData[0].drug_id = val.id
+      //       this.recordInfo.recordData[0].drug_name = val.drug_name
+      //       this.recordInfo.recordData[0].drug_type = val.drug_type
+      //       this.recordInfo.recordData[0].dose = val.dose
+      //       this.recordInfo.recordData[0].dose_unit = val.dose_unit
+      //       this.recordInfo.recordData[0].max_unit = val.max_unit
+      //       this.recordInfo.recordData[0].min_number = val.min_number
+      //       this.recordInfo.recordData[0].min_unit = val.min_unit
+      //       this.recordInfo.recordData[0].packing_unit = val.packing_unit
+      //       this.recordInfo.recordData[0].number = val.number
+      //       this.recordInfo.recordData[0].last_price = val.last_price
+      //       this.recordInfo.recordData[0].manufacturer = val.manufacturer
+      //    for(let i=0;i<this.recordInfo.recordData.length;i++){       
+      //      this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dose + this.recordInfo.recordData[i].dose_unit + "*" + this.recordInfo.recordData[i].min_number + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].max_unit
+      //      this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
+      //      for(let j=0;j<this.drugTypeList.length;j++){
+      //          if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
+      //             this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
+      //          } 
+      //      }
+      //    }
+      //    }else{
+      //       var arr = []
+      //       for(let i=0;i<this.recordInfo.recordData.length;i++){ 
+      //         if(this.recordInfo.recordData[i].drug_id> 0){
+      //            arr.push(this.recordInfo.recordData[i])
+      //         }
+      //       } 
+      //       this.recordInfo.recordData = arr
+      //       const tempObj = {}
+      //       tempObj['drug_name'] = val.drug_name
+      //       tempObj['drug_id'] = val.id
+      //       tempObj['number'] = ''
+      //       tempObj['product_date'] = ''
+      //       tempObj['expiry_date'] = ''
+      //       tempObj['warehousing_count'] = ''
+      //       tempObj['retail_price'] = ''
+      //       tempObj['price'] = ''
+      //       tempObj['remark'] = ''
+      //       tempObj['dealer'] = ''
+      //       tempObj['manufacturer'] = ''
+      //       tempObj['min_unit'] = ''
+      //       tempObj['batch_number'] = ''
+      //       tempObj['drug_type'] = ''
+      //       this.recordInfo.recordData.push(tempObj) 
+      //    }
+
+      //   for(let i=0;i<this.recordInfo.recordData.length;i++){       
+      //     this.recordInfo.recordData[i].name = this.recordInfo.recordData[i].dosage + this.recordInfo.recordData[i].max_unit + "*" + this.recordInfo.recordData[i].unval + this.recordInfo.recordData[i].min_unit + "/"+this.recordInfo.recordData[i].packing_unit
+      //     this.totalPrice += this.recordInfo.recordData[i].last_price * this.recordInfo.recordData[i].warehousing_count
+      //     for(let j=0;j<this.drugTypeList.length;j++){
+      //        if(this.recordInfo.recordData[i].drug_type == this.drugTypeList[j].id){
+      //           this.recordInfo.recordData[i].drug_type = this.drugTypeList[j].name
+      //         } 
+      //      }
+      //   }
+      // },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -580,8 +580,8 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log(this.recordInfo.recordData);
-         
+          console.log("2323223223",this.recordInfo.recordData);
+          
           postWarehouseOut(
             params,
             this.warehouse_out_time,