From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue | 543 ++++++++++++++++++++++++++++-------------------------
1 files changed, 288 insertions(+), 255 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
index 82d5ef7..6c65d39 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
@@ -11,13 +11,14 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import PrintProcess from '@/components/pp/PrintReworkProcess.vue'
import PrintLabel from '@/views/pp/processCard/PrintLabel.vue'
-import PrintCustomLabel from '@/views/pp/processCard/PrintCustomLabel.vue'
import footSum from "@/hook/footSum"
import {Search} from "@element-plus/icons-vue";
import companyInfo from "@/stores/sd/companyInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import SortDetail from "@/components/pp/SelectSortDetailProcessCard.vue";
-
+import PrintCustomLabel from '@/components/pp/PrintReworkCustomLabel.vue'
+import {hiprint} from "vue-plugin-hiprint";
+import {createTemplate} from "@/hook/createTemplateTag";
const company = companyInfo()
//璇█鑾峰彇
const {t} = useI18n()
@@ -31,7 +32,7 @@
const xGrid = ref(null)
const xGridDetail =ref(null)
-
+let hiprintTemplate = ref(null)
const getTableRow = (row,type) =>{
switch (type) {
@@ -46,7 +47,13 @@
}
}
-
+//鏍囩
+let labelRow = ref({
+ list:null,//鍕鹃�夌殑鏁版嵁
+ faceOrientation:null,//鍐呭闈�
+ type:null,//鏍囩妯℃澘
+ lableType:null//鏍囩绫诲瀷
+})
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({
@@ -61,6 +68,73 @@
})
+let lastList = ref([])
+const tags = ref([])
+const tag = ref({
+ id: null,
+ name: null,
+ type: 1,
+ tagWidth: null,
+ tagHeight: null,
+ value: null,
+ size: null
+})
+
+onMounted(async () => {
+ await getTags();
+ await hiprint.init();
+})
+
+const changeTag = () => {
+ hiprintTemplate.value = new hiprint.PrintTemplate({});
+ hiprintTemplate.value.design("#hiprint-printTemplate1",{grid:true});
+ const json = tag.value.value
+ hiprintTemplate.value.update(json)
+}
+
+const getTags = () => {
+ request.get('tagStyle/getTagList').then(res => {
+ res.data.forEach(item => {
+ item.value = JSON.parse(item.value)
+ })
+ tags.value = res.data
+ })
+}
+
+const printOrder = (type) => {
+ const list = tag.value.value
+ list.panels[0].printElements.forEach(element => {
+ element.options.fontFamily = 'Arial'
+ if( element.options.field !== undefined){
+ if(type===3 ){
+ element.options.hideTitle = true
+ }
+ }
+ if(type!==3){
+ element.options.hideTitle = false
+ if( element.options.field === undefined){
+ element.options.hideTitle = true
+ }
+ }
+ })
+
+ //hiprintTemplate.value.update(list)
+ let object = JSON.parse(JSON.stringify(lastList.value))
+ //鍒ゆ柇鏄惁涓鸿〃鏍�
+ let columnsNum = null
+ if(list.panels[0].printElements[0].options.field==='table'){
+ object = {table:lastList.value}
+ columnsNum = (list.panels[0].printElements[0].options.gridColumns || 1)
+ }
+ //鍒ゆ柇鏄惁鏈� 宓屽鑷畾涔夌焊寮�
+ if(tag.value.tagHeight && tag.value.tagWidth){
+ const print =createTemplate(list,object,tag.value.tagWidth,tag.value.tagHeight)
+ hiprintTemplate.value.update(print.template)
+ object = print.printData
+ }
+ hiprintTemplate.value.print(object)
+
+}
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
@@ -189,8 +263,7 @@
let startTime = form.date1[0]
let endTime = form.date1[1]
// 绗竴娆″姞杞芥煡璇�
- request.post(`/Replenish/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {
-
+ request.post(`/rework/selectPrint/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
xGrid.value.loadData(res.data.data)
titleSelectJson.value.dataType = res.data.type
@@ -260,6 +333,7 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
+ ,width:120
},
{
field: 'process_id',
@@ -267,40 +341,62 @@
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,
+ width:130
},
{
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: 'patch_num', title: t('order.quantity'),},
- {field: 'patch_area', title: t('order.area'),},
- {field: 'responsible_team', title: t('reportingWorks.responsibleTeam'),},
- {field: 'responsible_equipment', title: t('reportingWorks.responsibleEquipment'),},
- {field: 'responsible_personnel', title: t('reportingWorks.responsiblePersonnel'),},
- {field: 'patch_type', title: t('reportingWorks.breakageType'),},
- {field: 'patch_reason', title: t('reportingWorks.breakageReason'),},
- {field: 'patch_processes', title: t('reportingWorks.responsibleProcess'),},
- {field: 'product_name', title: t('order.product'),},
- {field: 'glass_child', title: t('reportingWorks.glassChild'),},
+ {
+ field: 'order_number',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width:100
+ },
+ {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",width:90},
+ {
+ field: 'glassNumber',
+ title: t('reportingWorks.glassNumber'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width:100
+ },
+ {field: 'glass_address', title: t('processCard.glassAddress'),width:90},
+ {field: 'rework_num', title: t('order.quantity'),width:70},
+ {field: 'rework_area', title: t('order.area'),width:70},
+ {field: 'rework_team', title: t('reportingWorks.responsibleTeam'),width:90},
+ {field: 'responsible_equipment', title: t('reportingWorks.responsibleEquipment'),width:120},
+ {field: 'responsible_personnel', title: t('rework.responsibilityInformation'),width:100},
+ {field: 'rework_type', title: t('reportingWorks.breakageType'),width:80},
+ {field: 'rework_reason', title: t('reportingWorks.breakageReason'),width:90},
+ {field: 'rework_processes', title: t('reportingWorks.responsibleProcess'),width:80},
+ {field: 'product_name', title: t('order.product'),width:120},
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),width:120},
+ {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},
],//琛ㄥご鎸夐挳
toolbarConfig: {
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'},
],
// import: false,
@@ -408,8 +504,28 @@
ElMessage.warning(t('searchOrder.msgList.checkOrder'))
return
}
- if (type===null||type===''||type===undefined){
- ElMessage.warning(t('processCard.pleaseSelectCustomPrintLabelStyle'))
+ if (tag.value.name == null || tag.value.name == '') {
+ ElMessage.warning(t('replenish.printPatchesMsg1'))
+ return
+ }
+
+ labelRow.value.list = JSON.stringify(selectRecords)
+ labelRow.value.type = tag.value.name
+ labelRow.value.dataType = 3
+ labelRow.value.lableType = 2
+ labelRow.value.switch = true
+ lastList.value = []
+ dialogTableVisibleLabel.value = true
+ break
+
+ }
+ case 'printLike': {
+ if(selectRecords===null ||selectRecords===''||selectRecords.length===0){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ if(printMerge.value===null ||printMerge.value===''){
+ ElMessage.warning(t('rework.msg1'))
return
}
@@ -421,17 +537,11 @@
id += selectRecords[i].id + "|"
}
}
-
- if (lableTypes==1){
- router.push({path: '/main/rework/PrintReworkCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
-
- }
- else {
- router.push({path: '/main/rework/PrintReworkCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})
-
- }
-
-
+ printRow.value.list = JSON.stringify(selectRecords)
+ 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
break
}
}
@@ -441,129 +551,6 @@
-const detailGridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
- keepSource: true,//淇濇寔婧愭暟鎹�
- align: 'center',//鏂囧瓧灞呬腑
- stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
- showFooter: true,//鏄剧ず鑴�
- printConfig: {},
- importConfig: {},
- exportConfig: {},
- scrollX: {enabled: true},
- scrollY: {enabled: true, gt: 0},//寮�鍚櫄鎷熸粴鍔�
- showOverflow: true,
- columnConfig: {
- resizable: true,
- useKey: true
- },
- filterConfig: { //绛涢�夐厤缃」
- // remote: true
- },
- customConfig: {
- storage: true
- },
- editConfig: {
- trigger: 'click',
- mode: 'row',
- showStatus: true
- },//琛ㄥご鍙傛暟
- columns: [
- {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
- {
- field: 'sort',
- width: 80,
- editRender: {name: 'input', attrs: {placeholder: ''}},
- title: t('processCard.sorting'),
- },
- {
- field: 'process_id',
- title: t('processCard.processId'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'order_number',
- title: t('order.OrderNum'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'technology_number',
- title: t('processCard.technologyNumber'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'glass_address',
- title: t('processCard.glassAddress'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'quantity',
- title: t('order.quantity'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_width',
- title: t('order.width'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'child_height',
- title: t('order.height'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'area',
- title: t('order.area'),
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- ],//琛ㄥご鎸夐挳
-
- toolbarConfig: {
- buttons: [
- {code: 'sort', name: t('processCard.sorting'), status: 'primary'},
- ],
- // import: false,
- // export: true,
- //print: true,
- zoom: true,
- custom: true
- },
- data: null,//琛ㄦ牸鏁版嵁
- //鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- return[
- columns.map((column, columnIndex) => {
- if (columnIndex === 0) {
- return t('basicData.total')
- }
- const List = ["quantity",'area',]
- if (List.includes(column.field)) {
- return footSum(data, column.field)
- }
- return ''
- })
- ]
- }
-})
const openedTable = () => {
let detail =ref(produceDetailList.value)
@@ -575,9 +562,9 @@
gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
// 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
if (hidePrintLabels=='true') {
- return button.code !== 'printLabel' && button.code !== 'printLabel2';
+ return button.code !== 'printLabel' && button.code !== 'printLabel2' ;
} else {
- return true; // 涓嶉殣钘忎换浣曟寜閽�
+ return true && button.code !=='printLike'; // 鏄剧ず璇ユ寜閽�
}
})
}
@@ -600,100 +587,103 @@
</script>
<template>
- <div class="main-div-customer">
- <el-date-picker
- v-model="form.date1"
- :default-time="defaultTime"
- :end-placeholder="$t('basicData.endDate')"
- :start-placeholder="$t('basicData.startDate')"
- format="YYYY/MM/DD"
- type="daterange"
- value-format="YYYY-MM-DD"
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-date-picker
+ v-model="form.date1"
+ :end-placeholder="$t('basicData.endDate')"
+ :start-placeholder="$t('basicData.startDate')"
+ format="YYYY/MM/DD"
+ type="daterange"
+ value-format="YYYY-MM-DD"
- />
- <el-button
- id="select"
- :icon="Search"
- type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
-
- </el-button>
-
- <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>
-
- <label>{{$t('processCard.labelStyle')}}锛�</label>
- <el-select v-model="printType" clearable default-value="default_city" :placeholder="$t('processCard.pleaseSelect')" style="width: 120px">
- <el-option
- v-for="item in titleSelectJson['dataType']"
- :key="item.id"
- :label="item.name"
- :value="item.name"
/>
- </el-select>
-
- <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">
- <el-option
- v-for="item in filteredOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
-
- <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.pleaseSelect')" clearable allow-create 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="600px"
- max-height="100%"
- v-bind="gridOptions"
- v-on="gridEvents"
+ <el-button
+ id="select"
+ :icon="Search"
+ type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
+
+ </el-button>
+ <!-- -->
+ <!-- <el-input clearable :placeholder="$t('processCard.mergePrinting')" v-model="printMerge" style="width: 90px"></el-input>-->
+
+ <label>{{$t('processCard.labelStyle')}}锛�</label>
+ <el-select v-model="tag" :placeholder="$t('replenish.listLabelTemplates')" style="width: 140px" @change="changeTag">
+ <el-option
+ v-for="(tag,index) in tags"
+ :key="index"
+ :label="tag.name"
+ :value="tag"
+ />
+ </el-select>
+
+<!-- <el-select v-model="lableType" class="m-2" :placeholder="lableTypeOptions[0].label" style="width: 140px">-->
+<!-- <el-option-->
+<!-- v-for="item in filteredOptions"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- -->
+<!-- <el-select v-model="stateValue" class="m-2" :placeholder="$t('processCard.pleaseSelect')" clearable allow-create 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"
+ 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>
+ >
+ <!-- @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>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')"
- link
- type="primary"
- size="small">
- {{ $t('basicData.edit') }}
- </el-button>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectProductionBasicData.edit') > -1"-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
- </template>
+ </template>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="text"
- v-model="option.data"
- @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="text"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
<el-dialog
id="sizePrintCalrd"
v-model="dialogTableVisible"
@@ -703,18 +693,18 @@
<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"
+ <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
style="width: 100%;height: 100%" />
</el-dialog>
- <el-dialog
- v-model="dialogTableVisibleLabel"
- destroy-on-close
- :title="$t('processCard.printLabel')"
- style="width: 80%;height:75% ">
- <PrintLabel :printList="selectRecords"
- style="width: 100%;height: 100%" />
- </el-dialog>
+<!-- <el-dialog-->
+<!-- v-model="dialogTableVisibleLabel"-->
+<!-- destroy-on-close-->
+<!-- :title="$t('processCard.printLabel')"-->
+<!-- style="width: 80%;height:75% ">-->
+<!-- <PrintLabel :printList="selectRecords"-->
+<!-- style="width: 100%;height: 100%" />-->
+<!-- </el-dialog>-->
<el-dialog
v-model="dialogTableVisibleCustomLabel"
@@ -734,14 +724,57 @@
<sort-detail id="child" :processId="editRow.processId" :technologyNumber="editRow.technologyNumber" />
</el-dialog>
-
+ <el-dialog
+ id="sizeCustom"
+ v-model="dialogTableVisibleLabel"
+ :title="$t('processCard.printLabel')"
+ destroy-on-close
+ style="width: 80%;height:75% ">
+ <template #header="{ close, titleId, titleClass }">
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.yesTitle')"
+ placement="top"
+ >
+ <el-button :icon="Printer" circle @click="printOrder(1)"/>
+ </el-tooltip>
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="$t('processCard.noTitle')"
+ placement="top"
+ >
+ <el-button @click="printOrder(3)">
+ <i class="vxe-icon-print"></i>
+ </el-button>
+ </el-tooltip>
+ </template>
+ <print-custom-label id="childLabel"
+ :detailType="labelRow.detailType"
+ :faceOrientation="labelRow.faceOrientation"
+ :lableType="labelRow.lableType"
+ :lastList='lastList'
+ :list="labelRow.list"
+ :switch="labelRow.switch"
+ :titleList="labelRow.titleList"
+ :type="labelRow.type"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+
+
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
--
Gitblit v1.8.0