修改图标

src/components/tabLeft.vue

@@ -2,8 +2,10 @@
 <template>
     <div class="left">
       <ul>
+        <!-- require('@/assets/inco/holding'+item.id+'.png') -->
         <li :class="{active:ind===item.id}" v-for="(item, index) in tabList" :key="index" @click="skip(item.id)">
-          <i :class="item.inon"></i>
+          <img :src="require('@/assets/inco/holding'+item.id+'.png')" alt="" v-if="ind!==item.id">
+          <img :src="require('@/assets/inco/holding'+item.id+'ac.png')" alt="" v-else>
           {{ item.name }}
         </li>
       </ul>
@@ -23,12 +25,12 @@ export default {
   data () {
     return {
       tabList: [
-        { name: '藏品登记', id: 0, inon: 'el-icon-s-claim' },
-        { name: '藏品总账', id: 3, inon: 'el-icon-s-order' },
-        { name: '入库管理', id: 1, inon: 'el-icon-caret-right' },
-        { name: '出库管理', id: 2, inon: 'el-icon-caret-left' },
-        { name: '藏品修改', id: 4, inon: 'el-icon-s-opportunity' },
-        { name: '藏品注销', id: 5, inon: 'el-icon-delete-solid' }
+        { name: '藏品登记', id: 0 },
+        { name: '藏品总账', id: 3 },
+        { name: '入库管理', id: 1 },
+        { name: '出库管理', id: 2 },
+        { name: '藏品修改', id: 4 },
+        { name: '藏品注销', id: 5 }
       ]
     }
   },
@@ -60,8 +62,10 @@ export default {
         height: 60px;
         display: flex;
         align-items: center;
-        i {
-          margin: 0 18px;
+        img{
+          margin: 3px 15px 0 35px;
+          width: 20px;
+          height: 20px;
         }
       }
       li:hover{

src/components/tabLeft2.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <ul>
         <li :class="{active:ind===item.id}" v-for="(item, index) in tabList" :key="index" @click="skip(item.id)">
-          <i :class="item.inon"></i>
+          <img :src="require('@/assets/inco/collect'+item.id+'.png')" alt="" v-if="ind!==item.id">
+          <img :src="require('@/assets/inco/collect'+item.id+'ac.png')" alt="" v-else>
           {{ item.name }}
         </li>
       </ul>
@@ -23,9 +24,9 @@ export default {
   data () {
     return {
       tabList: [
-        { name: '征集品总账', id: 0, inon: 'el-icon-s-order' },
-        { name: '征集品提用', id: 1, inon: 'el-icon-caret-left' },
-        { name: '征集品注销', id: 2, inon: 'el-icon-delete-solid' }
+        { name: '征集品总账', id: 0 },
+        { name: '征集品提用', id: 1 },
+        { name: '征集品注销', id: 2 }
       ]
     }
   },
@@ -57,10 +58,12 @@ export default {
         height: 60px;
         display: flex;
         align-items: center;
-        i {
-          margin: 0 18px;
+        img{
+          margin: 3px 15px 0 35px;
+          width: 20px;
+          height: 20px;
         }
-      }
+              }
       li:hover{
         background:#e6f7ff ;
       }

src/components/tabLeft3.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <ul>
         <li :class="{active:ind===item.id}" v-for="(item, index) in tabList" :key="index" @click="skip(item.id)">
-          <i :class="item.inon"></i>
+          <img :src="require('@/assets/inco/statistics'+item.id+'.png')" alt="" v-if="ind!==item.id">
+          <img :src="require('@/assets/inco/statistics'+item.id+'ac.png')" alt="" v-else>
           {{ item.name }}
         </li>
       </ul>
@@ -23,8 +24,8 @@ export default {
   data () {
     return {
       tabList: [
-        { name: '库房设置', id: 0, inon: 'el-icon-s-help' },
-        { name: '统计报表', id: 1, inon: 'el-icon-s-data' }
+        { name: '库房设置', id: 0 },
+        { name: '统计报表', id: 1 }
       ]
     }
   },
@@ -50,8 +51,10 @@ export default {
         height: 60px;
         display: flex;
         align-items: center;
-        i {
-          margin: 0 18px;
+        img{
+          margin: 3px 15px 0 35px;
+          width: 20px;
+          height: 20px;
         }
       }
       li:hover{

src/components/tabLeft4.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <ul>
         <li :class="{active:ind===item.id}" v-for="(item, index) in tabList" :key="index" @click="skip(item.id)">
-          <i :class="item.inon"></i>
+          <img :src="require('@/assets/inco/system'+item.id+'.png')" alt="" v-if="ind!==item.id">
+          <img :src="require('@/assets/inco/system'+item.id+'ac.png')" alt="" v-else>
           {{ item.name }}
         </li>
       </ul>
@@ -23,8 +24,8 @@ export default {
   data () {
     return {
       tabList: [
-        { name: '用户管理', id: 2, inon: 'el-icon-s-custom' },
-        { name: '系统日志', id: 1, inon: 'el-icon-s-comment' }
+        { name: '用户管理', id: 2 },
+        { name: '系统日志', id: 1 }
       ]
     }
   },
@@ -50,10 +51,12 @@ export default {
         height: 60px;
         display: flex;
         align-items: center;
-        i {
-          margin: 0 18px;
+        img{
+          margin: 3px 15px 0 35px;
+          width: 20px;
+          height: 20px;
         }
-      }
+            }
       li:hover{
         background:#e6f7ff ;
       }

src/views/holding/holding3_look.vue

@@ -57,7 +57,7 @@
               <span>文物级别：</span>{{ myObj.level ? myObj.level : "-" }}
             </div>
               <div>
-                <span>文物来源：</span>{{ myObj.sourceId ? myObj.sourceId : "-" }}
+                <span>文物来源：</span>{{ myObj.sourceName ? myObj.sourceName : "-" }}
               </div>
           </div>
           <div class="row">
@@ -147,7 +147,7 @@
       </div>
       <div class="conten">
         <div class="daochu">
-          <el-button size="small" @click="dialogTableVisible = true"
+          <el-button size="small" @click="record"
             >操作记录</el-button
           >
           <el-button size="small" @click="exPdf">导 出</el-button>
@@ -203,7 +203,7 @@
                 <span>文物级别：</span>{{ myObj.level ? myObj.level : "-" }}
               </div>
               <div>
-                <span>文物来源：</span>{{ myObj.sourceId ? myObj.sourceId : "-" }}
+                <span>文物来源：</span>{{ myObj.sourceName ? myObj.sourceName : "-" }}
               </div>
             </div>
             <div class="row">
@@ -373,20 +373,24 @@
         :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
         border
       >
-        <el-table-column label="序号" width="150">
+        <el-table-column label="序号" width="50">
           <template slot-scope="scope">
             {{ scope.$index + (myData.pageNum - 1) * myData.pageSize + 1 }}
           </template>
         </el-table-column>
         <el-table-column
-          property="name"
+          property="moduleNum"
           label="业务单号"
-          width="200"
         ></el-table-column>
-        <el-table-column property="address" label="完成时间"></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column
+          property="tempType"
+          label="业务类型"
+          width="150"
+        ></el-table-column>
+        <el-table-column property="updateTime" label="完成时间" width="220"></el-table-column>
+        <el-table-column label="操作" width="120">
           <template #default="{ row }">
-            <el-button type="text" @click="lookRZ(row.id)">查 看</el-button>
+            <el-button type="text" @click="lookRZ(row)">查 看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -417,6 +421,7 @@ import Holding3DiaEdit from './holding3_DiaEdit.vue'
 import htmlToPdf from '@/utils/htmlToPdf'
 import { getTreeList } from '@/apis/statistics0'
 import { getFileList } from '@/apis/holding'
+import { getRecord, getRecordDetail } from '@/apis/holding3'
 import axios from '@/utils/request'
 import TabList from '@/components/tabLeft.vue'
 export default {
@@ -427,10 +432,11 @@ export default {
     // 这里存放数据
     return {
       myData: {
+        goodsId: null,
         pageNum: 1,
         pageSize: 10
       },
-      gridData: [{ name: '666', address: '777' }],
+      gridData: [],
       dialogTableVisible: false,
       // 点击操作记录
       bigImg: '',
@@ -465,12 +471,59 @@ export default {
   },
   // 方法集合
   methods: {
+    // 点击操作记录
+    async record () {
+      const res = await getRecord(this.myData)
+      // console.log(999, res)
+      this.gridData = res.data.list
+      this.gridData.forEach(v => {
+        if (v.moduleType === 'register') v.tempType = '藏品登记'
+        else if (v.moduleType === 'storageIn') v.tempType = '藏品入库'
+        else if (v.moduleType === 'storageOut') v.tempType = '藏品出库'
+        // else if (v.moduleType === 'collectOut') v.tempType = '征集品提用'
+        else if (v.moduleType === 'ledgerEdit') v.tempType = '藏品修改'
+        // else if (v.moduleType === 'collectEdit') v.tempType = '征集品修改'
+      })
+      this.dialogTableVisible = true
+    },
     // 分页器方法
     currentChange (val) {},
     sizeChange (val) {},
     // 点击操作记录里面的查看
-    lookRZ (id) {
-      console.log(999, id)
+    async lookRZ (val) {
+      const res = await getRecordDetail(val.moduleType, val.moduleId)
+      // console.log(9999, res)
+      let temp = ''
+      let obj = {}
+      // 藏品登记
+      if (val.moduleType === 'register') {
+        temp = '/layout/holding0_result'
+        obj = res.data.data
+      }
+      // 入库
+      if (val.moduleType === 'storageIn') {
+        temp = '/layout/holding1_look'
+        obj = res.data.data.entity
+        obj.status = '已完成'
+      }
+      // 出库
+      if (val.moduleType === 'storageOut') {
+        temp = '/layout/holding2_look'
+        obj = res.data.data.entity
+        obj.type = this.CKtype(obj.type)
+        obj.status = '已完成'
+      }
+      // 修改
+      if (val.moduleType === 'ledgerEdit') {
+        temp = '/layout/holding4_look'
+        obj = res.data.data.entity
+        obj.status = '已完成'
+      }
+      const { href } = this.$router.resolve({
+        path: temp,
+        query: obj
+      })
+      window.open(href, '_blank')
     },
     // 点击查看
     imgLook (url) {
@@ -536,6 +589,7 @@ export default {
     // 拿到路由跳转传过来的数据
     this.myObj = this.$route.query
     this.myObj.id = Number(this.myObj.id)
+    this.myData.goodsId = this.myObj.id
     this.myObj.registerId = Number(this.myObj.registerId)
     if (this.myObj.storageId) {
       this.myObj.location = this.myObj.storageId.split(',')