初步完成征集品修改功能

src/apis/collect0.js

@@ -7,3 +7,11 @@ export const getHolding3List = (data) => {
     data
   })
 }
+// 点击申请编辑
+export const getHolding3Edit = (data) => {
+  return axios({
+    method: 'post',
+    url: '/cms/collectEdit/edit',
+    data
+  })
+}

src/apis/collect3.js

@@ -0,0 +1,29 @@
+import axios from '../utils/request'
+// 列表
+export const getList = (data) => {
+  return axios({
+    method: 'post',
+    url: '/cms/collectEdit/list',
+    data
+  })
+}
+// 点击删除
+export const delData = (id) => {
+  return axios({
+    url: `/cms/collectEdit/remove/${id}`
+  })
+}
+// 通过id获取详情
+export const getDetailById = (id) => {
+  return axios({
+    url: `/cms/collectEdit/detail/${id}`
+  })
+}
+// 点击审核
+export const clickAudit = (data) => {
+  return axios({
+    method: 'post',
+    url: '/cms/collectEdit/audit',
+    data
+  })
+}

src/components/tabLeft2.vue

@@ -26,6 +26,7 @@ export default {
       tabList: [
         { name: '征集品总账', id: 0 },
         { name: '征集品提用', id: 1 },
+        { name: '征集品修改', id: 3 },
         { name: '征集品注销', id: 2 }
       ]
     }

src/router/index.js

