XMLWAN 3 years ago
parent
commit
c5049b89d6

+ 1 - 1
src/xt_pages/stock/cancelStockOrder.vue View File

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

+ 7 - 1
src/xt_pages/stock/drugs/drugStockInOrder.vue View File

833
            if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
833
            if(this.exportList[i].manufacturer == this.manufacturerList[j].id){
834
              this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
834
              this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name
835
            }
835
            }
836
+           if(this.exportList[i].manufacturer == 0){
837
+              this.exportList[i].manufacturer = ""
838
+           } 
836
          }
839
          }
837
 
840
 
838
          for(let z=0;z<this.dealerList.length;z++){
841
          for(let z=0;z<this.dealerList.length;z++){
839
            if(this.exportList[i].dealer == this.dealerList[z].id){
842
            if(this.exportList[i].dealer == this.dealerList[z].id){
840
               this.exportList[i].dealer = this.dealerList[z].dealer_name
843
               this.exportList[i].dealer = this.dealerList[z].dealer_name
841
            }
844
            }
845
+           if(this.exportList[i].dealer == 0){
846
+             this.exportList[i].dealer = ""
847
+           }
842
          }
848
          }
843
       }
849
       }
844
       
850
       
858
          
864
          
859
      
865
      
860
         console.log("table",this.exportList)
866
         console.log("table",this.exportList)
861
-       
867
+        
862
         const data = this.formatJson(filterVal, this.exportList)
868
         const data = this.formatJson(filterVal, this.exportList)
863
         excel.export_json_to_excel({
869
         excel.export_json_to_excel({
864
           header: tHeader,
870
           header: tHeader,

+ 2 - 2
src/xt_pages/stock/drugs/query.vue View File

121
              {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
121
              {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
122
            </template>
122
            </template>
123
         </el-table-column>
123
         </el-table-column>
124
-        <el-table-column prop="drug_name" label="退库数量" align="center">
124
+        <!-- <el-table-column prop="drug_name" label="退库数量" align="center">
125
            <template slot-scope="scope">
125
            <template slot-scope="scope">
126
              {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
126
              {{getCancelCount(scope.row.drug_id)}}{{scope.row.max_unit}}
127
            </template>
127
            </template>
128
-        </el-table-column>
128
+        </el-table-column> -->
129
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
129
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
130
            <template slot-scope="scope">
130
            <template slot-scope="scope">
131
              <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>
131
              <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>