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 | 487 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 314 insertions(+), 173 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 1ba0deb..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,25 +1,34 @@
<script setup>
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
- }
-}
+import {onMounted, reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+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()
+let filterData = ref({})
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: '',
+ project: ''
+})
+
+//宸ュ簭
+const value = ref('纾ㄨ竟')
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -30,27 +39,137 @@
return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+ // 鍐呭楂樺害
+ scrollTop.value = row.$event.target.scrollTop
+ scrollHeight.value = row.$event.target.scrollHeight
+ clientHeight.value = row.$event.target.clientHeight
+}
+onMounted(()=>{
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value, gridOptions)
+})
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum = ref(1)
+let pageState = null
+
+
+
+
+let selectProcesses = value.value
+let total = reactive({
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
+})
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/report/yield/${orderInfo.yieldDate}/${selectProcesses}/${reportTime}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ 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 getWorkOrder = () => {
+ gridOptions.loading = true
+
+ let selectProcesses = value.value
+ 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 changeFilterEvent = (event, option, $panel,) => {
+// // 鎵嬪姩瑙﹀彂绛涢��
+// $panel.changeOption(event, !!option.data, option)
+// }
+
+// function filterChanged(column){
+// //gridOptions.loading=true
+// //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+// let value = column.datas[0]!=undefined?column.datas[0]:''
+// value = value.trim()
+// //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+// if (column.property.indexOf('.')>-1){
+// const columnArr = column.property.split('.')
+// filterData.value[columnArr[0]] = {
+// [columnArr[1]]:value
+// }
+// }else{
+// filterData.value[column.property] = value
+// }
+//
+// gridOptions.loading = true
+//
+// }
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'Yield',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -60,86 +179,82 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: '1', title: '宸ュ簭',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: '2', title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '3',title: '瀹㈡埛鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '4', title: '鎴愬搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5',title: '瀹屽伐闈㈢Н', sortable: true,showOverflow:"ellipsis"},
- {field: '6',title: '娆＄牬闈㈢Н', sortable: true},
- {field: '7', title: '鎬婚潰绉�', sortable: true},
- {field: '8', title: '鎴愬搧鐜�', sortable: true,},
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'process', width: 120, title: t('report.workingProcedure'), 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: 'process_id', width: 140, title: t('processCard.processId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+
+ {
+ field: 'project',
+ title: t('order.project'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'batch', width: 90, title: t('order.batch'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'product_name', title: t('order.product'), filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {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: {
// buttons: [{
//
// }],
- import: false,
- export: true,
- print: true,
+ slots: {
+ tools: 'toolbar_buttons'
+ },
zoom: true,
custom: true
},
- data: [
- {
- 1:'澶瑰眰',
- 2:'NG23103001',
- 3:'鎱曢潚鏂囧寲',
- 4:'10mmLYTM-140寮挗鍖�(澶�)+2.28PVB閫忔槑+10mm鐧界幓寮挗鍖�(鍐�)',
- 5:'256.67',
- 6:'7.94',
- 7:'264.61',
- 8:'97.0%',
-
- },
- {
- 1:'澶瑰眰',
- 2:'NG23103001',
- 3:'鎱曢潚鏂囧寲',
- 4:'10mmLYTM-140寮挗鍖�(澶�)+2.28PVB閫忔槑+10mm鐧界幓寮挗鍖�(鍐�)',
- 5:'256.67',
- 6:'7.94',
- 7:'264.61',
- 8:'97.0%',
-
- },
- {
- 1:'澶瑰眰',
- 2:'NG23103001',
- 3:'鎱曢潚鏂囧寲',
- 4:'10mmLYTM-140寮挗鍖�(澶�)+2.28PVB閫忔槑+10mm鐧界幓寮挗鍖�(鍐�)',
- 5:'256.67',
- 6:'7.94',
- 7:'264.61',
- 8:'97.0%',
-
- },
- {
- 1:'澶瑰眰',
- 2:'NG23103001',
- 3:'鎱曢潚鏂囧寲',
- 4:'10mmLYTM-140寮挗鍖�(澶�)+2.28PVB閫忔槑+10mm鐧界幓寮挗鍖�(鍐�)',
- 5:'256.67',
- 6:'7.94',
- 7:'264.61',
- 8:'97.0%',
-
- },
-
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['5','6','7']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["completedQuantity",'completedArea','breakageQuantity','breakageArea']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -148,110 +263,136 @@
})
-const value = ref('')
-const options = [
- {
- value: 'Option1',
- label: 'Option1',
- },
- {
- value: 'Option2',
- label: 'Option2',
- },
- {
- value: 'Option3',
- label: 'Option3',
- },
-]
+function exportExcel(url, fileName,date) {
+ let processes = value.value
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+ if(date===null){
+ ElMessage.warning(t('report.pleaseSelectADateFirst'))
+ return
+ }
-})
+ if(processes===null){
+ ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
+ 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,
+ processes: processes,
+ })
+ 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 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">
- <!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
- <!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.yieldDate"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ style="width: 350px"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- :default-time="defaultTime"
- style="width: 100px"
+ format="YYYY/MM/DD HH:mm"
+ value-format="YYYY-MM-DD HH:mm"
/>
- <el-select v-model="value" class="m-2" placeholder="鏌ヨ绫诲瀷">
+ <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
<el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.basic_name"
+ :value="item.basic_name"
/>
</el-select>
- <el-button type="primary">鏌ヨ</el-button>
- </el-row>
+ <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
</div>
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- 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,key,index) in row">
- <span style="font-weight: bold">{{key+': '}}</span>
- <span>{{ item }}</span>
- </li>
- </ul>
- </template>
+ <template #toolbar_buttons>
+ <vxe-button style="margin-right: 0.5rem"
+ @click="exportExcel('/report/exportYield',
+ t('report.yieldReport'),
+ form.date1)">
+ {{t('basicData.export')}}</vxe-button>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鍙嶅</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
-
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @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