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 | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 8d56876..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
@@ -59,6 +59,10 @@
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
+ }
}
}
@@ -83,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)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -111,12 +115,17 @@
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)
}
@@ -165,7 +174,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -179,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',
@@ -243,7 +252,7 @@
}
case 'printLabel': {
if(rowClickIndex.value===null){
- ElMessage.warning(t('璇烽�夋嫨宸ョ▼'))
+ ElMessage.warning(t('processCard.pleaseSelectProject'))
return
}
labelRow.value.type = '鎭掗懌'
@@ -256,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}})
@@ -276,7 +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>
@@ -324,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 }">
--
Gitblit v1.8.0