li.shaoyi 2 rokov pred
rodič
commit
25b49cb1b1

+ 1 - 1
src/filters/index.ts

@@ -75,7 +75,7 @@ export function handleNumberValue(value?: number | string, suffix = '') {
  * @param decimal 保留小数位
  */
 export function parsePercent(value: number, decimal = 2) {
-    const val = formatDecimal(value * 100, decimal, false)
+    const val = formatDecimal((value * 100).toPrecision(12), decimal, false)
     return handleNumberValue(val, '%')
 }
 

+ 3 - 2
src/packages/pc/views/customs/bonded/components/advance-payment/index.vue

@@ -2,14 +2,14 @@
 <template>
     <app-drawer title="确认预付款" :width="800" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-descriptions :column="2" border v-if="details">
-            <el-descriptions-item label="单据编号">{{ selectedRow.orderid }}</el-descriptions-item>
+            <el-descriptions-item label="单据编号">{{ handleNoneValue(selectedRow.orderno) }}</el-descriptions-item>
             <el-descriptions-item label="税费保证金">{{ details.taxmargin }}</el-descriptions-item>
             <el-descriptions-item label="汇款银行手续费">{{ details.bankfee }}</el-descriptions-item>
             <el-descriptions-item label="代缴物流保险费">{{ details.logisticsfee }}</el-descriptions-item>
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总共">{{ details.totalfee }}</el-descriptions-item>
-            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书(预付款)”</el-descriptions-item>
+            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书”</el-descriptions-item>
             <el-descriptions-item label="账户可用余额">{{ accountStore.avaiableMoney.toFixed(2) }}</el-descriptions-item>
         </el-descriptions>
         <template #footer>
@@ -22,6 +22,7 @@
 <script lang="ts" setup>
 import { shallowRef, PropType, computed } from 'vue'
 import { ElMessage } from 'element-plus'
+import { handleNoneValue } from '@/filters'
 import { useAccountStore } from '@/stores'
 import { useBSFWOrderOperate, useBSFWMemberOperate } from '@/business/customs/bonded'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

+ 1 - 1
src/packages/pc/views/customs/bonded/components/payment/index.vue

@@ -11,7 +11,7 @@
             <el-descriptions-item label="总应收款">{{ details.settleamount }}</el-descriptions-item>
             <el-descriptions-item label="预收款">{{ details.advanceamount }}</el-descriptions-item>
             <el-descriptions-item label="应收\退款">{{ arrearage.toFixed(2) }}</el-descriptions-item>
-            <el-descriptions-item label="结算费用详情文件">请下载文件“付款通知书(结算费用)”</el-descriptions-item>
+            <el-descriptions-item label="结算费用详情文件">请下载文件“结算费用通知书”</el-descriptions-item>
             <el-descriptions-item label="账户可用余额" v-if="arrearage >= 0">{{
                 accountStore.avaiableMoney.toFixed(2) }}</el-descriptions-item>
         </el-descriptions>

+ 1 - 1
src/packages/pc/views/customs/exit/components/advance-payment/index.vue

@@ -10,7 +10,7 @@
             <el-descriptions-item label="综合服务费">{{ details.servicefee }}</el-descriptions-item>
             <el-descriptions-item label="其它费用">{{ details.otherfee }}</el-descriptions-item>
             <el-descriptions-item label="总共">{{ details.totalfee }}</el-descriptions-item>
-            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书(预付款)”</el-descriptions-item>
+            <el-descriptions-item label="预付款详情文件">请下载文件“付款通知书”</el-descriptions-item>
             <el-descriptions-item label="账户可用余额">{{ accountStore.avaiableMoney.toFixed(2) }}</el-descriptions-item>
         </el-descriptions>
         <template #footer>

+ 1 - 1
src/packages/pc/views/customs/exit/components/payment/index.vue

@@ -12,7 +12,7 @@
             <el-descriptions-item label="总共">{{ details.settleamount }}</el-descriptions-item>
             <el-descriptions-item label="预收款">{{ details.advanceamount }}</el-descriptions-item>
             <el-descriptions-item label="应收\退款">{{ arrearage.toFixed(2) }}</el-descriptions-item>
-            <el-descriptions-item label="结算费用详情文件">请下载文件“付款通知书(结算费用)”</el-descriptions-item>
+            <el-descriptions-item label="结算费用详情文件">请下载文件“结算费用通知书”</el-descriptions-item>
             <el-descriptions-item label="账户可用余额" v-if="arrearage >= 0">{{
                 accountStore.avaiableMoney.toFixed(2) }}</el-descriptions-item>
         </el-descriptions>

+ 4 - 0
src/packages/pc/views/order/main/index.vue

@@ -12,6 +12,10 @@
             </app-filter>
         </template>
         <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+            <!-- 重量 -->
+            <template #weight="{ value }">
+                {{ handleNumberValue(value) }}
+            </template>
             <!-- 履约金额 -->
             <template #amount="{ value }">
                 {{ handleNumberValue(value) }}

+ 1 - 1
src/packages/pc/views/trade/purchase/components/details/index.vue

@@ -25,7 +25,7 @@
                         </li>
                         <li>
                             <span>尺寸</span>
-                            <span>{{ handleNoneValue(selectedRow.zssize) }}</span>
+                            <span>{{ handleNoneValue(selectedRow.zssizedisplay) }}</span>
                         </li>
                         <li>
                             <span>形状</span>

+ 1 - 0
src/types/ermcp/trade.d.ts

@@ -444,6 +444,7 @@ declare namespace Ermcp {
         zsshapetype: string; // 形状 - 多个, 逗号分隔
         zsshapetypedisplay: string;
         zssize: string; // 尺寸 - 两个小数, 逗号分隔
+        zssizedisplay: string;
         zsstyletype: string; // 款式 - 多个, 逗号分隔
         zsstyletypedisplay: string;
         zssymmetrytype: string; // 对称度 - 两个, 逗号分隔

+ 7 - 0
vue.config.js

@@ -24,6 +24,13 @@ module.exports = defineConfig({
   css: {
     extract: true, // 是否使用css分离插件 ExtractTextPlugin
     sourceMap: false,
+    loaderOptions: {
+      postcss: {
+        postcssOptions: {
+          config: process.env.VUE_APP_ROOT, // 自定义 postcss.config.js 文件路径,https://webpack.docschina.org/loaders/postcss-loader/#postcss-options
+        }
+      }
+    }
   },
   chainWebpack: (config) => {
     config.resolve.alias