财务月度汇总页面调试

jd-logistics-ui-v3/src/views/logistics/adjustmentRecord/index.vue

@@ -9,6 +9,16 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="调账类型" prop="adjustmentType">
+        <el-select v-model="queryParams.adjustmentType" placeholder="请选择">
+          <el-option
+              v-for="item in adjustment_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="费用明细id" prop="waybillCostDetailId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.waybillCostDetailId"-->
@@ -17,38 +27,38 @@
 <!--          @keyup.enter="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="原金额" prop="originalAmount">
-        <el-input
-          v-model="queryParams.originalAmount"
-          placeholder="请输入原金额"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整后金额" prop="adjustedAmount">
-        <el-input
-          v-model="queryParams.adjustedAmount"
-          placeholder="请输入调整后金额"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整金额" prop="adjustmentAmount">
-        <el-input
-          v-model="queryParams.adjustmentAmount"
-          placeholder="请输入调整金额"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调账原因" prop="adjustmentReason">
-        <el-input
-          v-model="queryParams.adjustmentReason"
-          placeholder="请输入调账原因"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="原金额" prop="originalAmount">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.originalAmount"-->
+<!--          placeholder="请输入原金额"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="调整后金额" prop="adjustedAmount">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.adjustedAmount"-->
+<!--          placeholder="请输入调整后金额"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="调整金额" prop="adjustmentAmount">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.adjustmentAmount"-->
+<!--          placeholder="请输入调整金额"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="调账原因" prop="adjustmentReason">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.adjustmentReason"-->
+<!--          placeholder="请输入调账原因"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="部门ID" prop="deptId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.deptId"-->
@@ -115,7 +125,7 @@
 
     <el-table v-loading="loading" :data="adjustmentRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="调账流水id" align="center" prop="financialAdjustId" />
+<!--      <el-table-column label="调账流水id" align="center" prop="financialAdjustId" />-->
       <el-table-column label="运单号" align="center" prop="waybillNo" width="160" />
 <!--      <el-table-column label="费用明细id" align="center" prop="waybillCostDetailId" />-->
       <el-table-column label="调账类型" align="center" prop="adjustmentType" >
@@ -127,7 +137,7 @@
       <el-table-column label="调整后金额" align="center" prop="adjustedAmount" />
       <el-table-column label="调整金额" align="center" prop="adjustmentAmount" />
       <el-table-column label="调账原因" align="center" prop="adjustmentReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="部门" align="center" prop="deptName" />
       <el-table-column label="操作人" align="center" prop="userName" />
 <!--      <el-table-column label="部门ID" align="center" prop="deptId" />-->

jd-logistics-ui-v3/src/views/logistics/monthSummary/index.vue

@@ -6,11 +6,11 @@
             v-model="summaryMonthRange"
             type="monthrange"
             range-separator="-"
-            clearable
             format="YYYY.MM"
             value-format="YYYY.MM"
             start-placeholder="开始月份"
             end-placeholder="结束月份"
+            clearable
           @change="handleQuery">
         </el-date-picker>
       </el-form-item>
@@ -82,7 +82,7 @@
 
     <el-table v-loading="loading" :data="monthSummaryList">
 <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="月度汇总id" align="center" prop="summaryId" width="90" />
+<!--      <el-table-column label="月度汇总id" align="center" prop="summaryId" width="90" />-->
       <el-table-column label="汇总月份" align="center" >
         <template #default="scope">
           <el-button
@@ -108,10 +108,10 @@
       <el-table-column label="电子发票ofd地址" align="center" prop="bwDzfpOfdUrl" />
       <el-table-column label="电子发票xml地址" align="center" prop="bwDzfpXmlUrl" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
         <template #default="scope">
-          <el-button link type="primary" @click="handleDuizhang(scope.row)" v-if="scope.row.status == 1">对账</el-button>
-          <el-button link type="primary" @click="handleKaipiao(scope.row)" v-if="scope.row.status == 2">开票</el-button>
+          <el-button link type="primary" @click="handleDuizhang(scope.row)" :disabled="scope.row.status != 1">对账</el-button>
+          <el-button link type="primary" @click="handleKaipiao(scope.row)" :disabled="scope.row.status != 2">开票</el-button>
 <!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:monthSummary:remove']">删除</el-button>-->
         </template>
       </el-table-column>
@@ -387,7 +387,7 @@ function reset() {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
-  if(summaryMonthRange.value.length > 0){
+  if(summaryMonthRange.value!=null && summaryMonthRange.value.length > 0){
     queryParams.value.summaryMonth = summaryMonthRange.value[0];
     queryParams.value.summaryMonthEnd = summaryMonthRange.value[1];
   }else{
@@ -401,6 +401,7 @@ function handleQuery() {
 function resetQuery() {
   summaryMonthRange.value =[];
   proxy.resetForm("queryRef")
+  setDefaultMonthRange();
   handleQuery()
 }
 
@@ -532,6 +533,32 @@ function detailClick(row){
     }
   })
 }
+// 计算上个月的日期范围
+const setDefaultMonthRange = () => {
+  const today = new Date();
+  const currentYear = today.getFullYear();
+  const currentMonth = today.getMonth() + 1; // 月份从0开始，所以要+1
+
+  // 计算上个月
+  let lastMonth = currentMonth - 1;
+  let lastYear = currentYear;
+
+  if (lastMonth === 0) {
+    lastMonth = 12;
+    lastYear = currentYear - 1;
+  }
+
+  // 格式化为 YYYY.MM
+  const startDate = `${lastYear}.${String(lastMonth).padStart(2, '0')}`;
+  const endDate = startDate; // 开始和结束相同，表示只选一个月
+
+  summaryMonthRange.value = [startDate, endDate];
+
+  // 同时设置查询参数
+  queryParams.value.summaryMonth = startDate;
+  queryParams.value.summaryMonthEnd = endDate;
+};
+setDefaultMonthRange();
 getList()
 </script>
 <style scoped>