Pārlūkot izejas kodu

11月14日 库存扣减更新

XMLWAN 3 gadus atpakaļ
vecāks
revīzija
a9741fc498

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Parādīt failu

286
                                         </el-table-column>
286
                                         </el-table-column>
287
                                         <el-table-column label="库存" width="60">
287
                                         <el-table-column label="库存" width="60">
288
                                             <template slot-scope="scope">
288
                                             <template slot-scope="scope">
289
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
289
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
290
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
290
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
291
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
291
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
292
                                               </span>
292
                                               </span>
383
                                         </el-table-column>
383
                                         </el-table-column>
384
                                         <el-table-column label="库存" width="40">
384
                                         <el-table-column label="库存" width="40">
385
                                             <template slot-scope="scope">
385
                                             <template slot-scope="scope">
386
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
386
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
387
                                                    {{scope.row.stock_count}}
387
                                                    {{scope.row.stock_count}}
388
                                               </span>
388
                                               </span>
389
                                               <span v-else> {{ scope.row.total }}</span>
389
                                               <span v-else> {{ scope.row.total }}</span>
2658
       selectDrugs(selection, row) {
2658
       selectDrugs(selection, row) {
2659
         console.log('selection', selection)
2659
         console.log('selection', selection)
2660
         console.log('row', row)
2660
         console.log('row', row)
2661
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 ){
2661
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
2662
             if (row.count <= 0) {
2662
             if (row.count <= 0) {
2663
               if (selection) {
2663
               if (selection) {
2664
                 selection.forEach(row => {
2664
                 selection.forEach(row => {
2933
       },
2933
       },
2934
       selectChange(selection, row) {
2934
       selectChange(selection, row) {
2935
         console.log('row', row)
2935
         console.log('row', row)
2936
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088){
2936
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 ){
2937
            if (row.stock_count <= 0) {
2937
            if (row.stock_count <= 0) {
2938
             if (row.type == 3) {
2938
             if (row.type == 3) {
2939
               if (selection) {
2939
               if (selection) {

+ 36 - 36
src/xt_pages/stock/drugs/query.vue Parādīt failu

77
           >搜索
77
           >搜索
78
           </el-button>
78
           </el-button>
79
       </div>
79
       </div>
80
-      
80
+
81
        <el-table :data="tableList" border style="width: 100%">
81
        <el-table :data="tableList" border style="width: 100%">
82
-      
82
+
83
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
83
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
84
            <template slot-scope="scope">
84
            <template slot-scope="scope">
85
              {{getDrugType(scope.row.drug_type)}}
85
              {{getDrugType(scope.row.drug_type)}}
107
         </el-table-column>
107
         </el-table-column>
108
         <el-table-column prop="drug_name" label="入库数量" align="center">
108
         <el-table-column prop="drug_name" label="入库数量" align="center">
109
            <template slot-scope="scope">
109
            <template slot-scope="scope">
110
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span> 
110
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
111
            </template>
111
            </template>
112
         </el-table-column>
112
         </el-table-column>
113
         <el-table-column prop="drug_name" label="出库数量" align="center">
113
         <el-table-column prop="drug_name" label="出库数量" align="center">
114
            <template slot-scope="scope">
114
            <template slot-scope="scope">
115
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088">
116
-                <span> 
115
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
116
+                <span>
117
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
117
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
118
-                </span> 
118
+                </span>
119
              </span>
119
              </span>
120
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
120
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
121
            </template>
121
            </template>
123
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
123
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
124
            <template slot-scope="scope">
124
            <template slot-scope="scope">
125
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
125
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
126
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088">
126
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
127
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
127
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
128
                </span>
128
                </span>
129
-               
129
+
130
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
130
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
131
             </div>
131
             </div>
132
            </template>
132
            </template>
148
           </template>
148
           </template>
149
         </el-table-column>
149
         </el-table-column>
150
        </el-table>
150
        </el-table>
151
-       
151
+
152
     <el-pagination
152
     <el-pagination
153
         @size-change="handleSizeChange"
153
         @size-change="handleSizeChange"
154
         @current-change="handleCurrentChange"
154
         @current-change="handleCurrentChange"
194
       this.getlist()
194
       this.getlist()
195
       var drugCategory = getDictionaryDataConfig('system','drug_category')
195
       var drugCategory = getDictionaryDataConfig('system','drug_category')
196
       this.drugCategory.push(...drugCategory)
196
       this.drugCategory.push(...drugCategory)
197
-      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
197
+      var drugTypeList = getDictionaryDataConfig('system','drug_type')
198
       this.drugTypeList.push(...drugTypeList)
198
       this.drugTypeList.push(...drugTypeList)
199
       this.org_id =  this.$store.getters.xt_user.org.id
199
       this.org_id =  this.$store.getters.xt_user.org.id
200
       console.log("机构ID",this.org_id)
200
       console.log("机构ID",this.org_id)
201
       this.getDrugCountList()
201
       this.getDrugCountList()
202
-     
203
-      
202
+
203
+
204
     },
204
     },
205
     components: {
205
     components: {
206
       SettingDialog,
206
       SettingDialog,
213
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
213
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
214
         ],
214
         ],
215
         keywords: '',
215
         keywords: '',
216
-       
216
+
217
         multipleSelection: [],
217
         multipleSelection: [],
218
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
218
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
219
         start_time: '',
219
         start_time: '',
279
                for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
279
                for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
280
                  if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
280
                  if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
281
                    list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
281
                    list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
282
-                 } 
282
+                 }
283
                }
283
                }
284
              }
284
              }
285
              console.log("列表list232323323232323223",list)
285
              console.log("列表list232323323232323223",list)
287
              var total = response.data.data.total
287
              var total = response.data.data.total
288
              this.total = total
288
              this.total = total
289
              this.manufacturerList = response.data.data.manufacturerList
289
              this.manufacturerList = response.data.data.manufacturerList
290
-           
290
+
291
            }
291
            }
292
         })
292
         })
293
       },
293
       },
