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

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

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

@@ -10,6 +10,7 @@
import {VXETable} from "vxe-table";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintProcess.vue'
import PrintProcessStraight from '@/components/pp/PrintProcessStraight.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
import PrintCustomLabel from '@/components/pp/PrintCustomLabel.vue'
import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelXJ.vue'
@@ -21,6 +22,9 @@
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import TagStyleDesigner from "@/components/pp/TagStyleDesigner.vue";
import useUserInfoStore from "@/stores/userInfo";
import { ElCheckbox } from 'element-plus'


const company = companyInfo()
const userStore = useUserInfoStore()
const userId = userStore.user.userId
@@ -33,6 +37,7 @@
const dialogTableVisibleLabel = ref(false)
const dialogTableVisibleLabelXJ = ref(false)
const dialogTableVisibleCustomLabel = ref(false)
const dialogTableVisibleStraight = ref(false)
const printVisible = ref(false)
let selectRecords = ref(null)
let titleStyleVisible = ref(false)
@@ -59,7 +64,12 @@
let printRow = ref({
  list: null,
  printMergeVal: null,
  like: null
  like: null,
  merge: null,
  printFc:null,
  flashback:null,
  landingSequence:null,
  compound:null
})

//标签
@@ -70,6 +80,12 @@
  lableType: null//标签类型
})

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

const getTableRow = (row, type) => {
  switch (type) {
@@ -144,6 +160,7 @@
  },
]
let hidePrintLabels = company.printLabel.hideButton;
let btnType = company.printBtn;