@@ -233,6 +233,30 @@ const router = new VueRouter({
           meta: { myInd: 2 },
           component: () => import('@/views/collect/collect2_look.vue')
         },
+        {
+          name: 'collect3',
+          path: 'collect3',
+          meta: { myInd: 2 },
+          component: () => import('@/views/collect/collect3.vue')
+        },
+        {
+          name: 'collect3_look',
+          path: 'collect3_look',
+          meta: { myInd: 2 },
+          component: () => import('@/views/collect/collect3_look.vue')
+        },
+        {
+          name: 'collect3_audit',
+          path: 'collect3_audit',
+          meta: { myInd: 2 },
+          component: () => import('@/views/collect/collect3_audit.vue')
+        },
+        {
+          name: 'collect3_audit_Dia',
+          path: 'collect3_audit_Dia',
+          meta: { myInd: 2 },
+          component: () => import('@/views/collect/collect3_audit_Dia.vue')
+        },
 
         // 库房管理
         {

src/views/collect/collect0_DiaEdit.vue

@@ -306,7 +306,7 @@
 
 <script>
 import axios from '@/utils/request'
-import { getHolding3Edit } from '../../apis/holding3'
+import { getHolding3Edit } from '@/apis/collect0'
 import {
   // holdingAdd,
   getGoodsNumType,

src/views/collect/collect0_look.vue

@@ -140,7 +140,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>
@@ -347,18 +347,22 @@
         :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
         border
       >
-        <el-table-column label="序号" width="150" :resizable="false">
+        <el-table-column label="序号" width="50" :resizable="false">
           <template slot-scope="scope">
             {{ scope.$index + (myData.pageNum - 1) * myData.pageSize + 1 }}
           </template>
         </el-table-column>
         <el-table-column
         :resizable="false"
-          property="name"
+          property="moduleNum"
           label="业务单号"
-          width="200"
         ></el-table-column>
-        <el-table-column property="address" label="完成时间" :resizable="false"></el-table-column>
+       <el-table-column
+        :resizable="false"
+          property="tempType"
+          label="业务类型"
+          width="150"
+        ></el-table-column>        <el-table-column property="updateTime" label="完成时间" width="220" :resizable="false"></el-table-column>
         <el-table-column label="操作" :resizable="false">
           <template #default="{ row }">
             <el-button type="text" @click="lookRZ(row.id)">查 看</el-button>
@@ -372,7 +376,7 @@
           @size-change="sizeChange"
           background
           layout="prev, pager, next,sizes,jumper"
-          :total="30"
+          :total="total"
         >
         </el-pagination>
       </div>
@@ -387,6 +391,7 @@
 </template>
 
 <script>
+import { getRecord } from '@/apis/holding3'
 import Collect0DiaEdit from './collect0_DiaEdit.vue'
 import htmlToPdf from '@/utils/htmlToPdf'
 import { getFileList } from '../../apis/holding'
@@ -399,11 +404,13 @@ export default {
   data () {
     // 这里存放数据
     return {
+      total: 0,
       myData: {
+        goodsId: null,
         pageNum: 1,
         pageSize: 10
       },
-      gridData: [{ name: '666', address: '777' }],
+      gridData: [],
       dialogTableVisible: false,
       // 点击操作记录
       bigImg: '',
@@ -436,6 +443,21 @@ export default {
   },
   // 方法集合
   methods: {
+    // 封装获取列表接口方法
+    async getlist (data) {
+      const res = await getRecord(data)
+      this.total = res.data.total
+      this.gridData = res.data.list
+      this.gridData.forEach(v => {
+        if (v.moduleType === 'collectOut') v.tempType = '征集品提用'
+        else if (v.moduleType === 'collectEdit') v.tempType = '征集品修改'
+      })
+    },
+    // 点击操作记录
+    record () {
+      this.getlist(this.myData)
+      this.dialogTableVisible = true
+    },
     // 分页器方法
     currentChange (val) {},
     sizeChange (val) {},

src/views/collect/collect3.vue

@@ -0,0 +1,388 @@
+<!--  -->
+<template>
+  <div class="holding">
+    <TabList :ind='3'/>
+    <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>
+      </div>
+      <div class="conten">
+
+        <div class="middle">
+          <ul class="title">
+            <li :class="{active:stateInd===index}" @click="stateSelect(index)" v-for="(item,index) in stateArr" :key="index">{{item.txt}}（{{item.num}}）</li>
+          </ul>
+          <div class="select">
+            <span>搜索：</span>
+                <el-select v-model="myData.type" placeholder="请选择" style="width:108px">
+                  <el-option label="藏品名称" value="name"></el-option>
+                  <el-option label="登记人" value="user"></el-option>
+                </el-select>
+
+            <el-input
+              v-model="myData.searchKey"
+              placeholder="请输入"
+              style="width: 217px"
+            ></el-input>
+            <span>日期范围：</span>
+            <el-date-picker
+              v-model="time"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+            <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
+          </div>
+          <!--表格 -->
+          <div class="table">
+            <el-table
+              :header-cell-style="{ background: '#eef1f6', color: '#606266' }"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column prop="name" label="藏品名称" :resizable="false">
+              </el-table-column>
+              <el-table-column prop="num" label="总登记号" width="280" :resizable="false">
+              </el-table-column>
+              <el-table-column prop="realName" label="编辑登记人" width="200" :resizable="false">
+              </el-table-column>
+              <el-table-column prop="updateTime" label="编辑日期" width="200" :resizable="false">
+              </el-table-column>
+              <el-table-column prop="status" label="状态" width="230" :resizable="false">
+              </el-table-column>
+              <el-table-column label="操作" width="295" :resizable="false">
+                <template #default='{row}'>
+                  <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
+                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLogo.audit">审核</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLogo.del">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 分页器 -->
+          <div class="paging">
+            <el-pagination
+              @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 { getList, delData } from '@/apis/collect3'
+import TabList from '@/components/tabLeft2.vue'
+export default {
+  name: 'collect3',
+  components: { TabList },
+  data () {
+    return {
+      userLogo: {
+        audit: false, // 审核
+        del: false// 删除
+      },
+      total: 0,
+      myData: {
+        type: 'name',
+        name: '',
+        endTime: '', // 结束时间
+        pageNum: 1, // 起始页码，默认1为第一页
+        pageSize: 10, // 每页数量
+        searchKey: '', // 搜索条件
+        startTime: '', // 开始时间
+        status: null // 状态，不传返回全部，0：草稿中， 1：待审核， 2：审核不通过， 3：审核通过,
+      },
+      // 选择状态的变量
+      stateInd: 0,
+      stateArr: [
+        { txt: '全部', num: 0 },
+        { txt: '待审核', num: 0 },
+        { txt: '已完成', num: 0 },
+        { txt: '审核不通过', num: 0 }
+      ],
+      type: '',
+      time: '',
+      // 表格数据
+      tableData: []
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {
+    // 处理时间
+    time (val) {
+      this.handleSelect(val)
+    }
+  },
+  // 方法集合
+  methods: {
+    // 点击查询
+    inquire () {
+      this.myData.pageNum = 1
+      this.getList(this.myData)
+    },
+    // 分页器
+    currentChange (val) {
+      // console.log('当前页改变了', val)
+      // this.myData.sourceId = null
+      // this.myData.searchKey = ''
+      // this.time = []
+      // this.myData.endTime = ''
+      // this.myData.startTime = ''
+      this.myData.pageNum = val
+      this.getList(this.myData)
+      this.$nextTick(() => {
+        // 所有dom加载完毕之后---要执行的代码
+        setTimeout(() => {
+          if (this.tableData.length === 0) {
+            this.myData.pageNum = 1
+            this.getList(this.myData)
+          }
+        }, 100)
+      })
+    },
+    sizeChange (val) {
+      // this.myData.sourceId = null
+      // this.myData.searchKey = ''
+      // this.time = []
+      // this.myData.endTime = ''
+      // this.myData.startTime = ''
+      // console.log('条数改变了', val)
+      this.myData.pageSize = val
+      this.getList(this.myData)
+    },
+    // 点击上面的状态切换
+    stateSelect (index) {
+      if (index !== this.stateInd) {
+        this.myData.pageNum = 1
+        // 点击待审核
+        if (index === 1) {
+          this.myData.status = 1
+          this.getList(this.myData)
+        } else if (index === 2) {
+          // 点击已完成
+          this.myData.status = 3
+          this.getList(this.myData)
+        } else if (index === 3) {
+          // 点击审核不通过
+          this.myData.status = 2
+          this.getList(this.myData)
+        } else if (index === 0) {
+          // 点击全部
+          this.myData.status = ''
+          this.getList(this.myData)
+        }
+      }
+      this.stateInd = index
+    }, // 点击查看
+    myLook (val) {
+      this.$router.push({
+        path: '/layout/collect3_look',
+        query: val
+      })
+    },
+    // 点击删除
+    async delData (id, status) {
+      this.$confirm('确定删除吗?', '提示', {
+        confirmButtonText: '删除',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        // 发请求删除
+        await delData(id)
+        // 发请求刷新页面
+        this.getList(this.myData)
+        // 更新顶部数据
+        this.stateArr.forEach(v => {
+          if (v.txt === status) v.num--
+        })
+        this.stateArr[0].num--
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消.'
+        })
+      })
+    },
+
+    // 点击审核
+    audit (val) {
+      this.$router.push({
+        path: '/layout/collect3_audit',
+        query: val
+      })
+    },
+
+    // 封装获取列表方法
+    async getList (data) {
+      const res = await getList(data)
+      this.total = res.data.total
+      // console.log(666, res.data.list)
+      this.tableData = res.data.list
+      this.tableData.forEach(v => {
+        v.status = this.myState(v.status)
+        // v.updateTime = v.updateTime.slice(0, 10)
+        // v.createTime = v.createTime.slice(0, 10)
+      })
+    },
+    // 时间处理----------------
+    handleSelect (e) {
+      const date = []
+      for (const i in e) {
+        date.push(this.gettime(e[i]))
+      }
+      this.myData.startTime = date[0]
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+    },
+    gettime (data) {
+      const value = data.getFullYear() + '-' +
+      this.checkTime(data.getMonth() + 1) + '-' +
+      this.checkTime(data.getDate()) + ' ' +
+      this.checkTime(data.getHours()) + ':' +
+      this.checkTime(data.getMinutes()) + ':' +
+      this.checkTime(data.getSeconds())
+      return value
+    },
+    checkTime (i) {
+      if (i < 10) {
+        i = '0' + i
+      }
+      return i
+    }
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created () {
+    this.getList(this.myData)
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  async mounted () {
+    // 进页面拿到所有数据
+    const res = await getList({ ...this.myData, pageSize: 99999 })
+    this.stateArr[0].num = res.data.list.length
+    let num1 = 0
+    let num2 = 0
+    let num3 = 0
+    res.data.list.forEach(v => {
+      if (v.status === 1) num1++
+      if (v.status === 3) num2++
+      if (v.status === 2) num3++
+    })
+    this.stateArr[1].num = num1
+    this.stateArr[2].num = num2
+    this.stateArr[3].num = num3
+    // 获取用户角色权限标识
+    let temp = localStorage.getItem('daliCK')
+    temp = JSON.parse(temp)
+    if (temp) {
+      const temp2 = temp.role[0]
+      if (temp2 === 'sys_admin') {
+        this.userLogo.audit = true
+        this.userLogo.del = true
+      } // 超管
+      if (temp2 === 'sys_audit') this.userLogo.audit = true // 保管部主任
+    }
+  },
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能，这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+.holding {
+    /deep/#mytitle>span{
+    font-weight: 800;
+  }
+
+  display: flex;
+  .right {
+    width: 100%;
+    .top {
+      padding-left: 35px;
+      display: flex;
+      align-items: center;
+      box-shadow: 1px 1px 10px 1px;
+      margin-left: 2px;
+      height: 40px;
+      background-color: #fff;
+    }
+    .conten {
+      padding: 20px 20px 40px;
+      width: 100%;
+      height: 829px;
+      .middle {
+        .title{
+          height: 60px;
+          border-bottom: 1px solid #ccc;
+          margin: 0 25px;
+          display: flex;
+          align-items: center;
+          color: black;
+          .active{
+            color: #409eff;
+            border-bottom: 2px solid #409eff;
+          }
+          li {
+            height: 60px;
+            line-height: 60px;
+            padding: 0 15px;
+            text-align: center;
+            margin-left: 40px;
+            cursor: pointer;
+          }
+        }
+        position: relative;
+        width: 100%;
+        height: 100%;
+        background-color: #fff;
+        .select {
+          color: black;
+          padding: 30px 0 0 0;
+          & > span {
+            margin-left: 30px;
+          }
+        }
+        .table {
+          max-height: 580px;
+          max-width: 1710px;
+          // overflow: auto;
+          padding: 24px;
+          /deep/.el-table__body-wrapper{
+            max-height: 510px;
+            overflow-y: auto;
+          }
+        }
+        .paging {
+          position: absolute;
+          bottom: 15px;
+          left: 50%;
+          transform: translateX(-50%);
+        }
+      }
+    }
+  }
+}
+</style>

src/views/collect/collect3_audit.vue

@@ -0,0 +1,360 @@
+<!--  -->
+<template>
+  <div class="holdingAdd">
+    <TabList :ind='3'/>
+    <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="con_top">
+          <div><span>征集品名称：</span>{{myObj.name}}</div>
+          <div><span>总登记号：</span>{{myObj.num}}</div>
+          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
+        </div>
+        <div class="con_edit">
+          <div class="title">修改记录
+                        <el-button size="small" @click="look">查 看</el-button>
+          </div>
+          <div class="editChange">
+            <div style="width:200px">修改内容</div>
+            <div style="width:650px">修改前</div>
+            <div style="flex: 1;">修改后</div>
+          </div>
+          <div class="father">
+          <div class="con_txt" v-for="(item,index) in editData" :key="index">
+            <div style="width:200px">{{item.name}}</div>
+            <div style="width:650px">{{item.qian?item.qian:'-'}}</div>
+            <div style="flex: 1;">{{item.hou?item.hou:'-'}}</div>
+          </div>
+          </div>
+        </div>
+        <div class="txt">
+          <el-form
+            :model="fromData"
+            :rules="rules"
+            ref="fromData"
+            label-width="100px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="审核结果：" prop="status">
+              <el-select v-model="fromData.status" placeholder="请选择">
+                <el-option label="通过" :value="3"></el-option>
+                <el-option label="不通过" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="审核说明："
+              prop="reason"
+            >
+              <el-input
+                type="textarea"
+                :rows="3"
+                v-model="fromData.reason"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <!-- 最下面的按钮 -->
+        <div class="button">
+          <el-button type="primary" @click="submit">提交</el-button>
+          <el-button @click="$router.go(-1)">返回</el-button>
+        </div>
+      </div>
+    </div>
+        <!-- 点击查看显示弹窗 -->
+    <Collect3Dia :dialogFormVisible.sync='isShow' :myObj='myObjLook'  ref="mylook"/>
+  </div>
+</template>
+
+<script>
+import Collect3Dia from './collect3_audit_Dia.vue'
+import { getDetailById, clickAudit } from '@/apis/collect3'
+import TabList from '@/components/tabLeft2.vue'
+export default {
+  name: 'collect3_audit',
+  // import引入的组件需要注入到对象中才能使用
+  components: { TabList, Collect3Dia },
+  data () {
+    // 这里存放数据
+    return {
+      fujianLook: [],
+      myObjLook: {},
+      isShow: false,
+      myObj: {},
+      // 字典
+      dictionaries: {
+        age: '年代',
+        amount: '具体数量',
+        amountType: '数量类型',
+        checkInScope: '入藏时间范围',
+        checkInYear: '入藏年度',
+        goodsTypeId: '文物类别',
+        height: '通高',
+        integrity: '完残程度',
+        length: '通长',
+        level: '文物级别',
+        name: '藏品名称',
+        num: '藏品编号',
+        numTypeId: '编号类型',
+        primitiveName: '原名',
+        quality: '具体质量',
+        qualityScope: '质量范围',
+        registerNum: '总登记号',
+        repair: '保存状态',
+        repairRemark: '完残状况',
+        texture: '质地',
+        textureCategory: '质地类别',
+        textureType: '文物质地',
+        thumb: '藏品图片',
+        width: '通宽'
+      },
+      editData: [
+        // { name: '完残程度', qian: '基本完整', hou: '部分残缺' }
+      ],
+      fromData: {
+        id: null,
+        reason: '',
+        status: 3
+      },
+      rules: {
+        reason: [
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { max: 255, message: '不能超过255个字符', trigger: 'blur' }
+        ],
+        status: [
+          { required: true, message: '请选择活动区域', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {
+    // 点击查看
+    look () {
+      this.isShow = true
+    },
+    // 点击提交
+    async submit () {
+      try {
+        await this.$refs.fromData.validate()
+        this.$confirm('是否确认提交?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          const res = await clickAudit(this.fromData)
+          // console.log(99999999, res)
+          if (res.code === 0) {
+            this.$message.success('审核成功')
+            this.$router.push('/layout/collect3')
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消提交'
+          })
+        })
+      } catch (error) {
+        console.log(error)
+      }
+    }
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  async created () {
+    this.myObj = this.$route.query
+    this.fromData.id = Number(this.$route.query.id)
+    // 获取上个页面传递的数据
+    const res = await getDetailById(this.myObj.id)
+    const oldObj = res.data.goods
+    if (oldObj.amountType === 0) oldObj.amountType = '单件'
+    else if (oldObj.amountType === 1) oldObj.amountType = '一套多件'
+    if (oldObj.textureType === 0) oldObj.textureType = '单一质地'
+    else if (oldObj.textureType === 1) oldObj.textureType = '复合质地'
+    oldObj.goodsTypeId = this.category(oldObj.goodsTypeId)
+    oldObj.integrity = this.spoil(oldObj.integrity)
+    oldObj.level = this.myWwjb(oldObj.level)
+    oldObj.numTypeId = this.mycategory(oldObj.numTypeId)
+    oldObj.repair = this.mySave(oldObj.repair)
+    if (oldObj.thumb) {
+      const temp = oldObj.thumb.split('/')
+      oldObj.thumb = temp[temp.length - 1]
+    }
+    const newObj = res.data.backupGoods
+    if (newObj.amountType === 0) newObj.amountType = '单件'
+    else if (newObj.amountType === 1) newObj.amountType = '一套多件'
+    if (newObj.textureType === 0) newObj.textureType = '单一质地'
+    else if (newObj.textureType === 1) newObj.textureType = '复合质地'
+    newObj.goodsTypeId = this.category(newObj.goodsTypeId)
+    newObj.integrity = this.spoil(newObj.integrity)
+    newObj.level = this.myWwjb(newObj.level)
+    newObj.numTypeId = this.mycategory(newObj.numTypeId)
+    newObj.repair = this.mySave(newObj.repair)
+    // 把新的数据给查看弹窗
+    this.myObjLook = { ...newObj }
+    if (newObj.thumb) {
+      const temp = newObj.thumb.split('/')
+      newObj.thumb = temp[temp.length - 1]
+    }
+    for (const k in oldObj) {
+      if (oldObj[k] !== newObj[k] && this.dictionaries[k]) {
+        this.editData.push({ name: this.dictionaries[k], qian: oldObj[k], hou: newObj[k] })
+      }
+    }
+    // 对比附件
+    const oldFujian = res.data.goodsFile
+    const newFujian = res.data.backupGoodsFile
+    if (oldFujian.length >= newFujian.length) {
+      let temp = ''
+      let temp2 = ''
+      oldFujian.forEach((v, i) => {
+        temp += v.name + ' / '
+        if (i <= newFujian.length - 1) temp2 += newFujian[i].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp, hou: temp2 })
+    } else {
+      let temp3 = ''
+      let temp4 = ''
+      newFujian.forEach((v2, i2) => {
+        temp3 += v2.name + ' / '
+        if (i2 <= oldFujian.length - 1) temp4 += oldFujian[i2].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp4, hou: temp3 })
+    }
+    // newFujian.forEach((v, i) => {
+    //   if (v.type === 'video') v.type2 = '视频文件'
+    //   if (v.type === 'img') v.type2 = '高清图片'
+    //   if (v.type === 'audio') v.type2 = '音频文件'
+    //   if (v.type === 'model') v.type2 = '三维模型'
+    //   if (v.type === 'doc') v.type2 = '文档资料'
+    //   if (oldFujian.length === 0) {
+    //     this.editData.push({ name: v.type2, qian: '', hou: v.name })
+    //   } else {
+    //     oldFujian.forEach(v2 => {
+    //       if (v.id !== v2.id && v.type === v2.type) {
+    //         this.editData.push({ name: v.type2, qian: v2.name, hou: v2.name + ' ， ' + v.name })
+    //       }
+    //     })
+    //   }
+    // })
+    // console.log(999, oldFujian, newFujian)
+    // this.editData附件信息完全相同，直接删掉
+    if (this.editData[this.editData.length - 1].qian === this.editData[this.editData.length - 1].hou) this.editData.pop()
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {},
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能，这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+//@import url(); 引入公共css类
+.holdingAdd {
+    /deep/#mytitle>span{
+    font-weight: 800;
+  }
+  display: flex;
+  .right {
+    width: 100%;
+    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 {
+    position: relative;
+    flex: 1;
+    background-color: #fff;
+    margin: 20px 20px 40px;
+    padding: 24px;
+    .con_top{
+      color: black;
+      height: 80px;
+      &>div {
+        float: left;
+        padding-left: 18px;
+        width: 50%;
+        height: 50%;
+        line-height: 40px;
+        border: 1px solid #ccc;
+        &>span {
+          font-weight: 700;
+        }
+      }
+    }
+    .con_edit{
+      color: black;
+      margin: 24px 0;
+      max-height: 460px;
+      // background-color: cadetblue;
+      .title{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding:0 38px;
+        height: 50px;
+        font-weight: 700;
+        border: 1px solid #ccc;
+      }
+      .editChange{
+        font-weight: 700;
+        height: 40px;
+        display: flex;
+        &>div {
+          background-color: #fafafa;
+          padding-left: 18px;
+          border: 1px solid #ccc;
+          height: 100%;
+          line-height: 40px;
+        }
+      }
+      .father{
+        max-height: 320px;
+        overflow: auto;
+      }
+    .con_txt{
+      display: flex;
+      &>div {
+        border: 1px solid #ccc;
+        padding: 8px 0;
+        padding-left: 18px;
+      }
+    }
+    }
+        .button {
+      position: absolute;
+      left: 50%;
+      bottom: 20px;
+      transform: translateX(-50%);
+      width: 240px;
+      display: flex;
+      justify-content: space-between;
+    }
+
+  }
+}
+</style>

src/views/collect/collect3_audit_Dia.vue

@@ -0,0 +1,332 @@
+<!--  -->
+<template>
+  <el-dialog title="查看藏品" :visible="dialogFormVisible" @close="btnOK()">
+    <!-- 点击查看弹出高清图片 -->
+    <div class="bigImg" v-show="bigImgShow">
+      <img :src="bigImg" alt="">
+      <div class="btnX">
+      <el-button @click="bigImgShow=false">关 闭</el-button>
+      </div>
+    </div>
+    <div class="title">
+      <div :class="{ active: index === 0 }" @click="change(0)">藏品信息</div>
+      <div :class="{ active: index === 1 }" @click="change(1)">附件</div>
+    </div>
+    <div class="info" v-if="!index">
+            <div class="row">
+              <div><span>藏品名称：</span>{{ myObj.name?myObj.name:'-' }}</div>
+              <div><span>总登记号：</span>{{ myObj.registerNum?myObj.registerNum:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>编号类型：</span>{{ myObj.numTypeId?myObj.numTypeId:'-' }}</div>
+              <div><span>藏品编号：</span>{{ myObj.num?myObj.num:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>原名：</span>{{ myObj.primitiveName?myObj.primitiveName:'-' }}</div>
+              <div><span>年代：</span>{{ myObj.age?myObj.age:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>文物类别：</span>{{ myObj.goodsTypeId?myObj.goodsTypeId:'-' }}</div>
+              <div><span>文物级别：</span>{{ myObj.level?myObj.level:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>质地类型：</span>{{ myObj.textureType?myObj.textureType:'-' }}</div>
+              <div><span>质地类别：</span>{{ myObj.textureCategory?myObj.textureCategory:'-' }}</div>
+              <div><span>质地：</span>{{ myObj.texture?myObj.texture:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>通长：</span>{{ myObj.length?myObj.length:'-' }}</div>
+              <div><span>通宽：</span>{{ myObj.width?myObj.width:'-' }}</div>
+              <div><span>通高：</span>{{ myObj.height?myObj.height:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>完残程度：</span>{{ myObj.integrity?myObj.integrity:'-' }}</div>
+              <div><span>保存状态：</span>{{ myObj.repair?myObj.repair:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>完残状况：</span>{{ myObj.repairRemark?myObj.repairRemark:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>数量类型：</span>{{ myObj.amountType?myObj.amountType:'-' }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount?myObj.amount:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>质量范围：</span>{{ myObj.qualityScope?myObj.qualityScope:'-' }}</div>
+              <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
+            </div>
+            <div class="row">
+              <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
+              <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
+            </div>
+            <!-- <div class="row">
+              <div>
+                <span>入库位置：</span>
+                <el-cascader
+                  ref="cascaderAddr"
+                  v-if="myObj.location && myObj.location.length === 3"
+                  placeholder=""
+                  disabled
+                  style="width: 80%"
+                  :props="{ value: 'id', label: 'name' }"
+                  v-model="myObj.location"
+                  :options="options"
+                ></el-cascader>
+                <i v-else>-</i>
+              </div>
+              <div>
+                <span>出库位置：</span>{{ myObj.outPath ? myObj.outPath : "-" }}
+              </div>
+            </div> -->
+    </div>
+    <div class="affix" v-else>
+      <div class="row">
+        <span>藏品图片：</span
+        ><img class="img" :src="baseURL + myObj.thumb" alt="" :onerror='defaultImg'/>
+      </div>
+      <div class="row row2">
+        <span>类型：</span>
+        <el-select v-model="select" style="width: 120px">
+          <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="120" v-if="this.select==='img'" :resizable="false">
+          <template #default='{row}'>
+            <div class="smimg">
+              <img :src="baseURL+row.filePath" alt="" :onerror='defaultImg'/>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="name" label="附件名称" width="235" :resizable="false">
+        </el-table-column>
+        <el-table-column prop="updateTime" label="上传时间" :resizable="false"> </el-table-column>
+        <el-table-column  label="操作" width="150" :resizable="false">
+          <template #default='{row}'>
+          <a href="javascript:;" class="mydown" @click="imgLook(row.filePath)" v-show="select==='img'">查 看</a>
+          <a :href="baseURL + row.filePath" target="_blank" :download="baseURL + row.filePath" class="mydown">下 载</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-button type="primary" class="confirm" @click="btnOK">确 定</el-button>
+  </el-dialog>
+</template>
+
+<script>
+import { getDetailById } from '@/apis/collect3'
+// import { getFileList } from '@/apis/holding'
+import axios from '@/utils/request'
+export default {
+  name: 'collect3_audit_Dia',
+  components: {},
+  props: {
+    dialogFormVisible: {
+      type: Boolean,
+      default: false
+    },
+    myObj: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      bigImg: '',
+      bigImgShow: false,
+      options: [],
+      baseURL: '',
+      index: 0,
+      select: 'video',
+      // 表格数据
+      tableData: [],
+      tableDataObj: {
+        img: [],
+        video: [],
+        audio: [],
+        model: [],
+        doc: []
+      },
+      affix: [
+        { label: '高清图片', value: 'img' },
+        { label: '视频文件', value: 'video' },
+        { label: '音频文件', value: 'audio' },
+        { label: '三维模型', value: 'model' },
+        { label: '文档资料', value: 'doc' }
+      ]
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {
+    select (val) {
+      // console.log(999, val)
+      this.tableData = this.tableDataObj[val]
+      // this.getFileList(this.myObj.id, this.select)
+    }
+  },
+  // 方法集合
+  methods: {
+    // 点击查看
+    imgLook (url) {
+      this.bigImgShow = true
+      this.bigImg = this.baseURL + url
+    },
+
+    // 切换上面的信息和附件
+    change (index) {
+      this.index = index
+    },
+    // 点击确定
+    btnOK () {
+      this.$emit('update:dialogFormVisible', false)
+      this.select = 'video'
+    }
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  async created () {
+    // 获取上个页面传递的数据
+    const res = await getDetailById(this.$route.query.id)
+    // console.log(999999, res)
+    const newFujian = res.data.backupGoodsFile
+    newFujian.forEach((v) => {
+      v.updateTime = v.updateTime.slice(0, 10)
+      if (v.type === 'img') this.tableDataObj.img.push(v)
+      if (v.type === 'video') this.tableDataObj.video.push(v)
+      if (v.type === 'audio') this.tableDataObj.audio.push(v)
+      if (v.type === 'model') this.tableDataObj.model.push(v)
+      if (v.type === 'doc') this.tableDataObj.doc.push(v)
+    })
+    this.tableData = this.tableDataObj.video
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {
+  },
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能，这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+.bigImg{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position:fixed;
+  left: 0;
+  top: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 9999;
+  background-color: rgba(0,0,0,.7);
+  &>img{
+    max-height: 80%;
+    max-width: 80%;
+  }
+  .btnX{
+    position: absolute;
+    bottom: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+  .mydown {
+    color: #40a9ff;
+    margin: 4px;
+  }
+.title {
+  height: 32px;
+  border: 1px solid #ccc;
+  border-radius: 10px;
+  display: flex;
+  overflow: hidden;
+  & > div {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 50%;
+  }
+  .active {
+    background-color: #409eff;
+    color: #fff;
+  }
+}
+.info {
+  margin: 20px;
+  width: 95%;
+  margin-bottom: 60px;
+  .row {
+    display: flex;
+    & > div {
+      padding-left: 20px;
+      flex: 1;
+      padding: 10px;
+      border: 1px solid #ccc;
+      font-size: 16px;
+      color: black;
+      span {
+        font-weight: 700;
+      }
+    }
+  }
+}
+.affix {
+  .smimg {
+    // border: 3px solid #ccc;
+    height: 50px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  margin: 20px;
+  width: 95%;
+  margin-bottom: 60px;
+  .row2 {
+    margin: 30px 0;
+    align-items: center;
+  }
+  .row {
+    display: flex;
+    span {
+      display: block;
+      width: 80px;
+      text-align: right;
+    }
+    img {
+      margin-left: 15px;
+      max-width: 700px;
+      max-height: 200px;
+      // width: 85px;
+      // height: 85px;
+      // border: 3px solid #ccc;
+    }
+  }
+}
+.confirm {
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+</style>

src/views/collect/collect3_look.vue

@@ -0,0 +1,295 @@
+<!--  -->
+<template>
+  <div class="holdingAdd">
+    <TabList :ind="3" />
+    <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="info">
+          <div class="row">
+            <div><span>藏品名称：</span>{{myObj.name}}</div>
+            <div><span>总登记号：</span>{{myObj.num}}</div>
+          </div>
+        <div class="row">
+          <div><span>编辑登记人：</span>{{myObj.realName}}</div>
+          <div><span>编辑时间：</span>{{myObj.updateTime}}</div>
+        </div>
+        <div class="row">
+          <div><span>审核结果：</span>{{myObj.status}}</div>
+        </div>
+        <div class="row">
+          <div><span>审核说明：</span>{{myObj.reason}}</div>
+        </div>
+        </div>
+        <div class="con_edit">
+          <div class="title">修改记录
+                        <el-button size="small" @click="isShow=true">查 看</el-button>
+          </div>
+          <div class="editChange">
+            <div style="width:200px">修改内容</div>
+            <div style="width:650px">修改前</div>
+            <div style="flex: 1;">修改后</div>
+          </div>
+          <div class="father">
+          <div class="con_txt" v-for="(item,index) in editData" :key="index">
+            <div style="width:200px">{{item.name}}</div>
+            <div style="width:650px">{{item.qian?item.qian:'-'}}</div>
+            <div style="flex: 1;">{{item.hou?item.hou:'-'}}</div>
+          </div>
+          </div>
+        </div>
+        <!-- 最下面的按钮 -->
+        <div class="button">
+          <el-button @click="$router.go(-1)">返回</el-button>
+        </div>
+      </div>
+    </div>
+        <!-- 点击查看显示弹窗 -->
+    <Holding4Look :dialogFormVisible.sync='isShow' :myObj='myObjLook'  ref="mylook"/>
+  </div>
+</template>
+
+<script>
+import Holding4Look from './collect3_audit_Dia.vue'
+import { getDetailById } from '@/apis/collect3'
+import TabList from '@/components/tabLeft2.vue'
+export default {
+  name: 'Collect3Look2',
+  // import引入的组件需要注入到对象中才能使用
+  components: { TabList, Holding4Look },
+  data () {
+    // 这里存放数据
+    return {
+      fujianLook: [],
+      myObjLook: {},
+      isShow: false,
+      myObj: {},
+      // 字典
+      dictionaries: {
+        age: '年代',
+        amount: '具体数量',
+        amountType: '数量类型',
+        checkInScope: '入藏时间范围',
+        checkInYear: '入藏年度',
+        goodsTypeId: '文物类别',
+        height: '通高',
+        integrity: '完残程度',
+        length: '通长',
+        level: '文物级别',
+        name: '藏品名称',
+        num: '藏品编号',
+        numTypeId: '编号类型',
+        primitiveName: '原名',
+        quality: '具体质量',
+        qualityScope: '质量范围',
+        registerNum: '总登记号',
+        repair: '保存状态',
+        repairRemark: '完残状况',
+        texture: '质地',
+        textureCategory: '质地类别',
+        textureType: '文物质地',
+        thumb: '藏品图片',
+        width: '通宽'
+      },
+
+      editData: []
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  async created () {
+    this.myObj = this.$route.query
+    // 获取上个页面传递的数据
+    const res = await getDetailById(this.myObj.id)
+    const oldObj = res.data.goods
+    if (oldObj.amountType === 0) oldObj.amountType = '单件'
+    else if (oldObj.amountType === 1) oldObj.amountType = '一套多件'
+    if (oldObj.textureType === 0) oldObj.textureType = '单一质地'
+    else if (oldObj.textureType === 1) oldObj.textureType = '复合质地'
+    oldObj.goodsTypeId = this.category(oldObj.goodsTypeId)
+    oldObj.integrity = this.spoil(oldObj.integrity)
+    oldObj.level = this.myWwjb(oldObj.level)
+    oldObj.numTypeId = this.mycategory(oldObj.numTypeId)
+    oldObj.repair = this.mySave(oldObj.repair)
+    if (oldObj.thumb) {
+      const temp = oldObj.thumb.split('/')
+      oldObj.thumb = temp[temp.length - 1]
+    }
+    const newObj = res.data.backupGoods
+    if (newObj.amountType === 0) newObj.amountType = '单件'
+    else if (newObj.amountType === 1) newObj.amountType = '一套多件'
+    if (newObj.textureType === 0) newObj.textureType = '单一质地'
+    else if (newObj.textureType === 1) newObj.textureType = '复合质地'
+    newObj.goodsTypeId = this.category(newObj.goodsTypeId)
+    newObj.integrity = this.spoil(newObj.integrity)
+    newObj.level = this.myWwjb(newObj.level)
+    newObj.numTypeId = this.mycategory(newObj.numTypeId)
+    newObj.repair = this.mySave(newObj.repair)
+    // 把新的数据给查看弹窗
+    this.myObjLook = { ...newObj }
+    if (newObj.thumb) {
+      const temp = newObj.thumb.split('/')
+      newObj.thumb = temp[temp.length - 1]
+    }
+    for (const k in oldObj) {
+      // console.log(oldObj[k], newObj[k])
+      if (oldObj[k] !== newObj[k] && this.dictionaries[k]) {
+        this.editData.push({ name: this.dictionaries[k], qian: oldObj[k], hou: newObj[k] })
+      }
+    }
+    // 对比附件
+    const oldFujian = res.data.goodsFile
+    const newFujian = res.data.backupGoodsFile
+    if (oldFujian.length >= newFujian.length) {
+      let temp = ''
+      let temp2 = ''
+      oldFujian.forEach((v, i) => {
+        temp += v.name + ' / '
+        if (i <= newFujian.length - 1) temp2 += newFujian[i].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp, hou: temp2 })
+    } else {
+      let temp3 = ''
+      let temp4 = ''
+      newFujian.forEach((v2, i2) => {
+        temp3 += v2.name + ' / '
+        if (i2 <= oldFujian.length - 1) temp4 += oldFujian[i2].name + ' / '
+      })
+      this.editData.push({ name: '附件信息', qian: temp4, hou: temp3 })
+    }
+    // newFujian.forEach((v, i) => {
+    //   if (v.type === 'video') v.type2 = '视频文件'
+    //   if (v.type === 'img') v.type2 = '高清图片'
+    //   if (v.type === 'audio') v.type2 = '音频文件'
+    //   if (v.type === 'model') v.type2 = '三维模型'
+    //   if (v.type === 'doc') v.type2 = '文档资料'
+    //   if (oldFujian.length === 0) {
+    //     this.editData.push({ name: v.type2, qian: '', hou: v.name })
+    //   } else {
+    //     oldFujian.forEach(v2 => {
+    //       if (v.id !== v2.id && v.type === v2.type) {
+    //         this.editData.push({ name: v.type2, qian: v2.name, hou: v2.name + ' ， ' + v.name })
+    //       }
+    //     })
+    //   }
+    // })
+    // console.log(999, oldFujian, newFujian)
+    // this.editData附件信息完全相同，直接删掉
+    if (this.editData[this.editData.length - 1].qian === this.editData[this.editData.length - 1].hou) this.editData.pop()
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {},
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能，这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+//@import url(); 引入公共css类
+.holdingAdd {
+  /deep/#mytitle > span {
+    font-weight: 800;
+  }
+  display: flex;
+  .right {
+    width: 100%;
+    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 {
+    position: relative;
+    padding: 24px;
+    color: black;
+    flex: 1;
+    background-color: #fff;
+    margin: 20px 20px 40px;
+    .info{
+      .row{
+        display: flex;
+        &>div{
+          flex: 1;
+          border: 1px solid #ccc;
+          padding: 10px 18px;
+          &>span {
+            font-weight: 700;
+          }
+        }
+      }
+    }
+    .con_edit{
+      color: black;
+      margin: 24px 0;
+      max-height: 460px;
+      // background-color: cadetblue;
+      .title{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding:0 38px;
+        height: 50px;
+        font-weight: 700;
+        border: 1px solid #ccc;
+      }
+      .editChange{
+        font-weight: 700;
+        height: 40px;
+        display: flex;
+        &>div {
+          background-color: #fafafa;
+          padding-left: 18px;
+          border: 1px solid #ccc;
+          height: 100%;
+          line-height: 40px;
+        }
+      }
+      .father{
+        max-height: 320px;
+        overflow: auto;
+      }
+    .con_txt{
+      display: flex;
+      &>div {
+        border: 1px solid #ccc;
+        padding: 8px 0;
+        padding-left: 18px;
+      }
+    }
+    }
+            .button {
+      position: absolute;
+      left: 50%;
+      bottom: 20px;
+      transform: translateX(-50%);
+      width: 240px;
+      display: flex;
+      justify-content: center;
+    }
+
+  }
+}
+</style>

src/views/home/index.vue

@@ -84,6 +84,7 @@ import { PieChart } from 'echarts/charts'
 import { LabelLayout } from 'echarts/features'
 import { CanvasRenderer } from 'echarts/renderers'
 
+import { getList as collect3 } from '@/apis/collect3'
 import { getList as getList4 } from '@/apis/holding4'
 import { getList as collect2 } from '@/apis/collect2'
 import { getList as collect1 } from '@/apis/collect1'
@@ -119,7 +120,7 @@ export default {
         { name: '藏品修改', inoc: 0, push: '/layout/holding4' },
         { name: '藏品注销', inoc: 0, push: '/layout/holding5' },
         { name: '征集品提用', inoc: 0, push: '/layout/collect1' },
-        { name: '征集品修改', inoc: 0, push: '/layout/holding4' },
+        { name: '征集品修改', inoc: 0, push: '/layout/collect3' },
         { name: '征集品注销', inoc: 0, push: '/layout/collect2' }
 
       ]
@@ -182,6 +183,11 @@ export default {
     col1.data.list.forEach(v => {
       if (v.status === 1 || v.status === 0 || v.status === 3) this.dingdong[5].inoc++
     })
+    // 进页面拿数据--征集品修改
+    const col3 = await collect3({ pageNum: 1, pageSize: 99999 })
+    col3.data.list.forEach(v => {
+      if (v.status === 1) this.dingdong[6].inoc++
+    })
     // 进页面拿数据--征集品注销
     const col2 = await collect2({ pageNum: 1, pageSize: 99999 })
     col2.data.list.forEach(v => {

src/views/layout/index.vue

@@ -136,6 +136,7 @@ export default {
           son: [
             { name: '征集品总账', id: 0 },
             { name: '征集品提用', id: 1 },
+            { name: '征集品修改', id: 3 },
             { name: '征集品注销', id: 2 }
           ]
         },