From c6b112564e0a97fc20db23e67dae0adee03f941c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 22 二月 2024 08:22:15 +0800
Subject: [PATCH] 工单管理模块修改
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index cf516a9..4eb0dba 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -73,6 +73,7 @@
request.post(`/workOrder/addWork/${id}`, filterData.value).then((res) => {
if (res.code == 200) {
+ console.log(res.data.data)
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
@@ -82,6 +83,41 @@
}
})
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+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
+ }
+
+
+ request.post(`/workOrder/addWork/${id}`, 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 sumNum = (list, field) => {
let count = 0
@@ -89,6 +125,11 @@
count += Number(item[field])
})
return count.toFixed(2)
+}
+
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
}
//瀛愮粍浠舵帴鏀跺弬鏁�
@@ -127,19 +168,12 @@
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{type: 'checkbox', fixed: "left", title: '閫夋嫨', width: 80},
{type: 'seq', fixed: "left", title: '鑷簭', width: 50},
- {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,},
- {
- field: 'productId',
- title: '浜у搧缂栧彿',
- sortable: true,
- showOverflow: "ellipsis",
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'}
- },
- {field: 'productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true},
- {field: 'quantity', title: '鎬绘暟閲�', sortable: true},
- {field: 'computeGrossArea', title: '鎬婚潰绉�', sortable: true},
- {field: 'perimeter', title: '鍛ㄩ暱', sortable: true, showOverflow: "ellipsis"},
+ {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'},},
+ {field: 'productId',title: '浜у搧缂栧彿',showOverflow: "ellipsis",filters: [{data: ''}],slots: {filter: 'num1_filter'}},
+ {field: 'productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, },
+ {field: 'quantity', title: '鎬绘暟閲�', },
+ {field: 'computeGrossArea', title: '鎬婚潰绉�', },
+ {field: 'perimeter', title: '鍛ㄩ暱', showOverflow: "ellipsis"}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -227,7 +261,9 @@
<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>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+
</li>
</ul>
</template>
--
Gitblit v1.8.0