if (hidePrintLabels == 'true') {
  filteredOptions = lableTypeOptions.filter((option, index) => index !== 2);
@@ -187,7 +204,9 @@
let orderId = route.query.orderId
data.value.printList = JSON.parse(route.query.printList)

let printFc = route.query.printNumberFc
let inquiryMode = route.query.checkedValue

// 第一次加载查询
request.post(`/processCard/selectPrint/${inquiryMode}`, data.value).then((res) => {

@@ -202,11 +221,9 @@
    titleSelectJson.value.dataType = res.data.type
    xGrid.value.reloadData(newDataCollection)
    gridOptions.loading = false
    if (userId!='admin'){
      gridOptions.toolbarConfig.buttons[5].visible=false
    }

    hideButton()

    hideHead()
  } else {
    ElMessage.warning(res.msg)
  }
@@ -230,6 +247,7 @@


const gridOptions = reactive({
  toolbar: true,
  loading: true,
  border: "full",//表格加边框
  keepSource: true,//保持源数据
@@ -298,15 +316,19 @@
      field: 'technology_number',
      title: t('processCard.technologyNumber'),
      showOverflow: "ellipsis",
      width: 110,
      width: 120,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged,
      sortable: true
    },
    {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: 'product_name', title: t('order.product'), width: 120,
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged},
    {
      field: 'glass_child',
      title: t('reportingWorks.glassChild'),
@@ -332,14 +354,15 @@
  ],//表头按钮

  toolbarConfig: {
    slots:{
      buttons: "toolbar_buttons"
    },
    buttons: [
      {code: 'print', name: t('processCard.print'), status: 'primary'},
      {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      {code: 'sortTable', name: "排序汇总", status: 'primary'},
      // {code: 'printTest', name: "测试打印", status: 'primary'},
      // {code: 'printLike', name: "同配置打印", status: 'primary'},
      // {code: 'print', name: t('processCard.print'), status: 'primary'},
      // {code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
      // {code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
      // {code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
      // {code: 'sortTable', name: t('processCard.sortSummary'), status: 'primary'},
    ],
    // import: false,
    // export: true,
@@ -380,6 +403,7 @@
    let lableTitle = lableType.text
    if ($grid) {
      switch (code) {
        //打印流程卡
        case 'print': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -397,11 +421,21 @@
          printRow.value.list = JSON.stringify(selectRecords)
          printRow.value.printMergeVal = printMerge.value
          printRow.value.like = null
          printRow.value.merge = company.flowCardMerge
          printRow.value.printFc= printFc
          printRow.value.flashback = flashback.value
          printRow.value.landingSequence=landingSequence.value
          printRow.value.compound = compound.value
          // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogTableVisible.value = true
          if(company.companyName=='常州市吉利玻璃有限公司'){
            dialogTableVisibleStraight.value = true
          }else{
            dialogTableVisible.value = true
          }

          break
        }

        //标签打印
        case 'printLabel': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -416,10 +450,14 @@
              id += selectRecords[i].id + "|"
            }
          }
          router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
          router.push({
            path: '/main/processCard/PrintLabel',
            query: {printList: JSON.stringify(selectRecords),printType:1}
          })

          break
        }
        //标签打印2
        case 'printLabel2': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -436,11 +474,12 @@
          }
          router.push({
            path: '/main/processCard/PrintCustomLabelSemi2',
            query: {printList: JSON.stringify(selectRecords)}
            query: {printList: JSON.stringify(selectRecords),printType:1}
          })

          break
        }
        //排序汇总
        case 'sort': {
          const $table = xGridDetail.value
          let data = $table.getTableData().fullData
@@ -469,6 +508,7 @@
          })
          break
        }
        //自定义打印
        case 'customLabel': {
          if (selectRecords === null || selectRecords === '' || selectRecords.length === 0) {
            ElMessage.warning(t('searchOrder.msgList.checkOrder'))
@@ -487,6 +527,7 @@
              id += selectRecords[i].id + "|"
            }
          }
          //成品标签1
          if (lableTypes == 1) {

            labelRow.value.list = JSON.stringify(selectRecords)
@@ -501,44 +542,55 @@
                dialogTableVisibleLabel.value = true
              }

            } else if (company.label === 2) {
            }
            //常州项目
            else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabelCZ',
                query: {
                  type: type,
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords)
                  printList: JSON.stringify(selectRecords),
                  printType:1
                }
              })
            }

          } else if (lableTypes == 2) {
          }
          //成品标签2
          else if (lableTypes == 2) {
            labelRow.value.list = JSON.stringify(selectRecords)
            labelRow.value.faceOrientation = faceOrientation
            labelRow.value.type = type
            labelRow.value.lableType = lableTypes
            if (company.label === 1) {
              dialogTableVisibleCustomLabel.value = true
            } else if (company.label === 2) {
            }
            //常州项目
            else if (company.label === 2) {
              router.push({
                path: '/main/processCard/PrintCustomLabelSemiCZ',
                query: {
                  type: type,
                  faceOrientation: faceOrientation,
                  lableType: lableTypes,
                  printList: JSON.stringify(selectRecords)
                  printList: JSON.stringify(selectRecords),
                  printType:1
                }
              })
            }
          } else if (lableTypes == 3) {
          }
          //成品标签3 常州项目
          else if (lableTypes == 3) {
            router.push({
              path: '/main/processCard/PrintLabel1',
              query: {
                type: type,
                faceOrientation: faceOrientation,
                lableType: lableTypes,
                printList: JSON.stringify(selectRecords)
                printList: JSON.stringify(selectRecords),
                printType:1
              }
            })

@@ -553,7 +605,7 @@
            return
          }
          if (printMerge.value === null || printMerge.value === '') {
            ElMessage.warning('请填入需要合并的层')
            ElMessage.warning(t('rework.msg1'))
            return
          }

@@ -569,7 +621,11 @@
          printRow.value.printMergeVal = printMerge.value
          printRow.value.like = "1"
          // router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
          dialogTableVisible.value = true
          if(company.companyName=='常州市吉利玻璃有限公司'){
            dialogTableVisibleStraight.value = true
          }else{
            dialogTableVisible.value = true
          }
          break
        }
        case 'sortTable': {
@@ -617,18 +673,29 @@
  addListener(xGridDetail.value, detailGridOptions)
}

