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/productionBasicData/SelectProductionBasicData.vue | 117 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 68 insertions(+), 49 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 96c9a64..ec2e63b 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([])
@@ -59,7 +62,6 @@
break
}
case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
break
}
}
@@ -123,11 +125,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: {
@@ -149,7 +151,7 @@
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -181,48 +183,63 @@
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- max-height="100%"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
- >
- <!-- @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>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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>
- </template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <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,'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>
+ </template>
+ </el-popconfirm>
+ </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 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"/>
@@ -230,7 +247,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"/>
@@ -238,7 +255,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"/>
@@ -246,7 +263,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"/>-->
@@ -264,9 +281,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>
@@ -275,11 +292,13 @@
</template>
<style scoped>
-.main-div-customer{
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-.el-row{
- margin: 10px;
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0