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

廖井涛

2024-07-10 78809560f4315777e770acec0e24cb42e2ca97a7

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

@@ -9,12 +9,13 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/views/pp/processCard/PrintProcess.vue'
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";

const company = companyInfo()

@@ -28,13 +29,26 @@
const printVisible= ref(false)
let selectRecords = ref(null)

const selectRecordsData = ref({
  printList: []
})

const xGrid = ref(null)
const xGridDetail =ref(null)

//排序
let editRow = ref({
  processId:null,
  technologyNumber:null
})

//打印
let  printRow = ref({
  list:null,
  printMergeVal:null
})



const getTableRow = (row,type) => {
  switch (type) {
@@ -119,6 +133,10 @@
const printMerge = ref('')
const printMergeOptions=[{}]

const printContent = ref({
  id: 'child',

})

//打印类型
const printType = ref()
@@ -139,14 +157,14 @@
  if (res.code == 200) {
    produceList = produceList.value.concat(deepClone(res.data.data))
    titleSelectJson.value.dataType = res.data.type
    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
    hideButton()
@@ -290,9 +308,9 @@
  toolbarButtonClick ({ code}) {
    const $grid = xGrid.value
    selectRecords = $grid.getCheckboxRecords()
    selectRecords.forEach(obj => {
      delete obj.print_status;
    });
    // selectRecords.forEach(obj => {
    //   delete obj.print_status;
    // });
    let type=printType.value
    let faceOrientation=stateValue.value
    let lableTypes=lableType.value
@@ -313,10 +331,10 @@
              id += selectRecords[i].id + "|"
            }
          }

          let printMergeVal=printMerge.value
         router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})

          printRow.value.list = JSON.stringify(selectRecords)
          printRow.value.printMergeVal=printMerge.value
        // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogTableVisible.value=true
          break
        }

@@ -442,6 +460,22 @@
  })
}


// 监听打印完成事件
const printNumber = () =>{

  selectRecordsData.value.printList=selectRecords
  let printState=0
  request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
    if (res.code == 200 && res.data === true) {
    } else {

      ElMessage.warning(t('basicData.msg.saveFail'))

    }
  })
}

</script>

<template>
@@ -523,11 +557,15 @@

    </vxe-grid>
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
        destroy-on-close
        :title="$t('processCard.print')"
        style="width: 80%;height:75% ">
      <PrintProcess :printList="selectRecords"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" @click="printNumber"  :icon="Printer" circle />
      </template>
      <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal"
                    style="width: 100%;height: 100%" />
    </el-dialog>

@@ -568,20 +606,16 @@
  height: 100%;
}

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
  -moz-user-select: none;
  -ms-user-select: none;
  user-select: none;
}

:deep(#sizeCheck .el-dialog__body){
  height: 90%;
  width: 100%;
}
/deep/ .vxe-menu {
  position: absolute;
  z-index: 9999 !important;

:deep(#sizePrintCalrd .el-dialog__body){
  height: 85%;
  width: 100%;
  overflow-y: auto;
}

</style>