From 0294300e78c5e816d7b6ad06ab0fac7a263363eb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 18:03:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 100 +++++++++++++++++---------------------------------
1 files changed, 34 insertions(+), 66 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 83deb13..656780b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -77,22 +77,7 @@
clientHeight.value = row.$event.target.clientHeight
}
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
-let filterData = ref({
- product: {
- thickness: '',
- totalThickness: ''
- },
- orderDetail: {
- orderNumber: '',
- height: '',
- computeGrossArea: '',
- binningQuantity: '',
- shape: '',
- width: '',
- weight: ''
- }
-
-})
+let filterData = ref({})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -111,7 +96,7 @@
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
if (res.code == 200) {
- console.log(res.data)
+ //console.log(res.data)
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
@@ -131,39 +116,22 @@
return ('00' + str).substr(str.length)
}
-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
- }
-
- request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
- if (res.code == 200) {
-
- pageTotal.value = res.data.total
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
const hasDecimal = (value) => {
const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
return regex.test(value); // 杩斿洖true/false
+}
+
+
+//绛涢�夋柟娉�
+const filterChanged = ({ option, row, column }) => {
+ if (option.data) {
+ return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
+ }
+ return true
+ //@filter-change="filterChanged"
}
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
@@ -186,7 +154,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -198,10 +166,10 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'checkbox', fixed: "left", title: '閫夋嫨'},
- {field: 'orderNumber', title: '璁㈠簭', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'shape', title: '褰㈢姸', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'width', title: '瀹�', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'height', title: '楂�', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'orderNumber', title: '璁㈠簭', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'shape', title: '褰㈢姸', showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'width', title: '瀹�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'height', title: '楂�', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
{field: 'baiscQuantity', title: '寰呭垎鏁伴噺', showOverflow: "ellipsis"},
{field: 'computeGrossArea', title: '寰呭垎闈㈢Н'},
{field: 'totalThickness', title: '鎬诲帤搴�'},
@@ -259,7 +227,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -271,16 +239,17 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'checkbox', fixed: "left", title: '閫夋嫨'},
- {field: 'processId', title: '娴佺▼鍗″彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 130},
+ {field: 'processId', title: '娴佺▼鍗″彿', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 130,filterMethod:filterChanged},
{
field: 'orderNumber',
title: '璁㈠簭',
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
+ ,filterMethod:filterChanged
},
- {field: 'landingSequence', title: '钀芥灦椤哄簭', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
- {field: 'shape', title: '褰㈢姸', filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'landingSequence', title: '钀芥灦椤哄簭', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'shape', title: '褰㈢姸', filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
{field: 'width', title: '瀹�', showOverflow: "ellipsis"},
{field: 'height', title: '楂�'},
{field: 'quantity', title: '鎬绘暟閲�'},
@@ -496,11 +465,14 @@
productionId:productionId
})
- console.log(flowCardData.value)
+ //console.log(flowCardData.value)
request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
if (res.code == 200) {
ElMessage.success("淇濆瓨鎴愬姛")
- location.reload();
+ //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
+ router.push({path: '/main/processCard/SplittingDetails', query: {orderId: orderId}})
+
+ //location.reload();
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -544,7 +516,6 @@
<el-aside width="44%" >
<vxe-grid
max-height="100%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGridLeft"
v-bind="gridLeftOptions"
@@ -572,7 +543,9 @@
<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)"/>
+ <input type="text"
+ v-model="option.data"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -593,11 +566,11 @@
<el-button @click="createProcessCard" type="primary">寤虹珛娴佺▼鍗�</el-button>
</el-main>
+<!-- 鍙充晶-->
<el-aside width="45%" height="500px" style="">
<vxe-grid
max-height="97%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -616,17 +589,12 @@
</ul>
</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)"/>
+ <input type="text"
+ v-model="option.data"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0