From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaCityPriceRuleWindow.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 8e3a551..26c55c0 100644
--- a/admin/src/components/business/OperaCityPriceRuleWindow.vue
+++ b/admin/src/components/business/OperaCityPriceRuleWindow.vue
@@ -15,10 +15,10 @@
</div>
</div>
</el-tab-pane>
- <el-tab-pane label="寮傚湴瀵勫瓨" name="remote">
- <div class="remote-config-title">寮傚湴瀵勯�侀厤缃�</div>
+ <el-tab-pane label="鍚屽煄瀵勯��" name="remote">
+ <div class="remote-config-title">鍚屽煄瀵勯��</div>
<div class="remote-header">
- <span class="remote-tip"> <p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁琛屾潕灏哄銆侀厤閫侀噷绋嬪強閰嶉�佷环鏍兼敹鍙栬垂鐢紙涓嶈冻1鍏噷鎸�1鍏噷璁′环锛�</p></span>
+ <span class="remote-tip"> <p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁琛屾潕绫诲瀷銆佽捣閫�/缁�侀噷绋嬪強璧烽��/缁�佷环鏍兼敹鍙栬垂鐢�(涓嶈冻1鍏噷鎸�1鍏噷璁′环)</p></span>
</div>
<el-table :data="remoteTableData" border stripe>
<el-table-column prop="categoryName" label="琛屾潕灏哄"></el-table-column>
@@ -50,6 +50,12 @@
<span class="remote-tip"><p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁閰嶉�侀噷绋嬮璁￠厤閫佹椂闀垮苟灞曠ず鍦ㄥ皬绋嬪簭涓嬪崟椤甸潰</p></span>
</div>
<el-table :data="timeTableData" border stripe>
+ <el-table-column label="璁㈠崟绾у埆">
+ <template slot-scope="{row}">
+ <span v-if="row.fieldA == 1" >鏍囬�熻揪</span>
+ <span v-if="row.fieldA == 2" >鎬ラ�熻揪</span>
+ </template>
+ </el-table-column>
<el-table-column label="璧烽�侀噷绋�(鍏噷)">
<template slot-scope="{row}">
<el-input v-model="row.startDistance" type="number" placeholder="璇疯緭鍏�"></el-input>
@@ -255,7 +261,7 @@
item.startPrice === null || item.startPrice === undefined || item.startPrice === '' ||
item.extraDistance === null || item.extraDistance === undefined || item.extraDistance === '' ||
item.extraPrice === null || item.extraPrice === undefined || item.extraPrice === '') {
- this.$message.error('璇峰～鍐欐墍鏈夊紓鍦板瘎閫佺殑閰嶇疆淇℃伅')
+ this.$message.error('璇峰～鍐欐墍鏈夊悓鍩庡瘎閫佺殑閰嶇疆淇℃伅')
return false
}
}
--
Gitblit v1.9.3