Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-02 07482e283a7c8ea7991447ce0b00f745bbb0e878

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/product/GlassType.vue

@@ -18,12 +18,19 @@
    ElMessage.warning(res.msg)
  }
})
let emit = defineEmits([
  'getProduct'
])
const emitParent = () => {
  emit('getProduct')
}

</script>

<template>
  <div>
    <el-cascader
        @change="emitParent"
        v-model="productGlassTypeStore.GlassType"
        :options="options"
        clearable

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

@@ -397,6 +397,15 @@
  customConfig: {
    storage: true
  },
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',
@@ -451,14 +460,16 @@
      title: t('order.width'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'child_height',
      title: t('order.height'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      sortable: true,
    },
    {
      field: 'area',
@@ -635,7 +646,7 @@
          ref="xGridDetail"
          class="mytable-scrollbar"
          max-height="100%"
          height="600px"
          height="550px"
          size="small"
          v-bind="detailGridOptions"
          v-on="gridEvents">

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -196,6 +196,15 @@
  customConfig: {
    storage: true
  },
  mouseConfig:{selected: true},//鼠标选中
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
  },
  editConfig: {
    trigger: 'click',
    mode: 'row',

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -223,6 +223,9 @@
  data:null,//表格数据
  toolbarConfig: {
    buttons: [],
    slots:{
      buttons: "toolbar_buttons"
    },
    // import: false,
    // export: true,
    // print: true,
@@ -317,11 +320,11 @@
<template>

  <div style="width: 100%;height: 100%">
      <glass-type   style="float: left" />
<!--      <glass-type   style="float: left" />
      <el-button
          @click="getProduct"
          id="select"
          type="primary" :icon="Search">{{ $t('basicData.search') }}</el-button>
          type="primary" :icon="Search">{{ $t('basicData.search') }}</el-button>-->



@@ -332,7 +335,6 @@
        ref="xGrid"
        v-bind="gridOptions"
        @scroll ="scrollEvnt"

    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
@@ -371,6 +373,9 @@
      <template #state="{ row,column}">
        <el-checkbox @click.native.prevent   :checked="row[column.field]===1"/>
      </template>
      <template #toolbar_buttons>
        <glass-type  @getProduct="getProduct"  />
      </template>

    </vxe-grid>