Merge remote-tracking branch 'origin/master'

jd-logistics-ui-v3/src/api/logistics/monthSummary.js

@@ -42,3 +42,11 @@ export function delMonthSummary(summaryId) {
     method: 'delete'
   })
 }
+// 查询财务月度汇总详细
+export function costDetailsList(query) {
+  return request({
+    url: '/system/costDetails/list',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -1,77 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="汇总月份" prop="summaryMonth">
-        <el-input
-          v-model="queryParams.summaryMonth"
-          placeholder="请输入汇总月份"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="应付金额" prop="payableAmount">
-        <el-input
-          v-model="queryParams.payableAmount"
-          placeholder="请输入应付金额"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="交易笔数" prop="transactionCount">
-        <el-input
-          v-model="queryParams.transactionCount"
-          placeholder="请输入交易笔数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="百旺开票单据编号" prop="bwDjbh">
-        <el-input
-          v-model="queryParams.bwDjbh"
-          placeholder="请输入百旺开票单据编号"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="电子发票pdf地址" prop="bwDzfpPdfUrl">
-        <el-input
-          v-model="queryParams.bwDzfpPdfUrl"
-          placeholder="请输入电子发票pdf地址"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-date-picker
+            v-model="queryParams.summaryMonth"
+            type="month"
+            placeholder="选择月"
+            clearable
+            format="YYYY.MM"
+            value-format="YYYY.MM"
+          @change="handleQuery">
+        </el-date-picker>
       </el-form-item>
-      <el-form-item label="电子发票ofd地址" prop="bwDzfpOfdUrl">
+      <el-form-item label="供应商名称" prop="deptName">
         <el-input
-          v-model="queryParams.bwDzfpOfdUrl"
-          placeholder="请输入电子发票ofd地址"
+          v-model="queryParams.deptName"
+          placeholder="请输入供应商名称"
           clearable
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="电子发票xml地址" prop="bwDzfpXmlUrl">
-        <el-input
-          v-model="queryParams.bwDzfpXmlUrl"
-          placeholder="请输入电子发票xml地址"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="账单状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择">
+          <el-option
+              v-for="item in monthly_report_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -80,35 +37,35 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['system:monthSummary:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:monthSummary:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:monthSummary:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:monthSummary:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:monthSummary:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:monthSummary:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -121,26 +78,34 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="monthSummaryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="月度汇总id" align="center" prop="summaryId" />
-      <el-table-column label="汇总月份" align="center" prop="summaryMonth" />
+    <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="汇总月份" align="center" >
+        <template #default="scope">
+          <div class="fontBlue" @click="detailClick(scope.row)">{{scope.row.summaryMonth}}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="应付金额" align="center" prop="payableAmount" />
       <el-table-column label="交易笔数" align="center" prop="transactionCount" />
-      <el-table-column label="账单状态 1.待对账 2.已对账 3.待开票 4.已开票" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门ID" align="center" prop="deptId" />
+      <el-table-column label="账单状态" align="center" prop="status" >
+        <template #default="scope">
+          <span>{{formatterOptions(monthly_report_status,scope.row.status)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="供应商" align="center" prop="deptName" />
       <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="百旺开票单据编号" align="center" prop="bwDjbh" />
       <el-table-column label="电子发票pdf地址" align="center" prop="bwDzfpPdfUrl" />
       <el-table-column label="电子发票ofd地址" align="center" prop="bwDzfpOfdUrl" />
       <el-table-column label="电子发票xml地址" align="center" prop="bwDzfpXmlUrl" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:monthSummary:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:monthSummary:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:monthSummary:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:monthSummary:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     
     <pagination
@@ -152,10 +117,16 @@
     />
 
     <!-- 添加或修改财务月度汇总对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="monthSummaryRef" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" v-model="open" width="70%" append-to-body>
+      <el-form ref="monthSummaryRef" :model="form" :rules="rules" :inline="true" label-width="160px">
         <el-form-item label="汇总月份" prop="summaryMonth">
-          <el-input v-model="form.summaryMonth" placeholder="请输入汇总月份" />
+          <el-date-picker
+              v-model="form.summaryMonth"
+              type="month"
+              placeholder="选择月"
+              clearable
+              value-format="yyyy-MM">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="应付金额" prop="payableAmount">
           <el-input v-model="form.payableAmount" placeholder="请输入应付金额" />
@@ -163,13 +134,17 @@
         <el-form-item label="交易笔数" prop="transactionCount">
           <el-input v-model="form.transactionCount" placeholder="请输入交易笔数" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+        <el-form-item label="账单状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择">
+            <el-option
+                v-for="item in monthly_report_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="部门ID" prop="deptId">
+        <el-form-item label="供应商名称" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门ID" />
         </el-form-item>
         <el-form-item label="用户id" prop="userId">
@@ -187,6 +162,9 @@
         <el-form-item label="电子发票xml地址" prop="bwDzfpXmlUrl">
           <el-input v-model="form.bwDzfpXmlUrl" placeholder="请输入电子发票xml地址" />
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -195,13 +173,70 @@
         </div>
       </template>
     </el-dialog>
+
+<!--    查看-->
+    <el-dialog title="查看" v-model="openDetail" width="80%" append-to-body>
+      <el-form :model="queryParamsCost" ref="queryCostRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="运单号" prop="externalWaybillNo">
+          <el-input
+              v-model="queryParamsCost.externalWaybillNo"
+              placeholder="请输入运单号"
+              clearable
+              @keyup.enter="handleQueryCost"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQueryCost">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQueryCost">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingCost" :data="monthSummaryListCost">
+        <el-table-column label="序号" align="center" type="index"></el-table-column>
+        <el-table-column label="日期" align="center" prop="signTime" show-overflow-tooltip />
+        <el-table-column label="运单号码" align="center" prop="externalWaybillNo" show-overflow-tooltip />
+        <el-table-column label="寄件地区" align="center" prop="senderCity" />
+        <el-table-column label="到件地区" align="center" prop="receiverCity" />
+        <el-table-column label="计费重量" align="center" prop="goodsWeight" />
+        <el-table-column label="产品类型" align="center"  >
+          <template #default="scope">
+            <span v-if="scope.row.orderType == 1">{{formatterOptions(jd_logistics_product_code,scope.row.productCode)}}</span>
+            <span v-if="scope.row.orderType == 2">{{formatterOptions(sf_logistics_product_code,scope.row.productCode)}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="付款方式" align="center"  >
+          <template #default="scope">
+            <span>月结</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="费用（元）" align="center" prop="rateAmount" />
+        <el-table-column label="经手人" align="center" prop="userName" />
+        <el-table-column label="增值费用" align="center" prop="feeItemName" />
+        <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
+      </el-table>
+
+      <pagination
+          v-show="totalCost>0"
+          :total="totalCost"
+          v-model:page="queryParamsCost.pageNum"
+          v-model:limit="queryParamsCost.pageSize"
+          @pagination="getCostDetailsList"
+      />
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="openDetail = false">返 回</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="MonthSummary">
-import { listMonthSummary, getMonthSummary, delMonthSummary, addMonthSummary, updateMonthSummary } from "@/api/logistics/monthSummary"
+import { listMonthSummary, getMonthSummary, delMonthSummary, addMonthSummary, updateMonthSummary,costDetailsList } from "@/api/logistics/monthSummary"
 
 const { proxy } = getCurrentInstance()
+const { monthly_report_status } = proxy.useDict("monthly_report_status")
+const { jd_logistics_product_code } = proxy.useDict("jd_logistics_product_code")
+const { sf_logistics_product_code } = proxy.useDict("sf_logistics_product_code")
 
 const monthSummaryList = ref([])
 const open = ref(false)
@@ -227,11 +262,34 @@ const data = reactive({
     bwDjbh: null,
     bwDzfpPdfUrl: null,
     bwDzfpOfdUrl: null,
-    bwDzfpXmlUrl: null
+    bwDzfpXmlUrl: null,
   },
+  monthly_report_status:[],
   rules: {
+    payableAmount: [
+      {
+        pattern: /^\d+(\.\d{1,2})?$/,
+        message: "应付金额必须为数字，且最多保留两位小数",
+        trigger: "blur"
+      }
+    ],
+    transactionCount: [
+      {
+        pattern: /^[1-9]\d*$/,
+        message: "交易笔数必须为正整数",
+        trigger: "blur"
+      }
+    ]
   }
 })
+const openDetail = ref(false);
+const loadingCost = ref(false);
+const monthSummaryListCost = ref([]);
+const totalCost = ref(0);
+const queryParamsCost = ref({
+  pageNum: 1,
+  pageSize: 10,
+})
 
 const { queryParams, form, rules } = toRefs(data)
 
@@ -350,6 +408,39 @@ function handleExport() {
     ...queryParams.value
   }, `monthSummary_${new Date().getTime()}.xlsx`)
 }
+function formatterOptions(options,value){
+  console.log(options,value)
+  const option = options.find(item => item.value === value)
+  return option ? option.label : value
+}
+// 点击月份查看
+function detailClick(row){
+  openDetail.value = true;
+  queryParamsCost.value.summaryMonth = row.summaryMonth;
+  queryParamsCost.value.deptId = row.deptId;
+  getCostDetailsList();
+}
+function getCostDetailsList(row){
+  loadingCost.value = true
 
+  costDetailsList(queryParamsCost.value).then(response => {
+    monthSummaryListCost.value = response.rows
+    totalCost.value = response.total
+    loadingCost.value = false
+  })
+}
+function handleQueryCost(){
+  queryParamsCost.value.pageNum = 1
+  getCostDetailsList()
+}
+function resetQueryCost() {
+  proxy.resetForm("queryCostRef")
+  handleQueryCost()
+}
 getList()
 </script>
+<style scoped>
+.fontBlue{
+  color: #2D71FF;
+}
+</style>

jd-logistics-ui-v3/src/views/logistics/order/personal.vue

@@ -6,44 +6,45 @@
     </div>
 
     <div class="logistics-company-list">
-      <!-- 顺丰物流 -->
-      <div class="company-card" :class="{ 'selected': selectedCompany === 'sf' }" @click="selectCompany('sf')">
+
+      <!-- 京东物流 -->
+      <div class="company-card" :class="{ 'selected': selectedCompany === 'jd' }" @click="selectCompany('jd')">
         <div class="company-header">
-          <div class="company-logo sf-logo">
-            <img src="../../../assets/images/logo-sf.png"/>
+          <div class="company-logo jd-logo">
+            <img src="../../../assets/images/logo-jd.png"/>
           </div>
           <div class="company-name">
-            <h3>顺丰物流</h3>
-            <!--            <el-tag type="success" size="small" class="recommend-tag">推荐</el-tag>-->
+            <h3>京东物流</h3>
           </div>
-          <div class="selection-indicator" v-if="selectedCompany === 'sf'">
-<!--            <el-icon color="#409EFF" size="24">-->
-<!--              <Select />-->
-<!--            </el-icon>-->
+          <div class="selection-indicator" v-if="selectedCompany === 'jd'">
+            <!--            <el-icon color="#409EFF" size="24">-->
+            <!--              <Select />-->
+            <!--            </el-icon>-->
           </div>
         </div>
 
         <div class="company-intro">
-          <span>顺丰物流提供高效、安全、便捷的快递服务，覆盖全国各大城市，支持次日达、隔日达等多种时效选择，是个人寄件的优质选择。</span>
+          <span>京东物流提供快速、可靠的快递服务，依托京东强大的物流网络，覆盖全国各级城市，支持上门取件、快递跟踪等全方位服务，满足个人寄件需求。</span>
         </div>
 
         <div class="company-footer">
-          <el-button type="primary" @click.stop="goToSFWebsite" class="jump-btn">
+          <el-button type="primary" @click.stop="goToJDWebsite" class="jump-btn">
             点击跳转
           </el-button>
         </div>
       </div>
 
-      <!-- 京东物流 -->
-      <div class="company-card" :class="{ 'selected': selectedCompany === 'jd' }" @click="selectCompany('jd')">
+      <!-- 顺丰物流 -->
+      <div class="company-card" :class="{ 'selected': selectedCompany === 'sf' }" @click="selectCompany('sf')">
         <div class="company-header">
-          <div class="company-logo jd-logo">
-            <img src="../../../assets/images/logo-jd.png"/>
+          <div class="company-logo sf-logo">
+            <img src="../../../assets/images/logo-sf.png"/>
           </div>
           <div class="company-name">
-            <h3>京东物流</h3>
+            <h3>顺丰物流</h3>
+            <!--            <el-tag type="success" size="small" class="recommend-tag">推荐</el-tag>-->
           </div>
-          <div class="selection-indicator" v-if="selectedCompany === 'jd'">
+          <div class="selection-indicator" v-if="selectedCompany === 'sf'">
 <!--            <el-icon color="#409EFF" size="24">-->
 <!--              <Select />-->
 <!--            </el-icon>-->
@@ -51,11 +52,11 @@
         </div>
 
         <div class="company-intro">
-          <span>京东物流提供快速、可靠的快递服务，依托京东强大的物流网络，覆盖全国各级城市，支持上门取件、快递跟踪等全方位服务，满足个人寄件需求。</span>
+          <span>顺丰物流提供高效、安全、便捷的快递服务，覆盖全国各大城市，支持次日达、隔日达等多种时效选择，是个人寄件的优质选择。</span>
         </div>
 
         <div class="company-footer">
-          <el-button type="primary" @click.stop="goToJDWebsite" class="jump-btn">
+          <el-button type="primary" @click.stop="goToSFWebsite" class="jump-btn">
             点击跳转
           </el-button>
         </div>

jd_logistics-app/pages/mine/mine.vue

@@ -350,29 +350,29 @@ function userLogoutFn() {
 		content: '确认要退出登录吗？',
 		success: function(res) {
 			if (res.confirm) {
-				uni.showLoading({
-					title: '正在退出...'
-				});
-				
-				userLogout({}).then(res => {
-					appStore.LOGOUT();
-					uni.hideLoading();
-					uni.showToast({
-						title: '已退出登录',
-						icon: 'success'
-					});
+				// uni.showLoading({
+				// 	title: '正在退出...'
+				// });
+				appStore.LOGOUT();
+				// userLogout({}).then(res => {
+				// 	appStore.LOGOUT();
+				// 	uni.hideLoading();
+				// 	uni.showToast({
+				// 		title: '已退出登录',
+				// 		icon: 'success'
+				// 	});
 					
-					// 延迟刷新页面状态
-					setTimeout(() => {
-						uni.$emit('userLogoutSuccess');
-					}, 500);
-				}).catch(err => {
-					uni.hideLoading();
-					uni.showToast({
-						title: '退出失败',
-						icon: 'none'
-					});
-				});
+				// 	// 延迟刷新页面状态
+				// 	setTimeout(() => {
+				// 		uni.$emit('userLogoutSuccess');
+				// 	}, 500);
+				// }).catch(err => {
+				// 	uni.hideLoading();
+				// 	uni.showToast({
+				// 		title: '退出失败',
+				// 		icon: 'none'
+				// 	});
+				// });
 			}
 		}
 	});