From d54dc04ae25b73ee0c7c588c6523d94624f052e3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 六月 2026 10:09:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
admin/src/components/business/OperaCityPriceRuleWindow.vue | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaCityPriceRuleWindow.vue b/admin/src/components/business/OperaCityPriceRuleWindow.vue
index 8e3a551..1af7049 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>
@@ -87,8 +93,8 @@
<div class="price-tip"><p class="tip-warn"><i class="el-icon-warning"></i>鏍规嵁璁㈠崟涓笉鍚岃繍钀ヨ鑹茶�岀嫭绔嬮厤缃笉鍚屽垎鎴愭瘮渚�</p></div>
<div class="price-items">
<div class="price-item" v-for="(item, index) in shareTableData" :key="index">
- <span class="price-label">{{item.fieldType === 4 ? '鍦ㄨ鍗曚腑浣滀负閰嶉�佸憳鏃讹紝' : '鍏朵腑闂ㄥ簵绫诲瀷涓�'}}{{item.fieldTypeName}}鍒嗘垚姣斾緥涓�</span>
- <el-input style="width: 100px;" v-model="item.ratio" type="number" placeholder="璇疯緭鍏�"></el-input>
+ <span class="price-label">{{item.fieldTypeName}}{{item.fieldType === 4 ? '鍦ㄨ鍗曚腑浣滀负閰嶉�佸憳鏃讹紝' : '闂ㄥ簵'}}鍒嗘垚姣斾緥涓�</span>
+ <el-input style="width: 100px;" v-model="item.ratio" placeholder="璇疯緭鍏�"></el-input>
<span class="price-unit">%</span>
</div>
</div>
@@ -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
}
}
@@ -290,6 +296,19 @@
this.$message.error('璇峰～鍐欐墍鏈夊垎鎴愭瘮渚�')
return false
}
+ const num = Number(item.ratio)
+ if (isNaN(num) || num < 1) {
+ this.$message.error(item.fieldTypeName + '鍒嗘垚姣斾緥蹇呴』澶т簬绛変簬1')
+ return false
+ }
+ const str = String(item.ratio)
+ if (str.includes('.')) {
+ const decimal = str.split('.')[1]
+ if (decimal.length > 1) {
+ this.$message.error(item.fieldTypeName + '鍒嗘垚姣斾緥鏈�澶氭敮鎸佷竴浣嶅皬鏁�')
+ return false
+ }
+ }
}
return true
}
--
Gitblit v1.9.3