Redeem 1 vuosi sitten
vanhempi
commit
f3c6c762c6
1 muutettua tiedostoa jossa 11 lisäystä ja 2 poistoa
  1. 11 2
      src/views/OYE/components/oYeTransResult.vue

+ 11 - 2
src/views/OYE/components/oYeTransResult.vue

@@ -1562,7 +1562,7 @@
 
 
 <script>
 <script>
 import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
-import { getCookie } from '@/utils/util.js'
+import { getCookie, accMul } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
 import currentLocation from './currentLocation.vue'
 import { downloadFile, creatImageFile } from '@/utils/base64ToBlob.js'
 import { downloadFile, creatImageFile } from '@/utils/base64ToBlob.js'
@@ -2247,6 +2247,12 @@ export default {
 
 
             return map
             return map
           })
           })
+          if (getCookie('orgCode') == 'ouyechangwaiku') {
+            this.oYeWarehouseList = this.oYeWarehouseList.filter(item => {
+              return item.remark == JSON.parse(getCookie('userInfo')).userName
+            })
+            this.steelMap.inboundWarehouse = getCookie('loginName')
+          }
         })
         })
     },
     },
     confireInboundTo(item) {
     confireInboundTo(item) {
@@ -2264,7 +2270,10 @@ export default {
         map.meter = e.meter
         map.meter = e.meter
         map.netWeight = e.inboundNetWeight
         map.netWeight = e.inboundNetWeight
         map.materialNumber = e.materialNumber
         map.materialNumber = e.materialNumber
-        map.theoryWeight = e.materialThoWeight
+        if (e.isPoundSale == 1) {
+          let theoryWeight = accMul(map.materialNumber, e.singleWeight)
+          map.theoryWeight = theoryWeight
+        }
         map.materialId = e.materialId
         map.materialId = e.materialId
         map.saleMaterialId = e.saleMaterialId
         map.saleMaterialId = e.saleMaterialId
         map.saleArea = e.saleRemarkByasm
         map.saleArea = e.saleRemarkByasm