337
           }
337
           }
338
         }
338
         }
339
       },
339
       },
340
-    
340
+
341
       getSpecificationName: function(id) {
341
       getSpecificationName: function(id) {
342
         let name = ''
342
         let name = ''
343
         for (let i = 0; i < this.goodInfo.length; i++) {
343
         for (let i = 0; i < this.goodInfo.length; i++) {
373
       calculate: function(val) {
373
       calculate: function(val) {
374
         return Math.round(parseFloat(val) * 100) / 100
374
         return Math.round(parseFloat(val) * 100) / 100
375
       },
375
       },
376
-  
376
+
377
     startTimeChange: function(val) {
377
     startTimeChange: function(val) {
378
       window.sessionStorage.removeItem('start_time')
378
       window.sessionStorage.removeItem('start_time')
379
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
379
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
381
         this.$message.error("开始时间不能大于结束时间");
381
         this.$message.error("开始时间不能大于结束时间");
382
         this.start_time = "";
382
         this.start_time = "";
383
       } else {
383
       } else {
384
-     
384
+
385
         this.getlist()
385
         this.getlist()
386
       }
386
       }
387
     },
387
     },
392
         this.$message.error("结束时间不能小于开始时间");
392
         this.$message.error("结束时间不能小于开始时间");
393
         this.end_time = "";
393
         this.end_time = "";
394
       } else {
394
       } else {
395
-       
395
+
396
         this.getlist()
396
         this.getlist()
397
       }
397
       }
398
-     
398
+
399
     },
399
     },
400
       stockInCount: function(row) {
400
       stockInCount: function(row) {
401
         let total = 0
401
         let total = 0
430
       search: function() {
430
       search: function() {
431
         this.getlist()
431
         this.getlist()
432
         this.getDrugCountList()
432
         this.getDrugCountList()
433
-      }, 
433
+      },
434
       setting: function() {
434
       setting: function() {
435
         this.$refs.dialog.show()
435
         this.$refs.dialog.show()
436
       },
436
       },
446
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
446
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
447
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
447
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
448
          }
448
          }
449
-       
449
+
450
          console.log("hhhhhhhadhfadf 列表",this.tableList)
450
          console.log("hhhhhhhadhfadf 列表",this.tableList)
