From 59b14e12476c148bb8eeeb587298b63db15d676e Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Mon, 30 Dec 2024 15:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monthlyReport/inventoryManagement.js      |  14 +-
 .../inventoryManagement.vue                   |  18 +-
 .../inventoryManagementDetail.vue             | 252 ++++++++++++++++++
 3 files changed, 274 insertions(+), 10 deletions(-)
 create mode 100644 yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue

diff --git a/yxt-as-ui/src/api/statement/monthlyReport/inventoryManagement.js b/yxt-as-ui/src/api/statement/monthlyReport/inventoryManagement.js
index b477754eb2..ca03c8b6c3 100644
--- a/yxt-as-ui/src/api/statement/monthlyReport/inventoryManagement.js
+++ b/yxt-as-ui/src/api/statement/monthlyReport/inventoryManagement.js
@@ -13,15 +13,13 @@ export default {
       }
     })
   },
-  // 查询分页列表
-  busDetailsList: function(params) {
+  // 查询详情
+  getDetail: function(params) {
     return request({
-      url: '/as/v1/AsBusrepairBill/busDetailsList',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
+      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/as/v1/inventoryRate/getDetail/' + params,
+      method: 'get',
+
     })
   }
 }
diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue
index f01b33a1f8..ae127a234a 100644
--- a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue
+++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue
@@ -47,9 +47,12 @@
           <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
             :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
-        <!--End查询列表部分-->
+
       </div>
     </div>
+    <!--End查询列表部分-->
+    <!-- 新增修改部分组件 -->
+    <divinfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="getList" />
   </div>
 </template>
 
@@ -58,13 +61,15 @@
   import pageye from '@/components/pagination/pageye'
   import ButtonBar from '@/components/ButtonBar'
   import req from '@/api/statement/monthlyReport/inventoryManagement'
