From bc343c6a967afe56208c9e290f862fec3f67ca02 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 25 Dec 2024 15:24:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A1=E7=AE=97=E7=B3=BB=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint_form.vue          | 22 ++++++++++++++++++++--
 src/views/enm_base/formulaSetting.vue |  2 +-
 src/views/fac_cal/mpointstat.vue      |  4 ++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index 1a2dd238..7519674e 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -189,14 +189,28 @@
 							</el-form-item>
 						</el-col>
 						<el-divider/>
-						<el-col :md="12" :sm="24">
+						<el-col :md="6" :sm="24">
+							<el-form-item label="计算系数名" label-width="90">
+								<el-input
+									v-model="form.cal_coefficient_name"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="4" :sm="24">
+							<el-form-item label="方式"  label-width="60">
+								<el-select v-model="form.cal_coefficient_method">
+								  <el-option v-for="item in fmOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="6" :sm="24">
 							<el-form-item label="计算系数" label-width="90">
 								<el-input-number
 									v-model="form.cal_coefficient"
 								></el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="8" :sm="24">
 							<el-form-item label="是否需要变更计算系数" label-width="220">
 								<el-switch v-model="form.need_change_cal_coefficient" />
 							</el-form-item>
@@ -390,6 +404,10 @@ export default {
 				edit: "编辑",
 				show: "查看",
 			},
+			fmOptions:[
+			{value: 1, label:"乘"},
+			{value: 2, label:"除"},
+			],
 			form: {
 				type: 10,
 				belong_dept: null,
diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue
index d312e14d..12c83ef5 100644
--- a/src/views/enm_base/formulaSetting.vue
+++ b/src/views/enm_base/formulaSetting.vue
@@ -3,7 +3,7 @@
 		<el-main class="nopadding">
 			<div v-for = "item in mpointList" :key="item.id" style="margin-top: 20px; margin-left: 10px">
 				<el-form :inline="true">
-					<el-form-item :label="item.name">
+					<el-form-item :label="item.name + '-' + item.cal_coefficient_name">
 						<el-input-number
 									v-model="item.cal_coefficient"
 								></el-input-number>
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index 8dc2c28e..ef5f7ec4 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -93,6 +93,10 @@
 						prop="val_origin"
 						min-width="100"
 					></el-table-column>
+					<el-table-column
+					label="计算系数"
+					prop="current_cal_coefficient"
+				></el-table-column>
 					<el-table-column
 						label="操作"
 						fixed="right"