From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index cfeb275..19d0e8b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -7,8 +7,11 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
+import useUserInfoStore from '@/stores/userInfo'
+
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
let router=useRouter()
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
@@ -123,11 +126,11 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
- {field: 'basic_type',width: 370, title: '绫诲瀷', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'basic_name', width: 330,title: '鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'd_basic_name',width: 330, title: '绫诲埆'},
+ {title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
+ {field: 'id', width: 60, title: t('productionBasicData.id'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
+ {field: 'basic_type',width: 370, title: t('machine.type'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'basic_name', width: 330,title: t('orderBasicData.name'), filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'd_basic_name',width: 330, title: t('productionBasicData.basicName')},
],
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -204,8 +207,14 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
+<!-- <el-button @click="getTableRow(row,'edit');" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>-->
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('selectProductionBasicData.edit') > -1"
+ link
+ type="primary"
+ size="small">
+ {{ $t('basicData.edit') }}
+ </el-button>
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
@@ -224,10 +233,10 @@
</vxe-grid>
- <el-dialog v-model="dialogTableVisible" title="鍩虹鏁版嵁淇敼">
+ <el-dialog v-model="dialogTableVisible" :title="$t('productionBasicData.basicDataEdit')">
<el-row>
<el-col :span="2">
- <el-text>id锛�</el-text>
+ <el-text>{{$t('productionBasicData.id')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-input v-model="getBasicData.id" readonly autocomplete="off" style="width: 220px"/>
@@ -235,7 +244,7 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>绫诲瀷锛�</el-text>
+ <el-text>{{$t('machine.type')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-input v-model="getBasicData.basic_type" readonly autocomplete="off" style="width: 220px"/>
@@ -243,7 +252,7 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>鍚嶇О锛�</el-text>
+ <el-text>{{$t('orderBasicData.name')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-input v-model="getBasicData.basic_name" autocomplete="off" style="width: 220px"/>
@@ -251,7 +260,7 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>绫诲埆锛�</el-text>
+ <el-text>{{$t('productionBasicData.basicName')}}锛�</el-text>
</el-col>
<el-col :span="3">
<!-- <el-input v-model="getBasicData.d_basic_name" autocomplete="off" style="width: 220px"/>-->
@@ -269,9 +278,9 @@
<template #footer>
<span class="dialog-footer">
- <el-button @click="dialogTableVisible = false">鍙栨秷</el-button>
+ <el-button @click="dialogTableVisible = false">{{$t('basicData.cancelButtonText')}}</el-button>
<el-button type="primary" @click="updateBasic">
- 淇敼
+ {{$t('basicData.update')}}
</el-button>
</span>
</template>
--
Gitblit v1.8.0