Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-05-28 339dff917db578591a15259fa9a6d0874c9169bf

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue

@@ -6,6 +6,7 @@
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -236,7 +237,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })
@@ -245,14 +246,7 @@

})

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}


const  xGrid = ref();
const gridEvents = {

 north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue

@@ -8,6 +8,7 @@
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -48,14 +49,6 @@
})


//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//子组件接收参数

@@ -133,7 +126,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -9,6 +9,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent,filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -73,14 +74,7 @@
})


//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}


//子组件接收参数
const xGrid = ref()
@@ -165,7 +159,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })

 north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue

@@ -8,6 +8,7 @@
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -58,14 +59,6 @@



//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//子组件接收参数

@@ -152,7 +145,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })

 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -9,6 +9,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent,filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -82,14 +83,6 @@
  }
})

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

//子组件接收参数
const xGrid = ref()
@@ -172,7 +165,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })

 north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue

@@ -8,6 +8,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -226,7 +227,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })
@@ -236,14 +237,6 @@
})


//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

const gridEvents = {
  toolbarButtonClick ({ code }) {

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -11,6 +11,7 @@
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
import footSum from "@/hook/footSum";

//语言获取
const { t } = useI18n()
@@ -406,7 +407,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })
@@ -415,14 +416,6 @@

})

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

const gridEvents = {
  async toolbarButtonClick({code}) {

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -9,6 +9,7 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
import footSum from "@/hook/footSum"

//语言获取
const { t } = useI18n()
@@ -273,7 +274,7 @@
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
          return footSum(data, column.field)
        }
        return ''
      })
@@ -283,14 +284,6 @@
})


//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}
</script>

<template>