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

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -45,7 +45,7 @@
             @change="endTimeChange"
         ></el-date-picker>
         <span>单据编码:</span>
-   
+
     </div>
     <div>
         <el-button size="small" type="primary" @click="savePurchaseOrder" v-show="showTwo">保存</el-button>
@@ -71,7 +71,7 @@
             <span>商品<span style="color: red">*</span></span>
         </template>
         <template slot-scope="scope">
-           <el-form-item required prop="name"> 
+           <el-form-item required prop="name">
             <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)">
                 <el-option
                     v-for="(item,index) in tabList"
@@ -80,7 +80,7 @@
                     :value="item">
                 </el-option>
              </el-select>
-           </el-form-item> 
+           </el-form-item>
         </template>
     </el-table-column>
     <el-table-column  align="center" width="150px">
@@ -108,7 +108,7 @@
         <template slot-scope="scope">
           <el-form-item :rules="tableRules.supply_count" required prop="supply_count">
           <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
-          </el-form-item>  
+          </el-form-item>
         </template>
     </el-table-column>
 
@@ -123,13 +123,13 @@
           {{calculate(scope.row.supply_count * scope.row.supply_price)}}
         </template>
     </el-table-column>
-    
+
     <el-table-column label="生产厂商" align="center" width="200px">
         <template slot-scope="scope">
         <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
         </template>
     </el-table-column>
-    
+
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
@@ -168,10 +168,10 @@
 </el-form>
    <div style="margin-top:10px">
         <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
-        
+
         <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
-        
-    </div>  
+
+    </div>
 </div>
 </div>
 </template>
@@ -209,7 +209,7 @@ return {
     showTwo:true,
     showOne:false,
     recordInfo: {
-      tableList:[],  
+      tableList:[],
     },
     keywords: "",
     total: 0,
@@ -257,12 +257,12 @@ getInitOrder(){
        for(let i=0;i<drugList.length;i++){
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
             drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
-          }   
+          }
         for(let j=0;j<this.manufactuerList.length;j++){
             if(drugList[i].manufacturer == this.manufactuerList[j].id){
                 drugList[i].manufacturer = this.manufactuerList[j].manufacturer_name
             }
-        }  
+        }
         for(let y=0;y<this.drugTypeList.length;y++){
             if(drugList[i].drug_type == this.drugTypeList[y].value){
             drugList[i].drug_type = this.drugTypeList[y].name
@@ -283,19 +283,19 @@ getInitOrder(){
 
         this.tabList.push(drugList[i])
         }
-        
+
         var goodList =  response.data.data.goodList
         for(let i=0;i<goodList.length;i++){
         for(let j=0;j<this.manufactuerList.length;j++){
             if(goodList[i].manufacturer == this.manufactuerList[j].id){
                 goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
             }
-        }   
+        }
         for(let y=0;y<this.goodTypeList.length;y++){
             if(goodList[i].good_type_id == this.goodTypeList[y].id){
                 goodList[i].good_type_id = this.goodTypeList[y].type_name
             }
-        } 
+        }
         goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
         goodList[i].supply_type = goodList[i].good_type_id
         goodList[i].supply_specification_name =goodList[i].specification_name
@@ -306,19 +306,19 @@ getInitOrder(){
         goodList[i].supply_manufacturer = goodList[i].manufacturer
         goodList[i].supply_license_number = ""
         goodList[i].supply_remake = ""
-        goodList[i].type = 2   
+        goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
 
-        this.tabList.push(goodList[i]) 
+        this.tabList.push(goodList[i])
         }
     }
-    })  
+    })
 },
 changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-    
+
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
         this.recordInfo.tableList[i].id = val.id
@@ -333,7 +333,7 @@ changeName(val){
         }else{
           this.recordInfo.tableList[i].supply_count = val.supply_count?val.supply_count:""
         }
-       
+
         this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
         this.recordInfo.tableList[i].supply_total_price = val.supply_total_price?val.supply_total_price:""
         this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
@@ -341,7 +341,7 @@ changeName(val){
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
      }
     }
-    
+
 },
 handleEdit(){
     const tempObj = {}
@@ -358,7 +358,7 @@ handleEdit(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.recordInfo.tableList.push(tempObj)  
+    this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
   if (this.recordInfo.tableList.length <= 1) {
@@ -371,7 +371,7 @@ handleDelete: function(index, row) {
 
 
 savePurchaseOrder(){
-   console.log("tablelsit323232",this.recordInfo.tableList)
+   // console.log("tablelsit323232",this.recordInfo.tableList)
    console.log("hhh232323",this.$refs)
     this.$refs["tableForm"].validate((valid)=>{
       if(valid){
@@ -385,13 +385,13 @@ savePurchaseOrder(){
         console.log("partam2332232332",params)
         console.log("tablelsit323232",this.recordInfo.tableList)
         for(let i=0;i<this.recordInfo.tableList.length;i++){
-            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count) 
+            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
-                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id 
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
                 }
 
-            } 
+            }
         }
         return
         savePurchaseOrder(this.recordInfo.tableList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
@@ -401,11 +401,11 @@ savePurchaseOrder(){
                 this.showTwo = false
                 this.showOne = true
             }
-        }) 
-      }  
+        })
+      }
+
+   })
 
-   })  
-   
 },
 
 changeTypeName(){
@@ -418,7 +418,7 @@ endTimeChange(){
 
 },
 search(){
-    
+
 },
 
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
@@ -446,7 +446,7 @@ getWarehoseInfo(arr,max_unit,min_unit,min_number){
     }
   }
  return max_str + min_str
- }, 
+ },
 getTotalStockCount(arr){
   var total_count = 0
   for(let i=0;i<arr.length;i++){
@@ -482,8 +482,8 @@ created(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.recordInfo.tableList.push(tempObj)  
-    this.getInitOrder()  
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
 }
 };
 </script>
@@ -540,7 +540,7 @@ background-color: #d0d3da;
 }
 .el-table__fixed-right{
   width:150px;
-  bottom: 20px; 
-  height: 200px; 
+  bottom: 20px;
+  height: 200px;
 }
 </style>