shaogen1995 пре 4 година
родитељ
комит
998e79680d

+ 9 - 0
src/apis/collect0.js

@@ -0,0 +1,9 @@
+import axios from '../utils/request'
+// 藏品登记-列表
+export const getHolding3List = (data) => {
+  return axios({
+    method: 'post',
+    url: '/cms/collect/list',
+    data
+  })
+}

+ 9 - 2
src/router/index.js

@@ -164,9 +164,16 @@ const router = new VueRouter({
         {
           name: 'collect0',
           path: 'collect0',
-          meta: { myInd: 2 },
+          meta: { myInd: 2, keepAlive: true },
           component: () => import('@/views/collect/collect0.vue')
-        }, {
+        },
+        {
+          name: 'collect0_look',
+          path: 'collect0_look',
+          meta: { myInd: 2 },
+          component: () => import('@/views/collect/collect0_look.vue')
+        },
+        {
           name: 'collect1',
           path: 'collect1',
           meta: { myInd: 2 },

+ 282 - 20
src/views/collect/collect0.vue

@@ -1,30 +1,147 @@
 <!--  -->
 <template>
-  <div class="collect0">
+  <div class="holding3">
     <TabList/>
     <div class="right">
       <div class="top">
         <el-breadcrumb separator="/">
           <el-breadcrumb-item to="">首页</el-breadcrumb-item>
           <el-breadcrumb-item to="">征集品管理</el-breadcrumb-item>
-          <el-breadcrumb-item id="mytitle">征集品总</el-breadcrumb-item>
+          <el-breadcrumb-item id="mytitle">征集品总</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
-      <div class="conten"></div>
+      <div class="conten">
+        <div class="middle">
+          <div class="select">
+            <span>藏品类型:</span>
+            <el-select v-model="mydata.goodsTypeId" placeholder="请选择">
+              <el-option
+                v-for="item in mytype"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+            <span v-if="0">藏品年代:</span>
+            <el-select v-if="0" v-model="age" placeholder="请选择">
+              <el-option
+                v-for="item in source2"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <span>藏品名称:</span>
+            <el-input
+              v-model="mydata.searchKey"
+              placeholder="请输入"
+              style="width: 217px"
+            ></el-input>
+            <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
+            <el-button v-if="0">导出</el-button>
+            <div class="pattern">
+              <div :class="{ active: change === 0 }" @click="pattern(0)">
+                <i class="el-icon-menu"></i>
+              </div>
+              <div :class="{ active: change === 1 }" @click="pattern(1)">
+                <i class="el-icon-s-unfold"></i>
+              </div>
+            </div>
+          </div>
+          <!--表格 -->
+          <div class="table" v-if="change">
+            <el-table
+              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column label="缩略图" width="80">
+                <template #default='{row}'>
+                  <div class="smimg">
+                    <img :src="baseURL+row.thumb" alt="" />
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="registerNum"
+                sortable
+                label="总登记号"
+                width="235"
+              >
+              </el-table-column>
+              <el-table-column prop="name" sortable label="藏品名称">
+              </el-table-column>
+              <el-table-column prop="age" sortable label="年代" width="180">
+              </el-table-column>
+              <el-table-column prop="textureType" sortable label="质地" width="220">
+              </el-table-column>
+              <el-table-column prop="status" label="状态" width="130">
+              </el-table-column>
+              <el-table-column label="操作" width="130">
+                <template #default="{row}">
+                  <el-button type="text" @click="myLook(row)">查看</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 图片显示 -->
+          <div class="imgInfo" v-else>
+            <div class="beNull" v-if="imgList.length===0">暂无数据</div>
+            <div v-else class="imgInfo_single" v-for="(item,index) in imgList" :key="index" @click="myLook(item)">
+              <img :src="baseURL+item.thumb" alt="" />
+              <span>{{item.name}}</span>
+            </div>
+          </div>
+          <!-- 分页器 -->
+          <div class="paging">
+            <el-pagination
+              :current-page='mydata.pageNum'
+              @current-change='currentChange'
+              @size-change='sizeChange'
+              background
+              layout="prev, pager, next,sizes,jumper"
+              :total="total"
+            >
+            </el-pagination>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
-
 <script>
+import axios from '@/utils/request'
+import { getHolding3List } from '@/apis/collect0'
+import { getGoodsType } from '@/apis/holding'
 import TabList from '@/components/tabLeft2.vue'
 export default {
-  name: 'collect0',
-  // import引入的组件需要注入到对象中才能使用
+  name: 'Collect0',
   components: { TabList },
   data () {
-    // 这里存放数据
     return {
-
+      // 分页器数据总条数
+      total: 0,
+      // 服务器前缀地址
+      baseURL: '',
+      // 请求藏品总账参数
+      mydata: {
+        goodsTypeId: '', // 藏品类型id
+        pageNum: 1, // 起始页码,默认1为第一页
+        pageSize: 10, // 每页数量
+        searchKey: '' // 搜索条件
+      },
+      // 控制显示表格还是图片
+      change: 0,
+      age: '',
+      source2: [],
+      // 图片数据
+      imgList: [],
+      // 表格数据
+      tableData: [],
+      mytype: []
     }
   },
   // 监听属性 类似于data概念
@@ -33,12 +150,68 @@ export default {
   watch: {},
   // 方法集合
   methods: {
-
+    // 点击查询
+    inquire () {
+      this.mydata.pageNum = 1
+      this.getHolding3List(this.mydata)
+    },
+    // 分页器
+    currentChange (val) {
+      // console.log('当前页改变了', val)
+      this.mydata.pageNum = val
+      this.getHolding3List(this.mydata)
+    },
+    sizeChange (val) {
+      // console.log('条数改变了', val)
+      this.mydata.pageSize = val
+      this.getHolding3List(this.mydata)
+    },
+    // 点击查看
+    myLook (val) {
+      this.$router.push({
+        path: '/layout/collect0_look',
+        query: val
+      })
+    },
+    // 封装获取藏品总账列表
+    async getHolding3List (data) {
+      const res = await getHolding3List(data)
+      this.total = res.data.total
+      // console.log(666, res)
+      this.imgList = res.data.list
+      this.tableData = res.data.list
+      this.tableData.forEach(v => {
+        if (v.textureType === 0) v.textureType = '单一质地'
+        else v.textureType = '复合质地'
+        if (v.status === 0) v.status = '待入库'
+        else if (v.status === 1) v.status = '已入库'
+        else v.status = '已出库'
+        v.numTypeId = this.mycategory(v.numTypeId)
+        v.integrity = this.spoil(v.integrity)
+        v.repair = this.mySave(v.repair)
+      })
+    },
+    // 控制显示表格还是图片
+    pattern (index) {
+      this.change = index
+    }
   },
   // 生命周期 - 创建完成(可以访问当前this实例)
-  created () {},
+  async created () {
+    // 获取藏品类型
+    const res = await getGoodsType()
+    this.mytype = res.data
+    this.mytype.unshift({ id: '', name: '全部' })
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
   // 生命周期 - 挂载完成(可以访问DOM元素)
-  mounted () {},
+  mounted () {
+    // 调用获取藏品总账列表
+    this.getHolding3List(this.mydata)
+    // 显示图还是表格
+    this.tabInd = this.INtabInd
+  },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前
   beforeUpdate () {}, // 生命周期 - 更新之前
@@ -49,16 +222,14 @@ export default {
 }
 </script>
 <style lang='less' scoped>
-//@import url(); 引入公共css类
-.collect0 {
+.holding3 {
     /deep/#mytitle>span{
     font-weight: 800;
   }
+
   display: flex;
   .right {
     width: 100%;
-    display: flex;
-    flex-direction: column;
     .top {
       padding-left: 35px;
       display: flex;
@@ -68,11 +239,102 @@ export default {
       height: 40px;
       background-color: #fff;
     }
-  }
-  .conten {
-    flex: 1;
-    background-color: #fff;
-    margin: 20px 20px 40px;
+    .conten {
+      padding: 20px 20px 40px;
+      width: 100%;
+      height: 829px;
+      .middle {
+        position: relative;
+        width: 100%;
+        height: 100%;
+        background-color: #fff;
+        .select {
+          align-items: center;
+          display: flex;
+          .pattern {
+            display: flex;
+            margin-left: 22px;
+            width: 130px;
+            height: 40px;
+            .active {
+              background-color: #3aa1ed;
+              color: #fff;
+            }
+            div {
+              cursor: pointer;
+              width: 65px;
+              height: 40px;
+              border-radius: 12px;
+              border: 1px solid #ccc;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #666;
+              i {
+                font-size: 20px;
+              }
+            }
+          }
+          color: black;
+          padding: 30px 0 0 0;
+          & > span {
+            margin-left: 30px;
+          }
+        }
+        .table {
+          max-height: 640px;
+          overflow: auto;
+          padding: 24px;
+          .smimg {
+            // width: 80px;
+            // height: 60px;
+            img {
+              margin: 5px 0 0 5px;
+              width: 50px;
+              // height: 50px;
+            }
+          }
+        }
+        .imgInfo {
+          .beNull{
+            margin-top: 40px;
+            font-size: 26px;
+          }
+          max-height: 635px;
+          overflow: auto;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          flex-wrap: wrap;
+          padding: 10px 60px 40px 60px;
+          .imgInfo_single {
+
+            cursor: pointer;
+            margin: 30px 45px 0 45px;
+            text-align: center;
+            width: 215px;
+            height: 250px;
+            border: 1px solid #ccc;
+            img {
+              // object-fit:scale-down;
+              width: 215px;
+              height: 200px;
+              margin-bottom: 8px;
+              border: 5px solid #ccc;
+            }
+            span {
+              color: black;
+            }
+          }
+        }
+        .paging {
+          position: absolute;
+          bottom: 15px;
+          left: 50%;
+          transform: translateX(-50%);
+        }
+      }
+    }
   }
 }
 </style>

+ 318 - 0
src/views/collect/collect0_look.vue

@@ -0,0 +1,318 @@
+<!--  -->
+<template>
+  <div class="holding3_look">
+    <TabList/>
+    <div class="right">
+      <div class="top">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item to="">首页</el-breadcrumb-item>
+          <el-breadcrumb-item to="">馆藏管理</el-breadcrumb-item>
+          <el-breadcrumb-item>藏品总账</el-breadcrumb-item>
+          <el-breadcrumb-item id="mytitle">查看</el-breadcrumb-item>
+        </el-breadcrumb>
+      </div>
+      <div class="conten">
+        <div class="conten_left">
+          <img :src="baseURL+myObj.thumb" alt="" />
+        </div>
+        <div class="conten_right">
+          <div class="title">
+            <h3>{{ myObj.name }}</h3>
+            <div v-if="myObj.status==='已入库'">已入库</div>
+            <div v-else-if="myObj.status==='待入库'" style="background-color: #ccc;">待入库</div>
+            <div v-else style="background-color: #85ce61;">已出库</div>
+          </div>
+          <div class="info">
+            <div class="row">
+              <div><span>藏品名称:</span>{{ myObj.name }}</div>
+              <div><span>总登记号:</span>{{ myObj.registerNum }}</div>
+            </div>
+            <div class="row">
+              <div><span>编号类型:</span>{{ myObj.numTypeId }}</div>
+              <div><span>藏品编号:</span>{{ myObj.num }}</div>
+            </div>
+            <div class="row">
+              <div><span>原名:</span>{{ myObj.primitiveName }}</div>
+              <div><span>年代:</span>{{ myObj.age }}</div>
+            </div>
+            <div class="row">
+              <div><span>文物类别:</span>{{ myObj.goodsTypeName }}</div>
+              <div><span>文物质地:</span>{{ myObj.texture }}</div>
+            </div>
+            <div class="row">
+              <div><span>数量类型:</span>{{ myObj.amountType === 0 ? "单件" : "一套多件" }}</div>
+              <div><span>具体数量:</span>{{ myObj.amount }}</div>
+            </div>
+            <div class="row">
+              <div><span>通长:</span>{{ myObj.length }}</div>
+              <div><span>通宽:</span>{{ myObj.width }}</div>
+              <div><span>通高:</span>{{ myObj.height }}</div>
+            </div>
+            <div class="row">
+              <!-- <div><span>文物类别:</span>{{myObj.goodsTypeName}}</div> -->
+              <div><span>具体质量:</span>{{ myObj.quality }}</div>
+              <div><span>完残程度:</span>{{ myObj.integrity }}</div>
+            </div>
+            <div class="row">
+              <!-- <div><span>文物价格:</span>1111</div> -->
+            </div>
+            <div class="row">
+              <div><span>保存状态:</span>{{ myObj.repair }}</div>
+              <div><span>入藏时间范围:</span>{{ myObj.checkInScope }}</div>
+            </div>
+            <div class="row">
+              <div><span>藏品位置:</span>{{myObj.outPath}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="conten_bot">
+          <div class="resource">
+            <div class="select">
+              <h3>数字资源</h3>
+              <el-select v-model="resource" placeholder="请选择">
+                <el-option v-for="item in affix" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </div>
+            <!-- 表格 -->
+            <el-table
+              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column label="缩略图" width="160" v-if="this.resource==='img'">
+                <template #default='{row}'>
+                  <div class="smimg">
+                    <img :src="baseURL+row.filePath" alt="" />
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="name" label="附件名称" > </el-table-column>
+              <!-- <el-table-column prop="address" label="附件说明" ></el-table-column> -->
+              <!-- <el-table-column prop="name" label="上传人" width="360"> </el-table-column> -->
+              <el-table-column prop="updateTime" label="上传时间" width="360"> </el-table-column>
+              <el-table-column label="操作" width="360">
+                <template #default='{row}'>
+                  <a :href="baseURL+row.filePath" :download="baseURL+row.filePath" target='_blank' class="mydown" >下 载</a>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 底部的返回按钮 -->
+          <div class="btn">
+            <el-button @click='$router.go(-1)'>返 回</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getFileList } from '../../apis/holding'
+import axios from '@/utils/request'
+import TabList from '@/components/tabLeft2.vue'
+export default {
+  name: 'Collect0_look',
+  // import引入的组件需要注入到对象中才能使用
+  components: { TabList },
+  data () {
+    // 这里存放数据
+    return {
+      // 服务器前缀地址
+      baseURL: '',
+      myObj: [],
+      // 表格数据
+      tableData: [
+      ],
+      resource: 'video',
+      affix: [
+        { label: '高清图片', value: 'img' },
+        { label: '视频文件', value: 'video' },
+        { label: '音频文件', value: 'audio' },
+        { label: '三维模型', value: 'model' },
+        { label: '文档资料', value: 'doc' }
+      ]
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {
+    resource () {
+      this.getFileList()
+    }
+  },
+  // 方法集合
+  methods: {
+    // 获取附件列表
+    async getFileList () {
+      const res = await getFileList(this.myObj.id, this.resource)
+      // console.log(666, res)
+      this.tableData = res.data
+      this.tableData.forEach(v => {
+        v.updateTime = v.updateTime.slice(0, 10)
+      })
+    }
+  },
+  // 生命周期 - 创建完成(可以访问当前this实例)
+  created () {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
+  // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted () {
+    // 拿到路由跳转传过来的数据
+    this.myObj = this.$route.query
+    // 调用获取附件方法
+    this.getFileList()
+  },
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能,这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+body {
+  overflow: auto;
+}
+body .el-table::before {
+    z-index: inherit;
+}
+//@import url(); 引入公共css类
+.holding3_look {
+  .mydown {
+    color: #40a9ff;
+  }
+  /deep/#mytitle > span {
+    font-weight: 800;
+  }
+  display: flex;
+  .right {
+    width: 100%;
+    height: 868px;
+    display: flex;
+    flex-direction: column;
+    .top {
+      padding-left: 35px;
+      display: flex;
+      align-items: center;
+      box-shadow: 1px 1px 10px 1px;
+      margin-left: 2px;
+      height: 40px;
+      background-color: #fff;
+    }
+  }
+  .conten {
+    display: flex;
+    flex-wrap: wrap;
+    flex: 1;
+    background-color: #fff;
+    margin: 20px 20px 40px;
+    padding: 10px 0 0 40px;
+    .conten_left {
+      width: 465px;
+      height: 400px;
+      background-color: #fafafa;
+      display: flex;
+      align-items: center;
+      img {
+        width: 100%;
+        height: 340px;
+        border: 15px solid #ccc;
+      }
+    }
+    .conten_right {
+      flex: 1;
+      height: 400px;
+      .title {
+        display: flex;
+        border-bottom: 2px solid #ccc;
+        height: 40px;
+        align-items: center;
+        margin: 0 20px;
+        h3 {
+          font-size: 20px;
+          color: black;
+          margin: 0 25px 0 35px;
+        }
+        & > div {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 50px;
+          height: 20px;
+          background-color: #40a9ff;
+          color: #fff;
+          font-size: 13px;
+          border-radius: 5px;
+        }
+      }
+      .info {
+        margin: 20px 0 0 55px;
+        width: 90%;
+        // margin-bottom: 60px;
+        .row {
+          display: flex;
+          & > div {
+            padding-left: 20px;
+            flex: 1;
+            height: 43px;
+            line-height: 43px;
+            border: 1px solid #ccc;
+            font-size: 16px;
+            color: black;
+            span {
+              font-weight: 700;
+            }
+          }
+        }
+      }
+    }
+    .conten_bot {
+      position: relative;
+
+      .btn{
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: -45px;
+      }
+      height: 250px;
+      width: 100%;
+      .resource {
+        /deep/.el-table{
+          max-height: 190px;
+          overflow: auto;
+        }
+          .smimg{
+            text-align: center;
+    height: 40px;
+    img {
+      width: 40px;
+      height: 40px;
+    }
+  }
+        max-height: 250px;
+        // overflow: auto;
+        width: 97%;
+        max-width: 1580px;
+        border: 1px solid #ccc;
+        .select {
+          h3 {
+            margin: 0 26px;
+            color: black;
+          }
+          display: flex;
+          height: 58px;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+</style>

+ 1 - 1
src/views/holding/holding1_add.vue

@@ -71,7 +71,7 @@
               </el-table-column>
               <el-table-column prop="integrity" label="完残程度" width="130">
               </el-table-column>
-              <el-table-column label="藏品位置" width="300">
+              <el-table-column label="藏品位置" width="350">
                 <template #default='scopt'>
                   <el-cascader
                     style="width:100%"

+ 29 - 3
src/views/holding/holding1_audit.vue

@@ -51,10 +51,21 @@
             <el-table-column prop="name" label="藏品名称"> </el-table-column>
             <el-table-column prop="goodsTypeId" label="类别" width="180">
             </el-table-column>
-            <el-table-column prop="integrity" label="完残程度" width="180">
-            </el-table-column>
-            <el-table-column prop="registerNum" label="藏品位置" width="300">
+            <el-table-column prop="integrity" label="完残程度" width="150">
             </el-table-column>
+              <el-table-column label="藏品位置" width="350">
+                <template #default='scopt'>
+                  <el-cascader
+                    placeholder=""
+                    disabled
+                    style="width:100%"
+                    :props="{value:'id',label:'name'}"
+                    v-model="tableData[scopt.$index].location"
+                    :options="options"
+                    @change="handleChange($event,scopt.row.id)"
+                  ></el-cascader>
+                </template>
+              </el-table-column>
           </el-table>
         </div>
         <div class="txt">
@@ -98,6 +109,7 @@
 </template>
 
 <script>
+import { getTreeList } from '@/apis/statistics0'
 import axios from '@/utils/request'
 import { getDetailById, holding1Audit } from '@/apis/holding1'
 import TabList from '@/components/tabLeft.vue'
@@ -109,6 +121,7 @@ export default {
   data () {
     // 这里存放数据
     return {
+      options: [],
       // 服务器前缀地址
       baseURL: '',
       myData: {},
@@ -156,6 +169,9 @@ export default {
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   async mounted () {
+    // 获取位置信息
+    const res1 = await getTreeList()
+    this.options = res1.data
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL
     // 拿到路由传递过来的参数
@@ -166,6 +182,8 @@ export default {
     this.tableData.forEach(v => {
       v.integrity = this.spoil(v.integrity)
       v.goodsTypeId = this.category(v.goodsTypeId)
+      v.location = v.storageId.split(',')
+      v.location = v.location.map(Number)
     })
   },
   beforeCreate () {}, // 生命周期 - 创建之前
@@ -229,6 +247,14 @@ export default {
       }
     }
     .table {
+      /deep/.el-input__inner{
+        background-color: transparent;
+        color: #606266;
+        border: none;
+      }
+      /deep/.el-input__suffix-inner{
+        opacity: 0;
+      }
       max-height: 288px;
       overflow: auto;
       .smimg {

+ 31 - 5
src/views/holding/holding1_look.vue

@@ -59,11 +59,22 @@
             <el-table-column prop="name" label="藏品名称"> </el-table-column>
             <el-table-column prop="goodsTypeId" label="类别" width="180">
             </el-table-column>
-            <el-table-column prop="integrity" label="完残程度" width="180">
+            <el-table-column prop="integrity" label="完残程度" width="150">
             </el-table-column>
-            <el-table-column prop="name" label="藏品位置" width="300">
-            </el-table-column>
-            <el-table-column prop="status" label="入库状态" width="300">
+              <el-table-column label="藏品位置" width="350">
+                <template #default='scopt'>
+                  <el-cascader
+                    placeholder=""
+                    disabled
+                    style="width:100%"
+                    :props="{value:'id',label:'name'}"
+                    v-model="tableData[scopt.$index].location"
+                    :options="options"
+                    @change="handleChange($event,scopt.row.id)"
+                  ></el-cascader>
+                </template>
+              </el-table-column>
+            <el-table-column prop="status" label="入库状态" width="130">
             </el-table-column>
           </el-table>
         </div>
@@ -77,15 +88,17 @@
 </template>
 
 <script>
+import { getTreeList } from '@/apis/statistics0'
 import { getDetailById } from '@/apis/holding1'
 import axios from '@/utils/request'
 import TabList from '@/components/tabLeft.vue'
 export default {
-  name: 'holding1_result',
+  name: 'holding1_look',
   components: { TabList },
   data () {
     // 这里存放数据
     return {
+      options: [],
       myData: {},
       // 服务器初始地址前缀
       baseURL: '',
@@ -121,6 +134,9 @@ export default {
   created () {},
   // 生命周期 - 挂载完成(可以访问DOM元素)
   async mounted () {
+    // 获取位置信息
+    const res1 = await getTreeList()
+    this.options = res1.data
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL
     // 从第一层拿到传过来的数据
@@ -131,6 +147,8 @@ export default {
       v.integrity = this.spoil(v.integrity)
       v.goodsTypeId = this.category(v.goodsTypeId)
       v.status = this.myStatus(v.status)
+      v.location = v.storageId.split(',')
+      v.location = v.location.map(Number)
     })
   },
   beforeCreate () {}, // 生命周期 - 创建之前
@@ -195,6 +213,14 @@ export default {
       }
     }
     .table {
+      /deep/.el-input__inner{
+        background-color: transparent;
+        color: #606266;
+        border: none;
+      }
+      /deep/.el-input__suffix-inner{
+        opacity: 0;
+      }
       max-height: 420px;
       overflow: auto;
       .smimg {