From a944fc9a5bfaac1e2367f6ce398f09eafbcb53a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 19 六月 2024 10:01:18 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 3e96af6..8fff03d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -4,15 +4,19 @@
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import footSum from "@/hook/footSum"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
import {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";
let productGlassTypeStore = useProductGlassTypeStore()
+const { t } = useI18n()
+const userStore = useUserInfoStore()
let router = useRouter()
let props = defineProps({
rowIndex:{}
@@ -132,17 +136,19 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'order_id', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
- {field: 'process_id', width: 140, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'order_number', title: '璁㈠崟搴忓彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'technology_number', title: '灏忕墖椤哄簭' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
- {field: 'area', title: '闈㈢Н' ,showOverflow:"ellipsis"},
- {field: 'product_name', title: '浜у搧鍚嶇О', },
- {field: 'glass_child', title: '鍗曠墖鍚嶇О', },
- {field: 'founder', title: '鍒嗘灦鍛�', },
- {field: 'splitFrame_time', title: '鍒嗘灦鏃堕棿', },
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+ {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
+ {field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'child_width', title: t('order.width'), },
+ {field: 'child_height', title: t('order.height'), },
+ {field: 'area', title: t('order.area') ,showOverflow:"ellipsis"},
+ {field: 'product_name', title: t('order.product'), },
+ {field: 'glass_child', title: t('reportingWorks.glassChild'), },
+ {field: 'founder', title: t('processCard.founder'), },
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'), },
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -159,15 +165,30 @@
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
+ // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ // return[
+ // columns.map((column, columnIndex) => {
+ // if (columnIndex === 0) {
+ // return '鍚堣:'
+ // }
+ // // if (props.tableProp.footList.includes(column.field)) {
+ // // return sumNum(data, column.field)
+ // // }
+ // return ''
+ // })
+ // ]
+ // }
+
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ const List = ["quantity",'area']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
return ''
})
]
--
Gitblit v1.8.0