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/addGoodOrder.vue

         this.supplyList = response.data.data.supplyList
        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
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              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){
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){

src/xt_pages/supply/components/addPurchaseOrder.vue

     getInitOrder().then(response=>{
     if(response.data.state == 1){
         var drugList = response.data.data.drugList
-        
+        console.log("druglist23232232323232332",drugList)
         this.manufactuerList = response.data.data.manufactuerList
         this.goodTypeList = response.data.data.goodTypeList
         this.drugTypeList = response.data.data.drugTypeList
         this.supplyList = response.data.data.supplyList
        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
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              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){
 
 },
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
+    console.log("arr2332233232",arr)
     var total = 0
     var max_str=  ""
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){

src/xt_pages/supply/components/editGoodOrder.vue

         this.supplyList = response.data.data.supplyList
        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
+             if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              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){
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){

src/xt_pages/supply/components/editPurchaseOrder.vue

         this.supplyList = response.data.data.supplyList
        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
+            if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              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){
     var min_str = ""
     if (arr.length > 0) {
       for(let i=0;i<arr.length;i++){
-        total += parseInt(arr[i].stock_max_number)
+        total += parseInt(arr[i].stock_max_number+arr[i].stock_min_number)
       }
     }
     if (total < min_number){