Merge branch 'order_fee_update' into pre-release

src/views/ecw/box/batchMarkup.vue

@@ -56,9 +56,12 @@
         <el-descriptions-item label="SO NO">
           {{shipmentObj.bookSeaInfo ? shipmentObj.bookSeaInfo.sono : '' }}
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('装柜时间')">
+        <el-descriptions-item v-if="shipmentObj.transportType == 1 || shipmentObj.transportType == 2" :label="$t('装柜时间')">
           {{shipmentObj.zgDate}}
         </el-descriptions-item>
+        <el-descriptions-item v-else :label="$t('出仓时间')">
+          {{shipmentObj.ckDate}}
+        </el-descriptions-item>
         <el-descriptions-item :label="$t('到港时间')">
           {{shipmentObj.dgDate}}
         </el-descriptions-item>

src/views/ecw/order/feeApplication.vue

@@ -57,7 +57,7 @@
           <template v-slot:default="scope">
             <el-input
               :disabled="!scope.row.editMode && !!scope.row.status"
-              v-model="scope.row.applicationFee" type="number"
+              v-model="scope.row.applicationFee" type="number" @input="formatAmount(scope.row)"
             ></el-input>
           </template>
         </el-table-column>
@@ -283,6 +283,17 @@ export default {
     });
   },
   methods: {
+    formatAmount(row) {
+      // 使用正则表达式限制输入为数字和小数点，并限制小数点后最多两位数字
+      // row.applicationFee = row.applicationFee.replace(/[^\d.]/g, '').replace(/(\..*)\./g, '$1');
+      if (row.applicationFee.indexOf('.') > -1) {
+        const decimalPart = row.applicationFee.split('.')[1];
+        if (decimalPart.length > 2) {
+          row.applicationFee = row.applicationFee.substring(0, row.applicationFee.length - (decimalPart.length - 2));
+        }
+      }
+    },
+
     del(index) {
       this.$confirm(this.$t("确定要删除此条费用申请么？")).then(() => {
         this.list.splice(index, 1);