451
          import('@/vendor/Export2Excel').then(excel => {
451
          import('@/vendor/Export2Excel').then(excel => {
452
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
452
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
453
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
453
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
454
-       
455
-        
454
+
455
+
456
          const data = this.formatJson(filterVal, this.tableList)
456
          const data = this.formatJson(filterVal, this.tableList)
457
          excel.export_json_to_excel({
457
          excel.export_json_to_excel({
458
            header: tHeader,
458
            header: tHeader,
483
         });
483
         });
484
       },
484
       },
485
       getDrugType(id){
485
       getDrugType(id){
486
-       
486
+
487
         var name = ""
487
         var name = ""
488
         for(let i=0;i<this.drugTypeList.length;i++){
488
         for(let i=0;i<this.drugTypeList.length;i++){
489
            if(this.drugTypeList[i].id == id){
489
            if(this.drugTypeList[i].id == id){
491
              name = this.drugTypeList[i].name
491
              name = this.drugTypeList[i].name
492
            }
492
            }
493
         }
493
         }
494
-     
494
+
495
         return name
495
         return name
496
       },
496
       },
497
       getManufacturerList(id){
497
       getManufacturerList(id){
630
             min_str =  total%min_number + min_unit
630
             min_str =  total%min_number + min_unit
631
           }
631
           }
632
         }
632
         }
633
-    
633
+
634
         return str + min_str
634
         return str + min_str
635
       },
635
       },
636
-  
636
+
637
       getCountOne(drug_id){
637
       getCountOne(drug_id){
638
         var count= 0
638
         var count= 0
639
         for(let i=0;i<this.drugOutList.length;i++){
639
         for(let i=0;i<this.drugOutList.length;i++){
644
         return count
644
         return count
645
       },
645
       },
646
      getCountTwo(drug_id,min_number,max_unit,min_unit){
646
      getCountTwo(drug_id,min_number,max_unit,min_unit){
647
-      
647
+
648
        var total_count = 0
648
        var total_count = 0
649
        var out_count = 0
649
        var out_count = 0
650
        var count = 0
650
        var count = 0
658
        if(parseInt(count/min_number)!=0){
658
        if(parseInt(count/min_number)!=0){
659
          str = parseInt(count/min_number) + max_unit
659
          str = parseInt(count/min_number) + max_unit
660
        }
660
        }
661
-     
661
+
662
        if((count%min_number)!=0){
662
        if((count%min_number)!=0){
663
          str_min = count%min_number + min_unit
663
          str_min = count%min_number + min_unit
664
        }
664
        }
683
         if(total == 0){
683
         if(total == 0){
684
            total = ""
684
            total = ""
685
         }
685
         }
686
-       
686
+
687
         return total
687
         return total
688
       },
688
       },
689
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
689
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
690
-       
690
+
691
          var max_str=  ""
691
          var max_str=  ""
692
          var min_str = ""
692
          var min_str = ""
693
          var total = 0
693
          var total = 0
711
            if(total%min_number!=0){
711
            if(total%min_number!=0){
712
               min_str = total%min_number + min_unit
712
               min_str = total%min_number + min_unit
713
            }
713
            }
714
-         
714
+
715
          }
715
          }
716
         return max_str + min_str
716
         return max_str + min_str
717
       },
717
       },
724
             total += parseInt(arr[i].count)
724
             total += parseInt(arr[i].count)
725
           }
725
           }
726
         }
726
         }
727
-      
727
+
728
         if (total < min_number){
728
         if (total < min_number){
729
            min_str = total + min_unit
729
            min_str = total + min_unit
730
          }
730
          }
739
            if(total%min_number!=0){
739
            if(total%min_number!=0){
740
               min_str = total%min_number + min_unit
740
               min_str = total%min_number + min_unit
741
            }
741
            }
742
-         
742
+
743
          }
743
          }
744
         return max_str + min_str
744
         return max_str + min_str
745
 
745
 
793
          return str + str_min
793
          return str + str_min
794
       },
794
       },
795
       getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
795
       getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
796
-        
796
+
797
         var str = ""
797
         var str = ""
