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

src/api/ecw/boxSea.js

@@ -364,6 +364,36 @@ export function abnormalCreate(data) {
   });
 }
 
+/**
+ * 单个费用重置
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function resetById(params) {
+  return request({
+    url: "/ecw/box-customs-extra-cost/resetById",
+    method: "get",
+    params,
+  });
+}
+
+/**
+ * 出货单费用重置
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function resetByShipmentId(params) {
+  return request({
+    url: "ecw/box-customs-extra-cost/resetByShipmentId",
+    method: "get",
+    params,
+  });
+}
+
 /*****************************  预装 start **********************************/
 
 /**

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

@@ -102,14 +102,14 @@
           </el-form>
         </el-row>
         <el-row>
-          <el-table :data="costOrderList">
+          <el-table :data="costOrderList" border class="table-inputNumber">
             <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-            <el-table-column :label="$t('报关费用')" align="center" prop="fee">
+            <el-table-column :label="$t('报关费用')" align="center" prop="fee" width="220">
               <template slot-scope="scope">
                 <el-input-number v-model="scope.row.fee" controls-position="right" :min="1"></el-input-number>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+            <el-table-column :label="$t('操作')" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="createExtraCost(scope.row)">{{$t('确定')}}</el-button>
               </template>
@@ -123,15 +123,15 @@
           </div>
         </el-row>
         <el-row>
-          <el-table :data="costList">
-            <el-table-column type="selection" width="55" />
+          <el-table :data="costList" border height="300px" class="table-inputNumber">
+            <el-table-column type="selection" width="55" align="center" />
             <el-table-column :label="$t('订单号')" align="center" prop="orderNo" />
-            <el-table-column :label="$t('报关费用')" align="center" prop="fee" width="220px">
+            <el-table-column :label="$t('报关费用')" align="center" prop="fee" width="220">
               <template slot-scope="scope">
                 <el-input-number v-model="scope.row.fee" controls-position="right" :min="1"></el-input-number>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+            <el-table-column :label="$t('操作')" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="updateExtraCost(scope.row)">{{$t('修改')}}</el-button>
                 <el-button size="small" @click="restCostList(scope.row)">{{$t('重置')}}</el-button>
@@ -153,6 +153,8 @@ import {
   extraCostCreate,
   extraCostUpdate,
   approvalCancel,
+  resetById,
+  resetByShipmentId,
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -180,9 +182,15 @@ export default {
       cusDeclarationObj: {},
       // 校验
       rules: {
-        dcBoxWgt: [{ required: true, message: this.$t("必填"), trigger: "change" }],
-        dcGoodsWgt: [{ required: true, message: this.$t("必填"), trigger: "change" }],
-        dcCustomsType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        dcBoxWgt: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
+        dcGoodsWgt: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
+        dcCustomsType: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
         dcCustomsStatus: [
           { required: true, message: this.$t("必填"), trigger: "change" },
         ],
@@ -330,24 +338,23 @@ export default {
         shipmentId: this.shipmentObj.id,
         orderNo: this.orderNo,
       }).then((res) => {
-        this.costOrderList = [
-          {
-            orderNo: this.orderNo,
-            orderId: res.data,
-          },
-        ];
-        this.searchCostList(res.data);
+        serviceMsg(res, this).then(() => {
+          this.costOrderList = [
+            {
+              orderNo: this.orderNo,
+              orderId: res.data,
+            },
+          ];
+          this.searchCostList();
+        });
       });
     },
     /* 查询额外费用订单 */
-    searchCostList(orderId) {
+    searchCostList() {
       extraCostList({
         shipmentId: this.shipmentObj.id,
-        orderId: orderId,
       }).then((res) => {
-        this.costList = res.data.map((item) => {
-          return { originalFee: item.fee, ...item };
-        });
+        this.costList = res.data;
       });
     },
     /* 创建额外费用 */
@@ -363,7 +370,7 @@ export default {
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.searchCostList(row.orderId);
+          this.searchCostList();
         });
       });
     },
@@ -375,27 +382,25 @@ export default {
       }
       extraCostUpdate(row).then((res) => {
         serviceMsg(res, this).then(() => {
-          this.searchCostList(row.orderId);
+          this.searchCostList();
         });
       });
     },
     /* 重置 */
     restCostList(row) {
-      this.costList = this.costList.map((item) => {
-        if (row && row.id === item.id) {
-          return {
-            ...item,
-            fee: item.originalFee,
-          };
-        }
-        if (!row) {
-          return {
-            ...item,
-            fee: item.originalFee,
-          };
-        }
-        return item;
-      });
+      if (row) {
+        resetById({ id: row.id }).then((res) => {
+          serviceMsg(res, this).then(() => {
+            this.searchCostList();
+          });
+        });
+      } else {
+        resetByShipmentId({ id: this.shipmentObj.id }).then((res) => {
+          serviceMsg(res, this).then(() => {
+            this.searchCostList();
+          });
+        });
+      }
     },
     /** 取消 */
     cancel(type) {
@@ -416,9 +421,10 @@ export default {
       this.$set(
         this.dialogConfig,
         "title",
-        `${this.shipmentObj.selfNo} ` + this.$t('报关费用')
+        `${this.shipmentObj.selfNo} ` + this.$t("报关费用")
       );
       this.$set(this.dialogConfig, "dialogVisible", true);
+      this.searchCostList();
     },
     // 计算VGM重量
     calcVGM(dcBoxWgt, dcGoodsWgt) {
@@ -477,7 +483,9 @@ export default {
     },
     /* 下载报关单 */
     downloadCusFile() {
-      downloadFileByUrl('downloadCustomFiles', { shipmentId: this.shipmentObj.id });
+      downloadFileByUrl("downloadCustomFiles", {
+        shipmentId: this.shipmentObj.id,
+      });
     },
   },
   watch: {
@@ -523,7 +531,9 @@ export default {
       } = this.shipmentObj;
       const { dcCheckStatus } = customsInfo;
       if (checkExamineStatus === 1) {
-        return dcCheckStatus === 1 ? this.$t("退场审核中") : this.$t("部分退场审核中");
+        return dcCheckStatus === 1
+          ? this.$t("退场审核中")
+          : this.$t("部分退场审核中");
       }
       if (checkExamineStatus === 2 && checkDealStatus === 0) {
         return dcCheckStatus === 1
@@ -605,5 +615,10 @@ export default {
       text-align: right;
     }
   }
+  .el-table.table-inputNumber {
+    .cell {
+      overflow: visible;
+    }
+  }
 }
 </style>

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

@@ -581,6 +581,20 @@ export default {
         createGoods(params).then((res) => {
           serviceMsg(res, this).then(() => {
             this.queryAllData();
+          }).catch(() => {
+            if(res.code === 555) {
+              this.$confirm(res.msg, this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  createGoods({...params, relationStatus: 1}).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    })
+                  })
+                })
+                .catch((_) => {});
+            }
           });
         });
       } else {

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

@@ -46,7 +46,6 @@ import { listUser } from "@/api/system/user";
 
 // 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用
 import { getSeaStatus, getStatusName, seaBaseData } from "./utils";
-console.log(seaBaseData())
 /**
  * 海运操作主页面
  */

src/views/system/user/index.vue

@@ -388,7 +388,7 @@ export default {
       if(!this.form.postIds) return false
       let has = false
       this.postOptions.forEach(item => {
-        if(this.form.postIds.indexOf(item.id) > -1 && item.code == 'customer service'){
+        if(this.form.postIds.indexOf(item.id) > -1 && item.code == 'documentary customer service'){
           has = true
         }
       })