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

廖井涛

2024-04-09 8202686b06680db9b82d4a99a31dc7f9dca4ee86

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

@@ -3,15 +3,10 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";
import { useI18n } from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
//语言获取
const { t } = useI18n()
let router=useRouter()
@@ -19,15 +14,10 @@
  switch (type) {
    case 'edit' :{
      //alert('我接收到子组件传送的编辑信息')
      router.push({path: '/main/processCard/AddProcessCard', query: { orderId: row.orderId,productionId:row.orderGlassDetail.productionId }})
      break
    }
    case 'delete':{
      alert('我接收到子组件传送的删除信息')
      break
    }
    case  'setType':{
      alert('我接收到子组件传送的排版状态')
      router.push({
        path: '/main/processCard/AddProcessCard',
        query: {orderId: row.orderId, productionId: row.orderGlassDetail.productionId}
      })
      break
    }
  }
@@ -71,12 +61,11 @@

let id=route.query.orderId

// 第一次加载查询
request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {

  if (res.code == 200) {
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    console.log('produceList', produceList)
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -94,45 +83,12 @@
}


/*使用筛选，后端获取数据*/
const changeFilterEvent = (event, option, $panel,) => {
  // 手动触发筛选
  $panel.changeOption(event, !!option.data, option)
}

function filterChanged(column) {
  gridOptions.loading = true
  //筛选条件发生变化条件发生变化
  let value = column.datas[0] != undefined ? column.datas[0] : ''
  value = value.trim()
  //判断是否存在外键
  if (column.property.indexOf('.') > -1) {
    const columnArr = column.property.split('.')
    filterData.value[columnArr[0]] = {
      [columnArr[1]]: value
    }
  } else {
    filterData.value[column.property] = value
  }

  request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
    if (res.code == 200) {
      pageTotal.value = res.data.total
      produceList = deepClone(res.data.data)

      xGrid.value.loadData(produceList)
      gridOptions.loading = false
    } else {
      ElMessage.warning(res.msg)
    }
  })
}
const hasDecimal = (value) => {
  const regex = /\./; // 定义正则表达式，查找小数点
  return regex.test(value); // 返回true/false
}
//子组件接收参数

//子组件接收参数
const xGrid = ref()
const gridOptions = reactive({
  loading: true,
@@ -154,7 +110,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    remote: true
                    // remote: true
  },
  customConfig: {
    storage: true
@@ -168,13 +124,38 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
    {field: 'orderId',  title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },  },
    {field: 'orderGlassDetail.productionId', title: t('workOrder.productionId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
    {field: 'orderDetail.quantity', title: t('order.quantity'),showOverflow:"ellipsis"},
    {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
    {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'),},
    {
      field: 'order_id',
      title: t('order.orderId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'production_id',
      title: t('workOrder.productionId'),
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'product_id',
      title: t('order.productId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'product_name',
      title: t('order.product'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {field: 'quantity', title: t('order.quantity'), showOverflow: "ellipsis"},
    {field: 'compute_gross_area', title: t('order.area'),},
    {field: 'perimeter', title: t('workOrder.perimeter'),},
  ],//表头按钮

  toolbarConfig: {
@@ -207,18 +188,17 @@
})



</script>

<template>
  <div class="main-div-customer">
    <vxe-grid
        max-height="100%"
        height="600px"
        @filter-change="filterChanged"
        class="mytable-scrollbar"
        ref="xGrid"
        class="mytable-scrollbar"
        height="600px"
        max-height="100%"
        v-bind="gridOptions"


    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -236,14 +216,17 @@

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

      </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
            <input type="text"
                   v-model="option.data"
                   @input="changeFilterEvent($event, option, $panel)"/>
          </div>
        </div>
      </template>