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

廖井涛

2024-07-25 15fa56463061f1e94140e23e98987aa3131714bf

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

@@ -11,7 +11,8 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
import footSum from "@/hook/footSum"
import companyInfo from "@/stores/sd/companyInfo"
@@ -47,6 +48,14 @@
  list:null,
  printMergeVal:null,
  like:null
})

//标签
let  labelRow = ref({
  list:null,//勾选的数据
  faceOrientation:null,//内外面
  type:null,//标签模板
  lableType:null//标签类型
})


@@ -137,6 +146,16 @@
const printContent = ref({
  id: 'child',

})



const printContentLabel = ref({
  id: 'childLabel',
})

const printContentLabelSemi = ref({
  id: 'childLabelSemi',
})

//打印类型
@@ -235,7 +254,7 @@
      title: t('order.orderId'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,width: 120
    },
    {
      field: 'process_id',
@@ -243,36 +262,39 @@
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,width: 140
    },
    {
      field: 'customer_name',
      title: t('customer.customerName'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,width: 120
    },
    {
      field: 'project',
      title:  t('order.project'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,width: 120
    },
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
    {field: 'glass_address', title: t('processCard.glassAddress'),},
    {field: 'quantity', title:  t('order.quantity'),},
    {field: 'total_area', title:  t('order.area'),},
    {field: 'product_name', title: t('order.product'),},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
    {field: 'founder', title: t('processCard.founder'),},
    {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",width: 90},
    {field: 'glass_address', title: t('processCard.glassAddress'),width: 90},
    {field: 'quantity', title:  t('order.quantity'),width: 90},
    {field: 'total_area', title:  t('order.area'),width: 90},
    {field: 'product_name', title: t('order.product'),width: 120},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),width: 120,filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
    {field: 'founder', title: t('processCard.founder'),width: 120},
    {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),width: 120},
    {field: 'process', title: t('craft.process'),filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,width: 160},
    {
      field: 'print_status',
      title: t('processCard.printStatus'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,width: 120
    },
  ],//表头按钮

@@ -429,13 +451,25 @@
          }

          if (lableTypes==1){
            router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})

            labelRow.value.list=JSON.stringify(selectRecords)
            labelRow.value.faceOrientation=faceOrientation
            labelRow.value.type=type
            labelRow.value.lableType= lableTypes
            dialogTableVisibleLabel.value=true
            //router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})

          }
          else if (lableTypes==2) {
            router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})
            labelRow.value.list=JSON.stringify(selectRecords)
            labelRow.value.faceOrientation=faceOrientation
            labelRow.value.type=type
            labelRow.value.lableType= lableTypes
            dialogTableVisibleCustomLabel.value=true
            //router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})

          }else if (lableTypes==3) {
          }else
            if (lableTypes==3) {
            router.push({path: '/main/processCard/PrintLabel1', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes,  printList: JSON.stringify(selectRecords)}})

          }
@@ -446,6 +480,10 @@
        case 'printLike': {
          if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
            return
          }
          if(printMerge.value===null ||printMerge.value===''){
            ElMessage.warning('请填入需要合并的层')
            return
          }

@@ -540,8 +578,7 @@
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="600px"
        max-height="100%"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"

@@ -584,6 +621,7 @@


    </vxe-grid>
<!--  流程卡打印  -->
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
@@ -593,28 +631,51 @@
      <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" :printLike="printRow.like"
                    style="width: 100%;height: 100%" />
      <print-process
          id="child"
          :printList="printRow.list"
          :printMerge="printRow.printMergeVal"
          :printLike="printRow.like"
          style="width: 100%;height: 100%" />
    </el-dialog>

<!--    成品标签-->
    <el-dialog
        id="sizeCustom"
        v-model="dialogTableVisibleLabel"
        destroy-on-close
        :title="$t('processCard.printLabel')"
        style="width: 80%;height:75% ">
      <PrintLabel :printList="selectRecords"
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel"   :icon="Printer" circle />
      </template>
      <print-custom-label id="childLabel"
                          :list="labelRow.list"
                          :faceOrientation="labelRow.faceOrientation"
                          :type="labelRow.type"
                          :lableType="labelRow.lableType"
                  style="width: 100%;height: 100%" />
    </el-dialog>

<!--   小片标签 -->
    <el-dialog
        id="sizeCustomSemi"
        v-model="dialogTableVisibleCustomLabel"
        destroy-on-close
        :title="$t('processCard.labelStyle')"
        style="width: 80%;height:75% ">
      <PrintLabel :printList="selectRecords"
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabelSemi"   :icon="Printer" circle />
      </template>
      <print-custom-label-semi id="childLabelSemi"
                               :list="labelRow.list"
                               :faceOrientation="labelRow.faceOrientation"
                               :type="labelRow.type"
                               :lableType="labelRow.lableType"
                  style="width: 100%;height: 100%" />
    </el-dialog>

<!--    排序-->
    <el-dialog
        id="sizeCheck"
        v-model="printVisible"
@@ -646,4 +707,16 @@
  overflow-y: auto;
}

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

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

</style>