guoyujie
2025-03-26 eac052747b0062b64febe994a8f8b82d56c5838a
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -4,7 +4,7 @@
import {ElDatePicker, ElMessage} from "element-plus"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import {useRouter} from 'vue-router'
import {useRoute, useRouter} from 'vue-router'
import {changeFilterEvent, filterChanged} from "@/hook"
import { useI18n } from 'vue-i18n'
@@ -12,16 +12,25 @@
//语言获取
const { t } = useI18n()
let router=useRouter()
const route = useRoute()
let props = defineProps({
  orderId:null
})
onMounted(()=>{
  if(props.orderId===null  || props.orderId===undefined || props.orderId===''){
    return
  }else{
    form.orderId = props.orderId
    getWorkOrder()
  }
  form.orderId = props.orderId
  getWorkOrder()
  if(route.query.orderId===null  || route.query.orderId===undefined || route.query.orderId===''){
  }else {
    form.orderId = route.query.orderId
    getWorkOrder()
  }
})
@@ -48,6 +57,7 @@
  }
})
//需要合并的列
let column = [1,3,8]
//点击查询
@@ -73,7 +83,7 @@
      res.data.data.forEach(item => {
        item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
        item.reportWorkTime = JSON.parse(item.reportWorkTime)
        //item.reportWorkTime = JSON.parse(item.reportWorkTime)
      })
      mergeCells.value = res.data.mergeCell
      xGrid.value.loadData(res.data.data)
@@ -188,6 +198,7 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    {field: 'quantity', width: 90,title: t('order.quantity')},
     {field: 'gross_area', width: 90,title: t('order.area')},
    {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
    // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
    {field: 'inventory',width: 120, title: t('report.inventoryNum')},
@@ -213,7 +224,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity", "broken_num", "inventory", "inventoryArea"]; // 静态列的求和
        const List = ["quantity", "broken_num", "inventory", "inventoryArea","gross_area"]; // 静态列的求和
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }