2024-06-11提交

src/views/ecw/box/batchMarkup.vue

@@ -143,7 +143,8 @@ import {getChannelList} from "@/api/ecw/channel";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import {getWarehouseList} from "@/api/ecw/warehouse";
 import {getSupplierPage} from "@/api/ecw/supplier";
-import {approvalCancel, boxGoodsDetail, createApproval, getSectionList, loadSecGoodsList} from "@/api/ecw/boxSea";
+import {approvalCancel, boxGoodsDetail, createApproval, 
+  getSectionList, loadSecGoodsList} from "@/api/ecw/boxSea";
 import {getAbnormalList, getbox, getLogList} from "@/api/ecw/box";
 import {getTotlContent} from "@/views/ecw/box/shippingSea/utils";
 import WorkFlow from "@/components/WorkFlow";

src/views/ecw/box/query.vue

@@ -392,7 +392,8 @@
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
                   <el-button
-                    type="primary" :disabled="scope.row.paymentId!='-1'"
+                    type="primary"
+                    :disabled="scope.row.paymentId != '-1'"
                     size="small"
                     @click="editCostClick(scope.row)"
                     style="marginright: 10px"
@@ -404,7 +405,8 @@
                     @confirm="deleteCostClick(scope.row)"
                   >
                     <el-button
-                      type="danger" :disabled="scope.row.paymentId!='-1'"
+                      type="danger"
+                      :disabled="scope.row.paymentId != '-1'"
                       size="small"
                       slot="reference"
                       v-hasPermi="['ecw:box-cost:delete']"
@@ -539,7 +541,6 @@
         />
       </template>
     </el-dialog>
-
     <!-- 对话框 lanbm 2024-05-23 add异常登记对话框 -->
     <el-dialog
       custom-class="shipping-dialog"

src/views/ecw/financial/receiptDetail.vue

@@ -722,14 +722,49 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item :label="$t('水单号')" prop="billNo">
+          <!--lanbm 2024-06-12 add
+          <el-form-item :label="$t('创建人')" prop="billNo">
             <el-input
               v-if="!isView"
               v-model="addForm.billNo"
               style="width: 220px"
             ></el-input>
-            <span v-else>{{ addForm.billNo }}</span>
           </el-form-item>
+          <el-form-item :label="$t('创建时间')" prop="createTime">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.createTime"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('最后更新人')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('最后更新时间')" prop="updateTime">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.updateTime"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('提交审批人')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('审批通过时间')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>-->
         </el-form>
         <div slot="footer" v-if="!isView">
           <el-button type="primary" @click="saveFrom">{{

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

@@ -7,8 +7,8 @@
         <!-- <div v-if="detail" class="billcontent" v-html="detail.billContent"></div> -->
         <p class="subs" style="text-align:center">
             <!--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>
+            <el-button type="primary" @click="download" :disabled="detail.status!='2'">{{$t('下载')}}</el-button>
+            <el-button type="primary" @click="print" :disabled="detail.status!='2'">{{$t('打印')}}</el-button>
         </p>
     </el-dialog>
 </template>

src/views/ecw/order/detail.vue

@@ -451,6 +451,7 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
         <el-tab-pane :label="$t('订单动态')" name="second">
           <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
             <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="parseTime(activity.businessTime)">

src/views/ecw/warehouse/index.vue

@@ -1098,7 +1098,6 @@ export default {
         ],
       },
       nodeId: this.$route.query.nodeId,
-
       // 枚举
       CommonStatusEnum: CommonStatusEnum,
       // 数据字典

src/views/report/BankReceiptDetails/index.vue

@@ -108,6 +108,23 @@
           placeholder="请输截止月"
         />
       </el-form-item>
+      <el-form-item :label="$t('收款账户')" prop="accountNo">
+        <el-select
+          filterable
+          clear
+          v-model="queryParams.accountNo"
+          :placeholder="$t('请选择收款账户')"
+          style="width: 220px"
+          v-el-select-loadmore="loadmore"
+        >
+          <el-option
+            v-for="item in bankData"
+            :key="item.id"
+            :label="item.baAccountName"
+            :value="item.baAccountName"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
           >搜索</el-button
@@ -209,6 +226,11 @@
         align="center"
         prop="createTime"
       />
+      <el-table-column
+        :label="$t('提价审批人')"
+        align="center"
+        prop="createBpm"
+      />
       <el-table-column
         :label="$t('提交审批时间')"
         align="center"
@@ -229,7 +251,6 @@
             >{{ $t("删除") }}</el-button
           >
           <el-button
-            v-if="scope.row.status == 0"
             type="text"
             @click="detailClick(scope.row)"
             v-hasPermi="['ecw:payment:detail:detail']"
@@ -351,9 +372,7 @@
         </el-form-item>
 
         <el-form-item :label="$t('剩余应收金额')">
-          <span>
-            {{ form.syValue }}</span
-          >
+          <span> {{ form.syValue }}</span>
         </el-form-item>
         <el-form-item :label="$t('收款账户')" prop="accountNo">
           <el-select
@@ -469,9 +488,46 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
+        <!--lanbm 2024-06-12 add-->
+        <el-form-item :label="$t('创建人')" v-show="isEdit" prop="creator">
+          <el-input
+            v-model="form.creator"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('创建时间')" v-show="isEdit" prop="createTime">
+          <el-input
+            v-model="form.createTime"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('最后更新人')" v-show="isEdit" prop="updater">
+          <el-input         
+            v-model="form.updater"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('最后更新时间')" v-show="isEdit" prop="updateTime">
+          <el-input
+            v-model="form.updateTime"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('提交审批人')" v-show="isEdit" prop="createBpm">
+          <el-input
+            v-model="form.createBpm"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('审批通过时间')" v-show="isEdit" prop="updateTimeBpm">
+          <el-input
+            v-model="form.updateTimeBpm"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" @click="saveFrom">{{
+        <el-button type="primary" v-show="!isEdit" @click="saveFrom">{{
           saveBtnText
         }}</el-button>
         <el-button @click="hiddenDialog">{{ $t("取消") }}</el-button>
@@ -561,6 +617,7 @@ export default {
         sDate4: undefined,
         eDate4: undefined, //实收日期
         creator: undefined, //创建人
+        accountNo: undefined, //收款账号 lanbm 2024-06-12 add
       },
       params: {
         page: 1,