2024-06-10提交

src/views/ecw/financial/receiptDetail.vue

@@ -787,7 +787,6 @@ import { getToken } from "@/utils/auth";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getCustomer } from "@/api/ecw/customer";
 import { getExchangeRatePage } from "@/api/ecw/exchangeRate";
-
 import {
   getReceiptInfoByIds,
   getInvoicingItem,
@@ -1012,7 +1011,6 @@ export default {
         }
         this.$set(this.form, "receiptAccountList", res.data);
         // 收款总计
-
         let num;
         let amountList = [];
         this.currencyList.forEach((item, index) => {
@@ -1065,7 +1063,6 @@ export default {
         });
       });
     }
-
     this.getList();
   },
   methods: {

src/views/ecw/order/detail.vue

@@ -576,6 +576,7 @@
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <!--查看提货单 lanbm 2024-06-03-->
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
+    <!--入仓记录 lanbm 2024-06-10 add-->
     <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" :type="type" @openPackHistory="openPackHistory" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
     <el-dialog :title="$t('付款人')" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
       <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >

src/views/ecw/warehouse/index.vue

@@ -698,6 +698,13 @@
               style="width: 400px"
             ></el-input>
           </el-form-item>
+          <!--lanbm 2024-06-10 添加的落款信息配置信息 -->
+          <el-form-item :label="$t('落款左边信息')">
+            <textarea v-model="lineform.lkLeft" style="width: 400px" rows="8" > </textarea>
+          </el-form-item>
+          <el-form-item :label="$t('落款右边信息')">
+            <textarea v-model="lineform.lkRight" style="width: 400px" rows="8"> </textarea>
+          </el-form-item>
         </template>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -898,7 +905,6 @@ export default {
       selectDeptList: [],
       //需要绑定部门的仓库id
       deptWarhouse: null,
-
       //洲际列表
       continentsList: [],
       //国家列表
@@ -931,13 +937,9 @@ export default {
       open: false,
       templateOpen: false,
       dateRangeCreateTime: [],
-
       serviceOpen: false,
-
       isUpdate: false,
-
       nodeList: [],
-
       routeLoadig: false,
       showRouteList: false,
       routeList: [],
@@ -996,6 +998,8 @@ export default {
         minPrice: 0,
         tempTitleZh: "",
         tempTitleEn: "",
+        lkLeft: "",
+        lkRight: "", //lanbm 2024-06-10 添加的落款配置信息
         recipientInfo: {
           companyAddress: "",
           companyAddressEn: "",
@@ -1458,6 +1462,7 @@ export default {
     },
 
     submitLineForm() {
+      //ecw_warehouse_line
       let otherService = this.lineform.otherService;
       // 如果不存在送货上门，则过滤提货异常
       if (!otherService.includes("2")) {
@@ -1475,6 +1480,8 @@ export default {
         recipientInfo: this.lineform.recipientInfo,
         tempTitleZh: this.lineform.tempTitleZh,
         tempTitleEn: this.lineform.tempTitleEn,
+        lkLeft:this.lineform.lkLeft,
+        lkRight:this.lineform.lkRight,//lanbm 2024-06-10 add
       }).then((res) => {
         this.$modal.msgSuccess(this.$t("操作成功"));
         this.getRouteList();