Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/ladingBill/index.vue

@@ -8,7 +8,7 @@
 
     <el-row style="margin-top:15px">
       <el-table :data="billData.list" border max-height="500px">
-        <el-table-column :label="$t('序号')" type="index" align="center" width="50" />
+        <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNo" />
         <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
         <el-table-column :label="$t('货物信息')" align="center" prop="">
           <template slot-scope="scope">

src/views/ecw/box/query.vue

@@ -68,7 +68,7 @@
             </div>
             <el-table :data="sectionObj.sectionOrderList" style="width: 100%" border @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" :selectable="selectable"></el-table-column>>
-              <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
+              <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
               <el-table-column prop="orderNo" :label="$t('订单号')" align="center">
                 <template v-slot="scope">
                   <a href="javascript:void(0)" @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a>

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -37,7 +37,7 @@
           <!-- 表格 -->
           <el-row class="table-content">
             <el-table :data="tableData.sectionOrderList" border max-height="500px">
-              <el-table-column :label="$t('序号')" type="index" align="center" width="50" />
+              <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNum" />
               <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
                 <template slot-scope="scope">
                   <div>

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -87,7 +87,8 @@
                     <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" min-width="500" />
                     <el-table-column :label="$t('品牌')" align="center" prop="brandType" width="120">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
+                        <template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('箱数')" align="center" prop="num" width="120" />
@@ -206,7 +207,7 @@ export default {
             }
             return {
               ...item,
-              title: this.$t('第{index}部分', {index: index + 1}),
+              title: this.$t("第{index}部分", { index: index + 1 }),
             };
           });
 
@@ -278,9 +279,13 @@ export default {
     },
     /* 删除部分 */
     deletePart() {
-      this.$confirm(this.$t("确认删除该部分及其已预装订单？"), this.$t("提示"), {
+      this.$confirm(
+        this.$t("确认删除该部分及其已预装订单？"),
+        this.$t("提示"),
+        {
           type: "warning",
-      })
+        }
+      )
         .then((_) => {
           deleteSection(this.partData.id).then((res) => {
             serviceMsg(res, this).then(() => {
@@ -308,7 +313,7 @@ export default {
     /* 获取城市 */
     importCityName(id) {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
-      return arr.length > 0 ? this.$l(arr[0], 'title') : this.$t("无");
+      return arr.length > 0 ? this.$l(arr[0], "title") : this.$t("无");
     },
     /* 待预装订单分页 */
     pageChange(page) {

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -120,6 +120,7 @@
                 <div v-show="!part.fold">
                   <el-table v-loading="preLoading" border :data="part.sectionGoodsList" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)">
                     <el-table-column type="selection" align="center" width="55" fixed="left" />
+                    <el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" />
                     <el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120">
                       <template slot-scope="scope">
                         <div>
@@ -717,7 +718,7 @@ export default {
     getRatioMax(row) {
       let volume = row.volume ?? 0;
       let weight = row.weight ?? 0;
-      return Decimal.div(volume, weight).toFixed(2);
+      return Decimal.div(weight, volume).toFixed(2);
     },
   },
 };

src/views/ecw/box/shippingSea/nodePage/review.vue

@@ -54,7 +54,9 @@ export default {
       if (shipmentObj[voKey] && shipmentObj[voKey].approvalStatus !== 1) {
         this.isReview = false;
       }
+      if (shipmentObj[voKey]) {
         this.bpmProcessId = shipmentObj[voKey].bpmProcessId;
+      }
       if (this.isReview) {
         this.$set(
           this.reviewObj,

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -27,7 +27,7 @@
           <el-row style="margin-top: 5px">
             <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
               <el-table-column type="selection" align="center" width="55" fixed="left" />
-              <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
+              <el-table-column align="center" :label="$t('序号')" width="50" prop="tidanNum" />
               <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
                 <template slot-scope="scope">
                   <div>

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -28,7 +28,7 @@
     <!-- 表格 -->
     <el-row class="table-area">
       <el-table v-loading="loading" :data="pageData.sectionOrderList" border max-height="500px">
-        <el-table-column :label="$t('序号')" type="index" align="center" width="50" />
+        <el-table-column :label="$t('序号')" align="center" width="50" prop="tidanNum" />
         <el-table-column :label="$t('订单号')" align="center" prop="orderNo">
           <template slot-scope="scope">
             {{ scope.row.orderNo }}

src/views/ecw/customerConfirm/index.vue

@@ -103,9 +103,9 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('预计入公海时间')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('分配时间')" align="center" prop="createTime" width="180">
         <template  v-slot = {row}>
-          <span>{{ parseTime(row.estimateEnterOpenSeaTime ) }}</span>
+          <span>{{ parseTime(row.customerServiceAssignedTime ) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">