From 073d2fa1d86fcb998bc27e79cdc3773da7ed8b2b Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 16:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue | 78 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index a90207d..fe5e196 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -91,42 +91,77 @@
<template #menu="{ row, index, size }">
<el-tooltip content="鏌ョ湅" placement="top" :enterable="false">
<el-link type="primary" icon="el-icon-view" :underline="false" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:query']"
@click="$refs.crudRef.rowView(row, index)">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top" :enterable="false">
+ <el-link type="primary" icon="el-icon-delete" :underline="false" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:remove']" v-if="row.status == 0"
+ @click="$refs.crudRef.rowDel(row, index)">
</el-link>
</el-tooltip>
<el-tooltip content="缂栬緫" placement="top" :enterable="false">
<el-link type="primary" icon="el-icon-edit" :underline="false" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:edit']" v-if="[0, 1].includes(row.status)"
@click="$refs.crudRef.rowEdit(row, index)">
</el-link>
</el-tooltip>
</template>
<template #menu-before="{ row }">
+
+
<el-tooltip content="杩愯緭璐у搧鐧昏" placement="top">
- <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
- v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
- icon="el-icon-document-add">
- </el-link>
+ <el-link size="small" type="primary" @click="handleAddGoods(row)" class="link-btn"
+ v-hasPermi="['tms:tmsGoodsDetail:add']" v-if="[0,1,2].includes(row.status)"
+ :underline="false" icon="el-icon-document-add">
+ </el-link>
</el-tooltip>
-
<el-tooltip content="瀹為檯杩愯緭璁板綍" placement="top">
- <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
- v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0, 1, 2].includes(row.status)" :underline="false"
- icon="el-icon-set-up">
- </el-link>
+ <el-link size="small" type="primary" @click="handleActual(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:update']" v-if="[0,1,2].includes(row.status)"
+ :underline="false" icon="el-icon-set-up">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="纭畾" placement="top">
+ <el-link size="small" type="primary" v-if="row.status == 0" @click="handleConfirm(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:confirmOrder']"
+ :underline="false" icon="el-icon-pointer">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="浣滃簾" placement="top">
+ <el-link size="small" type="primary" v-if="[0,1,2].includes(row.status)" @click="handleClose(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:closeOrder']"
+ :underline="false" icon="el-icon-close">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="澶嶅埗" placement="top">
+ <el-link size="small" type="primary" @click="handleCopy(row)" class="link-btn" :underline="false"
+ v-hasPermi="['tms:tmsDispatchOrder:copyOrder']"
+ icon="el-icon-connection">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="涓婁紶琛岀▼" placement="top">
+ <el-link size="small" type="primary" v-if="[1,2].includes(row.status)" @click="handleUploadItinerary(row)"
+ v-hasPermi="['tms:tmsTrip:add']"
+ class="link-btn" :underline="false" icon="el-icon-upload">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="鏌ョ湅琛岀▼" placement="top">
+ <el-link size="small" type="primary" v-if="![0,1].includes(row.status)" @click="handleLogItinerary(row)"
+ v-hasPermi="['tms:tmsTrip:list']"
+ class="link-btn" :underline="false" icon="el-icon-view">
+ </el-link>
+ </el-tooltip>
+ <el-tooltip content="瀹屾垚琛岀▼" placement="top">
+ <el-link size="small" type="primary" v-if="[2].includes(row.status)" @click="handleOk(row)" class="link-btn"
+ v-hasPermi="['tms:tmsDispatchOrder:okOrder']"
+ :underline="false" icon="el-icon-circle-check">
+ </el-link>
</el-tooltip>
- <el-tooltip content="澶嶅埗" placement="top">
- <el-link size="small" type="primary" @click="handleCopy(row)" class="link-btn" :underline="false"
- v-hasPermi="['tms:tmsDispatchOrder:copyOrder']" icon="el-icon-connection">
- </el-link>
- </el-tooltip>
- <el-tooltip content="鏃ュ織" placement="top">
- <el-link size="small" type="primary" @click="handleLog(row)" class="link-btn" :underline="false"
- icon="el-icon-tickets">
- </el-link>
- </el-tooltip>
</template>
<!-- <template #menu="{row}">
@@ -650,6 +685,7 @@
menuType: 'icon',
viewBtn: false, // 鍏抽棴鍘熺敓鏌ョ湅
editBtn: false, // 鍏抽棴鍘熺敓缂栬緫
+ delBtn: false, // 鍏抽棴鍘熺敓缂栬緫
searchIndex: 7, // 鍏抽敭锛氭姌鍙犳椂鏄剧ず鐨勪釜鏁帮紙鏍规嵁浣犵殑瀛楁鏁伴噺璋冩暣锛�
searchIcon: true, // 鍏抽敭锛氭樉绀烘姌鍙�/灞曞紑鎸夐挳
@@ -3024,7 +3060,7 @@
vehicleId: row.vehicleId,
}
console.log(boxForm.value);
-
+
})
}
const cancelBox = () => {
@@ -4622,4 +4658,4 @@
padding: 1px 11px;
box-shadow: 0 0 0 1px var(--el-disabled-border-color) inset;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0