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

chenlu

2025-07-30 e9f8d23f55f64903d834308f9f167aaf3195c20d

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

@@ -30,6 +30,7 @@
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")
let printStyle = ref("1")

//标签
let labelRow = ref({
@@ -43,6 +44,13 @@
const company = companyInfo()
let hidePrintLabels = company.printLabel.hideButton;

//倒叙
let  flashback = ref(1)
//落架顺序
let landingSequence= ref(1)
//合架打印
let compound = ref(null)

const form = reactive({
  date1: '',
  orderId: '',
@@ -55,13 +63,16 @@
  printMergeVal: null,
  like: null,
  project:null,
  merge: null
  merge: null,
  flashback:null,
  compound:null,
  landingSequence:null,
})
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
      if(parseInt(print.value)==1){
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1,printStyle:parseInt(printStyle.value) }})
      }else{
        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
      }
@@ -70,19 +81,22 @@
    }
    case 'edit1' :{
      if(parseInt(print.value)==1){
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2,printStyle:parseInt(printStyle.value) }})
      }else{
        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
      }
      break
    }
    case 'edit2' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3,printStyle:parseInt(printStyle.value) }})
      break
    }
    case 'edit3' :{
      printRow.value.project=row.project_no
      printRow.value.merge = company.flowCardMerge
      printRow.value.flashback = flashback.value
      printRow.value.compound = compound.value
      printRow.value.landingSequence=landingSequence.value
      if(company.companyName=='常州市吉利玻璃有限公司'){
        dialogTableVisibleStraight.value = true
      }else{
@@ -138,7 +152,7 @@
  if (res.code == 200) {
    if(hidePrintLabels=="true"){
      //删除下拉框
      remove(gridOptions.toolbarConfig.slots)
      //remove(gridOptions.toolbarConfig.slots)
      const button = {'code': 'printLabel',
        status: 'primary',
        'name': t('processCard.finishedProductPrinting2')}
@@ -265,7 +279,7 @@
    buttons: [
    ],
    slots:{
      buttons: "toolbar_buttons"
      buttons: "toolbar_buttons",
    },
    zoom: true,
    custom: true
@@ -417,11 +431,19 @@
        </template>

        <template #toolbar_buttons>
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" label="11列4行"></vxe-option>
            <vxe-option value="2" label="6行3列"></vxe-option>
          </vxe-select>
        </template>

        <template #toolbar_button2>
          <vxe-select @change="changeOrderType" v-model="print" >
            <vxe-option value="1" label="EPSON LQ-82KF ESC/P2"></vxe-option>
            <vxe-option value="2" label="TSC TTP-244Pro"></vxe-option>
          </vxe-select>
        </template>




@@ -476,6 +498,9 @@
          :printMerge="printRow.printMergeVal"
          :printProject="printRow.project"
          :merges="printRow.merge"
          :flashback = "printRow.flashback"
          :compound = "printRow.compound"
          :landingSequence = "printRow.landingSequence"
          style="width: 100%;height: 100%"/>
    </el-dialog>