订单首页流程卡新增楼层编号显示

廖井涛

6 天以前 a660db06773007b1be690e0674829c00a57aeb7b

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -4,24 +4,36 @@
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 {addListener} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";
import {VxeUI} from "vxe-pc-ui";
//语言获取
const { t } = useI18n()
let router=useRouter()
const route = useRoute()

let props = defineProps({
  orderId:null
})
onMounted(()=>{
  //启用表格拖动选中
  addListener(xGrid.value, gridOptions)
  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,12 +60,13 @@
  }
})


//需要合并的列
let column = [1,3,8]
//点击查询
const getWorkOrder = () => {
  gridOptions.columns = gridOptions.columns.slice(0, 11); //清除动态生成的列重新查询
  request.post(`/report/processCardProgress/${form.orderId}`, column).then((res) => {
  request.post(`/report/processCardProgressReport/${form.orderId}`, column).then((res) => {
    if (res.code == 200) {
      if (res.data.data.length === 0) {
        ElMessage.warning(t('report.noDataFoundForThisOrder'))
@@ -71,9 +84,9 @@
        gridOptions.columns.push(column)
      })
      res.data.data.forEach(item => {
        item.reportWorkQuantity = JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount = JSON.parse(item.reportWorkQuantityCount)
        //item.reportWorkTime = JSON.parse(item.reportWorkTime)
        item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
        item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
        item.reportWorkQuantityShow=JSON.parse(item.reportWorkQuantityShow)
      })
      mergeCells.value = res.data.mergeCell
      xGrid.value.loadData(res.data.data)
@@ -93,37 +106,16 @@
}

const quantitySum = ( row,column )=>{
  const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0
  const reportWorkTime = row.reportWorkTime[column.title] || 0
  if (reportWorkTime===0){
    if(reportWorkQuantity===reportWorkQuantityCount){
      return reportWorkQuantity
    }

    return (reportWorkQuantity
        +'('
        +reportWorkQuantityCount
        +')' )
  }
  else {
    if(reportWorkQuantity===reportWorkQuantityCount){
      return (reportWorkQuantity+'['
          +reportWorkTime
          +']')
    }

    return (reportWorkQuantity
        +'('
        +reportWorkQuantityCount
        +')'
        +'['
        +reportWorkTime
        +']'
    )
  const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || ''
  const reportWorkQuantityShow = row.reportWorkQuantityShow[column.title] || ''
  if(reportWorkQuantityShow === reportWorkQuantityCount ){
    return reportWorkQuantityShow
  }

  //return
  return (reportWorkQuantityShow
      +'('
      +reportWorkQuantityCount
      +')' )
}


@@ -152,7 +144,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    // remote: true
                    // remote: true
  },
  customConfig: {
    storage: true
@@ -162,7 +154,7 @@
    mode: 'row',
    showStatus: true
  },//表头参数
   columns : [
  columns : [
    // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {field: 'product_name', width: 150,
      title: t('order.product'),
@@ -188,10 +180,11 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    {field: 'quantity', width: 90,title: t('order.quantity')},
    {field: 'grossArea', 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')},
    {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
    {field: 'Storage',width: 120, title: t('report.inventoryNum')},
    {field: 'StorageAreaShow',width: 120, title: t('report.inventoryArea')},
  ],

  toolbarConfig: {
@@ -200,7 +193,7 @@
    // }],
    // import: false,
    // export: true,
     // print: true,
    // print: true,
    zoom: true,
    custom: true
  },
@@ -213,7 +206,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)
        }
@@ -239,26 +232,28 @@
])



const handleCellDblClick = ({ row, column, cell, $event }) => {
  VxeUI.clipboard.copy(row[column.property])
}
</script>

<template>
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-input
            v-model="form.orderId"
            clearable
            :disabled="props.orderId"
            :placeholder="$t('order.orderId')"
            style="width: 140px"></el-input>
        &nbsp;&nbsp;
        <el-button
            :disabled="props.orderId"
            @click="getWorkOrder"
            id="select"
            type="primary" :icon="Search">{{$t('basicData.search')}}
      <el-input
          v-model="form.orderId"
          clearable
          :disabled="props.orderId"
          :placeholder="$t('order.orderId')"
          style="width: 140px"></el-input>
      &nbsp;&nbsp;
      <el-button
          :disabled="props.orderId"
          @click="getWorkOrder"
          id="select"
          type="primary" :icon="Search">{{$t('basicData.search')}}

        </el-button>
      </el-button>

    </div>
    <div class="main-table">
@@ -268,6 +263,7 @@
          ref="xGrid"
          v-bind="gridOptions"
          :merge-cells="mergeCells"
          @cell-dblclick="handleCellDblClick"

      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -314,4 +310,12 @@
  width: 100%;
  height: calc(100% - 35px);
}

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
  -moz-user-select: none;
  -ms-user-select: none;
  user-select: none;
}
</style>