From fa32e887b8fdcd4a2bc3326306cbc558e119a9bb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 01 八月 2024 10:00:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue | 1 -
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 8 ++++----
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 3 +++
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 32 ++++++++++++++++++++++++++------
4 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
index 6f1b283..bd19d61 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -366,7 +366,6 @@
const tags = ref([])
const activeName = ref(null)
-console.log(TgaStyleSet.value)
// 娉ㄥ唽榛樿闈㈡澘
hiprint.init({
providers: [new TagStyleSet(TgaStyleSet.value)],
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 86d8ed7..024ed18 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -19,7 +19,7 @@
})
//宸ュ簭
-const value = ref(t('machine.edgeGrinding'))
+const value = ref()
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -49,6 +49,13 @@
//瀹氫箟褰撳墠椤垫暟
let pageNum = ref(1)
let pageState = null
+
+let newItem= ref({
+ basic_name: '鍏ㄩ儴',
+ basic_type: 'product',
+ basic_category: 'process',
+ id: "001"
+ })
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
@@ -88,6 +95,7 @@
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
titleSelectJson.value.processType = res.data.process
+ titleSelectJson.value.processType.unshift(newItem.value)
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -219,7 +227,7 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 40},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'reportingWorkTime', width: 160, title: t('reportingWorks.reportingWorkTime'),
},
@@ -239,7 +247,7 @@
{
field: 'processId', width: 140, title: t('processCard.processId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }
},
- {field: 'orderNumber', width: 60, title: t('order.OrderNum')},
+ {field: 'orderNumber', width: 90, title: t('order.OrderNum')},
{field: 'code', width: 60, title: t('reportingWorks.glassNumber')},
{field: 'width', width: 100, title: t('order.width')},
{field: 'height', width: 100, title: t('order.height')},
@@ -358,7 +366,7 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- max-height="100%"
+ height="100%"
v-bind="gridOptions"
>
@@ -373,7 +381,19 @@
</ul>
</template>
-
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ :total="total.dataTotal"
+ @page-change="handlePageChange"
+ >
+ </vxe-pager>
+ </template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
@@ -396,7 +416,7 @@
<style scoped>
.main-div-customer {
width: 99%;
- height: 100%;
+ height: 90%;
}
#selectForm {
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index b7d35c3..5687a34 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -410,6 +410,9 @@
}
public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
+ if (selectProcesses.equals("鍏ㄩ儴")){
+ selectProcesses="";
+ }
Integer offset = (pageNum - 1) * pageSize;
Map<String, Object> map = new HashMap<>();
map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index c1b1269..340de15 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1229,7 +1229,7 @@
) AS pd ON pd.prod_id = od.product_id
AND pd.glass_sort = rwd.technology_number
where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
@@ -1265,8 +1265,8 @@
<select id="teamOutputPageTotal">
SELECT
- CEILING(count(rw.reporting_work_id)/#{pageSize}) as 'pageTotal',
- count(distinct rw.reporting_work_id) as 'total'
+ CEILING(count(rwd.id)/#{pageSize}) as 'pageTotal',
+ count(distinct rwd.id) as 'total'
FROM
reporting_work AS rw
LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
@@ -1289,7 +1289,7 @@
) AS pd ON pd.prod_id = od.product_id
AND pd.glass_sort = rwd.technology_number
where rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- and rw.this_process=#{selectProcesses}
+ and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
</if>
--
Gitblit v1.8.0