update

src/packages/sbyj/views/delivery/components/completed/list/index.vue

@@ -19,6 +19,10 @@
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
+                            <span>实际交料重量</span>
+                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                        </li>
+                        <li>
                             <span>补差价</span>
                             <span>{{ item.deliverypremium }}</span>
                         </li>
@@ -28,15 +32,15 @@
                         </li>
                         <li>
                             <span>总货款</span>
-                            <span>{{ item.deliveryamount }}</span>
+                            <span>{{ formatDecimal(item.deliverytotalamount) }}</span>
                         </li>
                         <li>
                             <span>已付货款</span>
-                            <span>{{ item.payedamount }}</span>
+                            <span>{{ formatDecimal(item.payedamount) }}</span>
                         </li>
                         <li>
                             <span>冻结货款</span>
-                            <span>{{ item.freezeamount }}</span>
+                            <span>{{ formatDecimal(item.freezeamount) }}</span>
                         </li>
                         <li>
                             <span>申请日期</span>
@@ -58,7 +62,7 @@
 <script lang="ts" setup>
 
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { formatDate } from '@/filters'
+import { formatDate, formatDecimal } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'

src/packages/sbyj/views/delivery/components/pending/list/index.vue

@@ -19,6 +19,10 @@
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
+                            <span>实际交料重量</span>
+                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                        </li>
+                        <li>
                             <span>补差价</span>
                             <span>{{ item.deliverypremium }}</span>
                         </li>
@@ -28,16 +32,8 @@
                         </li>
                         <li>
                             <span>总货款</span>
-                            <span>{{ item.deliveryamount }}</span>
+                            <span>{{ formatDecimal(item.deliverytotalamount) }}</span>
                         </li>
-                        <!-- <li>
-                                <span>已付货款</span>
-                                <span>{{ item.payedamount }}</span>
-                            </li>
-                            <li>
-                                <span>冻结货款</span>
-                                <span>{{ item.freezeamount }}</span>
-                            </li> -->
                         <li>
                             <span>申请日期</span>
                             <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
@@ -57,7 +53,7 @@
 <script lang="ts" setup>
 
 import { shallowRef, defineAsyncComponent } from 'vue'
-import { formatDate } from '@/filters'
+import { formatDate,formatDecimal } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'

src/packages/sbyj/views/delivery/components/processing/list/index.vue

@@ -23,6 +23,10 @@
                             <span>{{ item.deliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                         </li>
                         <li>
+                            <span>实际交料重量</span>
+                            <span>{{ item.realdeliveryqty }}{{ getGoodsUnitName(item.goodunitid) }}</span>
+                        </li>
+                        <li>
                             <span>补差价</span>
                             <span>{{ item.deliverypremium }}</span>
                         </li>
@@ -32,15 +36,15 @@
                         </li>
                         <li>
                             <span>总货款</span>
-                            <span>{{ item.deliveryamount }}</span>
+                            <span>{{ formatDecimal(item.deliverytotalamount) }}</span>
                         </li>
                         <li>
                             <span>已付货款</span>
-                            <span>{{ item.payedamount }}</span>
+                            <span>{{ formatDecimal(item.payedamount) }}</span>
                         </li>
                         <li>
                             <span>冻结货款</span>
-                            <span>{{ item.freezeamount }}</span>
+                            <span>{{ formatDecimal(item.freezeamount) }}</span>
                         </li>
                         <li>
                             <span>申请日期</span>
@@ -65,7 +69,7 @@
 <script lang="ts" setup>
 
 import { shallowRef, defineAsyncComponent, reactive } from 'vue'
-import { formatDate, handleRequestBigNumber } from '@/filters'
+import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { BuyOrSell } from '@/constants/order'
 import { getGoodsUnitName } from '@/constants/unit'
 import { useComponent } from '@/hooks/component'

src/types/model/order.d.ts

@@ -1630,11 +1630,13 @@ declare namespace Model {
         payedamount: number;
         /// 冻结货款
         freezeamount: number;
-        goodscode: string;//商品代码(内部)
-        goodsname: string;//商品名称
-        goodunitid: number;//报价单位id
-        agreeunit: number;//合约单位
-        decimalplace: number;//报价小数位
+        goodscode: string; // 商品代码(内部)
+        goodsname: string; // 商品名称
+        goodunitid: number; // 报价单位id
+        agreeunit: number; // 合约单位
+        decimalplace: number; // 报价小数位
+        realdeliveryamount: number; // 实际交收货款
+        realdeliveryqty: number; // 实际交收数量
     }
 
     /* 查询我的交收-订单明细 请求*/