From 7ed2a032d0724e68aec8af940f2ce0023a9f0eb7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 15 四月 2026 09:27:51 +0800
Subject: [PATCH] 修改调度单年月日
---
ui/admin-ui3/src/views/tms/generationCost/index.vue | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/generationCost/index.vue b/ui/admin-ui3/src/views/tms/generationCost/index.vue
index 81a8e41..6995609 100644
--- a/ui/admin-ui3/src/views/tms/generationCost/index.vue
+++ b/ui/admin-ui3/src/views/tms/generationCost/index.vue
@@ -114,17 +114,18 @@
</avue-form>
<avue-crud :option="boxTableOption" :data="boxTableData" @selection-change="boxSelectionChange">
<template #menu-left>
- <el-button type="danger" plain icon="Delete" :disabled="!(boxSelectionList.length === 1 && boxSelectionList[0]?.status === 0)"
+ <el-button type="danger" plain icon="Delete"
+ :disabled="!(boxSelectionList.length === 1 && boxSelectionList[0]?.status === 0)"
@click="handleBatchBoxDel">
浣滃簾
</el-button>
</template>
<template #isYF="{ row }">
- <el-checkbox v-model="row.isYF" :disabled="row.status == 1" :true-value="1" :false-value="0"
+ <el-checkbox v-model="row.isYF" :disabled="row.status == 1" :true-value="1" :false-value="0"
@change="(e: number) => isYFChange(e, row)"></el-checkbox>
</template>
<template #yfServiceProviderId="{ row }">
- <el-select :disabled="row.status == 1" v-model="row.yfServiceProviderIdType" placeholder="璇烽�夋嫨鏈嶅姟鍟�"
+ <el-select :disabled="row.status == 1" v-model="row.yfServiceProviderIdType" placeholder="璇烽�夋嫨鏈嶅姟鍟�"
@change="(e: any) => ysServiceProviderChange(e, row)" :filterable="true">
<el-option v-for="item in serviceProviderList"
:key="item.serviceProviderId + '_' + item.serviceProviderType" :label="item.serviceProviderName"
@@ -132,10 +133,11 @@
</el-select>
</template>
<template #yfPrice="{ row }">
- <el-input :disabled="row.status == 1" v-model="row.yfPrice" :min="1" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
+ <el-input :disabled="row.status == 1" v-model="row.yfPrice" :min="1" type="number"
+ placeholder="璇疯緭鍏ラ噾棰�"></el-input>
</template>
<template #yfCurrency="{ row }">
- <el-radio-group v-model="row.yfCurrency" :disabled="row.status == 1" >
+ <el-radio-group v-model="row.yfCurrency" :disabled="row.status == 1">
<el-radio v-for="dict in sys_currency" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</template>
@@ -227,7 +229,7 @@
updateTmsDispatchOrder,
generateTmsDispatchOrder, initGenerate, initYSGenerate,
ysGenerateTmsDispatchOrder, initYFGenerate, yfGenerateTmsDispatchOrder,
- getServiceProvider, checkCloseOrder, closeOrder,tmsFinanceDetail
+ getServiceProvider, checkCloseOrder, closeOrder, tmsFinanceDetail
} from "@/api/tms/tmsDispatchOrder";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, onMounted, reactive, ref, toRefs, watch, getCurrentInstance, nextTick } from "vue";
@@ -900,7 +902,7 @@
const financeTableOption = ref({
menu: false,
addBtn: false,
- header: true,
+ header: true,
selection: true,
title: '鍘嗗彶鍨粯璐圭敤',
column: {
@@ -973,7 +975,7 @@
label: '搴斾粯甯佸埗',
display: true,
},
- status: {
+ status: {
label: '鐘舵��',
display: true,
type: 'select', dicUrl: '/system/dict/data/type/sys_cancel_word', dataType: 'string',
@@ -1221,50 +1223,48 @@
console.log(pageF.single)
},
+
getBeginListFunc: (params = {}) => {
- // 1. 鏃ユ湡杞崲
- let newParams = <any>{ ...params };
- if (newParams) {
- // 1. 瀹氫箟鏃ユ湡瀛楁鏄犲皠 (鏁扮粍鍚� : 鎺ュ彛闇�瑕佺殑鍓嶇紑)
- // 杩欐牱鍐欑殑濂藉鏄細濡傛灉浣犳湁澶氫釜鏃ユ湡锛岀洿鎺ュ湪杩欓噷娣诲姞涓�琛屽嵆鍙�
- const dateMap = {
- createTimeRange: 'createTime',
- updateTimeRange: 'updateTime',
- confirmTimeRange: 'confirmTime',
- okTimeRange: 'okTime',
+ // 1. 浣跨敤娴呮嫹璐濓紝涓嶅奖鍝嶅師濮嬫煡璇㈠璞�
+ // 鍏抽敭鐐癸細浠庡師濮� queryParams.value 鍙栧�硷紝纭繚鍒嗛〉鏃朵緷鐒惰兘鎷垮埌鏁扮粍
+ let newParams = { ...queryParams.value, ...params };
- };
+ // 2. 瀹氫箟鏃ユ湡瀛楁鏄犲皠 (鏁扮粍鍚� : 鎺ュ彛闇�瑕佺殑鍓嶇紑)
+ const dateMap = {
+ createTimeRange: 'createTime',
+ updateTimeRange: 'updateTime',
+ confirmTimeRange: 'confirmTime',
+ okTimeRange: 'okTime',
+ };
- // 2. 閬嶅巻澶勭悊鏃ユ湡
- Object.keys(dateMap).forEach(arrayKey => {
- const prefix = dateMap[arrayKey];
- const range = newParams[arrayKey];
+ // 3. 閬嶅巻澶勭悊鏃ユ湡
+ Object.keys(dateMap).forEach(arrayKey => {
+ const prefix = dateMap[arrayKey];
+ const range = newParams[arrayKey];
- if (Array.isArray(range) && range.length > 0) {
- // 璧嬪�� Begin 鍜� End
- newParams[`${prefix}Begin`] = range[0];
- newParams[`${prefix}End`] = range[1];
- }
+ if (Array.isArray(range) && range.length === 2) {
+ // 璧嬪�兼帴鍙ｉ渶瑕佺殑 Begin 鍜� End
+ newParams[`${prefix}Begin`] = range[0];
+ newParams[`${prefix}End`] = range[1];
+ }
- // 銆愭牳蹇冩敼鍔ㄣ�戯細鏃犺鏄惁鏈夊�硷紝澶勭悊瀹屽悗閮芥妸鍘熷鐨� Array 瀛楁鍒犳帀
- // 杩欐牱璇锋眰閲屽氨涓嶄細鍑虹幇 confirmTimeRangeArray: [...]
- delete newParams[arrayKey];
- });
+ // 鍙湪缁欐帴鍙ｇ殑鍙傛暟涓垹闄ゆ暟缁勶紝涓嶅奖鍝嶉〉闈㈡樉绀虹殑 queryParams
+ delete newParams[arrayKey];
+ });
- // 3. 閫氱敤娓呮礂锛氬垹闄ゆ墍鏈夌┖瀛楃涓层�乶ull 鎴� undefined 鐨勫叾浠栧瓧娈�
- Object.keys(newParams).forEach(key => {
- const val = newParams[key];
- if (val === '' || val === null || val === undefined) {
- delete newParams[key];
- }
- });
+ // 4. 娓呮礂鍙傛暟锛氳繃婊ょ┖鍊�
+ const finalParams = {};
+ Object.keys(newParams).forEach(key => {
+ const val = newParams[key];
+ if (val !== '' && val !== null && val !== undefined) {
+ finalParams[key] = val;
+ }
+ });
- } else {
- newParams = {};
- }
+ console.log('鍙戦�佺粰鎺ュ彛鐨勬渶缁堝弬鏁�:', finalParams);
- return newParams;
-
+ // 銆愭牳蹇冧慨鏀广�戯細鐩存帴杩斿洖锛屼笉瑕佽祴鍊肩粰 queryParams.value
+ return finalParams;
},
})
@@ -1705,7 +1705,7 @@
ElMessage.warning('璇烽�夋嫨瑕佷綔搴熺殑璐圭敤鏄庣粏');
return;
}
-
+
ElMessageBox.confirm(`纭瑕佷綔搴熼�変腑鐨� ${boxSelectionList.value.length} 鏉¤垂鐢ㄦ槑缁嗗悧锛焋, '璀﹀憡', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1714,15 +1714,15 @@
// 浠� boxTableData 涓Щ闄ら�変腑鐨勯」
// const ids = boxSelectionList.value.map((item: any) => item.id).join(',');
let data = {
- id:boxSelectionList.value[0].id,
- status:1
+ id: boxSelectionList.value[0].id,
+ status: 1
}
- tmsFinanceDetail(data).then(res => {
- ElMessage.success('浣滃簾鎴愬姛');
- getTab2Data(); // 鍒锋柊鏁版嵁
- }).catch(err => {
- ElMessage.error('浣滃簾澶辫触');
- });
+ tmsFinanceDetail(data).then(res => {
+ ElMessage.success('浣滃簾鎴愬姛');
+ getTab2Data(); // 鍒锋柊鏁版嵁
+ }).catch(err => {
+ ElMessage.error('浣滃簾澶辫触');
+ });
// ElMessage.success('浣滃簾鎴愬姛');
// boxSelectionList.value = []; // 娓呯┖閫夋嫨
}).catch(() => {
--
Gitblit v1.8.0