From c296c9e53de81a1cb5b708f9fad1e170af462467 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 22 May 2023 23:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeliveryExpressTemplateForm.vue           | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/mall/trade/delivery/expressTemplate/DeliveryExpressTemplateForm.vue b/src/views/mall/trade/delivery/expressTemplate/DeliveryExpressTemplateForm.vue
index 024b8a88..aa52f83b 100644
--- a/src/views/mall/trade/delivery/expressTemplate/DeliveryExpressTemplateForm.vue
+++ b/src/views/mall/trade/delivery/expressTemplate/DeliveryExpressTemplateForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="85%">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%">
     <el-form
       ref="formRef"
       :model="formData"
@@ -12,14 +12,18 @@
       </el-form-item>
       <el-form-item label="计费方式" prop="chargeMode">
         <el-radio-group v-model="formData.chargeMode" @change="changeChargeMode">
-          <el-radio :label="1">按件数</el-radio>
-          <el-radio :label="2">按重量</el-radio>
-          <el-radio :label="3">按体积</el-radio>
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="运费" prop="templateCharge">
         <el-table border style="width: 100%" :data="formData.templateCharge">
-          <el-table-column align="center" label="区域">
+          <el-table-column align="center" label="区域" width="180">
             <template #default="{ row }">
               <!--   区域数据太多，用赖加载方式，要不然性能有问题 -->
               <el-tree-select
@@ -36,22 +40,32 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :label="columnTitle.startCountTitle" prop="startCount">
+          <el-table-column
+            align="center"
+            :label="columnTitle.startCountTitle"
+            width="180"
+            prop="startCount"
+          >
             <template #default="{ row }">
               <el-input-number v-model="row.startCount" :min="1" />
             </template>
           </el-table-column>
-          <el-table-column label="运费(元)" prop="startPrice">
+          <el-table-column width="180" align="center" label="运费(元)" prop="startPrice">
             <template #default="{ row }">
               <el-input-number v-model="row.startPrice" :min="1" />
             </template>
           </el-table-column>
-          <el-table-column :label="columnTitle.extraCountTitle" prop="extraCount">
+          <el-table-column
+            width="180"
+            align="center"
+            :label="columnTitle.extraCountTitle"
+            prop="extraCount"
+          >
             <template #default="{ row }">
               <el-input-number v-model="row.extraCount" :min="1" />
             </template>
           </el-table-column>
-          <el-table-column label="续费(元)" prop="extraPrice">
+          <el-table-column width="180" align="center" label="续费(元)" prop="extraPrice">
             <template #default="{ row }">
               <el-input-number v-model="row.extraPrice" :min="1" />
             </template>
@@ -72,7 +86,7 @@
       </el-form-item>
       <el-form-item label="包邮区域" prop="templateFree">
         <el-table border style="width: 100%" :data="formData.templateFree">
-          <el-table-column label="区域">
+          <el-table-column align="center" label="区域">
             <template #default="{ row }">
               <!--   区域数据太多，用赖加载方式，要不然性能有问题 -->
               <el-tree-select
@@ -89,12 +103,12 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :label="columnTitle.freeCountTitle" prop="freeCount">
+          <el-table-column align="center" :label="columnTitle.freeCountTitle" prop="freeCount">
             <template #default="{ row }">
               <el-input-number v-model="row.freeCount" :min="1" />
             </template>
           </el-table-column>
-          <el-table-column label="包邮金额（元）" prop="freePrice">
+          <el-table-column align="center" label="包邮金额（元）" prop="freePrice">
             <template #default="{ row }">
               <el-input-number v-model="row.freePrice" :min="1" />
             </template>
@@ -122,6 +136,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as DeliveryExpressTemplateApi from '@/api/mall/trade/delivery/expressTemplate'
 import { defaultProps } from '@/utils/tree'
 import { yuanToFen, fenToYuan } from '@/utils'