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

廖井涛

86 分钟以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -1,5 +1,5 @@
<script lang="ts" setup>
import {onMounted, reactive, ref} from "vue";
import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
@@ -13,26 +13,26 @@
import {Printer} from "@element-plus/icons-vue/global";
import companyInfo from "@/stores/sd/companyInfo"
import {remove} from "xe-utils";
import PrintCustomLabelProject from "@/components/pp/PrintCustomLabelProject.vue";
import PrintProcess from "@/components/pp/PrintProcess.vue";
import PrintProcessStraight from "@/components/pp/PrintProcessStraight.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo"

//语言获取
const {t} = useI18n()

let router = useRouter()
const dialogTableVisible = ref(false)
const dialogTableVisibleLabelXJTwo = ref(false)
const dialogTableVisibleLabelProject = ref(false)
const dialogTableVisibleStraight = ref(false)
let rowClickIndex = ref(null)
let lastList = ref([])
const orderInfo = useOrderInfoStore()

const tags = ref([])

const tagType=ref()

//定义数据返回结果
let produceList = ref([])
let titleStyleVisible = ref(false)
let print = ref("1")


let printStyle = ref("1")

//标签
let labelRow = ref({
@@ -41,12 +41,17 @@
  type: "",//标签模板
  lableType: null,//标签类型
  dataType: 0,//标签类型
  projectNo:null,
  detailType:0//是否是工程明细打印
  projectNo:null
})
const company = companyInfo()
let name=company.companyName
let hidePrintLabels = company.printLabel.hideButton;

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

const form = reactive({
  date1: '',
@@ -54,59 +59,22 @@
  project: ''
})

const tag = ref({
  id:null,
  name:null,
  type:1,
  tagWidth:null,
  tagHeight:null,
  value:null,
  size:null

//打印
let printRow = ref({
  list: null,
  printMergeVal: null,
  like: null,
  project:null,
  merge: null,
  flashback:null,
  compound:null,
  landingSequence:null,
})

onMounted(async  () => {
  await getTags();
  await   hiprint.init();
})
let hiprintTemplate = ref()
const changeTag = () => {
  hiprintTemplate.value = new hiprint.PrintTemplate({});
  const json = JSON.parse(tag.value.value)
  hiprintTemplate.value.update(json)
}
const getTableRow = (row, type) => {
  switch (type) {
    case 'edit' :{
      if(parseInt(print.value)==1){
        if (name.indexOf('吉利玻璃')!=-1){
          router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
        }
        else {
          if (tag.value.name==null || tag.value.name==''){
            ElMessage.warning(t('请选择标签模板'))
            return
          }
          let name=company.companyName
          labelRow.value.list = JSON.stringify([row])
          if (name == '金华福喜天成玻璃有限公司'){
            labelRow.value.type = tag.value.name
            labelRow.value.dataType=3
            labelRow.value.lableType = 1
            labelRow.value.switch=true
            labelRow.value.detailType=1
            lastList.value = []
            dialogTableVisibleLabelProject.value = true
          }
          else {
            labelRow.value.type = '恒鑫带数量'
            labelRow.value.dataType=3
            dialogTableVisibleLabelXJTwo.value = true
          }
        }


          return
        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 }})
      }
@@ -114,8 +82,28 @@
      break
    }
    case 'edit1' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
      if(parseInt(print.value)==1){
        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,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{
        dialogTableVisible.value = true
      }
    }
  }
}
@@ -153,26 +141,22 @@
}

//第一次加载获取近七天时间和默认状态
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
  orderInfo.workOrderDate=getNowTime()
}
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
let orderId=form.orderId
let project=form.project

const getTags = () => {
  request.get('tagStyle/getTagList').then(res => {
    tags.value = res.data
  })
}

//第一次加载数据

request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {

  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')}
@@ -189,6 +173,7 @@
      gridOptions.toolbarConfig.buttons.push(button2)

    }
    orderInfo.workOrderDate = res.data.selectDate
    produceList.value = deepClone(res.data.data)
    xGrid.value.reloadData(produceList.value)
    gridOptions.loading = false
