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

guoyujie

21 小时以前 4adce5c0784baf7de2ec62a12dacf207ea2a164e

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

@@ -34,10 +34,7 @@
})
onMounted(()=>{
  getTags()
  filterData.value = orderInfo.selectProcessCardFilter.data
  orderInfo.selectProcessCardFilter.list.forEach(item =>{
    xGrid.value.getColumnByField(item.field).filters = item.column.filters
  })

  //启用表格拖动选中
  addListener(xGrid.value, gridOptions)
  if(props.orderId===null  || props.orderId===undefined || props.orderId===''){
@@ -333,9 +330,12 @@
    {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    // {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    //   slots: {filter: 'num1_filter'},
    //   filterMethod: filterChanged},
    {field: 'child_width', title: t('order.width'),width: 80,filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged },
    {field: 'child_height', title: t('order.height'),width: 80 ,filters: [{data: ''}],
      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')},
@@ -397,16 +397,16 @@
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }

          let id = ""
          for (let i = 0; i < selectRecords.length; i++) {
            if (i + 1 === selectRecords.length) {
              id += selectRecords[i].id
            } else {
              id += selectRecords[i].id + "|"
            }
          }
          printRow.value.list = JSON.stringify(selectRecords)
          //去除重复的勾选内容
          const uniqueRecords = Array.from(
              new Map(
                  selectRecords.map(item => [
                    `${item.process_id}_${item.technology_number}`,
                    item
                  ])
              ).values()
          )
          printRow.value.list = JSON.stringify(uniqueRecords)
          printRow.value.printMergeVal = printMerge.value
          printRow.value.like = null
          printRow.value.merge = company.flowCardMerge
@@ -429,14 +429,6 @@
            return
          }

          let id = ""
          for (let i = 0; i < selectRecords.length; i++) {
            if (i + 1 === selectRecords.length) {
              id += selectRecords[i].id
            } else {
              id += selectRecords[i].id + "|"
            }
          }
          lastList.value = []
          labelRow.value.list = JSON.stringify(selectRecords)
          labelRow.value.faceOrientation = faceOrientation
@@ -543,6 +535,7 @@
          :merge-cells="mergeCells"
          @cell-dblclick="handleCellDblClick"
          v-on="gridEvents"
          :checkbox-config="{labelField: 'name', highlight: true, range: true}"

      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->