From eba3314826d53ff0f7e5679d185baaff84e50354 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 十二月 2025 10:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue | 244 +++++++++++++++++++++++-------------------------
1 files changed, 119 insertions(+), 125 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
index f9533f8..5f528f2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -1,6 +1,6 @@
<script setup>
-import {reactive, ref} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
@@ -8,7 +8,14 @@
import {useI18n} from 'vue-i18n'
import {changeFilterEvent, filterChanged} from "@/hook"
import footSum from "@/hook/footSum"
-
+import dayjs from 'dayjs'
+import {addListener} from "@/hook/mouseMove";
+import {VxeUI} from "vxe-pc-ui";
+import companyInfo from "@/stores/sd/companyInfo";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+const company = companyInfo()
+const reportTime=company.reportTime
+const orderInfo = useOrderInfoStore()
//璇█鑾峰彇
const {t} = useI18n()
let router = useRouter()
@@ -43,6 +50,10 @@
clientHeight.value = row.$event.target.clientHeight
}
+onMounted(()=>{
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
@@ -52,24 +63,9 @@
let pageNum = ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
-}
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
+
let selectProcesses = value.value
let total = reactive({
pageTotal: 0,
@@ -81,63 +77,44 @@
processType: [],
})
//绗竴娆″姞杞芥暟鎹�
-request.post(`/report/yield/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
+request.post(`/report/yield/${orderInfo.yieldDate}/${selectProcesses}/${reportTime}`, filterData.value).then((res) => {
if (res.code == 200) {
- // total.dataTotal = res.data.total.total*1
- // total.pageTotal= res.data.total.pageTotal
- // pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process
+ orderInfo.yieldDate = res.data.selectDate
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
+ gridOptions.loading = false
ElMessage.warning(res.msg)
}
})
-//椤佃剼缈婚〉鏌ヨ
-const selectPageList = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- request.post(`/report/yield/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
- if (res.code == 200) {
-
-
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
+ gridOptions.loading = true
- let startTime = form.date1[0]
- let endTime = form.date1[1]
let selectProcesses = value.value
- request.post(`/report/yield/${startTime}/${endTime}/${selectProcesses}`, filterData.value).then((res) => {
+ console.log(orderInfo.yieldDate)
+ console.log(reportTime)
+ request.post(`/report/yield/${orderInfo.yieldDate}/${selectProcesses}/${reportTime}`, filterData.value).then((res) => {
if (res.code == 200) {
// total.dataTotal = res.data.total.total*1
// total.pageTotal= res.data.total.pageTotal
// pageTotal.value = res.data.total
+ orderInfo.yieldDate = res.data.selectDate
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
} else {
+ gridOptions.loading = false
ElMessage.warning(res.msg)
}
})
-}
-
-//椤佃剼璺宠浆
-const handlePageChange = ({currentPage, pageSize}) => {
- pageNum.value = currentPage
- total.pageTotal = pageSize
- selectPageList()
}
@@ -179,8 +156,8 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'Yield',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -204,53 +181,57 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
- field: 'process', width: 120, title: '宸ュ簭', filters: [{data: ''}],
+ field: 'process', width: 120, title: t('report.workingProcedure'), filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'order_id',
- width: 120,
- title: '閿�鍞崟鍙�',
- showOverflow: "ellipsis",
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ field: 'reporting_work_time',
+ width: 160,
+ title: t('reportingWorks.reportingWorkTime'),
+ formatter: ({ cellValue }) => {
+ if (!cellValue) return ''
+ // 鐢� dayjs 鎴栬�� moment 鏍煎紡鍖�
+ return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss')
+ }
},
{
- field: 'customer_name', title: '瀹㈡埛鍚嶇О', filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
- {
- field: 'project',
- title: '椤圭洰鍚嶇О',
- showOverflow: "ellipsis",
+ field: 'process_id', width: 140, title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'product_name', title: '浜у搧鍚嶇О', filters: [{data: ''}],
+ field: 'project',
+ title: t('order.project'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'finishedArea', title: '瀹屽伐闈㈢Н', filters: [{data: ''}],
+ field: 'batch', width: 90, title: t('order.batch'),
+ filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
- field: 'brokenArea',
- title: '娆＄牬闈㈢Н',
- type: 'date',
- attrs: {placeholder: '', type: 'date'},
+ field: 'product_name', title: t('order.product'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
},
- {field: 'area', width: 120, title: '鎬婚潰绉�', showOverflow: "ellipsis"},
- {field: 'finished', width: 100, title: '鎴愬搧鐜�'},
+ {field: 'completedQuantity', width: 90, title: t('reportingWorks.completedQuantity')},
+ {field: 'completedArea', width: 100, title: t('reportingWorks.completedArea')},
+ {field: 'breakageQuantity', width: 100, title: t('reportingWorks.quantityBroken')},
+ {field: 'breakageArea', width: 100, title: t('reportingWorks.wornArea')},
+ {field: 'responsibleTeam', width: 100, title: t('reportingWorks.responsibleTeam')
+ ,filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'finished', width: 100, title: t('report.finished')},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -271,7 +252,7 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["finishedArea",'brokenArea','area',]
+ const List = ["completedQuantity",'completedArea','breakageQuantity','breakageArea']
if (List.includes(column.field)) {
return footSum(data, column.field)
}
@@ -286,12 +267,12 @@
let processes = value.value
if(date===null){
- ElMessage.warning("璇峰厛閫夋嫨鏃ユ湡")
+ ElMessage.warning(t('report.pleaseSelectADateFirst'))
return
}
if(processes===null){
- ElMessage.warning("璇峰厛閫夋嫨宸ュ簭")
+ ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
return
}
@@ -300,7 +281,7 @@
const timeDiff = Math.abs(date2.getTime() - date1.getTime());
const daysDiff = timeDiff / (1000 * 3600 * 24);
if(Math.floor(daysDiff)>180){
- ElMessage.warning("瀵煎嚭鐨勭瓫閫夋椂闂翠笉鑳借秴杩�180澶�")
+ ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
return
}
let dataMp = ref({
@@ -324,20 +305,23 @@
})
}
+
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+ VxeUI.clipboard.copy(row[column.property])
+}
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="form.date1"
- end-placeholder="缁撴潫鏃堕棿"
- format="YYYY/MM/DD"
- start-placeholder="寮�濮嬫椂闂�"
- style="width: 100px"
+ v-model="orderInfo.yieldDate"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ style="width: 350px"
type="daterange"
- value-format="YYYY-MM-DD"
+ format="YYYY/MM/DD HH:mm"
+ value-format="YYYY-MM-DD HH:mm"
/>
<el-select v-model="value" clearable default-value="default_city" style="width: 120px">
@@ -348,57 +332,67 @@
:value="item.basic_name"
/>
</el-select>
- <el-button type="primary" @click="getWorkOrder">鏌ヨ</el-button>
- </el-row>
+ <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
</div>
- <vxe-grid
- ref="xGrid"
- class="mytable-scrollbar"
- max-height="100%"
- v-bind="gridOptions"
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ @cell-dblclick="handleCellDblClick"
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
-
- <template #toolbar_buttons>
- <vxe-button style="margin-right: 0.5rem"
- @click="exportExcel('/report/exportYield',
- '鎴愬搧鐜囨姤琛�',
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportYield',
+ t('report.yieldReport'),
form.date1)">
- 瀵煎嚭</vxe-button>
- </template>
+ {{t('basicData.export')}}</vxe-button>
+ </template>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 60%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0