From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue | 71 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
index 5105d1f..db29e70 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
@@ -45,11 +45,11 @@
//琛ㄥご鍙傛暟
columns:[
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
- {type: 'seq', title: '搴忓彿', width: 80 ,fixed:"left",},
- {field:'operateTypeName',title: '鍚嶇О'},
- {field:'operateType',title: '鍒О'},
- {field:'type',title: '绫诲瀷'},
- {field:'createTime',title: '鍒涘缓鏃ユ湡'},
+ {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
+ {field:'operateTypeName',title: t('warehouseBasicData.operateTypeName')},
+ {field:'operateType',title: t('warehouseBasicData.operateType')},
+ {field:'type',title: t('warehouseBasicData.type')},
+ {field:'createTime',title: t('basicData.creationTime')},
],
@@ -57,7 +57,7 @@
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '鏂板',status: 'primary'},
+ {'code': 'add', 'name': t('basicData.insert'),status: 'primary'},
],
// import: false,
@@ -107,7 +107,13 @@
}
}
-request.get('/BasicWarehouse/getBasicWarehouse').then(res => {
+const options = ref({
+ originalFilm: t('ingredients.originalFilm'),
+ accessories: t('ingredients.accessories')
+ })
+
+
+request.post(`/BasicWarehouse/getBasicWarehouse`,options.value).then(res => {
if(res.code==='200'){
xGrid.value.reloadData(res.data)
}
@@ -144,7 +150,7 @@
ElMessage.warning(t('searchOrder.msgDeleteFail'))
}
}).catch((err)=>{
- ElMessage.error('绯荤粺閿欒')
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
})
break
@@ -156,27 +162,28 @@
</script>
<template>
- <div>
- <vxe-grid
- style="width: 40vw;"
- class="mytable-scrollbar"
- max-height="500px"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- >
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')"
- v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.edit') > -1"
- link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" title="纭畾鍒犻櫎鏁版嵁锛�">
- <template #reference>
- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
- </template>
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ class="mytable-scrollbar"
+ height="100%"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ >
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.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>
- </vxe-grid>
+ </vxe-grid>
+ </div>
<el-dialog
v-model="dialogTableVisible"
destroy-on-close
@@ -187,5 +194,13 @@
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 70px;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0