Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

src/packages/pc/views/footer/pricing/detail2/components/delivery/index.vue

@@ -36,7 +36,7 @@
                     :max="enableqty" :min="0" />
             </el-form-item>
             <el-form-item :label="t('position.goods.deliveryqty')">
-                <span>{{ (formData.DeliveryLot ?? 0) * selectedRow.agreeUnit }}{{ selectedRow.goodsUnit }}</span>
+                <span>{{ (formData.DeliveryLot ?? 0) * selectedRow.agreeUnit }}{{ getGoodsUnitName(selectedRow.goodsUnitID)}}</span>
             </el-form-item>
             <el-form-item class="el-form-item--row" prop="DeliveryInfo"
                 :label="selectedRow.tHDetailEx.buyOrSell === BuyOrSell.Buy ? t('position.goods.address') : t('position.goods.deliveryinfo')">

src/packages/pc/views/footer/pricing/detail2/index.vue

@@ -109,7 +109,7 @@ const tableColumns = shallowRef<Partial<Column>[]>([
     {
         key: 'operate',
         title: t('common.operate'),
-        width: 140,
+        width: 190,
         fixed: TableV2FixedDir.RIGHT,
         cellRenderer: ({ rowData }) => <>
             <el-button type="danger" size="small" onClick={() => showComponent('transfer', rowData)}>{t('operation.close')}</el-button>