const hideButton = () => {
  // 根据条件值 hidePrintLabels 过滤按钮数组
  gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
    // 这里根据 hidePrintLabels 的值决定是否隐藏 printLabel 和 printLabel2
    if (hidePrintLabels == 'true') {
      return button.code !== 'printLabel' && button.code !== 'printLabel2';
    } else {
      return true && button.code !== 'printLike'; // 显示该按钮
    }
  })

//判断某个按钮 code 是否要显示
function isButtonVisible(code) {
  // 如果要隐藏 printLabel/printLabel2
  if (hidePrintLabels && (code === 'printLabel' || code === 'printLabel2')) {
    return false
  }
  // 如果 btnType 为 1，要隐藏 customLabel
  if (btnType === 1 && code === 'customLabel') {
    return false
  }
  return true
}

const hideHead = () => {
  // 判断 btnType 是否等于 '1' (可以根据需要调整为数字 1)
  if (btnType == 1) {
    const headDiv = document.querySelector('.head');
    if (headDiv) {
      headDiv.style.display = 'none'; // 隐藏 class="head" 的 div
    }
  }
}

// 监听打印完成事件
const printNumber = () => {
@@ -645,88 +712,171 @@
  })
}

function onFlashbackChange(checked) {
  flashback.value = checked ? 0 : 1
}

function onlandingSequenceChange(checked) {
  landingSequence.value = checked ? 0 : 1
}
</script>

