初步实现藏品登记和藏品总账

src/views/holding/holding0.vue

@@ -66,10 +66,10 @@
               </el-table-column>
               <el-table-column label="操作" width="150">
                 <template #default='{row}'>
-                  <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'">查看</el-button>
+                  <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'||row.status==='审核通过'">查看</el-button>
                   <el-button type="text" v-if="row.status==='待办理'||row.status==='草稿中'||row.status==='待审核'" @click="editH0(row)">编辑</el-button>
                   <el-button type="text" v-if="row.status==='待审核'||row.status==='草稿中'" @click="auditH0(row)">审核</el-button>
-                  <el-button type="text" @click="removeH0(row.id)" v-if="row.status!=='已完成'">删除</el-button>
+                  <el-button type="text" @click="removeH0(row.id)" v-if="row.status!=='审核通过'">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/holding/holding0_audit_Dia.vue

@@ -35,7 +35,7 @@
         <div><span>通高：</span>{{ myObj.height }}</div>
       </div>
       <div class="row">
-        <!-- <div><span>文物类别：</span>{{myObj}}</div> -->
+        <!-- <div><span>文物类别：</span>{{myObj.goodsTypeName}}</div> -->
         <!-- <div><span>文物价格：</span>找不到字段</div> -->
       </div>
       <div class="row">

src/views/holding/holding3.vue

@@ -14,12 +14,12 @@
         <div class="middle">
           <div class="select">
             <span>藏品类型：</span>
-            <el-select v-model="sourceVal" placeholder="请选择">
+            <el-select v-model="mydata.goodsTypeId" placeholder="请选择">
               <el-option
-                v-for="item in source"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in mytype"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               >
               </el-option>
             </el-select>
@@ -35,11 +35,11 @@
             </el-select>
             <span>藏品名称：</span>
             <el-input
-              v-model="type"
+              v-model="mydata.searchKey"
               placeholder="请输入"
               style="width: 217px"
             ></el-input>
-            <el-button style="margin-left: 20px">查询</el-button>
+            <el-button style="margin-left: 20px" @click="getHolding3List(mydata)">查询</el-button>
             <el-button>导出</el-button>
             <div class="pattern">
               <div :class="{ active: change === 0 }" @click="pattern(0)">
@@ -59,30 +59,30 @@
               style="width: 100%"
             >
               <el-table-column label="缩略图" width="80">
-                <template #default>
+                <template #default='{row}'>
                   <div class="smimg">
-                    <img src="../../assets/img/user.png" alt="" />
+                    <img :src="baseURL+row.thumb" alt="" />
                   </div>
                 </template>
               </el-table-column>
               <el-table-column
-                prop="name"
+                prop="registerNum"
                 sortable
                 label="总登记号"
                 width="235"
               >
               </el-table-column>
-              <el-table-column prop="address" sortable label="藏品名称">
+              <el-table-column prop="name" sortable label="藏品名称">
               </el-table-column>
-              <el-table-column prop="name" sortable label="年代" width="130">
+              <el-table-column prop="age" sortable label="年代" width="130">
               </el-table-column>
-              <el-table-column prop="name" sortable label="质地" width="220">
+              <el-table-column prop="textureType" sortable label="质地" width="220">
               </el-table-column>
-              <el-table-column prop="name" label="状态" width="130">
+              <el-table-column prop="isStorage" label="状态" width="130">
               </el-table-column>
               <el-table-column label="操作" width="130">
-                <template #default>
-                  <el-button type="text" @click="$router.push('/layout/holding3_look')">查看</el-button>
+                <template #default="{row}">
+                  <el-button type="text" @click="myLook(row)">查看</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -90,9 +90,9 @@
           <!-- 图片显示 -->
           <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">
-              <img src="../../assets/img/user.png" alt="" />
-              <span>文物名称</span>
+            <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>
           <!-- 分页器 -->
@@ -109,65 +109,34 @@
     </div>
   </div>
 </template>
-
 <script>
+import axios from '@/utils/request'
 import { getHolding3List } from '@/apis/holding3'
+import { getGoodsType } from '@/apis/holding'
 import TabList from '@/components/tabLeft.vue'
 export default {
   name: 'Holding3',
   components: { TabList },
   data () {
     return {
+      // 服务器前缀地址
+      baseURL: '',
       // 请求藏品总账参数
       mydata: {
-        startTime: '', // 开始时间
-        endTime: '', // 结束时间
+        goodsTypeId: '', // 藏品类型id
         pageNum: 1, // 起始页码，默认1为第一页
         pageSize: 10, // 每页数量
-        searchKey: '', // 搜索条件
-        status: '', // 状态
-        type: ''// 类型
+        searchKey: '' // 搜索条件
       },
       // 控制显示表格还是图片
       change: 0,
-      type: '',
-      sourceVal: '',
       age: '',
-      source: [
-        {
-          value: '选项1',
-          label: '黄金糕'
-        },
-        {
-          value: '选项2',
-          label: '双皮奶'
-        }
-      ],
-      source2: [
-        {
-          value: '选项11',
-          label: '黄金糕11'
-        },
-        {
-          value: '选项22',
-          label: '双皮奶22'
-        }
-      ],
+      source2: [],
       // 图片数据
       imgList: [],
       // 表格数据
-      tableData: [
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }
-      ]
+      tableData: [],
+      mytype: []
     }
   },
   // 监听属性 类似于data概念
