2024-06-04提交

src/api/ecw/box.js

@@ -117,6 +117,8 @@ export function getLogList(params) {
 }
 
 // 获得费用登记列表
+//先登记费用入表 ecw_box_cost 同时进应付款表，ecw_payable，
+//用户在应收款列表中点击收款，生成付款单，入表 ecw_payment
 export function getCostList(params) {
   return request({
     url: "/ecw/box-cost/list",
@@ -124,8 +126,8 @@ export function getCostList(params) {
     params,
   });
 }
-// 付款单主表 SELECT * from ecw_payment
-// 付款单费用明细 SELECT * from ecw_payable 
+// 收款单表 SELECT * from ecw_payment
+// 应付款表  SELECT * from ecw_payable 
 // 根据明细获取主表ID
 export function getPaymentId(id) {
   return request({

src/views/ecw/box/query.vue

@@ -392,7 +392,7 @@
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
                   <el-button
-                    type="primary"
+                    type="primary" :disabled="scope.row.paymentId!='-1'"
                     size="small"
                     @click="editCostClick(scope.row)"
                     style="marginright: 10px"
@@ -404,7 +404,7 @@
                     @confirm="deleteCostClick(scope.row)"
                   >
                     <el-button
-                      type="danger"
+                      type="danger" :disabled="scope.row.paymentId!='-1'"
                       size="small"
                       slot="reference"
                       v-hasPermi="['ecw:box-cost:delete']"

src/views/ecw/box/queryAir.vue

@@ -456,7 +456,7 @@
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
                   <el-button
-                    type="primary"
+                    type="primary" :disabled="scope.row.paymentId!='-1'"
                     size="small"
                     @click="editCostClick(scope.row)"
                     style="marginright: 10px"
@@ -468,7 +468,7 @@
                     @confirm="deleteCostClick(scope.row)"
                   >
                     <el-button
-                      type="danger"
+                      type="danger" :disabled="scope.row.paymentId!='-1'"
                       size="small"
                       slot="reference"
                       v-hasPermi="['ecw:box-cost:delete']"

src/views/ecw/financial/payable.vue

@@ -343,6 +343,9 @@ import { getSupplierPage } from "@/api/ecw/supplier";
 import { getCurrencyPage } from "@/api/ecw/currency";
 import { getWarehouseList } from "@/api/ecw/warehouse";
 
+/*
+应付款
+*/
 export default {
   name: "EcwFinancialPayable",
   components: {},

src/views/ecw/order/components/PrintLadingBill.vue

@@ -6,8 +6,9 @@
         <pdf-viewer id="pdfViewer" ref="viewer" v-if="pdfData" :url="pdfData" style="display:block; margin: 0 auto; max-height: 80vh; overflow:auto;" />
         <!-- <div v-if="detail" class="billcontent" v-html="detail.billContent"></div> -->
         <p class="subs" style="text-align:center">
-            <el-button type="primary" @click="download" :disabled="!detail">{{$t('下载')}}</el-button>
-            <el-button type="primary" @click="print" :disabled="!detail">{{$t('打印')}}</el-button>
+            <!--lanbm 2024-06-04 添加审批状态控制逻辑-->
+            <el-button type="primary" @click="download" :disabled="detail.bpmStatus!='2'">{{$t('下载')}}</el-button>
+            <el-button type="primary" @click="print" :disabled="detail.bpmStatus!='2'">{{$t('打印')}}</el-button>
         </p>
     </el-dialog>
 </template>

src/views/ecw/order/detail.vue

@@ -574,6 +574,7 @@
     </el-card>
 
     <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" />
     <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">

src/views/ecw/warehouse/index.vue

@@ -91,7 +91,6 @@
       <el-table-column :label="$t('仓库编号')" align="center" prop="number" />
       <el-table-column :label="$t('仓库名称')" align="center" prop="titleZh" />
       <el-table-column :label="$t('英文名称')" align="center" prop="titleEn" />
-
       <el-table-column :label="$t('贸易属性')" align="center" prop="tradeType">
         <template slot-scope="scope">
           <div>{{ tradeTypeName(scope.row.tradeType) }}</div>
@@ -114,7 +113,18 @@
         align="center"
         :prop="$l('address')"
       />
-
+      <!--lanbm 2024-06-04 add-->
+      <el-table-column
+        :label="$t('仓库免租期')"
+        align="center"
+        prop="rentFreeDays"
+      />
+      <el-table-column
+        :label="$t('锁定收货人天数')"
+        align="center"
+        prop="lockRecipientDays"
+      />
+      <!--end lanbm 2024-06-04 add-->
       <el-table-column prop="head" :label="$t('负责人')" align="center">
         <template slot-scope="scope">
           <div>
@@ -315,7 +325,7 @@
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('所属网点')" prop="nodeId">
           <el-select
             v-model="form.nodeId"
@@ -504,7 +514,25 @@
             >
           </el-radio-group>
         </el-form-item>
+
+        <!--lanbm 2024-06-04 添加控货需要的逻辑字段-->
+        <el-form-item :label="$t('仓库免租期')" prop="rentFreeDays">
+          <el-input-number
+            v-model="form.rentFreeDays"
+            controls-position="right"
+            :min="0"
+          />
+        </el-form-item>
+        <el-form-item :label="$t('锁定收货人天数')" prop="lockRecipientDays">
+          <el-input-number
+            v-model="form.lockRecipientDays"
+            controls-position="right"
+            :min="0"
+          />
+        </el-form-item>
       </el-form>
+
+      <!--end lanbm 2024-06-04 添加控货需要的逻辑字段-->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{
           $t("确定")
@@ -609,7 +637,7 @@
           </el-radio-group>
         </el-form-item>
         <!--lanbm 2024-05-25 把海运的相关配置信息也显示出来了，把空运文字提示出掉了-->
-        <template v-if="['3', '4','1'].includes(lineform.transportType)">
+        <template v-if="['3', '4', '1'].includes(lineform.transportType)">
           <el-form-item :label="$t('模板中文标题')">
             <el-input
               v-model="lineform.tempTitleZh"