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 | 153 +++++++++++++++++++++++---------------------------
1 files changed, 70 insertions(+), 83 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 e4c3edd..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()+3600 * 1000 * 24)
- .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)
@@ -328,9 +313,8 @@
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
v-model="orderInfo.workOrderDate"
type="daterange"
@@ -363,72 +347,75 @@
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
</el-button>
- </el-row>
</div>
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <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 v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <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 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>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
-<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
-<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
-<!-- @click="getTableRow(row,'edit')"-->
-<!-- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
-<!-- link-->
-<!-- type="primary"-->
-<!-- size="small">-->
-<!-- {{$t('workOrder.transferOrder')}}-->
-<!-- </el-button>-->
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+ <!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+ <!-- @click="getTableRow(row,'edit')"-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+ <!-- link-->
+ <!-- type="primary"-->
+ <!-- size="small">-->
+ <!-- {{$t('workOrder.transferOrder')}}-->
+ <!-- </el-button>-->
- <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
- <template #reference>
- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
- </template>
- </el-popconfirm>
- </template>
+ <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <template #reference>
+ <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
+ </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)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 50%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0