@@ -176,11 +145,28 @@ export default {
   watch: {},
   // 方法集合
   methods: {
+    // 点击查看
+    myLook (val) {
+      this.$router.push({
+        path: '/layout/holding3_look',
+        query: val
+      })
+    },
     // 封装获取藏品总账列表
     async getHolding3List (data) {
       const res = await getHolding3List(data)
       // 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.isStorage === 0) v.isStorage = '未入库'
+        else v.isStorage = '已入库'
+        v.numTypeId = this.mycategory(v.numTypeId)
+        v.integrity = this.spoil(v.integrity)
+        v.repair = this.mySave(v.repair)
+      })
     },
     // 控制显示表格还是图片
     pattern (index) {
@@ -188,7 +174,13 @@ export default {
     }
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created () {},
+  async created () {
+    // 获取藏品类型
+    const res = await getGoodsType()
+    this.mytype = res.data
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted () {
     // 调用获取藏品总账列表
@@ -292,6 +284,7 @@ export default {
           flex-wrap: wrap;
           padding: 10px 75px 40px 75px;
           .imgInfo_single {
+            cursor: pointer;
             margin: 30px 45px 0 45px;
             text-align: center;
             width: 140px;

src/views/holding/holding3_look.vue

@@ -13,53 +13,53 @@
       </div>
       <div class="conten">
         <div class="conten_left">
-          <img src="../../assets/img/user.png" alt="" />
+          <img :src="baseURL+myObj.thumb" alt="" />
         </div>
         <div class="conten_right">
           <div class="title">
-            <h3>陶瓷花瓶</h3>
+            <h3>{{ myObj.name }}</h3>
             <div>已入库</div>
           </div>
           <div class="info">
             <div class="row">
-              <div><span>藏品名称：</span>1111</div>
-              <div><span>总登记号：</span>1111</div>
+              <div><span>藏品名称：</span>{{ myObj.name }}</div>
+              <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
             </div>
             <div class="row">
-              <div><span>编号类型：</span>1111</div>
-              <div><span>藏品编号：</span>1111</div>
+              <div><span>编号类型：</span>{{ myObj.numTypeId }}</div>
+              <div><span>藏品编号：</span>{{ myObj.num }}</div>
             </div>
             <div class="row">
-              <div><span>原名：</span>1111</div>
-              <div><span>年代：</span>1111</div>
+              <div><span>原名：</span>{{ myObj.primitiveName }}</div>
+              <div><span>年代：</span>{{ myObj.age }}</div>
             </div>
             <div class="row">
-              <div><span>文物类别：</span>1111</div>
-              <div><span>文物质地：</span>1111</div>
+              <div><span>文物类别：</span>{{ myObj.goodsTypeName }}</div>
+              <div><span>文物质地：</span>{{ myObj.texture }}</div>
             </div>
             <div class="row">
-              <div><span>数量：</span>1111</div>
-              <div><span>集体数量：</span>1111</div>
+              <div><span>数量类型：</span>{{ myObj.amountType === 0 ? "单件" : "一套多件" }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount }}</div>
             </div>
             <div class="row">
-              <div><span>通长：</span>1111</div>
-              <div><span>通宽：</span>1111</div>
-              <div><span>通高：</span>1111</div>
+              <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>1111</div>
-              <div><span>具体质量：</span>1111</div>
+              <!-- <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><span>完残程度：</span>1111</div>
+              <!-- <div><span>文物价格：</span>1111</div> -->
             </div>
             <div class="row">
-              <div><span>保存状态：</span>1111</div>
-              <div><span>入藏时间范围：</span>1111</div>
+              <div><span>保存状态：</span>{{ myObj.repair }}</div>
+              <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
             </div>
             <div class="row">
-              <div><span>藏品位置：</span>1111</div>
+              <div><span>藏品位置：</span>暂无数据</div>
             </div>
           </div>
         </div>
@@ -68,8 +68,7 @@
             <div class="select">
               <h3>数字资源</h3>
               <el-select v-model="resource" placeholder="请选择">
-                <el-option label="高清图片" value="GQpicture"></el-option>
-                <el-option label="高清视频" value="GQvideo"></el-option>
+                <el-option v-for="item in affix" :key="item.value" :label="item.label" :value="item.value"></el-option>
               </el-select>
             </div>
             <!-- 表格 -->
@@ -108,6 +107,7 @@
 </template>
 
 <script>
+import axios from '@/utils/request'
 import TabList from '@/components/tabLeft.vue'
 export default {
   name: 'Holding3_look',
@@ -116,23 +116,20 @@ export default {
   data () {
     // 这里存放数据
     return {
+      // 服务器前缀地址
+      baseURL: '',
+      myObj: [],
       // 表格数据
       tableData: [
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }
-      ],
-      tabList: [
-        '藏品登记',
-        '入库管理',
-        '出库管理',
-        '藏品总账',
-        '藏品盘核',
-        '藏品注销'
       ],
-      resource: 'GQpicture'
+      resource: 'video',
+      affix: [
+        { label: '模型', value: 'model' },
+        { label: '视频', value: 'video' },
+        { label: '图片', value: 'img' },
+        { label: '音频', value: 'audio' },
+        { label: '文档', value: 'doc' }
+      ]
     }
   },
   // 监听属性 类似于data概念
@@ -144,9 +141,15 @@ export default {
 
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created () {},
+  created () {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
   // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {},
+  mounted () {
+    // 拿到路由跳转传过来的数据
+    this.myObj = this.$route.query
+  },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前
   beforeUpdate () {}, // 生命周期 - 更新之前