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

guoyuji

2024-10-14 fcc92299eb3fb49835fa6975c67730018b451803

 north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue

@@ -11,7 +11,7 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintReworkProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
import footSum from "@/hook/footSum"
import {Search} from "@element-plus/icons-vue";
import companyInfo from "@/stores/sd/companyInfo"
@@ -190,7 +190,6 @@
  let endTime = form.date1[1]
// 第一次加载查询
  request.post(`/rework/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {

    if (res.code == 200) {
      xGrid.value.loadData(res.data.data)
      titleSelectJson.value.dataType = res.data.type
@@ -260,6 +259,7 @@
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      ,width:120
    },
    {
      field: 'process_id',
@@ -267,41 +267,54 @@
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:130
    },
    {
      field: 'customer_name',
      title: t('customer.customerName'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:120
    },
    {
      field: 'project',
      title:  t('order.project'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:120
    },
    {
      field: 'order_number',
      title:  t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:100
    },
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
    {field: 'glass_address', title: t('processCard.glassAddress'),},
    {field: 'rework_num', title:  t('order.quantity'),},
    {field: 'rework_area', title:  t('order.area'),},
    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),},
    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),},
    {field: 'rework_type', title:  t('reportingWorks.breakageType'),},
    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),},
    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),},
    {field: 'product_name', title: t('order.product'),},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),},
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",width:90},
    {
      field: 'glassNumber',
      title: t('reportingWorks.glassNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      width:100
    },
    {field: 'glass_address', title: t('processCard.glassAddress'),width:90},
    {field: 'rework_num', title:  t('order.quantity'),width:70},
    {field: 'rework_area', title:  t('order.area'),width:70},
    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),width:90},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),width:120},
    {field: 'responsible_personnel', title:  '责任信息',width:100},
    {field: 'rework_type', title:  t('reportingWorks.breakageType'),width:80},
    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),width:90},
    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),width:80},
    {field: 'product_name', title: t('order.product'),width:120},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:120},
    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},
  ],//表头按钮

  toolbarConfig: {
@@ -654,8 +667,8 @@
        type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}

    </el-button>
    &nbsp;&nbsp;
    <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
<!--    &nbsp;&nbsp;-->
<!--    <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>-->
    &nbsp;
    <label>{{$t('processCard.labelStyle')}}：</label>
    <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
@@ -687,8 +700,7 @@
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="600px"
        max-height="100%"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"

@@ -724,6 +736,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>
@@ -778,7 +791,7 @@
<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
  height: 94%;
}