update：更新收货汇总对接

2024-03-15 14:41:42 +08:00 · 2024-03-15 14:41:42 +08:00 · 8e3dd63aa2
parent 2dd4b8e43c
commit 8e3dd63aa2
7 changed files with 259 additions and 138 deletions
--- a/src/PagesStatistics/components/FilterDialog.vue
+++ b/src/PagesStatistics/components/FilterDialog.vue
@ -4,13 +4,13 @@
      <view class="title">筛选</view>
      <u-list height="200">
        <u-list-item>
-          <u-cell :title="`供应商`" @click="handleDialog('showSupplier', true)">
+          <u-cell :title="`${isShipment ? '客户' : '供应商'}`" @click="handleDialog('showSupplier', true)">
            <template #right-icon> </template>
          </u-cell>
        </u-list-item>
        <u-list-item boder="none">
          <u-cell
-            :title="`收货产品`"
+            :title="`${isShipment ? '出货产品' : '收货产品'}`"
            @click="handleDialog('showProduct', true)"
          >
            <template #right-icon> </template>
@ -42,6 +42,7 @@
    @handleDialog="(v:boolean) => {handleDialog('showProduct', v)}"
    @changeProduct="changeProduct"
    ref="productRef"
+    :isShipment="isShipment"
  ></ProductDialog>
 </template>
 <script setup lang="ts">
@ -49,6 +50,7 @@ import SupplierDialog from "./SupplierDialog.vue";
 import ProductDialog from "./ProductDialog.vue";
 const props = defineProps<{
  show: boolean;
+  isShipment: boolean;
 }>();
 const emit = defineEmits(["handleDialog", "changeOther"]);
 const handleClose = () => {
--- a/src/PagesStatistics/components/ProductDialog.vue
+++ b/src/PagesStatistics/components/ProductDialog.vue
@ -1,10 +1,14 @@
 <template>
  <u-popup :show="show" mode="left" :closeable="true" @close="handleClose">
    <view class="c-dialog-filter">
-      <view class="title">收货产品</view>
+      <view class="title">{{ isShipment ? "出货" : "收货" }}产品</view>
      <view class="dialog-product-layout">
-        <text v-for="(item, index) in state.list" :class="{ active: state.current === item.id }" @click="handleSelect(item)" :key="index"
-          >{{ item.reProductsName }}</text
+        <text
+          v-for="(item, index) in state.list"
+          :class="{ active: state.current === item.id }"
+          @click="handleSelect(item)"
+          :key="index"
+          >{{isShipment ? item.shmProductsName : item.reProductsName }}</text
        >
      </view>
      <!-- <view class="btn-confirm">
@ -16,36 +20,44 @@
  </u-popup>
 </template>
 <script setup lang="ts">
-import { ReceiveProductApi } from '@/services';
+import { ReceiveProductApi, GoodsApi } from "@/services";

 const props = defineProps<{
-  show: boolean,
-}>()
-const emit = defineEmits(['handleDialog', 'changeProduct']);
+  show: boolean;
+  isShipment: boolean;
+}>();
+const emit = defineEmits(["handleDialog", "changeProduct"]);
 const handleClose = () => {
-  emit('handleDialog', false)
-}
+  emit("handleDialog", false);
+};
 const state = reactive<any>({
  list: [],
  current: -1,
+});

