From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 211b7a4..7434174 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -5,11 +5,11 @@
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
+import {ArrowLeftBold, Search} from "@element-plus/icons-vue"
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
import { useI18n } from 'vue-i18n'
@@ -171,7 +171,7 @@
{type: 'checkbox', fixed: "left", title: t('basicData.check')},
{
field: 'orderNumber',
- title: t('basicData.check'),
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -288,7 +288,7 @@
},
{
field: 'landingSequence',
- title: t('processCard.technologyNumber'),
+ title: '钀芥灦椤哄簭',
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -668,6 +668,7 @@
ref="xGridLeft"
class="mytable-scrollbar"
max-height="100%"
+ height="650px"
v-bind="gridLeftOptions"
v-on="gridEvents"
>
@@ -722,6 +723,7 @@
ref="xGrid"
class="mytable-scrollbar"
max-height="100%"
+ height="650px"
v-bind="gridOptions"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
--
Gitblit v1.8.0