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

src/api/supply.js

   })
 }
 
+export function savePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount) {
+  return request({
+    url: '/api/supply/savepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount,
+    method: 'post',
+    data: data
+  })
+}

src/xt_pages/dialysis/components/consumablesDialog.vue

                   this.tableData.push(response.data.data.list[i])
                }
              }
-             console.log("表哥22222222222",this.tableData) 
+            
           })
        },
 

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 13" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

src/xt_pages/medicalScheduling/index.vue

                     
                     this.tableData = data
 
-                   console.log("表哥3333333333",this.tableData)
+              
                 }
             })
         },

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

               }
               this.tableData.push({ name: key, data: dd[key]});
             }
-            console.log("表哥",this.tableData)
+       
             let projectArr = []
           
             this.newArr.map(item => {

src/xt_pages/stock/drugs/drugStockOutOrder.vue

               total += this.drugFlowList[i].count
           }
         }
-        all_price = total * min_price
+        all_price = total * price
       
         return  all_price
       },

src/xt_pages/stock/drugs/inventory.vue

              <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
                 <template slot-scope="scope">
                   <el-input style="width:50px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
-                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
                  </template> 
               </el-table-column>
 

src/xt_pages/supply/components/addPurchaseOrder.vue

 <div class="app-container ">
     <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
     <div>
+        <span>供应商:</span>
         <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
         @change="changeTypeName">
         <el-option
             :value="item.id">
         </el-option>
         </el-select>
+        <span>单据日期:</span>
         <el-date-picker
         size="small"
         v-model="start_time"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         @change="startTimeChange"
-        ></el-date-picker>-
+        ></el-date-picker>
+        <span>交货日期:</span>
         <el-date-picker
             size="small"
             v-model="end_time"
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
         ></el-date-picker>
-        <el-input
-        size="small"
-        style="width: 200px;margin-left:10px;"
-        class="filter-item"
-        v-model.trim="keywords"
-        placeholder="耗材名称"
-        />
-        <el-button
-        size="small"
-        class="filter-item"
-        type="primary"
-        icon="el-icon-search"
-        @click="search"
-        >搜索</el-button
-        >
+        <span>单据编码:</span>
+   
     </div>
     <div>
         <el-button size="small" type="primary" @click="savePurchaseOrder">保存</el-button>
         </template>
     </el-table-column>
   </el-table>
-    
+   <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>
 </template>
     drugTypeList:[],
     supplier_name:"",
     supplyList:[],
+    rate_of_concession:"",
+    discount_amount:"",
 };
 },
 methods:{
     })  
 },
 changeGoodName(val){
-    console.log("9媚23323232",val)  
-    this.currentIndex = val
+  this.currentIndex = val
 },
 changeName(val){
-    console.log("val23322323",val)
     
-    for(let i=0;i<this.tableList.length;i++){
+   for(let i=0;i<this.tableList.length;i++){
     if(this.currentIndex == i){
         this.tableList[i].id = val.id
         this.tableList[i].type = val.type
         this.tableList[i].supply_manufacturer = val.supply_manufacturer
         this.tableList[i].supply_license_number = val.supply_license_number
         this.tableList[i].supply_remake = val.supply_remake
+     }
     }
-    }
-    console.log("表哥332322332232323",this.tableList)
+    
 },
 handleEdit(){
     const tempObj = {}
    }
 },
 savePurchaseOrder(){
-    console.log("param323322332",this.tableList)
-    savePurchaseOrder().then(response=>{
+     
+     var params = {
+        supplier_name:this.supplier_name,
+        start_time:this.start_time,
+        end_time:this.end_time,
+        rate_of_concession:this.rate_of_concession,
+        discount_amount:this.discount_amount,
+     }
+    console.log("partam2332232332",params)
+    console.log("tablelsit323232",this.tabList)
+    savePurchaseOrder(this.tabList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
 
     })  
 },