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

guoyuji

2024-07-04 1ac72716fbc5d8271fa23475de4fb1408b7040ee

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

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

@@ -135,15 +135,14 @@
  if (res.code == 200) {
    produceList = produceList.value.concat(deepClone(res.data.data))
    titleSelectJson.value.dataType = res.data.type
    console.log(produceList)
    produceList.forEach(item => {
      if(item.print_status == 1){
        item.print_status='已打印'
      }
      else if (item.print_status == 0){
        item.print_status='未打印'
      }
    });
    // produceList.forEach(item => {
    //   if(item.print_status == 1){
    //     item.print_status='已打印'
    //   }
    //   else if (item.print_status == 0){
    //     item.print_status='未打印'
    //   }
    // });
    xGrid.value.reloadData(produceList)
    gridOptions.loading = false
  } else {
@@ -544,6 +543,20 @@
            visible: true,
            disabled: false
          },
          {
            code: 'addAutomatically',
            name: "自动填充",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
          {
            code: 'selectFill',
            name: "选中填充",
            prefixIcon: 'vxe-icon-indicator',
            visible: true,
            disabled: false
          },
        ]
      ]
    }
@@ -628,6 +641,39 @@
          }
          break
        }
        case 'addAutomatically' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = 1
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
        case 'selectFill' : {
          let result = toolbarButtonClickEvent()
          if (result.cell === "sort" ) {
            if (result) {
              const dataList = xGrid.value.getTableData().visibleData
              let val = dataList[result.start][result.cell]
              dataList.forEach((item, index) => {
                if (index >= result.start && index <= result.end) {
                  console.log(item)
                  item[result.cell] = val
                  val=val*1+1
                }
              })
            }
          }
          break
        }
      }
    }
  },