From 8e8b65495acba329662b0bc4240bcc8d17ebc66b Mon Sep 17 00:00:00 2001
From: user <user@example.com>
Date: Mon, 31 Mar 2025 17:05:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=A9=E6=96=99=E6=8A=98=E7=BA=AF=E7=8E=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E8=BE=93=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将生产折纯、客户折纯和报关折纯的显示和输入方式优化为百分比形式，提高用户体验。修改了相关组件的逻辑，确保数据在存储和显示时正确转换。
---
 .../entities/material/material-edit.component.ts   | 14 +++++++++++++-
 .../webapp/app/entities/material/material-edit.vue | 12 +++++++++---
 .../app/entities/material/material.component.ts    |  5 +++++
 src/main/webapp/app/entities/material/material.vue |  9 +++++++++
 src/main/webapp/i18n/zh-cn/material.json           |  6 +++---
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/app/entities/material/material-edit.component.ts b/src/main/webapp/app/entities/material/material-edit.component.ts
index 2e2fede..1789821 100644
--- a/src/main/webapp/app/entities/material/material-edit.component.ts
+++ b/src/main/webapp/app/entities/material/material-edit.component.ts
@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted } from 'vue';
+import { defineComponent, ref, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlertService } from '@/shared/alert/alert.service';
 import { useRoute, useRouter } from 'vue-router';
@@ -48,6 +48,9 @@ export default defineComponent({
       sortNo: 0,
       version: 0,
       status: '',
+      productionRateDisplay: 0,
+      customerRateDisplay: 0,
+      customsRateDisplay: 0,
     });
 
     const loadData = async () => {
@@ -89,6 +92,10 @@ export default defineComponent({
 
         if (route.params?.id) {
           material.value = materialRes.data;
+          // 设置百分比显示值
+          material.value.productionRateDisplay = material.value.productionRate ? (material.value.productionRate * 100).toFixed(2) : 0;
+          material.value.customerRateDisplay = material.value.customerRate ? (material.value.customerRate * 100).toFixed(2) : 0;
+          material.value.customsRateDisplay = material.value.customsRate ? (material.value.customsRate * 100).toFixed(2) : 0;
         } else {
           // 设置新建material时的默认状态值
           const defaultStatus = statusDictsRes.data.find(item => {
@@ -152,6 +159,11 @@ export default defineComponent({
         return;
       }
 
+      // 转换百分比值为小数
+      material.value.productionRate = material.value.productionRateDisplay ? (material.value.productionRateDisplay / 100).toFixed(4) : null;
+      material.value.customerRate = material.value.customerRateDisplay ? (material.value.customerRateDisplay / 100).toFixed(4) : null;
+      material.value.customsRate = material.value.customsRateDisplay ? (material.value.customsRateDisplay / 100).toFixed(4) : null;
+
       isSaving.value = true;
       try {
         if (material.value.id) {
diff --git a/src/main/webapp/app/entities/material/material-edit.vue b/src/main/webapp/app/entities/material/material-edit.vue
index 6c62a6c..86cd940 100644
--- a/src/main/webapp/app/entities/material/material-edit.vue
+++ b/src/main/webapp/app/entities/material/material-edit.vue
@@ -51,17 +51,23 @@
         </vxe-form-item>
         <vxe-form-item field="productionRate" :title="$t('jewpmsApp.material.productionRate')" :item-render="{}">
           <template #default="{ data }">
-            <vxe-input v-model="data.productionRate" type="float" step="0.001" clearable data-cy="productionRate" />
+            <vxe-input v-model="data.productionRateDisplay" type="number" min="0" max="100" step="0.01" clearable data-cy="productionRate">
+              <template #suffix>%</template>
+            </vxe-input>
           </template>
         </vxe-form-item>
         <vxe-form-item field="customerRate" :title="$t('jewpmsApp.material.customerRate')" :item-render="{}">
           <template #default="{ data }">
-            <vxe-input v-model="data.customerRate" type="float" step="0.001" clearable data-cy="customerRate" />
+            <vxe-input v-model="data.customerRateDisplay" type="number" min="0" max="100" step="0.01" clearable data-cy="customerRate">
+              <template #suffix>%</template>
+            </vxe-input>
           </template>
         </vxe-form-item>
         <vxe-form-item field="customsRate" :title="$t('jewpmsApp.material.customsRate')" :item-render="{}">
           <template #default="{ data }">
-            <vxe-input v-model="data.customsRate" type="float" step="0.001" clearable data-cy="customsRate" />
+            <vxe-input v-model="data.customsRateDisplay" type="number" min="0" max="100" step="0.01" clearable data-cy="customsRate">
+              <template #suffix>%</template>
+            </vxe-input>
           </template>
         </vxe-form-item>
         <vxe-form-item
diff --git a/src/main/webapp/app/entities/material/material.component.ts b/src/main/webapp/app/entities/material/material.component.ts
index 05a01e4..9caba53 100644
--- a/src/main/webapp/app/entities/material/material.component.ts
+++ b/src/main/webapp/app/entities/material/material.component.ts
@@ -83,6 +83,11 @@ export default defineComponent({
         field: 'productionRate',
         sortable: true,
       },
+      {
+        title: $t('jewpmsApp.material.customerRate'),
+        field: 'customerRate',
+        sortable: true,
+      },
       {
         title: $t('jewpmsApp.material.customsRate'),
         field: 'customsRate',
diff --git a/src/main/webapp/app/entities/material/material.vue b/src/main/webapp/app/entities/material/material.vue
index 194b653..714853e 100644
--- a/src/main/webapp/app/entities/material/material.vue
+++ b/src/main/webapp/app/entities/material/material.vue
@@ -110,6 +110,15 @@
         <template #default="{ row }" v-if="column.field === 'status'">
           {{ statusDicts.find(s => s.number === String(row.status))?.name || row.status }}
         </template>
+        <template #default="{ row }" v-if="column.field === 'productionRate'">
+          {{ row.productionRate !== null && row.productionRate !== undefined ? (row.productionRate * 100).toFixed(2) + '%' : '' }}
+        </template>
+        <template #default="{ row }" v-if="column.field === 'customerRate'">
+          {{ row.customerRate !== null && row.customerRate !== undefined ? (row.customerRate * 100).toFixed(2) + '%' : '' }}
+        </template>
+        <template #default="{ row }" v-if="column.field === 'customsRate'">
+          {{ row.customsRate !== null && row.customsRate !== undefined ? (row.customsRate * 100).toFixed(2) + '%' : '' }}
+        </template>
         <template #default="{ row }" v-if="column.title === $t('entity.action.actions')">
           <div class="vxe-group">
             <vxe-button class="btn-circle">
diff --git a/src/main/webapp/i18n/zh-cn/material.json b/src/main/webapp/i18n/zh-cn/material.json
index fba9ec2..3059c7c 100644
--- a/src/main/webapp/i18n/zh-cn/material.json
+++ b/src/main/webapp/i18n/zh-cn/material.json
@@ -23,9 +23,9 @@
       "category": "类别",
       "unitWeight": "重量单位",
       "spec": "规格",
-      "productionRate": "生产折纯%",
-      "customerRate": "客户折纯%",
-      "customsRate": "报关折纯%",
+      "productionRate": "生产折纯",
+      "customerRate": "客户折纯",
+      "customsRate": "报关折纯",
       "matGroup00": "组别0",
       "matGroup01": "组别1",
       "matGroup02": "组别2",