Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js

@@ -4,7 +4,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
       url: '/buscenter/v1/vehicleBusinessFileManagement/listPage',
       method: 'post',
       data: params,
@@ -14,10 +14,10 @@ export default {
     })
   },
 
-  init: function(data) {
+  init(data) {
     return request({
-      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
-      url: '/buscenter/v1/vehicleBusinessFileManagement/gteInitBySid/' + data,
+      url: '/buscenter/v1/vehicleBusinessFileManagement/getInitBySid/' + data,
       method: 'get',
     })
   },

anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagement.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="车辆业务档案" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="queryParams.params.orgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="销售部门">
+                <el-input v-model="queryParams.params.sellDept" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="销售专员">
+                <el-input v-model="queryParams.params.staffName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="销售订单编号">
+                <el-input v-model="queryParams.params.saleOrderNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="买卖合同编号">
+                <el-input v-model="queryParams.params.contractNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="付款方式">
+                <el-select v-model="queryParams.params.payType" placeholder="请选择">
+                  <el-option v-for="(item,i) in payTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="业务类型">
+                <el-select v-model="queryParams.params.businessType" placeholder="请选择">
+                  <el-option v-for="(item,i) in busTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="queryParams.params.customerName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="客户电话">
+                <el-input v-model="queryParams.params.customerPhone" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-input v-model="queryParams.params.modelName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="开票单位">
+                <el-input v-model="queryParams.params.invoiceTitle" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="开票类型">
+                <el-select v-model="queryParams.params.invoiceType" placeholder="请选择">
+                  <el-option v-for="(item,i) in invoiceTypeList" :key="i" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="出库日期">
+                <el-date-picker v-model="queryParams.params.deliveryStartData" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>至
+                <el-date-picker v-model="queryParams.params.deliveryEndData" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="业务状态">
+                <el-select v-model="queryParams.params.businessStatus" placeholder="请选择">
+                  <el-option v-for="(item,i) in businessStatusList" :key="i" :label="item.dictValue"
+                    :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="欠款金额 > ">
+                <el-input v-model="queryParams.params.arrearsMoney" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">车辆业务档案列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" align="center" width="80">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="vinNo" label="车架号" align="center" width="120" />
+            <el-table-column prop="modelName" label="车型" align="center" width="220" />
+            <el-table-column label="销售订单编号" align="center" width="180">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleCheck(scope.row)">{{scope.row.saleOrderNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="contractNo" label="买卖合同编号" align="center" width="130" />
+            <el-table-column prop="payType" label="付款方式" align="center" width="150" />
+            <el-table-column prop="businessType" label="业务类型" align="center" width="100" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="customerName" label="客户电话" align="center" width="120" />
+            <el-table-column prop="salePrice" label="销售合同价" align="center" width="120" />
+            <el-table-column prop="invoiceTitle" label="开票单位" align="center" width="220" />
+            <el-table-column prop="invoiceType" label="开票类型" align="center" width="120" />
+            <el-table-column prop="outBoundDate" label="出库日期" align="center" width="100" />
+            <el-table-column prop="paymentAmount" label="交款金额" align="center" width="100" />
+            <el-table-column prop="arrearsMoney" label="欠款金额" align="center" width="100" />
+            <el-table-column prop="businessStatus" label="业务状态" align="center" width="100" />
+            <el-table-column prop="orgName" label="分公司" align="center" width="150" />
+            <el-table-column prop="sellDept" label="销售部门" align="center" width="220" />
+            <el-table-column prop="staffName" label="销售专员" align="center" width="100" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="loadList" />
+    <dingdanInfo v-show="viewState == 5" ref="dingdanInfo" @doback="resetState" @reloadlist="loadList" />
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divInfo from './vehicleBusinessFileManagementInfo.vue'
+  import dingdanInfo from '@/components/publicPage/dingdanInfo'
+  import {
+    typeValues,
+    getTypeValueList
+  } from '@/api/dictcommons/dictcommons'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divInfo,
+      dingdanInfo
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "deptName": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "sourceBillNo": "",
+            "userSid": "",
+            "orgPath": "",
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
+          }
+        },
+        sids: [],
+        selectionList: [],
+        busTypeList: [],
+        payTypeList: [],
+        invoiceTypeList: [],
+        businessStatusList: [],
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+
+      typeValues({
+        type: 'wms_busType'
+      }).then((res) => {
+        if (res.success) {
+          this.busTypeList = res.data
+        }
+      })
+
+    },
+    methods: {
+      handleCheck(row) {
+        this.viewState = 5
+        this.$refs['dingdanInfo'].showInfo({
+          sid: row.saleOrderSid
+        })
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          // case 'doDel':
+          //   this.doDel()
+          //   break
+          // case 'toAdd':
+          //   this.toAdd()
+          //   break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+
+      loadList() {
+        this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
+        req.listPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "deptName": "",
+            "createByName": "",
+            "billNo": "",
+            "createStartTime": "",
+            "createEndTime": "",
+            "finishStartTime": "",
+            "finishEndTime": "",
+            "sourceBillNo": "",
+            "userSid": "",
+            "orgPath": "",
+            "menuUrl": "",
+            "warehouseTypeKey": "01"
+          }
+        }
+        this.loadList()
+      },
+
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+
+
+      resetState() {
+        this.viewState = 1
+      },
+
+      toRelevancy(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showInfo(row)
+      }
+
+    }
+  }
+</script>
+<style scoped>
+</style>

anrui-buscenter/anrui-buscenter-ui/src/views/vehicleBusinessFileManagement/vehicleBusinessFileManagementInfo.vue

@@ -1,8 +1,188 @@
 <template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>车辆业务档案详情</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+
+      <div class="listconadd">
+
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <el-row class="first_row">
+            <el-col :span="8">
+              <div class="span-sty">销售订单号</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.saleOrderNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">买卖合同号</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">业务类型</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.businessType }}</span></el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.orgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.sellDept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.staffName }}</span></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.modelName }}</span></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售合同价</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.salePrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.invoiceTitle }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票类型</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.invoiceType }}</span></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户电话</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">身份证号码</div>
+              <el-form-item><span class="addinputInfo">{{ saleOrderInfo.remarks }}</span></el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <div class="title titleOne">
+            <div>销售订单附件</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="文件名称" prop="goodsSpuName" align="center" />
+            <el-table-column label="上传日期" prop="goodsSkuCode" align="center" />
+            <el-table-column label="上传人" prop="goodsSkuCode" align="center" />
+          </el-table>
+
+        </el-form>
+
+      </div>
+    </div>
+
+  </div>
 </template>
 
 <script>
+  import req from '@/api/vehicleBusinessFileManagement/vehicleBusinessFileManagement.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        viewState: 1,
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {},
+        saleOrderInfo: {}
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.$emit('doback')
+      },
+
+      showInfo(row) {
+        var params = {
+          sid: row.sid
+        }
+
+        this.saleOrderInfo = row
+
+        console.log('projectDailySave--e:', row)
+
+
+        req.init(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      },
+      showEdit(row) {
+
+
+      },
+      resetState() {
+        this.viewState = 1
+      },
+    }
+  }
 </script>
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
 
-<style>
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
 </style>

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',
+      baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
-      method: 'post',
+      url: '/as/v1/inventoryRate/getDetail/' + params,
-      data: params,
+      method: 'get',
-      headers: {
+
-        'Content-Type': 'application/json'
-      }
     })
   }
 }

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>

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>