From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index 822e7cd..3da9010 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -12,6 +12,7 @@
import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
import {Printer} from "@element-plus/icons-vue/global";
import companyInfo from "@/stores/sd/companyInfo"
+import {remove} from "xe-utils";
//璇█鑾峰彇
const {t} = useI18n()
@@ -24,6 +25,7 @@
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
let titleStyleVisible = ref(false)
+let print = ref("1")
//鏍囩
let labelRow = ref({
@@ -45,11 +47,20 @@
const getTableRow = (row, type) => {
switch (type) {
case 'edit' :{
- router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ if(parseInt(print.value)==1){
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:1 }})
+ }else{
+ router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:1 }})
+ }
+
break
}
case 'edit1' :{
router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
+ break
+ }
+ case 'edit2' :{
+ router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:3 }})
break
}
}
@@ -76,11 +87,11 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 14)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -100,15 +111,23 @@
if (res.code == 200) {
if(hidePrintLabels=="true"){
+ //鍒犻櫎涓嬫媺妗�
+ remove(gridOptions.toolbarConfig.slots)
const button = {'code': 'printLabel',
status: 'primary',
- 'name': "鎴愬搧鎵撳嵃2"}
- gridOptions.toolbarConfig.buttons.push(button)
+ 'name': t('processCard.finishedProductPrinting2')}
+ let name=company.companyName
+ if (name != '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
+ gridOptions.toolbarConfig.buttons.push(button)
+ }
+
+
const button2 = {'code': 'detailPrinting',
status: 'primary',
- 'name': "鏄庣粏鎵撳嵃"}
+ 'name': t('processCard.detailPrinting')}
gridOptions.toolbarConfig.buttons.push(button2)
+
}
produceList.value = deepClone(res.data.data)
xGrid.value.reloadData(produceList.value)
@@ -155,7 +174,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -169,7 +188,7 @@
//琛ㄥご鍙傛暟
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: 140, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'project_no',
@@ -197,7 +216,9 @@
toolbarConfig: {
buttons: [
],
-
+ slots:{
+ buttons: "toolbar_buttons"
+ },
zoom: true,
custom: true
},
@@ -231,7 +252,7 @@
}
case 'printLabel': {
if(rowClickIndex.value===null){
- ElMessage.warning(t('璇烽�夋嫨宸ョ▼'))
+ ElMessage.warning(t('processCard.pleaseSelectProject'))
return
}
labelRow.value.type = '鎭掗懌'
@@ -244,7 +265,7 @@
}
case 'detailPrinting': {
if(rowClickIndex.value===null){
- ElMessage.warning(t('璇烽�夋嫨宸ョ▼'))
+ ElMessage.warning(t('processCard.pleaseSelectProject'))
return
}
router.push({path: '/main/processCard/PrintProjectDetails', query: {projectNo: rowClickIndex.value.project_no}})
@@ -264,6 +285,16 @@
id: 'childLabel',
})
+const hideButton = () => {
+ let name=company.companyName
+ // 鏍规嵁鏉′欢鍊� hidePrintLabels 杩囨护鎸夐挳鏁扮粍
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ // 杩欓噷鏍规嵁 hidePrintLabels 鐨勫�煎喅瀹氭槸鍚﹂殣钘� printLabel 鍜� printLabel2
+ if (name == '閲戝崕绂忓枩澶╂垚鐜荤拑鏈夐檺鍏徃') {
+ return button.code !== 'printLabel';
+ }
+ })
+}
</script>
<template>
@@ -311,6 +342,7 @@
<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>
</template>
<template #num1_filter="{ column, $panel }">
@@ -322,6 +354,15 @@
</div>
</div>
</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>
+
+
</vxe-grid>
@@ -354,6 +395,8 @@
</div>
</template>
+
+
<style scoped>
.main-div-customer {
width: 99%;
--
Gitblit v1.8.0