@@ -203,9 +188,9 @@
  let startTime = form.date1[0]
  let endTime = form.date1[1]

  request.post(`/processCard/selectPrintPrintProject/${startTime}/${endTime}`, filterData.value).then((res) => {
  request.post(`/processCard/selectPrintPrintProject/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
    if (res.code == 200) {

      orderInfo.workOrderDate = res.data.selectDate
      xGrid.value.loadData(res.data.data)
      gridOptions.loading = false
    } else {
@@ -234,7 +219,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
                    // remote: true
    // remote: true
  },
  customConfig: {
    storage: true
@@ -248,11 +233,32 @@
  //表头参数
  columns: [
    {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
    {title: t('basicData.operate'), width: 120, slots: { default: 'button_slot' },fixed:"left"},
    {title: t('basicData.operate'), width: 240, slots: { default: 'button_slot' },fixed:"left"},
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {
      field: 'project_no',
      title: t('ingredientsStock.projectNo'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    // {
    //   field: 'order_id',
    //   title: t('order.orderId'),
    //   filters: [{data: ''}],
    //   slots: {filter: 'num1_filter'},
    //   filterMethod: filterChanged
    // },
    {
      field: 'glass_thickness',
      title: t('order.totalThickness'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'glass_type',
      title: t('ingredients.films'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
@@ -271,13 +277,21 @@
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'labelPrintNum',
      title: t('processCard.numberLabelPrintingOperations')
    },
    {
      field: 'processPrintNum',
      title: t('processCard.numberTimesProcessCardPrinted')
    },
  ],//表头按钮

  toolbarConfig: {
    buttons: [
    ],
    slots:{
      buttons: "toolbar_buttons"
      buttons: "toolbar_buttons",
    },
    zoom: true,
    custom: true
@@ -290,7 +304,7 @@
        if (columnIndex === 0) {
          return t('basicData.total')
        }
        const List = ["quantity",'area',]
        const List = ["glass_total","glass_total_area","labelPrintNum",'processPrintNum',]
        if (List.includes(column.field)) {
          return footSum(data, column.field)
        }
@@ -345,17 +359,36 @@
  id: 'childLabel',
})

const printObjectProcess = () => {
  hiprintTemplate.value.print(lastList.value)
const hideButton = () => {
  let name=company.companyName
  // 根据条件值 hidePrintLabels 过滤按钮数组
  gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
    // 这里根据 hidePrintLabels 的值决定是否隐藏 printLabel 和 printLabel2
    if (name == '金华福喜天成玻璃有限公司') {
      return button.code !== 'printLabel';
    }
  })
}
const printContent = ref({
  id: 'child',

})
const printCount = ()=>{
  request.post(`/processCard/updateProjectProcessPrintCount/${printRow.value.project}`).then((res) => {
    if(res.code==='200'){
      ElMessage.info(t('order.printingNumber')+':'+res.data)
      getWorkOrder()
    }
  })
}

</script>

<template>
  <div class="main-div-customer">
    <div id="selectForm">
      <el-row :gutter="0">
  <div  style="width: 100%;height: 100%">
    <div class="head">
        <el-date-picker
            v-model="form.date1"
            v-model="orderInfo.workOrderDate"
            :start-placeholder="$t('basicData.startDate')"
            :end-placeholder="$t('basicData.endDate')"
            format="YYYY/MM/DD"
@@ -370,74 +403,81 @@
            :icon="Search"
            type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
        </el-button>
        &nbsp;&nbsp;
        &nbsp;&nbsp;
        <el-row v-if="name.indexOf('吉利玻璃')==-1">
          标签模板：
          <el-select v-model="tag" @change="changeTag" placeholder="标签模板列表" style="width: 140px" >
            <el-option
                v-for="(tag,index) in tags"
                :key="index"
                :label="tag.name"
                :value="tag"
            />
          </el-select>
        </el-row>
      </el-row>
      <el-row>

      </el-row>
      <div>

      </div>
    </div>
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <!--      下拉显示所有信息插槽-->
      <template #content="{ row }">
        <ul class="expand-wrapper">
          <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
            <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
            <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
            <span v-else>{{ row[item.field] }}</span>
    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          class="mytable-scrollbar"
          height="100%"
          v-bind="gridOptions"
          v-on="gridEvents"
      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
        <!--      下拉显示所有信息插槽-->
        <template #content="{ row }">
          <ul class="expand-wrapper">
            <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
              <span style="font-weight: bold">{{ item.title + ':  ' }}</span>
              <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
              <span v-else>{{ row[item.field] }}</span>

          </li>
        </ul>
      </template>
      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button v-if="name.indexOf('吉利玻璃')!=-1" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
        <el-button v-else @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
        <el-button v-if="name.indexOf('吉利玻璃')!=-1" @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
      </template>
            </li>
          </ul>
        </template>
        <!--左边固定显示的插槽-->
        <template #button_slot="{ row }">
          <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('machine.cutting')}}</el-button>
          <el-button @click="getTableRow(row,'edit1')" link type="primary" size="small">{{$t('machine.tempering')}}</el-button>
          <el-button @click="getTableRow(row,'edit2')" link type="primary" size="small">{{$t('components.finishedProduct')}}</el-button>
          <el-button @click="getTableRow(row,'edit3')" link type="primary" size="small">{{$t('流程卡')}}</el-button>
        </template>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data" type="text"
                   @keyup.enter.native="$panel.confirmFilter()"
                   @input="changeFilterEvent($event, option, $panel)"/>
        <template #num1_filter="{ column, $panel }">
          <div>
            <div v-for="(option, index) in column.filters" :key="index">
              <input v-model="option.data" type="text"
                     @keyup.enter.native="$panel.confirmFilter()"
                     @input="changeFilterEvent($event, option, $panel)"/>
            </div>
          </div>
        </div>
      </template>
        </template>

      <template #toolbar_buttons>
        <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>
        <template #toolbar_buttons="{ $grid }">
          <vxe-select @change="changeOrderType" v-model="printStyle" >
            <vxe-option value="1" :label="t('processCard.print1')"></vxe-option>
            <vxe-option value="2" :label="t('processCard.print2')"></vxe-option>
          </vxe-select>
          &nbsp;&nbsp;
<!--          <el-button
              v-if="hidePrintLabels=='true'"
              type="primary"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
          >
            {{ t('processCard.finishedProductPrinting2') }}
          </el-button>-->
          &nbsp;&nbsp;
          <el-button
              v-if="hidePrintLabels=='true'"
              type="primary"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'detailPrinting' })"
          >
            {{ t('processCard.detailPrinting') }}
          </el-button>
        </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>




    </vxe-grid>

      </vxe-grid>
    </div>
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
@@ -455,7 +495,9 @@
        destroy-on-close
        style="width: 80%;height:75%;overflow: auto ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContentLabel" :icon="Printer" circle/>
        <el-button
            v-print="printContentLabel"
            :icon="Printer" circle/>
      </template>
      <print-custom-label-x-j-two id="childLabel"
                                  :faceOrientation="labelRow.faceOrientation"
@@ -465,28 +507,48 @@
                                  style="width: 100%;height: 100%"/>
    </el-dialog>

    <!--    成品标签工程打印-->
    <el-dialog
        id="sizeCustom"
        v-model="dialogTableVisibleLabelProject"
        :title="$t('processCard.printLabel')"
        id="sizePrintCalrd"
        v-model="dialogTableVisible"
        :title="$t('processCard.print')"
        destroy-on-close
        style="width: 80%;height:75% ">
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button @click="printObjectProcess" :icon="Printer" circle/>
        <el-button
            v-print="printContent"
            @click="printCount"
            :icon="Printer" circle />
      </template>
      <print-custom-label-project id="childLabel"
      <print-process
          id="child"
          :printLike="printRow.like"
          :printList="printRow.list"
          :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>

                                  :lastList = 'lastList'
                                  :faceOrientation="labelRow.faceOrientation"
                                  :lableType="labelRow.lableType"
                                  :list="labelRow.list"
                                  :type="labelRow.type"
                                  :titleList="labelRow.titleList"
                                  :switch="labelRow.switch"
                                  :detailType="labelRow.detailType"

                                  style="width: 100%;height: 100%"/>
    <el-dialog
        id="sizePrintCalrd"
        v-model="dialogTableVisibleStraight"
        :title="$t('processCard.print')"
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-process-straight
          id="child"
          :printLike="printRow.like"
          :printList="printRow.list"
          :printMerge="printRow.printMergeVal"
          :printProject="printRow.project"
          :merges="printRow.merge"
          style="width: 100%;height: 100%"/>
    </el-dialog>
  </div>
</template>
@@ -494,16 +556,25 @@


<style scoped>
.main-div-customer {
  width: 99%;
  height: 93%;
.head{
  width: 100%;
  height: 35px;
}
#selectForm {
  width: 50%;

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
:deep(#titleStyle .el-dialog__body){
  height: 90%;
  width: 100%;
}

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


</style>