798
         var str_min = ""
798
         var str_min = ""
799
         //总库存
799
         //总库存

+ 11 - 11
src/xt_pages/stock/stockQuery.vue Parādīt failu

108
        </el-table-column>
108
        </el-table-column>
109
        <el-table-column label="出库数量" align="center">
109
        <el-table-column label="出库数量" align="center">
110
          <template slot-scope="scope">
110
          <template slot-scope="scope">
111
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">
111
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
112
             <span>
112
             <span>
113
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
113
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
114
             </span>
114
             </span>
115
           </span>
115
           </span>
116
-          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span> 
116
+          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
117
          </template>
117
          </template>
118
        </el-table-column>
118
        </el-table-column>
119
 
119
 
120
        <el-table-column label="剩余库存量" align="center">
120
        <el-table-column label="剩余库存量" align="center">
121
          <template slot-scope="scope">
121
          <template slot-scope="scope">
122
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
123
-          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
122
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
123
+          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
124
          </template>
124
          </template>
125
        </el-table-column>
125
        </el-table-column>
126
        <el-table-column label="操作" align="center" width="260px">
126
        <el-table-column label="操作" align="center" width="260px">
171
 
171
 
172
     var start_time =  window.sessionStorage.getItem('start_time')
172
     var start_time =  window.sessionStorage.getItem('start_time')
173
     var end_time =  window.sessionStorage.getItem('end_time')
173
     var end_time =  window.sessionStorage.getItem('end_time')
174
-   
174
+
175
     if(start_time !=null){
175
     if(start_time !=null){
176
       this.start_time = start_time
176
       this.start_time = start_time
177
     }
177
     }
221
     };
221
     };
222
   },
222
   },
223
   methods: {
223
   methods: {
224
-  
224
+
225
     GetAllGoodType: function() {
225
     GetAllGoodType: function() {
226
       GetAllGoodType().then(response => {
226
       GetAllGoodType().then(response => {
227
         if (response.data.state == 0) {
227
         if (response.data.state == 0) {
259
       this.limit = val;
259
       this.limit = val;
260
       this.getlist()
260
       this.getlist()
261
       this.getStockDrugCount()
261
       this.getStockDrugCount()
262
-      
262
+
263
     },
263
     },
264
     handleCurrentChange(val) {
264
     handleCurrentChange(val) {
265
       this.page = val;
265
       this.page = val;
335
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
335
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
336
          const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
336
          const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
337
 
337
 
338
-       
338
+
339
          for(let i=0;i<this.tableList.length;i++){
339
          for(let i=0;i<this.tableList.length;i++){
340
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
340
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
341
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
341
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
347
           }else{
347
           }else{
348
              this.tableList[i].overplus = 0
348
              this.tableList[i].overplus = 0
349
           }
349
           }
350
-          
350
+
351
          }
351
          }
352
          const data = this.formatJson(filterVal, this.tableList)
352
          const data = this.formatJson(filterVal, this.tableList)
353
          excel.export_json_to_excel({
353
          excel.export_json_to_excel({
429
        var specification_name = ""
429
        var specification_name = ""
430
        for(let i=0;i<this.manufacturerList.length;i++){
430
        for(let i=0;i<this.manufacturerList.length;i++){
431
           if(val.manufacturer == this.manufacturerList[i].id){
431
           if(val.manufacturer == this.manufacturerList[i].id){
432
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
432
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
433
           }
433
           }
434
        }
434
        }
435
       specification_name = val.specification_name + "/" + val.packing_unit
435
       specification_name = val.specification_name + "/" + val.packing_unit
443
        var specification_name = ""
443
        var specification_name = ""
444
        for(let i=0;i<this.manufacturerList.length;i++){
444
        for(let i=0;i<this.manufacturerList.length;i++){
445
           if(val.manufacturer == this.manufacturerList[i].id){
445
           if(val.manufacturer == this.manufacturerList[i].id){
446
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
446
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
447
           }
447
           }
448
        }
448
        }
449
       specification_name = val.specification_name + "/" + val.packing_unit
449
       specification_name = val.specification_name + "/" + val.packing_unit