数据

src/xt_pages/stock/cancelStockOrder.vue

@@ -641,7 +641,7 @@ export default {
       const tHeader = ['耗材名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['good_name', 'unit','count','price','number','register_account','manufacturer','product_date','expiry_date','remark']
       console.log("table",this.exportList)
-      
+     
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
         header: tHeader,

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -833,12 +833,18 @@ export default {
            if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
              this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
            }
+           if(this.exportList[i].manufacturer == 0){
+              this.exportList[i].manufacturer = ""
+           } 
          }
 
          for(let z=0;z<this.dealerList.length;z++){
            if(this.exportList[i].dealer == this.dealerList[z].id){
               this.exportList[i].dealer = this.dealerList[z].dealer_name
            }
+           if(this.exportList[i].dealer == 0){
+             this.exportList[i].dealer = ""
+           }
          }
       }
       
@@ -858,7 +864,7 @@ export default {
          
      
         console.log("table",this.exportList)
-       
+        
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,

src/xt_pages/stock/drugs/query.vue

@@ -121,11 +121,11 @@
              {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="退库数量" align="center">
+        <!-- <el-table-column prop="drug_name" label="退库数量" align="center">
            <template slot-scope="scope">
              {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
              <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)!=''">{{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>