update

src/packages/pc/components/modules/goods-detail/order/index.vue

@@ -4,22 +4,22 @@
         <app-table class="sell" :data="sellList" v-model:columns="sellColumns" :row-key="rowKey"
             :expand-row-keys="expandKeys" @row-click="rowClick" showIndex>
             <!-- 展开行 -->
-            <template #expand="{ row, index }">
+            <!-- <template #expand="{ row, index }">
                 <div class="buttonbar" v-if="index === 0">
                     <el-button type="primary" size="small" :disabled="row.userid === loginStore.userId"
                         @click="showComponent('delisting', row)">摘牌</el-button>
                 </div>
-            </template>
+            </template> -->
         </app-table>
         <app-table class="buy" :data="buyList" v-model:columns="buyColumns" :row-key="rowKey" :expand-row-keys="expandKeys"
             @row-click="rowClick" showIndex>
             <!-- 展开行 -->
-            <template #expand="{ row, index }">
+            <!-- <template #expand="{ row, index }">
                 <div class="buttonbar" v-if="index === 0">
                     <el-button type="primary" size="small" :disabled="row.userid === loginStore.userId"
                         @click="showComponent('delisting', row)">摘牌</el-button>
                 </div>
-            </template>
+            </template> -->
         </app-table>
         <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
             v-if="componentId" />

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

@@ -10,6 +10,7 @@
                     <Cell title="交料单号" :value="selectedRow.deliveryorderid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="交料重量" :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell title="实际交料重量" :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
                     <Cell title="总货款" :value="formatDecimal(selectedRow.deliverytotalamount)" />
                     <Cell title="已付货款" :value="formatDecimal(selectedRow.payedamount)" />
                     <Cell title="剩余货款" :value="formatDecimal(amount)" />

src/packages/sbyj/views/delivery/detail/index.vue

@@ -10,6 +10,7 @@
                     <Cell title="交料单号" :value="selectedRow.deliveryorderid" />
                     <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
                     <Cell title="交料重量" :value="selectedRow.deliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
+                    <Cell title="实际交料重量" :value="selectedRow.realdeliveryqty + getGoodsUnitName(selectedRow.goodunitid)" />
                     <Cell title="交料价格" :value="selectedRow.deliveryprice" />
                     <Cell title="补差价" :value="selectedRow.deliverypremium" />
                     <Cell title="总货款" :value="selectedRow.deliverytotalamount" />

src/packages/sbyj/views/delivery/detail/order-list/index.vue

@@ -20,23 +20,23 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>订单重量：</span>
+                                    <span>订单重量</span>
                                     <span>
                                         {{ item.holdqty + getGoodsUnitName(selectedRow.goodunitid) }}
                                     </span>
                                 </li>
                                 <li>
-                                    <span>交料重量：</span>
+                                    <span>交料重量</span>
                                     <span>
                                         {{ item.deliveryqty + getGoodsUnitName(selectedRow.goodunitid) }}
                                     </span>
                                 </li>
                                 <li>
-                                    <span>交料价格：</span>
+                                    <span>交料价格</span>
                                     <span>{{ formatDecimal(item.deliveryprice) }}</span>
                                 </li>
                                 <li>
-                                    <span>交料货款：</span>
+                                    <span>交料货款</span>
                                     <span>{{ item.deliveryamount }}</span>
                                 </li>
                             </ul>