-})
-
-const handleSelect = (item:any) => {
-  state.current = item.id
-  emit('changeProduct', item)
-  emit('handleDialog', false)
-}
+const handleSelect = (item: any) => {
+  state.current = item.id;
+  emit("changeProduct", item);
+  emit("handleDialog", false);
+};
 const getList = () => {
-  ReceiveProductApi.getAllReProducts().then(res => {
+  if (props.isShipment) {
+    GoodsApi.getShipmentProductList().then((res) => {
      if (res.code === 200) {
-    state.list = res.data
+        state.list = res.data;
      }
-})
-}
+    });
+  } else {
+    ReceiveProductApi.getAllReProducts().then((res) => {
+      if (res.code === 200) {
+        state.list = res.data;
+      }
+    });
+  }
+};
 onMounted(() => {
-  getList()
-})
+  getList();
+});
 </script>
 <style lang="scss" scoped>
 .c-dialog-filter {
@ -58,8 +70,8 @@ onMounted(() => {
    text-align: center;
  }
 }
- // 产品dialog
-  .dialog-product-layout {
+// 产品dialog
+.dialog-product-layout {
  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
  border-radius: 13rpx;
  margin: 42rpx 25rpx;
@ -89,9 +101,9 @@ onMounted(() => {
    border-color: $u-primary;
    color: $u-primary;
  }
-  }
+}

-  .btn-confirm {
+.btn-confirm {
  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(0, 56, 93, 0.12);
  border-radius: 13rpx 13rpx 0rpx 0rpx;
  position: absolute;
@ -106,5 +118,5 @@ onMounted(() => {
      border-radius: 43rpx;
    }
  }
-  }
+}
 </style>
--- a/src/PagesStatistics/components/StatusDialog.vue
+++ b/src/PagesStatistics/components/StatusDialog.vue
@ -10,7 +10,7 @@
      <view class="box"><text>单据状态</text></view>
      <view class="box-btn"
        ><text
-          v-for="(item, index) in state.statusList"
+          v-for="(item, index) in isShipment ? state.statusList2 : state.statusList1"
          :key="index"
          :class="{ active: state.currentStates === item.id }"
          @click="handleSelect(item)"
@ -23,11 +23,12 @@
 <script setup lang="ts">
 const props = defineProps<{
  show: boolean;
+  isShipment: boolean;
 }>();

 const state = reactive({
  currentStates: -1,
-  statusList: [
+  statusList1: [
    {
      id: -1,
      name: "全部",
@ -45,6 +46,20 @@ const state = reactive({
      name: "未审核",
    },
  ],
+  statusList2: [
+    {
+      id: -1,
+      name: "全部",
+    },
+    {
+      id: 4,
+      name: "已结算",
+    },
+    {
+      id: 3,
+      name: "未结算",
+    },
+  ],
 });

 const emit = defineEmits(["handleDialog", "changeStatus"]);
@ -52,10 +67,10 @@ const handleClose = () => {
  emit("handleDialog", false);
 };
 const handleSelect = (item: any) => {
-  state.currentStates = item.id
-  emit("changeStatus", item)
+  state.currentStates = item.id;
+  emit("changeStatus", item);
  emit("handleDialog", false);
-}
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .u-popup__content {
--- a/src/PagesStatistics/receivePanel.vue
+++ b/src/PagesStatistics/receivePanel.vue
@ -118,6 +118,7 @@
  <!-- 单据弹框 -->
  <StatusDialog
    :show="showDialog.showStatus"
+    :isShipment="false"
    @handleDialog="(v:boolean) => {handleDialog('showStatus', v)}"
    @changeStatus="changeStatus"
  />
--- a/src/PagesStatistics/shipmentPanel.vue
+++ b/src/PagesStatistics/shipmentPanel.vue
@ -2,41 +2,46 @@
  <view class="layout-box">
    <view class="filter">
      <u-input
-        v-model="params.startTime"
+        v-model="state.startTime"
        disabled
        disabledColor="#ffffff"
        placeholder="请选择开始时间"
      ></u-input>
      <text>-</text>
      <u-input
-        v-model="params.endTime"
+        v-model="state.endTime"
        disabled
        disabledColor="#ffffff"
        placeholder="请选择结束时间"
      ></u-input>
-      <u-icon name="arrow-down-fill" @click="handleDialog('showTime',true)"></u-icon>
+      <u-icon
+        name="arrow-down"
+        @click="handleDialog('showTime', true)"
+      ></u-icon>
      <text class="status">单据状态</text>
-      <u-icon name="arrow-down-fill" @click="handleDialog('showStatus', true)"></u-icon>
+      <u-icon
+        name="arrow-down"
+        @click="handleDialog('showStatus', true)"
+      ></u-icon>
      <text class="btn" @click="handleDialog('showFilter', true)">筛选</text>
    </view>
-
    <view class="box">
      <up-row>
        <up-col span="4">
          <view class="inner-box" style="border: none">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalAmount }}</view>
            <view>出货总量/kg</view>
          </view>
        </up-col>
        <up-col span="4">
          <view class="inner-box">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalPayShipment }}</view>
            <view>已收/kg</view>
          </view>
        </up-col>
        <up-col span="4">
          <view class="inner-box">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalUnPayShipment }}</view>
            <view>未收/kg</view>
          </view>
        </up-col>
@ -47,19 +52,19 @@
      <up-row>
        <up-col span="4">
          <view class="inner-box" style="border: none">
-            <view class="num">892339.9</view>
-            <view>结算金额/kg</view>
+            <view class="num">{{ state.summary.totalCollection }}</view>
+            <view>结算金额/元</view>
          </view>
        </up-col>
        <up-col span="4">
          <view class="inner-box">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalPayCollection }}</view>
            <view>实收金额</view>
          </view>
        </up-col>
        <up-col span="4">
          <view class="inner-box">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalUnPayCollection }}</view>
            <view>应收金额</view>
          </view>
        </up-col>
@ -69,14 +74,14 @@
      <up-row>
        <up-col span="6">
          <view class="inner-box" style="border: none">
-            <view class="num">892339.9</view>
+            <view class="num">{{ state.summary.totalReceipt }}</view>
            <view>出货单</view>
          </view>
        </up-col>
        <up-col span="6">
          <view class="inner-box">
