Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/boxSea.js

@@ -530,6 +530,21 @@ export function createGoods(data) {
   });
 }
 
+/**
+ * 预装关联订单
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function loadRelationOrder(data) {
+  return request({
+    url: "/ecw/box-preload-goods/loadRelationOrder",
+    method: "post",
+    data,
+  });
+}
+
 /*****************************  预装 end **********************************/
 
 /*****************************  装柜 start **********************************/

src/utils/dict.js

@@ -100,6 +100,7 @@ export const DICT_TYPE = {
   ECW_OFFER_TYPE: 'offer_type', // 跟进类型
   ECW_OFFER_METHOD: 'offer_method', //  跟进方式
   ECW_RECEIPT_STATE: 'receipt_state',//收款单状态
+  ECW_RECEIVABLE_STATE: 'receivable_state',//应收明细状态
   ECW_SUING_METHOD: 'suing_method', // 出单方式
   ECW_HARVEST_METHOD: 'harvest_method', // 收货方式
   ECW_PAY_ADVANCE: 'pay_advance', // 是否预付

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

@@ -318,6 +318,7 @@ import {
   changeSection,
   approvalCreate,
   approvalCancel,
+  loadRelationOrder,
 } from "@/api/ecw/boxSea";
 import userSelect from "./common/userSelect.vue";
 import {
@@ -583,9 +584,25 @@ export default {
         };
 
         createGoods(params).then((res) => {
-          serviceMsg(res, this).then(() => {
-            this.queryAllData();
-          })
+          const { data } = res;
+          if(data.relationMsg) {
+              const msg = data.relationMsg.replaceAll(',',"，");
+              this.$confirm(msg, this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  loadRelationOrder(data).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    })
+                  })
+                })
+                .catch((_) => {});
+          } else {
+            serviceMsg(res, this).then(() => {
+              this.queryAllData();
+            })
+          }
         }).catch((res) => {
             if(res.code === 555) {
               const msg = res.msg && res.msg.replaceAll(',',"，");

src/views/ecw/financial/creatCollection.vue

@@ -1085,14 +1085,19 @@ export default {
         orderNo: this.selectListRow.orderNo,
         orderId: this.selectListRow.orderId,
       }
-      updateReceivableDiscountById(params).then(res => {
+       updateReceivableDiscountById(params).then(res => {
         if (this.selectListRow.discountTotal) {
           this.$modal.msgSuccess(this.$t('修改成功'));
         } else {
           this.$modal.msgSuccess(this.$t('新增成功'));
         }
-        getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
-          this.$set(this.list, this.selectListIndex, {...res.data})
+        // getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
+        //   this.$set(this.list, this.selectListIndex, {...res.data})
+        //   this.cancelDiscount()
+        //   this.calculation()
+        // })
+         getInvoicingItem({ id: this.id }).then(res => {
+          this.list = [...res.data]
           this.cancelDiscount()
           this.calculation()
         })

src/views/ecw/order/feeApplication.vue

@@ -43,7 +43,7 @@
          </el-table-column>
          <el-table-column :label="$t('确认收款')">
            <template v-slot:default ="scope">
-             <dict-tag :type="DICT_TYPE.RECEIVE_FLAG" :value="scope.row.receiveFlag" />
+             <dict-tag :type="DICT_TYPE.ECW_RECEIVABLE_STATE" :value="scope.row.receiveFlag" />
            </template>
          </el-table-column>
          <el-table-column :label="$t('申请人')">