+  import divinfo from './inventoryManagementDetail.vue'
 
   export default {
     name: 'inventoryManagement',
     components: {
       Pagination,
       pageye,
-      ButtonBar
+      ButtonBar,
+      divinfo
     },
     data() {
       return {
@@ -109,6 +114,14 @@
     methods: {
       handle(row) {
         console.log('handle    ' + row.sid)
+
+        this.viewState = 4
+        this.$refs['divinfo'].showAdd(row)
+
+      },
+      resetState() {
+        this.viewState = 1
+        this.getList()
       },
       // 搜索条件效果
       clicksearchShow() {
@@ -186,6 +199,7 @@
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)
       }
+
     }
   }
 </script>
diff --git a/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue
new file mode 100644
index 0000000000..2887ec0dad
--- /dev/null
+++ b/yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue
@@ -0,0 +1,252 @@
+<template>
+  <div>
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div style="margin: 0 auto;">{{title}}</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div style="margin-top: 10px; height: 100%;">
+
+      <el-table :key="tableKey" v-loading="listLoading" height="650px" :data="list" border
+        style="width: 100%;margin-bottom: 50px;" :span-method="objectSpanMethods">
+        <el-table-column fixed label="序号" type="index" width="80" :index="index+1" align="center" />
+        <el-table-column prop="品牌" label="品牌" align="center" width="150" />
+        <el-table-column prop="服务站名称" label="服务站名称" align="center" width="150" />
+        <el-table-column prop="软件系统" label="软件系统" align="center" width="150" />
+
+        <el-table-column prop="品名" label="品名" align="center" width="150" />
+        <el-table-column prop="项目" label="项目" align="center" width="150" />
+        <el-table-column prop="在修车辆" label="在修车辆" align="center" width="150" />
+
+        <el-table-column label="库存总计" align="center">
+          <el-table-column prop="库存总计品种" label="品种（个）" align="center" width="120" />
+          <el-table-column prop="库存总计金额" label="金额（元）" align="center" width="120" />
+        </el-table-column>
+
+        <el-table-column label="正常库存" align="center">
+
+          <el-table-column label="库龄1-60天" align="center">
+            <el-table-column label="1-2个月内配件" align="center">
+              <el-table-column prop="1月金额" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="1月金额" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="1月占比" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <!-- <el-table-column label="库龄61-90天" align="center">
+            <el-table-column label="超2个月（3个月）配件" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+        </el-table-column>
+
+        <el-table-column label="滞销件" align="center">
+
+          <el-table-column label="库龄91-180天" align="center">
+            <el-table-column label="超3个月（4-6个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="库龄150-180天" align="center">
+            <el-table-column label="超5个月（6个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+        </el-table-column>
+
+        <el-table-column label="积压件" align="center">
+
+          <el-table-column label="库龄181-270天" align="center">
+            <el-table-column label="超6个月（7-9个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="库龄240-270天" align="center">
+            <el-table-column label="超8个月（9个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="库龄271-360天" align="center">
+            <el-table-column label="超9个月（10-12个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="库龄330-360天" align="center">
+            <el-table-column label="超11个月（12个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="库龄361-720天" align="center">
+            <el-table-column label="超12个月（13-24个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column>
+
+          <el-table-column label="超24个月（25个月以上）" align="center">
+            <el-table-column label="超11个月（12个月）" align="center">
+              <el-table-column prop="deptName" label="品种（个）" align="center" width="120" />
+              <el-table-column prop="deptName" label="金额（元）" align="center" width="120" />
+              <el-table-column prop="deptName" label="占比" align="center" width="120" />
+            </el-table-column>
+          </el-table-column> -->
+
+        </el-table-column>
+
+        <el-table-column label="库存当量" align="center">
+
+          <el-table-column label="当月出库配件成本" align="center">
+            <el-table-column prop="库存当量出库金额" label="金额（元）" align="center" width="120" />
+            <el-table-column prop="库存当量出库占比" label="占比" align="center" width="120" />
+          </el-table-column>
+
+          <el-table-column label="当月入库配件成本" align="center">
+            <el-table-column prop="库存当量入库金额" label="金额（元）" align="center" width="120" />
+            <el-table-column prop="库存当量入库占比" label="占比" align="center" width="120" />
+          </el-table-column>
+
+        </el-table-column>
+
+
+
+
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/statement/monthlyReport/inventoryManagement'
+  export default {
+    data() {
+      return {
+        index: 0,
+        tableKey: 0,
+        listLoading: false,
+        list: [],
+        title: "",
+        mergeObj: {}, // 用来记录需要合并行的下标
+        // mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名
+        mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名
+      }
+    },
+
+    methods: {
+
+      objectSpanMethods({
+        row, //当前行、
+        column, //当前列、
+        rowIndex, //当前行索引
+        columnIndex //当前列索引
+      }) {
+
+        if (row.项目 == '总计') {
+          if (columnIndex === 4) {
+            //定位到6行4列的ID，告诉该单元格合并1行2列
+            return [1, 2]
+          }
+          if (columnIndex === 5) {
+            //定位到6行4列的ID，告诉该单元格合并1行2列
+            return [0, 0]
+          }
+        }
+
+
+        // 判断列的属性
+        if (this.mergeArr.indexOf(column.property) !== -1) {
+          // 判断其值是不是为0
+          if (this.mergeObj[column.property][rowIndex]) {
+            return [this.mergeObj[column.property][rowIndex], 1]
+          } else {
+            // 如果为0则为需要合并的行
+            return [0, 0];
+          }
+        }
+
+
+
+      },
+      showAdd(row) {
+        this.title = "安瑞集团" + row.createTime + row.deptName + "服务站配件库存管理指标完成情况报表"
+
+        req.getDetail(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.list = resp.data
+              this.getSpanArr(this.list)
+            }
+          })
+          .catch(e => {
+            this.$emit('doback')
+          })
+
+      },
+      // getSpanArr方法
+      getSpanArr(data) {
+        this.mergeArr.forEach((key, index1) => {
+          let count = 0; // 用来记录需要合并行的起始位置
+          this.mergeObj[key] = []; // 记录每一列的合并信息
+          data.forEach((item, index) => {
+            // index == 0表示数据为第一行，直接 push 一个 1
+            if (index === 0) {
+              this.mergeObj[key].push(1);
+            } else {
+              console.log('>>>>>>>>>commodityCurrentChange', item)
+              console.log('>>>>>>>>>commodityCurrentChange', key)
+              console.log('>>>>>>>>>commodityCurrentChange', item[key])
+              console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key])
+              // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
+              if (item[key] === data[index - 1][key]) {
+                this.mergeObj[key][count] += 1;
+                this.mergeObj[key].push(0);
+              } else {
+                // 如果当前行和上一行其值不相等
+                count = index; // 记录当前位置
+                this.mergeObj[key].push(1); // 重新push 一个 1
+              }
+            }
+          })
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>