From 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 15:36:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/returnReason.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/returnReason.vue b/admin/src/views/business/returnReason.vue
index 1ae36f1..58c2fad 100644
--- a/admin/src/views/business/returnReason.vue
+++ b/admin/src/views/business/returnReason.vue
@@ -3,8 +3,8 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鍘熷洜" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ師鍥�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
@@ -15,7 +15,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:baseparam:create']">
- <li><el-button type="primary" @click="$refs.operaReturnReasonWindow.open('鏂板缓杞﹁締闂')" icon="el-icon-plus" v-permissions="['business:baseparam:create']">鏂板缓</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaReturnReasonWindow.open('鏂板缓寮哄埗杩樿溅鍘熷洜')" icon="el-icon-plus" v-permissions="['business:baseparam:create']">鏂板缓</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -44,7 +44,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaReturnReasonWindow.open('缂栬緫杞﹁締闂', row)" icon="el-icon-edit" v-permissions="['business:baseparam:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.operaReturnReasonWindow.open('缂栬緫寮哄埗杩樿溅鍘熷洜', row)" icon="el-icon-edit" v-permissions="['business:baseparam:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:baseparam:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
--
Gitblit v1.9.3