From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index fe22c6d..07c3a42 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -111,34 +111,16 @@
let pageNum = $ref(1)
let pageState = null
-//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime())
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
-}
-
const getFirst = () => {
- //绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
-//form.date1 = getNowTime()
- if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
- orderInfo.workOrderDate=getNowTime()
- }
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
+
let state = optionVal.value
//绗竴娆″姞杞芥暟鎹�
- request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${state}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
+ orderInfo.workOrderDate = res.data.selectDate
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
gridOptions.loading = false
@@ -152,18 +134,17 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
+ gridOptions.loading = true
let selectState = optionVal.value
- request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
- //isButtonDisabled=false
pageTotal.value = res.data.total
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -191,11 +172,10 @@
}
//鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
+
let selectState = optionVal.value
- request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
@@ -307,9 +287,14 @@
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
if ($grid) {
switch (code) {
case 'transferOrder': {
+ if (checkedList.length == 0) {
+ ElMessage.warning(t('workOrder.msgSelect'))
+ return
+ }
const idList = []
$grid.getCheckboxRecords().forEach(item => {
idList.push(item.orderId)
--
Gitblit v1.8.0