-            <view class="num">892339.9</view>
-            <view>均价(元/kg)</view>
+            <view class="num">{{ state.summary.averagePrice }}</view>
+            <view>均价（元/kg）</view>
          </view>
        </up-col>
      </up-row>
@ -86,47 +91,59 @@
      <uni-table stripe emptyText="暂无更多数据">
        <!-- 表头行 -->
        <uni-tr>
-          <uni-th align="center" v-for="(item, index) in tableTitleList" :key="index">{{
+          <uni-th v-for="(item, index) in tableTitleList" :key="index">{{
            item.name
          }}</uni-th>
        </uni-tr>
        <!-- 表格数据行 -->
-        <uni-tr v-for="(item, index) in 10" :key="index">
-          <uni-td>张家港华仁再生</uni-td>
-          <uni-td>1636.00</uni-td>
-          <uni-td>5646.00</uni-td>
-          <uni-td>5636.00</uni-td>
-          <uni-td>5636.00</uni-td>
+        <uni-tr v-for="(item, index) in state.summary.rankings" :key="index">
+          <uni-td>{{ item.userName }}</uni-td>
+          <uni-td>{{ item.totalAmount }}</uni-td>
+          <uni-td>{{ item.totalPayment }}</uni-td>
+          <uni-td>{{ item.totalOrderNumber }}</uni-td>
+          <uni-td>{{ item.totalOrderNumber }}</uni-td>
        </uni-tr>
      </uni-table>
    </view>
  </view>

  <!-- 时间弹框 -->
-  <TimeDialog ref="timeDialog"  :show="showDialog.showTime" @handleDialog="(v:boolean) => {handleDialog('showTime', v)}"/>
+  <TimeDialog
+    ref="timeDialog"
+    :show="showDialog.showTime"
+    @handleDialog="(v:boolean) => {handleDialog('showTime', v)}"
+    @changeTime="changeTime"
+  />

  <!-- 单据弹框 -->
-  <StatusDialog :show="showDialog.showStatus" @handleDialog="(v:boolean) => {handleDialog('showStatus', v)}"/>
+  <StatusDialog
+    :show="showDialog.showStatus"
+    :isShipment="true"
+    @handleDialog="(v:boolean) => {handleDialog('showStatus', v)}"
+    @changeStatus="changeStatus"
+
+  />

  <!-- 筛选弹框 -->
-  <FilterDialog :show="showDialog.showFilter" @handleDialog="(v:boolean) => {handleDialog('showFilter', v)}"/>
-
+  <FilterDialog
+    :show="showDialog.showFilter"
+    @handleDialog="(v:boolean) => {handleDialog('showFilter', v)}"
+    @changeOther="changeOther"
+    :isShipment="true"
+  />
 </template>
 <script setup lang="ts">
-import TimeDialog from './components/TimeDialog.vue'
-import StatusDialog from './components/StatusDialog.vue'
-import FilterDialog from './components/FilterDialog.vue'
-const params = reactive({
-  startTime: "2024-01-01",
-  endTime: "2024-01-01",
-});
-
+import TimeDialog from "./components/TimeDialog.vue";
+import StatusDialog from "./components/StatusDialog.vue";
+import FilterDialog from "./components/FilterDialog.vue";
+import { ShipmentApi } from "@/services";
+import { formatDate, getCurrentMonthStartAndEnd } from "@/utils";
 const tableTitleList = reactive([
  {
    name: "客户",
  },
  {
-    name: "结算重量",
+    name: "结算重量/kg",
  },
  {
    name: "结算金额",
@ -140,21 +157,84 @@ const tableTitleList = reactive([
 ]);
 const showDialog = <
  {
-    [key: string]: boolean
+    [key: string]: boolean;
  }
->reactive(
-  {
+>reactive({
  showTime: false,
  showStatus: false,
-    showFilter: false
+  showFilter: false,
+});
+
+const state = reactive<{
+  summary: ShipmentSummaryCount;
+  startTime: string;
+  endTime: string;
+  scaleStatus: number;
+  userId: number;
+  productId: number;
+}>({
+  summary: {
+    totalAmount: 0, // 收货汇总：审核过收货总量
+    totalPayShipment: 0, // 已支付的出货总
+    totalUnPayShipment: 0, // 未支付的出货总量
+    totalCollection: 0, // 总收款
+    totalPayCollection: 0, // 已经收到的收款
+    totalUnPayCollection: 0, // 未收到的收款
+    totalReceipt: 0, // 收货单数量已审核的
+    averagePrice: 0, // 平均单价
+    rankings: [],
+  },
+  startTime: formatDate(getCurrentMonthStartAndEnd().start, "{y}-{m}-{d}"),
+  endTime: formatDate(getCurrentMonthStartAndEnd().end, "{y}-{m}-{d}"),
+  scaleStatus: -1,
+  userId: -1,
+  productId: -1,
+});
+
+const changeTime = (obj: any) => {
+  state.startTime = obj.startTime;
+  state.endTime = obj.endTime;
+  getList();
+};
+
+const changeStatus = (obj: any) => {
+  state.scaleStatus = obj.id;
+  getList();
+};
+
+const changeOther = (obj: any) => {
+  state.userId = obj.userId;
+  state.productId = obj.productId;
+  getList();
+};
+
+const handleDialog = (key: string, v: boolean) => {
+  showDialog[key] = v;
+};
+
+const getList = () => {
+  let params: any = {
+    startTime: state.startTime + " 00:00:00",
+    endTime: state.endTime + " 23:59:59",
+  };
+  if (state.scaleStatus > -1) {
+    params.scaleStatus = state.scaleStatus;
  }
-)
-
-const handleDialog = (key: string, v:boolean) => {
-  showDialog[key] = v
-}
-
-
+  if (state.userId > -1) {
+    params.userId = state.userId;
+  }
+  if (state.productId > -1) {
+    params.productId = state.productId;
+  }
+  ShipmentApi.getOrderInReceipt(params).then((res) => {
+    if (res.code === 200) {
+      state.summary = res.data;
+    }
+  });
+};
+onMounted(() => {
+  getList();
+});
 </script>
 <style lang="scss" scoped>
 .layout-box {
@ -164,15 +244,14 @@ const handleDialog = (key: string, v:boolean) => {
    align-items: center;
    justify-items: center;
    font-family: Source Han Sans CN;
-    font-weight: 500;
-    font-size: 27rpx;
+    font-size: 28rpx;
    color: #000000;
    ::v-deep .u-input {
      padding: 0rpx 16.03rpx !important;
      input {
        font-family: Source Han Sans CN;
        font-weight: 400;
-        font-size: 21rpx !important;
+        font-size: 24rpx !important;
        color: #000000;
      }
    }
@ -195,7 +274,7 @@ const handleDialog = (key: string, v:boolean) => {
    align-items: center;
    font-family: Source Han Sans CN;
    font-weight: 400;
-    font-size: 24rpx;
+    font-size: 26rpx;
    color: #000000;
    text-align: center;
    background: #ffffff;
@ -207,7 +286,7 @@ const handleDialog = (key: string, v:boolean) => {
    text-align: center;
    font-family: Source Han Sans CN;
    font-weight: 400;
-    font-size: 24rpx;
+    font-size: 26rpx;
    color: #000000;
    border-left: 1px solid #e9e9e9;
    .num {
@ -216,21 +295,20 @@ const handleDialog = (key: string, v:boolean) => {
    }
  }
  ::v-deep .uni-table {
-    min-width: auto !important;
+    min-width: 500px !important;
    .uni-table-th {
      font-family: Source Han Sans CN;
      font-weight: 500;
-      font-size: 22rpx;
+      font-size: 24rpx;
      color: #000000;
      padding: 5px 5px;
    }
    .uni-table-td {
      font-family: Source Han Sans CN;
      font-weight: 400;
-      font-size: 21rpx;
+      font-size: 24rpx;
      color: #000000;
    }
  }
 }
-
 </style>
--- a/src/services/shipment.ts
+++ b/src/services/shipment.ts
@ -53,12 +53,13 @@ export const countOrderByMonth = () => {
    url: "/api/orderOut/countOrderByMonth"
  });
 };
-// 出库分类统计

-export const getOrderInReceipt = () => {
-  return http<Shipment>({
+// 出库分类统计
+export const getOrderInReceipt = (data: any) => {
+  return http<ShipmentSummaryCount>({
    method: "GET",
-    url: "/api/orderOut/OrderInReceipt"
+    url: "/api/orderOut/OrderInReceipt",
+    data
  });
 };
 // 出货单排行榜
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@ -59,6 +59,18 @@ interface ReceiveSummaryCount {
  averagePrice?: number; // 平均单价
  rankings?: Array;
 }
+
+interface ShipmentSummaryCount {
+  totalAmount?: number; // 收货汇总：审核过收货总量
+  totalPayShipment?: number; // 已支付的出货总
+  totalUnPayShipment?: number; // 未支付的出货总量
+  totalCollection?: number; // 总收款
+  totalPayCollection?: number; // 已经收到的收款
+  totalUnPayCollection?: number; // 未收到的收款
+  totalReceipt?: number; // 收货单数量已审核的
+  averagePrice?: number; // 平均单价
+  rankings?: Array;
+}
 // 分页结构
 interface OrderPage<T> {
  total: number;