2024-05-22 提交

src/views/ecw/financial/payable.vue

@@ -90,7 +90,7 @@
               v-model="queryParams.dateRangeCreateTime"
               style="width: 300px"
               value-format="yyyy-MM-dd"
-              type="datetimerange"
+              type="daterange"
               range-separator="-"
               :start-placeholder="$t('开始日期')"
               :end-placeholder="$t('结束日期')"
@@ -366,13 +366,15 @@ export default {
         page: 1,
         rows: 20,
         dateRangeCreateTime: undefined,
+        beginCreateTime: undefined,
+        endCreateTime: undefined,
       },
       allSupplier: [],
       currencyList: [],
       warehouseList: [],
       //lanbm 2024-05-17 add
       dateTypes: [
-        { value: "0", label: this.$t("费用产生时间") },
+        { value: "7", label: this.$t("费用产生时间") },
         { value: "1", label: this.$t("预装时间") },
         { value: "2", label: this.$t("装柜时间") },
         { value: "3", label: this.$t("起运时间") },
@@ -426,6 +428,13 @@ export default {
       let params = { ...this.queryParams };
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
+      if (
+        params.dateRangeCreateTime != null &&
+        params.dateRangeCreateTime.length == 2
+      ) {
+        params.beginCreateTime = params.dateRangeCreateTime[0];
+        params.endCreateTime = params.dateRangeCreateTime[1];
+      }
       getPayableList(params).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;

src/views/ecw/order/detail.vue

@@ -694,7 +694,8 @@ export default {
   components: {
     ImageDisplay,
     OperateLogDetail,
-    PrintWarehouseReceipt, PrintLadingBill, WarehouseDetail, WarehouseAreaSelect,DeclarationDocuments,
+    PrintWarehouseReceipt, PrintLadingBill,
+     WarehouseDetail, WarehouseAreaSelect,DeclarationDocuments,
     FeeDetail,PackHistory,PackHistoryDetail
   },
   filters: {

src/views/report/WarehouseInDetail/index.vue

+<template>
+  <!-- 订单获取入仓记录 -->
+  <el-dialog
+    :title="title"
+    visible
+    :before-close="closeDialog"
+    :close-on-click-modal="false"
+    width="1000px"
+  >
+    <el-table :data="warehouseItem">
+      <el-table-column type="index" :label="$t('序号')" />
+      <el-table-column :label="$t('箱数')" prop="cartonsNum">
+        <template slot-scope="{ row }">
+          <template
+            v-if="
+              row.orderWarehouseInDetailsVOList &&
+              row.orderWarehouseInDetailsVOList.length
+            "
+          >
+            <WarehouseRecordDetail
+              v-model="row.orderWarehouseInDetailsVOList"
+              :num="row.cartonsNum"
+              text
+              readonly
+            />
+          </template>
+          <template v-else>{{ row.cartonsNum }}</template>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
+        <template slot-scope="{ row }">
+          <dict-tag
+            :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE"
+            :value="row.specificationType"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('包装类型')" prop="unit">
+        <template slot-scope="{ row }">
+          <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('长')" prop="boxGauge">
+        <template slot-scope="{ row }">
+          {{ row.boxGauge.split("*")[0] }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('宽')" prop="boxGauge">
+        <template slot-scope="{ row }">
+          {{ row.boxGauge.split("*")[1] }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('高')" prop="boxGauge">
+        <template slot-scope="{ row }">
+          {{ row.boxGauge.split("*")[2] }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
+      <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
+      <el-table-column :label="$t('数量（个）')" prop="quantityAll" />
+      <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
+      <el-table-column :label="$t('首次入仓时间')" prop="inTime">
+        <template slot-scope="{ row }">{{ row.inTime | parseTime }}</template>
+      </el-table-column>
+      <el-table-column :label="$t('储位')" prop="orderLocationBackVOList">
+        <template slot-scope="{ row }">
+          {{ getLocationName(row.orderLocationBackVOList) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList">
+        <template slot-scope="{ row }">
+          <image-display :pictureUrls="warehouseItem.pictureUrls" :type="5">
+            <el-button type="text"> 查看 </el-button>
+          </image-display>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('备注')" prop="remark">
+        <template slot-scope="{ row }">
+          {{ row.remark }}
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+<script>
+import { getOrderWarehouseIn } from "@/api/ecw/order";
+import { parseTime } from "@/utils/ruoyi";
+import WarehouseAreaSelect from "@/components/WarehouseAreaSelect";
+import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
+import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue";
+export default {
+  components: {
+    WarehouseRecordDetail,
+    ImageDisplay,
+    WarehouseAreaSelect,
+  },
+  filters: { parseTime },
+  props: {
+    order: Object, // order 和 orderId 二选一
+    orderId: Number,
+    orderItemId: Number,
+    type: Number,
+  },
+  data() {
+    return {
+      warehouseItem: [],
+    };
+  },
+  computed: {
+    title() {
+      return this.$l(this.order, "orderNo") + " - " + this.$t("入仓记录");
+    },
+  },
+  created() {
+    this.show = true;
+    getOrderWarehouseIn(this.order.orderId).then((res) => {
+      this.warehouseItem = [];
+      for (var i = 0; i < res.data.length; i++) {
+        for (
+          var j = 0;
+          j < res.data[i].orderWarehouseInBackItemDoList.length;
+          j++
+        ) {
+          this.warehouseItem.push(
+            res.data[i].orderWarehouseInBackItemDoList[j]
+          );
+        }
+      }
+    });
+  },
+  methods: {
+    // 获取储位名称
+    getLocationName(locationArr) {
+      if (!locationArr || !locationArr.length) return "";
+      let arr = [];
+      locationArr.forEach((item) => {
+        arr.push(`${item.areaName}${item.locationName || ""}`);
+      });
+      return Array.from(new Set(arr)).join(",");
+    },
+    closeDialog() {
+      this.show = false;
+      this.$emit("close");
+    },
+    seePackLog() {
+      this.$emit("openPackHistory", this.orderItemId);
+    },
+  },
+};
+</script>

src/views/report/sales_analysis/index.vue

@@ -318,13 +318,19 @@
                 <tr>
                   <td><div class="cell"></div></td>
                   <td>
-                    <div class="cell">总箱数：{{ StatisticalSummary.sumBox }}</div>
+                    <div class="cell">
+                      总箱数：{{ StatisticalSummary.sumBox }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总方数：{{ StatisticalSummary.sumM3 }}</div>
+                    <div class="cell">
+                      总方数：{{ StatisticalSummary.sumM3 }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总重量：{{ StatisticalSummary.sumKG }}</div>
+                    <div class="cell">
+                      总重量：{{ StatisticalSummary.sumKG }}
+                    </div>
                   </td>
                   <td>
                     <div class="cell">总V值：{{ StatisticalSummary.sumV }}</div>
@@ -333,31 +339,47 @@
                 <tr>
                   <td><div class="cell">新客户</div></td>
                   <td>
-                    <div class="cell">总箱数：{{ StatisticalSummary.sumBoxNew }}</div>
+                    <div class="cell">
+                      总箱数：{{ StatisticalSummary.sumBoxNew }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总方数：{{ StatisticalSummary.sumM3New }}</div>
+                    <div class="cell">
+                      总方数：{{ StatisticalSummary.sumM3New }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总重量：{{ StatisticalSummary.sumKGNew }}</div>
+                    <div class="cell">
+                      总重量：{{ StatisticalSummary.sumKGNew }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总V值：{{ StatisticalSummary.sumVNew }}</div>
+                    <div class="cell">
+                      总V值：{{ StatisticalSummary.sumVNew }}
+                    </div>
                   </td>
                 </tr>
                 <tr>
                   <td><div class="cell">旧客户</div></td>
                   <td>
-                    <div class="cell">总箱数：{{ StatisticalSummary.sumBoxOld }}</div>
+                    <div class="cell">
+                      总箱数：{{ StatisticalSummary.sumBoxOld }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总方数：{{ StatisticalSummary.sumM3Old }}</div>
+                    <div class="cell">
+                      总方数：{{ StatisticalSummary.sumM3Old }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总重量：{{ StatisticalSummary.sumKGOld }}</div>
+                    <div class="cell">
+                      总重量：{{ StatisticalSummary.sumKGOld }}
+                    </div>
                   </td>
                   <td>
-                    <div class="cell">总V值：{{ StatisticalSummary.sumVOld }}</div>
+                    <div class="cell">
+                      总V值：{{ StatisticalSummary.sumVOld }}
+                    </div>
                   </td>
                 </tr>
               </tbody>
@@ -465,9 +487,15 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <WarehouseDetail-detail :order="order" :orderItemId="showWarehouseInItemId"
-     v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null">
-    </WarehouseDetail-detail>
+
+    <warehouse-detail
+      :order="order"
+      :orderItemId="showWarehouseInItemId"
+      :type="type"
+      @openPackHistory="openPackHistory"
+      v-if="showWarehouseInItemId"
+      @close="showWarehouseInItemId = null"
+    />
   </div>
 </template>
   
@@ -477,13 +505,17 @@ import { getCountryListAll } from "@/api/ecw/country";
 import Treeselect from "@riophae/vue-treeselect";
 import "@/assets/styles/vue-treeselect.css";
 import { getWarehouseList } from "@/api/ecw/warehouse";
-import { getListPage, exportExcel,getStatisticalSummary } from "@/api/report/salesanalysis";
+import {
+  getListPage,
+  exportExcel,
+  getStatisticalSummary,
+} from "@/api/report/salesanalysis";
 import { getCurUserPermission } from "@/api/report/EcwReportPermission";
 import { getAllChannelList, getChannelList } from "@/api/ecw/channel";
 import { listSimpleDepts } from "@/api/system/dept";
-import {getOrder} from "@/api/ecw/order";
+import { getOrder } from "@/api/ecw/order";
 //入仓记录页面
-import WarehouseDetail from "@/views/ecw/order/components/WarehouseDetail";
+import WarehouseDetail from "@/views/report/WarehouseInDetail/index.vue";
 
 //2024-05-01合并
 export default {
@@ -509,6 +541,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      showDetail: false,
       deptOptions: undefined,
       dateRangeCreateTime: [],
       SearchType: [
@@ -563,20 +596,20 @@ export default {
       showWarehouseInItemId: undefined,
       order: null,
       type: 1,
-      StatisticalSummary:{
-        sumBox:0,
-        sumM3:0,
-        sumKG:0,
-        sumV:0,
-        sumBoxNew:0,
-        sumM3New:0,
-        sumKGNew:0,
-        sumVNew:0,
-        sumBoxOld:0,
-        sumM3Old:0,
-        sumKGOld:0,
-        sumVOld:0,
-      }
+      StatisticalSummary: {
+        sumBox: 0,
+        sumM3: 0,
+        sumKG: 0,
+        sumV: 0,
+        sumBoxNew: 0,
+        sumM3New: 0,
+        sumKGNew: 0,
+        sumVNew: 0,
+        sumBoxOld: 0,
+        sumM3Old: 0,
+        sumKGOld: 0,
+        sumVOld: 0,
+      },
     };
   },
   created() {
@@ -631,7 +664,6 @@ export default {
       getStatisticalSummary(params).then((response) => {
         this.StatisticalSummary = response.data;
       });
-
     },
 
     /** 表单重置 */
@@ -685,10 +717,15 @@ export default {
     // 显示入仓记录
     showWarehouseLogs(row, type) {
       getOrder(row.orderId).then((response) => {
-        this.order = response.data;
-        this.showWarehouseInItemId = row.orderItemId;
+        this.order = response.data;//组件中只用到了此参数
+        this.type = 2;
+        this.showWarehouseInItemId = 1;
       });
     },
+    openPackHistory(id) {
+      //查询打包历史
+      //this.shopPackId = id
+    },
     /** 查询部门下拉树结构 + 岗位下拉 */
     getTreeselect() {
       if (this.objEcwReportPermission.permissionFw == 3) {