From 961a0109a7ad2e98a46cec5bb0f4b72a4357ccab Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 3 Sep 2024 16:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bikerebatemanagement/bicyclerebatemanagement.vue        | 4 ++--
 .../bikerebatemanagement/bicyclerebatemanagementAdd.vue     | 6 ++++--
 .../bikerebatemanagement/bicyclerebatemanagementEdit.vue    | 5 ++++-
 .../bikerebatemanagement/bicyclerebatemanagementInfo.vue    | 5 ++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 627631bedd..12cfd4031d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -56,7 +56,7 @@
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
             <el-table-column fixed label="操作" align="center" width="180px" >
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button type="primary" :disabled="scope.row.state !== '0'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -165,7 +165,7 @@
                 <span>{{ scope.row.adjustmentMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="调整说明" align="center" width="120">
+            <el-table-column label="调整说明" align="center" min-width="200">
               <template slot-scope="scope">
                 <span>{{ scope.row.adjustmentRemarks }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
index 367983edcb..07fd91db8c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
@@ -53,7 +53,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>计算标准(%)</span>
+              <span>计算标准
+                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-else>(元)</span>
+              </span>
             </el-col>
             <el-col :span="12">
               <el-form-item><el-input v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" class="addinputw"></el-input></el-form-item>
@@ -62,7 +65,6 @@
           <div class="title">
             <div>返利车辆列表</div>
             <div>
-              <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline">添加</el-button>
               <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="addjacket()">批量选择</el-button>
             </div>
           </div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
index 8f93cbbca0..3c5b881bff 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
@@ -53,7 +53,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>计算标准(%)</span>
+              <span>计算标准
+                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-else>(元)</span>
+              </span>
             </el-col>
             <el-col :span="12">
               <el-form-item><el-input v-model="formobj.calculationStandard" @input="estimateRebateInput" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" class="addinputw"></el-input></el-form-item>
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
index dedbe5b5fc..aedbca06bb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue
@@ -43,7 +43,10 @@
               <el-form-item><span>{{ formobj.calculationModeValue }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>计算标准(%)</span>
+              <span>计算标准
+                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-else>(元)</span>
+              </span>
             </el-col>
             <el-col :span="12">
               <el-form-item><span>{{ formobj.calculationStandard }}</span></el-form-item>