From d294abb765e4ed349907c92ce313689c6299ba7d Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 02 十二月 2025 00:17:00 +0800
Subject: [PATCH] feat:地图都改为天地图的接口
---
ruoyi-ui/src/views/system/orders/index.vue | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/system/orders/index.vue b/ruoyi-ui/src/views/system/orders/index.vue
index c5135d1..9bb9b8b 100644
--- a/ruoyi-ui/src/views/system/orders/index.vue
+++ b/ruoyi-ui/src/views/system/orders/index.vue
@@ -87,7 +87,15 @@
<el-table v-loading="loading" :data="ordersList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="ID" align="center" prop="OrderID" />
+ <el-table-column label="璁㈠崟ID" align="center" prop="OrderID" />
+ <el-table-column label="璁㈠崟鐘舵��" align="center" prop="OrderStatus">
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.OrderStatus === 0" type="warning">宸叉彁浜�</el-tag>
+ <el-tag v-else-if="scope.row.OrderStatus === 1" type="success">澶勭悊鎴愬姛</el-tag>
+ <el-tag v-else-if="scope.row.OrderStatus === 2" type="info">宸插彇娑�</el-tag>
+ <el-tag v-else type="danger">鏈煡鐘舵��</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鑱旂郴浜�" align="center" prop="LinkPerson" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="LinkTel" />
<el-table-column label="鍙楃悊鐢佃瘽" align="center" prop="AlarmTel" />
@@ -111,7 +119,7 @@
<el-table-column label="棰勪及閲戦" align="center" prop="BookingPrice" />
<el-table-column label="棰勭害鏃堕棿" align="center" prop="BookingDate" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.BookingDate, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.BookingDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="澶囨敞" align="center" prop="Remark" />
@@ -123,37 +131,37 @@
<el-table-column label="妤煎眰" align="center" prop="LiftingFloor" />
<el-table-column label="鐩戞姢锛岄噸鐥�" align="center" prop="RequirementCode" />
<el-table-column label="杞繍绫诲瀷" align="center" prop="TypeCode" />
- <el-table-column label="绗笁鏂硅皟鐢ㄧ粨鏋�" align="center" prop="ThirdPartyResult" />
+ <el-table-column label="绗笁鏂硅皟鐢ㄧ粨鏋�" align="center" prop="ThirdPartyResult">
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.ThirdPartyResult === 1" type="success">璋冪敤鎴愬姛</el-tag>
+ <el-tag v-else-if="scope.row.ThirdPartyResult === 2" type="danger">璋冪敤澶辫触</el-tag>
+ <el-tag v-else type="info">鏈煡鐘舵��</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="绗笁鏂规湇鍔D" align="center" prop="ServiceOrdID" />
<el-table-column label="绗笁鏂规湇鍔″崟鍙�" align="center" prop="ServiceOrdNo" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="CreateTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.CreateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="UpdateTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.UpdateTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.UpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
- <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
+ v-if="scope.row.ThirdPartyResult === 2 || scope.row.OrderStatus === 0"
size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:orders:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:orders:remove']"
- >鍒犻櫎</el-button>
+ type="primary"
+ icon="el-icon-refresh"
+ @click="handleResend(scope.row)"
+ >閲嶆柊鍙戦��</el-button>
</template>
- </el-table-column> -->
+ </el-table-column>
</el-table>
<pagination
v-show="total>0"
@@ -280,7 +288,7 @@
</template>
<script>
-import { listOrders, getOrders, delOrders, addOrders, updateOrders } from "@/api/system/orders";
+import { listOrders, getOrders, delOrders, addOrders, updateOrders, resendOrder } from "@/api/system/orders";
export default {
name: "Orders",
@@ -480,6 +488,17 @@
this.download('system/orders/export', {
...this.queryParams
}, `orders_${new Date().getTime()}.xlsx`)
+ },
+ /** 閲嶆柊鍙戦�佹寜閽搷浣� */
+ handleResend(row) {
+ this.$modal.confirm('鏄惁纭閲嶆柊鍙戦�佽璁㈠崟锛�').then(() => {
+ // 杩欓噷璋冪敤閲嶆柊鍙戦�佺殑API
+ // TODO: 闇�瑕佸湪鍚庣瀹炵幇閲嶆柊鍙戦�佺殑鎺ュ彛
+ resendOrder(row.OrderID).then(response => {
+ this.$modal.msgSuccess("閲嶆柊鍙戦�佹垚鍔�");
+ this.getList();
+ }).catch(() => {});
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.1