From 5e18bf58d03f4b6830afddb92af9079dcc5587e2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 11 三月 2024 09:25:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/plan/customerorder/index.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index 3b0251a..4ba8c0f 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -586,7 +586,7 @@
sort: true,
isTrue: true,
isSearch: true,
- searchInfoType: 'text',
+ searchInfoType: 'date',
formatter: this.formatDutyDate,
},
{
@@ -1036,20 +1036,24 @@
permitArr: [],
})
}
- this.table.toolbar.push({
- text: '涓嬭浇宸ヨ壓鏂囦欢',
- disabled: false,
- type: 'primary',
- fun: this.downloadWord,
- permitArr: ['03plan','04planed'],
- })
- this.table.toolbar.push({
- text: '涓嬭浇鎺掍骇鍗�',
- disabled: false,
- type: 'primary',
- permitArr: [],
- fun: this.downloadProductionScheduling,
- })
+ if(this.permissions.plan_download_process_file){
+ this.table.toolbar.push({
+ text: '涓嬭浇宸ヨ壓鏂囦欢',
+ disabled: false,
+ type: 'primary',
+ fun: this.downloadWord,
+ permitArr: ['03plan','04planed'],
+ })
+ }
+ if(this.permissions.plan_download_product_file){
+ this.table.toolbar.push({
+ text: '涓嬭浇鎺掍骇鍗�',
+ disabled: false,
+ type: 'primary',
+ permitArr: [],
+ fun: this.downloadProductionScheduling,
+ })
+ }
this.table.toolbar.push({
text: '鍏宠仈璁㈠崟',
disabled: false,
@@ -1130,7 +1134,7 @@
this.$message.error("璇烽�夋嫨涓�鏉℃暟鎹�")
return
}
- downloadProduct({ids: ids}).then(res=>{
+ downloadProduct(ids).then(res=>{
if(res.status===200){
transform(res)
}
--
Gitblit v1.9.3