From d1cee577fddcc8fde276c1dd1ff3f444d7e8b82c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 23 五月 2024 10:25:52 +0800
Subject: [PATCH] 添加复选框筛选功能，修改筛选后翻页显示错误问题
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue | 14 +-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 16 +-
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 223 +++++++++++++++++++++++++------------------
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 30 ++++++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 10 +
5 files changed, 183 insertions(+), 110 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 ddd5558..dc5e107 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
@@ -11,30 +11,30 @@
import Sortable from 'sortablejs'
import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
-import { useI18n } from 'vue-i18n'
-import useUserInfoStore from '@/stores/userInfo'
+import {useI18n} from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
import {toolbarButtonClickEvent} from "@/hook/mouseMove";
//璇█鑾峰彇
-const { t } = useI18n()
+const {t} = useI18n()
const userStore = useUserInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
let props = defineProps({
- rowIndex:{}
+ rowIndex: {}
})
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 }})
+ router.push({path: '/main/processCard/SelectDetailProcessCard', query: {processId: row.processId}})
break
}
case 'delete': {
request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
- if (res.code == 200 && res.data===true) {
+ if (res.code == 200 && res.data === true) {
ElMessage.success(t('workOrder.deleteOk'))
- router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+ router.push({path: '/main/processCard/SelectProcessCard', query: {random: Math.random()}})
} else {
ElMessage.warning('鍒犻櫎澶辫触锛屾鏌ユ祦绋嬪崱鏄惁宸叉姤宸�')
}
@@ -46,17 +46,15 @@
}
-
function padLeftZero(str) {
return ('00' + str).substr(str.length)
}
-//瀹氫箟鏃堕棿
+//瀹氫箟鍙橀噺
const form = reactive({
date1: '',
+ getSelect:'涓嶅彲鎺掔増'
})
-
-
//琛ㄥ熬姹傚拰
@@ -96,38 +94,38 @@
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
//瀹氫箟褰撳墠椤垫暟
-let pageNum=ref(1)
+let pageNum = ref(1)
let pageState = null
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
.toISOString()
.replace('T', ' ')
- .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime()+3600 * 1000 * 24)
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
.toISOString()
.replace('T', ' ')
- .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
return [start, end]
}
//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1=getNowTime()
+form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
let total = reactive({
- pageTotal : 0,
- dataTotal : 0,
- pageSize : 100
+ pageTotal: 0,
+ dataTotal: 0,
+ pageSize: 100
})
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
- total.dataTotal = res.data.total.total*1
- total.pageTotal= res.data.total.pageTotal
+ 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))
xGrid.value.reloadData(produceList)
@@ -138,15 +136,15 @@
})
//椤佃剼缈婚〉鏌ヨ
-const selectPageList = ()=>{
+const selectPageList = () => {
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
- if(res.code==200){
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ if (res.code == 200) {
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
- }else{
+ } else {
ElMessage.warning(res.msg)
}
})
@@ -159,7 +157,8 @@
let endTime = form.date1[1]
request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, 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
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
@@ -170,9 +169,9 @@
}
//椤佃剼璺宠浆
-const handlePageChange = ({ currentPage, pageSize }) => {
- pageNum.value=currentPage
- total.pageTotal = pageSize
+const handlePageChange = ({currentPage, pageSize}) => {
+ pageNum.value = currentPage
+ total.pageTotal = pageSize
selectPageList()
}
@@ -183,17 +182,17 @@
}
function filterChanged(column) {
- gridOptions.loading = true
+ gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
+ let value = column.datas[0]!=undefined?column.datas[0]:''
value = value.trim()
//鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
+ [columnArr[1]]:value
}
- } else {
+ }else{
filterData.value[column.property] = value
}
@@ -202,14 +201,14 @@
let endTime = form.date1[1]
request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
- if(res.code==200){
- pageTotal.value=res.data.total
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
+ xGrid.value.reloadData(produceList)
gridOptions.loading=false
- }else{
+ } else {
ElMessage.warning(res.msg)
}
})
@@ -225,18 +224,18 @@
const xGrid = ref()
const gridOptions = reactive({
loading: true,
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
@@ -252,21 +251,40 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
- {title: t('basicData.operate'), width: 100, slots: { default: 'button_slot' },fixed:"left"},
- { 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: 'processId', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
- {field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
- {field: 'quantity', title: t('order.quantity'), },
- {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
- {field: 'founder', title: t('processCard.founder'), },
- {field: 'orderDetail.processingNote', title: t('order.processingNote'), },
- {field: 'layoutStatus', title: t('processCard.layoutStatus'), }
+ {title: t('basicData.operate'), width: 100, slots: {default: 'button_slot'}, fixed: "left"},
+ {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: 'processId',
+ width: 140,
+ title: t('processCard.processId'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'}
+ },
+ {
+ field: 'orderDetail.productId',
+ title: t('order.productId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ },
+ {
+ field: 'orderDetail.productName',
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ width: 180
+ },
+ {field: 'order.project', title: t('order.project'), showOverflow: "ellipsis"},
+ {field: 'quantity', title: t('order.quantity'),},
+ {field: 'orderDetail.computeGrossArea', title: t('order.area'),},
+ {field: 'founder', title: t('processCard.founder'),},
+ {field: 'orderDetail.processingNote', title: t('order.processingNote'),},
+
+ {field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -279,9 +297,7 @@
zoom: true,
custom: true
},
- data: [
-
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod({columns, data}) {//椤佃剼鍑芥暟
let footList = ['', '',]
@@ -299,6 +315,12 @@
}
})
+
+const sexOptions = ref([
+ {label: '宸叉帓鐗�', value: '宸叉帓鐗�'},
+ {label: '鍙帓鐗�', value: '鍙帓鐗�'},
+ {label: '涓嶅彲鎺掔増', value: '涓嶅彲鎺掔増'}
+])
//琛ㄦ牸鎸夐挳
const gridEvents = {
@@ -321,7 +343,7 @@
//淇敼鎺掔増鐘舵��
request.post("/processCard/updateComposing", composingData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ if (res.code == 200 && res.data === true) {
ElMessage.success("淇敼鎴愬姛")
router.push({
path: '/main/processCard/SelectProcessCard',
@@ -344,15 +366,15 @@
}
}
const checkBoxConfig = {
- checkMethod: ({ row }) => {
- if (row['layoutStatus']==='鍙帓鐗�'||row['layoutStatus']==='宸叉帓鐗�'){
+ checkMethod: ({row}) => {
+ if (row['layoutStatus'] === '鍙帓鐗�' || row['layoutStatus'] === '宸叉帓鐗�') {
return row.disable
- }else{
+ } else {
return !row.disable
}
},
- reserve:true
+ reserve: true
}
@@ -364,32 +386,32 @@
<el-row :gutter="0">
<el-date-picker
v-model="form.date1"
- type="daterange"
- format="YYYY/MM/DD"
- value-format="YYYY-MM-DD"
- :start-placeholder="$t('basicData.startDate')"
- :end-placeholder="$t('basicData.endDate')"
:default-time="defaultTime"
+ :end-placeholder="$t('basicData.endDate')"
+ :start-placeholder="$t('basicData.startDate')"
+ format="YYYY/MM/DD"
+ type="daterange"
+ value-format="YYYY-MM-DD"
/>
<el-button
- @click="getWorkOrder"
id="select"
- type="primary" :icon="Search">{{$t('basicData.search')}}
+ :icon="Search"
+ type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
</el-row>
</div>
<vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ :checkbox-config="checkBoxConfig"
+ class="mytable-scrollbar"
+ max-height="100%"
v-bind="gridOptions"
v-on="gridEvents"
- :checkbox-config="checkBoxConfig"
+ @filter-change="filterChanged"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -407,23 +429,23 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }" >
-<!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
-<!-- </el-button>-->
- <el-button @click="getTableRow(row,'select')"
- v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
+ <template #button_slot="{ row }">
+ <!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
+ <!-- </el-button>-->
+ <el-button v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
link
+ size="small"
type="primary"
- size="small">
+ @click="getTableRow(row,'select')">
{{ $t('basicData.edit') }}
</el-button>
-<!-- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>-->
-<!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
-<!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <!-- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>-->
+ <!-- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>-->
+ <!-- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>-->
+ <!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+ <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
<template #reference>
- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
</template>
</el-popconfirm>
</template>
@@ -431,7 +453,19 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+ <template #select_filter="{ column, $panel }">
+ <div>
+
+ <div v-for="(option, index) in column.filters" :key="index">
+ <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
+ <option value="宸叉帓鐗�" label="宸叉帓鐗�"></option>
+ <option value="鍙帓鐗�" label="鍙帓鐗�"></option>
+ <option value="涓嶅彲鎺掔増" label="涓嶅彲鎺掔増"></option>
+ </select>
</div>
</div>
</template>
@@ -439,12 +473,12 @@
<!--浣跨敤 pager 鎻掓Ы-->
<!-- 'PrevJump','NextJump', -->
<vxe-pager
- @page-change="handlePageChange"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
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>
@@ -454,10 +488,11 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
+
#selectForm {
width: 40%;
text-align: center;
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
index 0773c2e..3520ef8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -99,7 +99,7 @@
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
//瀹氫箟褰撳墠椤垫暟
-const pageNum = $ref(1)
+let pageNum=ref(1)
let pageState = null
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
@@ -150,7 +150,7 @@
const selectPageList = ()=>{
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/reportingWork/selectQualityTesting/${pageNum}/${total.pageSize}/${startTime}/${endTime}/${state}/${inputVal}`,filterData.value).then((res) => {
+ request.post(`/reportingWork/selectQualityTesting/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${state}/${inputVal}`,filterData.value).then((res) => {
if(res.code==200){
produceList = deepClone(res.data.data)
@@ -170,7 +170,7 @@
if (inputVal == '') {
inputVal = null
}
- request.post(`/reportingWork/selectQualityTesting/${pageNum}/${total.pageSize}/${startTime}/${endTime}/${state}/${inputVal}`, filterData.value).then((res) => {
+ request.post(`/reportingWork/selectQualityTesting/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}/${state}/${inputVal}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
@@ -222,12 +222,12 @@
request.post(`/reportingWork/selectQualityTesting/1/${total.pageSize}/${startTime}/${endTime}/${state}/${inputVal}`, filterData.value).then((res) => {
if (res.code == 200) {
- pageTotal.value=res.data.total
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
-
+ pageNum.value=1
produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading = false
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading=false
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 231d60c..31f1926 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -178,17 +178,17 @@
}
function filterChanged(column) {
- gridOptions.loading = true
+ gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
+ let value = column.datas[0]!=undefined?column.datas[0]:''
value = value.trim()
//鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
+ [columnArr[1]]:value
}
- } else {
+ }else{
filterData.value[column.property] = value
}
@@ -198,11 +198,11 @@
request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
if(res.code==200){
- pageTotal.value=res.data.total
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
+ xGrid.value.reloadData(produceList)
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index d3cbf5c..62570c7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -81,7 +81,15 @@
<if test="flowCard.order.project != null and flowCard.order.project!= ''">
and b.project regexp #{flowCard.order.project}
</if>
-
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '涓嶅彲鎺掔増'">
+ and a.layout_status regexp 0
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '鍙帓鐗�'">
+ and a.layout_status regexp 1
+ </if>
+ <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and flowCard.layoutStatus == '宸叉帓鐗�'">
+ and a.layout_status regexp 2
+ </if>
group by a.process_Id
ORDER BY a.id desc
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 3fbea0f..e59aff1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -530,6 +530,24 @@
where rw.reviewed_state != 2
and rw.reporting_work_time between #{selectTime1} and #{selectTime2} and position(#{orderId} in rw.order_id)
and rw.reviewed_state!=-1
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.orderId != null and reportingWork.orderId != ''">
+ and o.order_id regexp #{reportingWork.orderId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.batch != null and reportingWork.order.batch != ''">
+ and o.batch regexp #{reportingWork.order.batch}
+ </if>
+ <if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
+ and rw.this_process regexp #{reportingWork.thisProcess}
+ </if>
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
</select>
@@ -663,6 +681,18 @@
and position(#{processId} in rw.process_id)
and position(#{state} in dd.quality_ins_status)
and rw.reviewed_state!=-1
+ <if test="reportingWork.reportingWorkId != null and reportingWork.reportingWorkId != ''">
+ and rw.reporting_work_id regexp #{reportingWork.reportingWorkId}
+ </if>
+ <if test="reportingWork.processId != null and reportingWork.processId != ''">
+ and rw.process_id regexp #{reportingWork.processId}
+ </if>
+ <if test="reportingWork.order.project != null and reportingWork.order.project != ''">
+ and o.project regexp #{reportingWork.order.project}
+ </if>
+ <if test="reportingWork.order.customerName != null and reportingWork.order.customerName != ''">
+ and o.customer_name regexp #{reportingWork.order.customerName}
+ </if>
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
</select>
--
Gitblit v1.8.0