<template>
  <div class="main-div-customer">
    <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
              style="width: 90px"></el-input>
    &nbsp;
    <label>{{ $t('processCard.labelStyle') }}：</label>
    <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
               style="width: 120px">
      <el-option
          v-for="item in titleSelectJson['dataType']"
          :key="item.id"
          :label="item.name"
          :value="item.name"
      />
    </el-select>
    &nbsp;
    <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
      <el-option
          v-for="item in filteredOptions"
          :key="item.value"
          :label="item.label"
          :value="item.value"
      />
    </el-select>
    &nbsp;
    <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
               filterable style="width: 140px">
      <el-option
          v-for="item in stateOptions"
          :key="item.value"
          :label="item.label"
          :value="item.value"
      />
    </el-select>
    <vxe-grid
        ref="xGrid"
        class="mytable-scrollbar"
        height="100%"
        v-bind="gridOptions"
        v-on="gridEvents"
  <div  style="width: 100%;height: 100%">
    <div class="head">
      <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable
                style="width: 90px"></el-input>
      &nbsp;
      <label>{{ $t('processCard.labelStyle') }}：</label>
      <el-select v-model="printType" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
                 style="width: 120px">
        <el-option
            v-for="item in titleSelectJson['dataType']"
            :key="item.id"
            :label="item.name"
            :value="item.name"
        />
      </el-select>
      &nbsp;
      <el-select v-model="lableType" :placeholder="lableTypeOptions[0].label" class="m-2" style="width: 140px">
        <el-option
            v-for="item in filteredOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
        />
      </el-select>
      &nbsp;
      <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
                 filterable style="width: 140px">
        <el-option
            v-for="item in stateOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
        />
      </el-select>
    </div>

    <div class="main-table">
      <vxe-grid
          ref="xGrid"
          :checkbox-config="{labelField: 'name', highlight: true, range: true}"
          class="mytable-scrollbar"
          height="100%"
          v-bind="gridOptions"
          v-on="gridEvents"

      >
        <!-- 自定义 toolbar_buttons 插槽 -->
        <template #toolbar_buttons="{ $grid }">


    >
      <!--      @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>
          <!-- 手动写出所有按钮 -->
          <el-button
              v-if="isButtonVisible('print')"
              type="primary"
              style="margin-right:8px;"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'print' })"
          >
            {{ t('processCard.print') }}
          </el-button>

          </li>
        </ul>
      </template>
          <el-button
              v-if="isButtonVisible('customLabel')"
              type="primary"
              style="margin-right:8px;"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'customLabel' })"
          >
            {{ t('processCard.customLabelPrinting') }}
          </el-button>

      <!--左边固定显示的插槽-->
      <!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
      <template #button_slot="{ row }">
        <el-button link
                   size="small"
                   type="primary"
                   @click="getTableRow(row,'edit')">
          {{ $t('basicData.edit') }}
        </el-button>
          <el-button
              v-if="isButtonVisible('printLabel')"
              type="primary"
              style="margin-right:8px;"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel' })"
          >
            {{ t('processCard.labelPrinting') }}
          </el-button>

      </template>
          <el-button
              v-if="isButtonVisible('printLabel2')"
              type="primary"
              style="margin-right:8px;"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'printLabel2' })"
          >
            {{ t('processCard.labelPrinting2') }}
          </el-button>

      <template #num1_filter="{ column, $panel }">
        <div>
          <div v-for="(option, index) in column.filters" :key="index">
            <input v-model="option.data"
                   type="text"
                   @input="changeFilterEvent($event, option, $panel)"/>
          <el-button
              v-if="isButtonVisible('sortTable')"
              type="primary"
              style="margin-right:8px;"
              @click="$grid.dispatchEvent('toolbar-button-click', { code: 'sortTable' })"
          >
            {{ t('processCard.sortSummary') }}
          </el-button>

          <el-checkbox
              :model-value="flashback === 0"
              @change="onFlashbackChange"
          >
            {{ t('processCard.flashback') }}
          </el-checkbox>
          <el-checkbox
              :model-value="landingSequence === 0"
              @change="onlandingSequenceChange"
          >
            {{ t('processCard.landingSequence') }}
          </el-checkbox>
          <el-input
              v-model="compound"
              :placeholder="$t('processCard.printCompound')"
              clearable
              style="margin-left:20px; width: 110px;"
          />

        </template>
        <!--      @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>

        <!--左边固定显示的插槽-->
        <!--      v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
        <template #button_slot="{ row }">
          <el-button link
                     size="small"
                     type="primary"
                     @click="getTableRow(row,'edit')">
            {{ $t('basicData.edit') }}
          </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)"/>
            </div>
          </div>
        </div>
      </template>
        </template>


    </vxe-grid>
      </vxe-grid>
    </div>
    <!--  流程卡打印  -->
    <el-dialog
        id="sizePrintCalrd"
@@ -742,6 +892,29 @@
          :printLike="printRow.like"
          :printList="printRow.list"
          :printMerge="printRow.printMergeVal"
          :printFc="printRow.printFc"
          :merges="printRow.merge"
          :flashback = "printRow.flashback"
          :landingSequence = "printRow.landingSequence"
          :compound = "printRow.compound"
          style="width: 100%;height: 100%"/>
    </el-dialog>

    <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"
          :merges="printRow.merge"
          style="width: 100%;height: 100%"/>
    </el-dialog>

@@ -763,7 +936,7 @@
                          style="width: 100%;height: 100%"/>
    </el-dialog>

    <!--    成品标签新疆-->
    <!--    成品标签两列-->
    <el-dialog
        id="sizeCustom"
        v-model="dialogTableVisibleLabelXJ"
@@ -813,12 +986,13 @@
    <el-dialog
        id="sizeCheck"
        v-model="dialogSortTable"
        title="排序汇总"
        :title="$t('processCard.sortSummary')"
        destroy-on-close
        style="width: 80%;height:75% ">
      <select-sort-table id="child" :orderId="tableRow.orderId"/>
    </el-dialog>

<!--   标签样式    -->
    <el-dialog
        id="titleStyle"
        :title="$t('processCard.labelStyle')"
@@ -837,9 +1011,15 @@
</template>

<style scoped>
.main-div-customer {
  width: 99%;
  height: 92%;

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}