新分支

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -177,7 +177,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000,1500,3000,5000]"
+        :page-sizes="[10, 50, 100,1000,1500,3000,5000,8000,10000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"

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

@@ -9,7 +9,7 @@
       >打印
     </el-button>
      <el-button
-      v-if="org_id != 10265 && org_id != 0"
+      v-if="org_id != 10265"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
@@ -17,7 +17,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10265 || org_id == 0"
+      v-if="org_id == 10265"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiOne"
@@ -191,7 +191,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000]"
+        :page-sizes="[10, 50, 100,1000,2000,3000,4000,5000,6000,7000]"
         :page-size="10"
         background
         style="margin-top:20px;float: right"
@@ -588,7 +588,7 @@ export default {
     },
 
      exportList(){
-        console.log("表哥",this.tablePrint)
+       
         
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
@@ -719,26 +719,18 @@ export default {
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
             this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
-            if(this.org_id == 9919){
-              this.tableData[i].total = (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)
-              if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
-                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
-              }
-              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
-                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
-              }
-              if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
-                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
-              }
+       
+            this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+            if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
             }
+            
          }
        }
        const data = this.formatJson(filterVal, this.tableData)