From 46964bace341e98f238a0a3fd29f6adc643312c7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 24 十一月 2025 13:14:32 +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 | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 151 insertions(+), 10 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 b267239..8532246 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
@@ -19,6 +19,7 @@
import useOrderInfoStore from "@/stores/sd/order/orderInfo"
import {Printer} from "@element-plus/icons-vue/global";
import SelectProcessCardDetail from "@/components/pp/SelectProcessCardDetail.vue";
+import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
//璇█鑾峰彇
const {t} = useI18n()
@@ -28,6 +29,7 @@
let productGlassTypeStore = useProductGlassTypeStore()
const dialogTableVisible = ref(false)
+const dialogProcess = ref(false)
let router = useRouter()
let props = defineProps({
rowIndex: {}
@@ -104,6 +106,12 @@
}
})
+//娴佺▼鍗¤繘搴︾敤鍊�
+let processVal = ref({
+ orderId:null,
+ row: {},
+ processId:null//鐢ㄤ簬鍚庣鏁版嵁杩斿洖锛岀粨鏋滅瓫閫�
+})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -119,6 +127,7 @@
})
const getFlowCardList = async () => {
+ gridOptions.loading = true
//绗竴娆″姞杞芥暟鎹�
await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
@@ -127,10 +136,26 @@
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))
+ 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
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -143,29 +168,61 @@
})
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
+ gridOptions.loading = true
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)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
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 {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -204,13 +261,28 @@
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()
orderInfo.selectProcessCardFilter.data = filterData.value
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -283,13 +355,14 @@
},
{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: 'order.updateTime', title: t('productStock.approvedDate'),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: {
@@ -297,8 +370,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,
@@ -313,9 +389,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 ''
})
@@ -347,6 +424,8 @@
let composingData = ref({
composing: selectRecords,
+ userId: user.user.userId,
+ userName:user.user.userName
})
//淇敼鎺掔増鐘舵��
@@ -381,7 +460,7 @@
composing: selectRecords,
})
selectRecords.forEach(item => {
- if (item.layoutStatus == "宸叉帓鐗�"){
+ if (item.layoutStatus == t('processCard.typesetter')){
ElMessage.warning(t('processCard.notSelectTheOptionData'))
return;
}
@@ -396,7 +475,7 @@
})
} else {
- ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+ ElMessage.warning(t('processCard.msg.msg7'))
}
})
@@ -482,7 +561,47 @@
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)
+ }
+
+ })
+}
+
+const onCellDblClick = ({ row, column }) => {
+ processVal.value.orderId = row.orderId
+ processVal.value.processId = row.processId
+ dialogProcess.value = true
+};
</script>
<template>
@@ -517,6 +636,7 @@
v-bind="gridOptions"
v-on="gridEvents"
@filter-change="filterChanged"
+ @cell-dblclick="onCellDblClick"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -590,14 +710,35 @@
>
</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>
<el-dialog
id="sizePrintCalrd"
+ v-model="dialogProcess"
+ :title="$t('order.processCardCollect')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <order-process-collect
+ :orderId="processVal.orderId"
+ :processId="processVal.processId"
+ :row="processVal.row"
+ style="width: 100%;height: 100%"
+ />
+ </el-dialog>
+
+ <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