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

guoyuji

2025-03-10 46bf33053daa5f2bfe163822ce4f793f669024f8

 north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue

@@ -7,8 +7,11 @@
import {useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
import  useUserInfoStore from '@/stores/userInfo'
import footSum from "@/hook/footSum"
//语言获取
const {t} = useI18n()
const userStore = useUserInfoStore()
let router = useRouter()
const getTableRow = (row, type) => {
  switch (type) {
@@ -16,7 +19,7 @@
      //alert('我接收到子组件传送的编辑信息')
      router.push({
        path: '/main/processCard/AddProcessCard',
        query: {orderId: row.orderId, productionId: row.orderGlassDetail.productionId}
        query: {orderId: row.order_id, productionId: row.production_id, quantity:row.quantity}
      })
      break
    }
@@ -58,7 +61,6 @@

const {currentRoute} = useRouter()
const route = currentRoute.value

let id = route.query.orderId

// 第一次加载查询
@@ -97,7 +99,7 @@
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'demo_1',
  id: 'SplittingDetails',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
@@ -159,26 +161,23 @@
  ],//表头按钮

  toolbarConfig: {
    // buttons: [{
    //
    // }],
    // import: false,
    // export: true,
    // print: true,
    // buttons: [
    //   {code: 'editCheckbox', name: t('basicData.edit'), status: 'primary'},
    // ],
    zoom: true,
    custom: true
  },
  data: null,//表格数据
  //脚部求和
  footerMethod({columns, data}) {//页脚函数
    let footList = ['data.orderDetail.quantity', 'data.orderDetail.computeGrossArea']
    return [
  footerMethod ({ columns, data }) {//页脚函数
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        const List = ["quantity",'compute_gross_area','perimeter']
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
        return ''
      })
@@ -195,8 +194,7 @@
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="600px"
        max-height="100%"
        height="100%"
        v-bind="gridOptions"


@@ -216,9 +214,15 @@

      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
<!--        <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}-->
<!--        </el-button>-->
        <el-button @click="getTableRow(row,'edit')"
                   v-if="userStore.user.permissions.indexOf('splittingDetails.edit') > -1"
                   link
                   type="primary"
                   size="small">
          {{ $t('basicData.edit') }}
        </el-button>

      </template>

      <template #num1_filter="{ column, $panel }">
@@ -226,6 +230,7 @@
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="text"
                   v-model="option.data"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>