From 63acd6ed0dfc65f57c2b085cf2bd8e227f0bb826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 3 Apr 2023 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/order/indexjs.js             |  6 ++--
 src/views/system/stationItem/index.vue        | 34 ++++++++++++++++---
 src/views/system/stationItem/stationItemjs.js | 10 ++++++
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index 3615b30..a77811f 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -227,11 +227,11 @@ export default {
                 res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '未失能' : ''
                 if (row.orderStatus == 'EVALUATED') {
                     if (res.data) {
-                        if (res.data[0].evaluateSatisfaction == 'COMMONLY') {
+                        if (res.data.evaluateSatisfaction == 'COMMONLY') {
                             this.query.evaluateSatisfaction = '一般'
-                        } else if (res.data[0].evaluateSatisfaction == 'SATISFIED') {
+                        } else if (res.data.evaluateSatisfaction == 'SATISFIED') {
                             this.query.evaluateSatisfaction = '满意'
-                        } else if (res.data[0].evaluateSatisfaction == 'DISSATISFIED') {
+                        } else if (res.data.evaluateSatisfaction == 'DISSATISFIED') {
                             this.query.evaluateSatisfaction = '不满意'
                         }
                         this.loading = false
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 1b046d5..c854f0f 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -309,9 +309,9 @@
           <el-table
             ref="nurseStationItemPrices"
             :data="form.nurseStationItemPrices"
-            style="margin-top: 20px; width: 900px"
+            style="margin-top: 20px; width: 1050px"
           >
-            <el-table-column property="serveDurationUnit" label="服务时长和单位" align="center">
+            <el-table-column property="serveDurationUnit" label="服务时长和单位" align="center" width="120">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.serveDurationUnit" maxlength="6"></el-input>
               </template>
@@ -320,7 +320,7 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.price"
-                  placeholder="小数点后两位(元)"
+                  placeholder="最多小数点后两位(元)"
                   type="number"
                   min="0"
                   oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 6) { value = value.slice(0, 6) }"
@@ -332,7 +332,33 @@
                 <el-input v-model="scope.row.description" maxlength="300"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column property="description" label="佣金金额" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.commissionAmount"
+                  maxlength="300"
+                  placeholder="最多小数点后两位(元)"
+                  @input="commissionAmountinput(scope.row)"
+                  type="number"
+                  min="0"
+                  oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 6) { value = value.slice(0, 6) }"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column property="description" label="佣金比例(%)" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.commissionRate"
+                  maxlength="300"
+                  @input="commissionRateoninput(scope.row)"
+                  placeholder="最多小数点后两位(%)"
+                  type="number"
+                  min="0"
+                  oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 6) { value = value.slice(0, 6) }"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="100">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" @click="addnurseStationItemPrices">新增</el-button>
                 <el-button size="mini" type="text" @click="delnurseStationItemPrices(scope.row)">删除</el-button>
diff --git a/src/views/system/stationItem/stationItemjs.js b/src/views/system/stationItem/stationItemjs.js
index 7cdbe51..9c76986 100644
--- a/src/views/system/stationItem/stationItemjs.js
+++ b/src/views/system/stationItem/stationItemjs.js
@@ -197,6 +197,16 @@ export default {
         this.classifylistInfo();
     },
     methods: {
+        commissionAmountinput(e) {
+            if (e.commissionRate) {
+                e.commissionAmount = ''
+            }
+        },
+        commissionRateoninput(e) {
+            if (e.commissionAmount) {
+                e.commissionRate = ''
+            }
+        },
         //点击上架
         upwhetherShelf(row) {
             let shelfStatus = null