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/detail/print.vue

@@ -52,8 +52,8 @@
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2"> 
                   <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span> 
-                   <span  v-if="org_id == 10265">{{getMySelfCount(item.good_id) }}</span>   
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583">{{getStockCount(item.good_id) }}</span>
+                   <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>   
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215">{{getStockCount(item.good_id) }}</span>
                 </span>
                
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -77,8 +77,8 @@
                   <span v-if="org_id == 3907 || org_id ==9919">
                      {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
-                  <span v-if="org_id == 10265">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id == 10265 || org_id == 10215">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
@@ -100,8 +100,8 @@
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">
                   <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
-                  <span v-if="org_id == 10265">{{getWareOutTotalSix().toFixed(2)}}</span>
-                  <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265"> {{getWareOutTotal().toFixed(2)}}</span>
+                  <span v-if="org_id == 10265 || org_id == 10215">{{getWareOutTotalSix().toFixed(2)}}</span>
+                  <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265 && org_id!=10215"> {{getWareOutTotal().toFixed(2)}}</span>
                  </span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
               </td>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -744,8 +744,6 @@ export default {
       },
 
     exportList(){
-       console.log("哈哈哈",this.tableOut)
-      
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -756,14 +754,17 @@ export default {
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else if(this.orgId == 10265){
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10215){
+          this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
        
-        if(this.orgId  == 10265){
+        if(this.orgId  == 10265 || this.orgId ==10215 ){
         
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
-        }else{
+        }
+        if(this.orgId!=10265 && this.orgId !=10215){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -136,15 +136,25 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{scope.row.count}}
+            {{scope.row.count}} 
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
            <span v-else>
-             <span v-if="scope.row.price >0">{{(scope.row.last_price * scope.row.count).toFixed(2)}}</span>
-             <span v-if="scope.row.price  == 0">{{(getPrice(scope.row.drug_id)* scope.row.count).toFixed(2)}}</span>
+             <span v-if="scope.row.price >0">
+                <span v-if="scope.row.count >= scope.row.min_number">
+                 {{((scope.row.last_price * scope.row.count)/scope.row.min_number).toFixed(2)}}
+                </span>  
+                <span v-else>{{(scope.row.last_price * scope.row.count).toFixed(2)}}</span>
+              </span>
+             <span v-if="scope.row.price  == 0">
+               <span v-if="scope.row.count >=scope.row.min_number">
+                 {{((getPrice(scope.row.drug_id)* scope.row.count)/scope.row.min_number).toFixed(2)}}
+               </span> 
+               <span v-else>{{(getPrice(scope.row.drug_id)* scope.row.count).toFixed(2)}}</span>
+             </span>
            </span>
             <!-- {{scope.row.total_price}} -->
           </template>
@@ -562,17 +572,35 @@ export default {
        for(let i=0;i<this.tableData.length;i++){
          if(this.tableData[i].is_total == 0){
             this.tableData[i].index = i+1
-      
-            this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
+            if(this.tableData[i].drug_type == 1){
+              this.tableData[i].drugtype = "西药"
+            }
+            if(this.tableData[i].drug_type == 2){
+              this.tableData[i].drugtype = "草药"
+            }
+            if(this.tableData[i].drug_type == 3){
+              this.tableData[i].drugtype = "成药"
+            }
+            // this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
             this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
             this.tableData[i].time = this.getTime(this.tableData[i].ctime)
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
             if(this.org_id == 9671 || this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
-              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+              if(this.tableData[i].count >=this.tableData[i].min_number){
+               this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)/this.tableData[i].min_number
+              }else{
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+              }
+              
             }else{
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+                if(this.tableData[i].count >=this.tableData[i].min_number){
+                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)/this.tableData[i].min_number
+              }else{
+                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+              }
+             
             }
          }
        }

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -235,8 +235,8 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{(getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price/scope.row.min_number)/scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{(getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price)/scope.row.min_number).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">