From 2ad329b52d19e48bcdc9013aaf3fcee460456548 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 九月 2025 15:28:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 162 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 120 insertions(+), 42 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index bc9c82f..4ae8102 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -36,8 +36,6 @@
list: null,
})
const getTableRow = (row, type) => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
switch (type) {
case 'select' : {
router.push({path: '/main/processCard/SelectDetailProcessCard', query: {processId: row.processId}})
@@ -114,26 +112,6 @@
let pageNum = ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime())
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
-}
-
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
- orderInfo.workOrderDate=getNowTime()
-}
-let startTime = orderInfo.workOrderDate[0]
-let endTime = orderInfo.workOrderDate[1]
let total = reactive({
pageTotal: 0,
dataTotal: 0,
@@ -142,13 +120,29 @@
const getFlowCardList = async () => {
//绗竴娆″姞杞芥暟鎹�
- await request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
total.pageTotal = res.data.total.pageTotal
+ orderInfo.workOrderDate = res.data.selectDate
pageTotal.value = res.data.total
+ total.value = res.data.total
produceList.value = produceList.value.concat(deepClone(res.data.data))
+ console.log(produceList.value)
+ produceList.value.forEach(item => {
+ switch (item.layoutStatus) {
+ case "0":
+ item.layoutStatus = t('processCard.composingNo');
+ break;
+ case "1":
+ item.layoutStatus = t('processCard.composingOk');
+ break;
+ case "2":
+ item.layoutStatus = t('processCard.typesetter');
+ break;
+ }
+ });
xGrid.value.loadData(produceList.value)
} else {
ElMessage.warning(res.msg)
@@ -164,12 +158,23 @@
})
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
+ produceList.value.forEach(item => {
+ switch (item.layoutStatus) {
+ case "0":
+ item.layoutStatus = t('processCard.composingNo');
+ break;
+ case "1":
+ item.layoutStatus = t('processCard.composingOk');
+ break;
+ case "2":
+ item.layoutStatus = t('processCard.typesetter');
+ break;
+ }
+ });
xGrid.value.loadData(produceList.value)
} else {
ElMessage.warning(res.msg)
@@ -180,13 +185,26 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
total.pageTotal = res.data.total.pageTotal
+ orderInfo.workOrderDate = res.data.selectDate
pageTotal.value = res.data.total
+ total.value = res.data.total
+ res.data.data.forEach(item => {
+ switch (item.layoutStatus) {
+ case "0":
+ item.layoutStatus = t('processCard.composingNo');
+ break;
+ case "1":
+ item.layoutStatus = t('processCard.composingOk');
+ break;
+ case "2":
+ item.layoutStatus = t('processCard.typesetter');
+ break;
+ }
+ });
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
@@ -223,16 +241,27 @@
filterData.value[column.property] = value
}
-//鑾峰彇閫変腑鏃堕棿
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.total
produceList.value = deepClone(res.data.data)
+ produceList.value.forEach(item => {
+ switch (item.layoutStatus) {
+ case "0":
+ item.layoutStatus = t('processCard.composingNo');
+ break;
+ case "1":
+ item.layoutStatus = t('processCard.composingOk');
+ break;
+ case "2":
+ item.layoutStatus = t('processCard.typesetter');
+ break;
+ }
+ });
xGrid.value.loadData(produceList.value)
gridOptions.loading=false
orderInfo.selectProcessCardFilter.list = xGrid.value.getCheckedFilters()
@@ -286,6 +315,8 @@
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+
{
field: 'processId',
width: 140,
@@ -309,13 +340,13 @@
},
{field: 'order.project', title: t('order.project'), showOverflow: "ellipsis"},
{field: 'quantity', title: t('order.quantity'),},
- {field: 'orderDetail.computeGrossArea', title: t('order.area'),},
+ {field: 'computeGrossArea', title: t('order.area'),},
{field: 'founder', title: t('processCard.founder'),},
{field: 'orderDetail.processingNote', title: t('order.processingNote'),},
-
+ {field: 'order.createTime', title: t('report.orderTime'),width: 110},
{field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
{field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'rack',width:100, title: t('鏋跺彿'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
+ {field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -323,8 +354,11 @@
{code: 'update', name: t('processCard.composing'), status: 'primary'},
{code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
{code: 'delete', name: t('basicData.delete'), status: 'primary'},
- {code: 'rack', name: t('鍚堟灦'), status: 'primary'},
+ {code: 'rack', name: t('processCard.combinedFrame'), status: 'primary'},
],
+ slots: {
+ tools: 'toolbar_buttons'
+ },
import: false,
// export: true,
// print: true,
@@ -339,9 +373,10 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'orderDetail.computeGrossArea']
+ const List = ["quantity",'computeGrossArea']
if (List.includes(column.field)) {
- return footSum(data, column.field)
+ //return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
}
return ''
})
@@ -373,6 +408,8 @@
let composingData = ref({
composing: selectRecords,
+ userId: user.user.userId,
+ userName:user.user.userName
})
//淇敼鎺掔増鐘舵��
@@ -407,7 +444,7 @@
composing: selectRecords,
})
selectRecords.forEach(item => {
- if (item.layoutStatus == "宸叉帓鐗�"){
+ if (item.layoutStatus == t('processCard.typesetter')){
ElMessage.warning(t('processCard.notSelectTheOptionData'))
return;
}
@@ -422,7 +459,7 @@
})
} else {
- ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+ ElMessage.warning(t('processCard.msg.msg7'))
}
})
@@ -508,7 +545,41 @@
reserve: true
}
+function exportExcel(url, fileName,date) {
+ if(date===null){
+ ElMessage.warning(t('report.pleaseSelectADateFirst'))
+ return
+ }
+
+ const date1 = new Date(date[0]);
+ const date2 = new Date(date[1]);
+ const timeDiff = Math.abs(date2.getTime() - date1.getTime());
+ const daysDiff = timeDiff / (1000 * 3600 * 24);
+ if(Math.floor(daysDiff)>180){
+ ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
+ return
+ }
+ let dataMp = ref({
+ date: date,
+ })
+ request.post(url,dataMp.value,{responseType :'blob'}).then(res => {
+ const blob = new Blob([res])
+ if ('download' in document.createElement('a')) { // 闈濱E涓嬭浇
+ const elink = document.createElement('a')
+ elink.download = `${fileName}.xlsx`
+ elink.style.display = 'none'
+ elink.href = URL.createObjectURL(blob)
+ document.body.appendChild(elink)
+ elink.click()
+ URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
+ document.body.removeChild(elink)
+ } else { // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName)
+ }
+
+ })
+}
</script>
<template>
@@ -616,6 +687,13 @@
>
</vxe-pager>
</template>
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/processCard/exportDateProcess',
+ t('order.processCard'),
+ orderInfo.workOrderDate)">
+ {{t('basicData.export')}}</vxe-button>
+ </template>
</vxe-grid>
</div>
@@ -623,7 +701,7 @@
<el-dialog
id="sizePrintCalrd"
v-model="dialogTableVisible"
- :title="$t('娴佺▼鍗″悎鏋�')"
+ :title="$t('processCard.combinedFrame')"
destroy-on-close
style="width: 75%;height:75% ">
<select-process-card-detail
--
Gitblit v1.8.0