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

huang

2024-11-12 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2

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

@@ -308,6 +308,9 @@
      filterMethod: filterChanged, width: 100
    },
    {field: 'quantity', title: t('order.quantity'), width: 90},
    {field: 'printQuantity', title: t('processCard.printQuantity'), width: 90,
      editRender: {name: 'input', attrs: {placeholder: ''}},
    },
    {field: 'total_area', title: t('order.area'), width: 90},
    {
      field: 'product_name', title: t('order.product'), width: 120,
@@ -338,16 +341,33 @@
      filterMethod: filterChanged, width: 120
    },
  ],//表头按钮

//表单验证
  editRules: {
    printQuantity: [
      {
        validator ({ row }) {
          const regex = /^[0-9]\d*$/
          const printQuantity =
              (row.printQuantity === undefined || row.printQuantity===null || row.printQuantity==='') ? 0 : row.printQuantity
           if(!regex.test(printQuantity)){
             return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
          }
          else if(row.quantity<printQuantity){
            return new Error(t('processCard.printWarn1'))
          }
        }
      }
    ]
  },
  toolbarConfig: {
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'printLabel3', name: '成品打印2', status: 'primary'},
      {code: 'printTest', name: "可编辑打印", status: 'primary'},
      {code: 'invertSelection', name: "反选", status: 'primary'},
      {code: 'printLabel3', name: t('processCard.finishedProductPrinting2'), status: 'primary'},
      {code: 'printTest', name: t('processCard.editablePrinting'), status: 'primary'},
      {code: 'invertSelection', name: t('processCard.invertSelection'), status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
    ],
    // import: false,
@@ -377,7 +397,7 @@
})

const gridEvents = {
  toolbarButtonClick({code}) {
  async toolbarButtonClick({code}) {
    const $grid = xGrid.value
    selectRecords = $grid.getCheckboxRecords()
    // selectRecords.forEach(obj => {
@@ -584,6 +604,11 @@
          break
        }
        case 'printTest': {
          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return