From 1fe0e0d2c210e243d6d403cbbd05d9d57db0bc3d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 10 Jul 2024 16:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenanceitem/maintenanceitemAdd.vue    | 20 +++++++++++++++++--
 .../maintenanceitem/maintenanceitemInfo.vue   |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index b77299bb27..790d3161c0 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -74,8 +74,13 @@
               <el-form-item prop="price"><span class="addinputInfo">{{ calculatePrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>考核工时</div>
-              <el-form-item prop="examineHourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>工时提成</div>
+              <el-form-item prop="examineHourPrice">
+                <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-input style="width: 40%" @input="royaltiesRatioInput(formobj)" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" clearable placeholder="" />
+                  <el-input style="width: 100px" @input="examineHourPriceInput(formobj)" @keyup.native="royaltiesRatio = getNumber(royaltiesRatio, 2)" v-model="royaltiesRatio" clearable placeholder="提成比例(%)" />
+                </div>
+              </el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">备注</div>
@@ -129,6 +134,7 @@ export default {
       goodsModel_list: [],
       manufacturer_list: [],
       subject_list: [],
+      royaltiesRatio: '', // 提成比例
       formobj: {
         sid: '',
         createBySid: '',
@@ -224,6 +230,8 @@ export default {
       req.fetchBySid(row.sid).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          // 因提成比例不存数据库，则编辑信息时需要计算出值
+          this.examineHourPriceInput(this.formobj)
         }
       })
     },
@@ -277,6 +285,14 @@ export default {
         this.formobj.manufacturerSid = ''
       }
     },
+    // 计算提成比例 = 工时提成 / 销售价
+    royaltiesRatioInput(val) {
+      this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(val.price !== '' ? val.price : '0')) * 100) / 100
+    },
+    // 计算工时提成 = 销售价 * 提成比例
+    examineHourPriceInput(val) {
+      val.examineHourPrice = Math.round((parseFloat(val.price !== '' ? val.price : '0') * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100
+    },
     saveOrUpdate() {
       this.formobj.price = this.calculatePrice
       this.$refs['form_obj'].validate((valid) => {
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
index faebb37cf9..466366049a 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue
@@ -57,7 +57,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.price }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">考核工时</div>
+              <div class="span-sty">工时提成</div>
               <el-form-item><span class="addinputInfo">{{ formobj.examineHourPrice }}</span></el-form-item>
             </el-col>
             <el-col :span="8">