shaogen1995 4 лет назад
Родитель
Сommit
ff70328c92
4 измененных файлов с 100 добавлено и 47 удалено
  1. 7 1
      src/apis/holding.js
  2. 22 0
      src/main.js
  3. 25 11
      src/views/holding/holding0_audit.vue
  4. 46 35
      src/views/holding/holding0_audit_Dia.vue

+ 7 - 1
src/apis/holding.js

@@ -79,4 +79,10 @@ export const auditH0 = (id) => {
     url: `/cms/register/apply/${id}`
   })
 }
-// holding0_audit通过id获取详情
+// holding0_audit点击审核
+export const auditH0Tow = (data) => {
+  return axios({
+    url: '/cms/register/audit',
+    data
+  })
+}

+ 22 - 0
src/main.js

@@ -85,6 +85,28 @@ const checkBtn = {
         { id: 3, name: '审核通过' }
       ]
       return list.filter(v => id === v.id)[0].name
+    },
+    // 编号类型数据处理
+    mycategory (id) {
+      const list = [
+        { id: 1, name: '辅助账号' },
+        { id: 2, name: '索书号' },
+        { id: 3, name: '档案编号' },
+        { id: 4, name: '固定资产登记号' },
+        { id: 5, name: '财产登记号' },
+        { id: 6, name: '出土(水)登记号' },
+        { id: 7, name: '其他编号' }
+      ]
+      return list.filter(v => id === v.id)[0].name
+    },
+    mySave (id) {
+      const list = [
+        { id: 0, name: '不需修复' },
+        { id: 1, name: '需要修复' },
+        { id: 2, name: '继续修复' },
+        { id: 3, name: '已修复' }
+      ]
+      return list.filter(v => id === v.id)[0].name
     }
   }
 }

+ 25 - 11
src/views/holding/holding0_audit.vue

@@ -48,9 +48,9 @@
             style="width: 100%"
           >
             <el-table-column label="缩略图" width="100">
-              <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>
@@ -62,19 +62,19 @@
             <el-table-column prop="integrity" label="完残程度" width="220">
             </el-table-column>
             <el-table-column label="操作" width="130">
-              <template #default>
-                <el-button type="text" @click="isShow=true">查 看</el-button>
+              <template #default='{row}'>
+                <el-button type="text" @click="myLook(row)">查 看</el-button>
               </template>
             </el-table-column>
             <el-table-column label="审核结果" width="150">
-              <template #default>
+              <template #default='{row}'>
                 <el-select
-                  v-model="auditResult"
+                  v-model="row.auditResultDan"
                   placeholder="请选择"
                 >
-                  <el-option label="入库" value="0"></el-option>
-                  <el-option label="不入库" value="1"></el-option>
-                  <el-option label="不通过" value="2"></el-option>
+                  <el-option  label="入库" :value="4"></el-option>
+                  <el-option  label="不入库" :value="3"></el-option>
+                  <el-option  label="审核不通过" :value="2"></el-option>
                 </el-select>
               </template>
             </el-table-column>
@@ -106,11 +106,12 @@
       </div>
     </div>
     <!-- 点击查看显示弹窗 -->
-    <Holding0AuditDia :dialogFormVisible.sync='isShow'/>
+    <Holding0AuditDia :dialogFormVisible.sync='isShow' :myObj='myObj'/>
   </div>
 </template>
 
 <script>
+import axios from '@/utils/request'
 import { getHoldingList } from '@/apis/holding'
 import TabList from '@/components/tabLeft.vue'
 import Holding0AuditDia from './holding0_audit_Dia.vue'
@@ -121,6 +122,8 @@ export default {
   data () {
     // 这里存放数据
     return {
+      myObj: {},
+      baseURL: '',
       // 数据显示
       myData: {},
       // 点击查看显示弹窗
@@ -131,7 +134,8 @@ export default {
       rules: {
         textarea: [{ max: 255, message: '不能超过255个字符', trigger: 'blur' }]
       },
-      auditResult: '',
+      // 多选框数据
+      // mySelect: [{ id: 4, name: '入库' }, { id: 3, name: '不入库' }, { id: 2, name: '审核不通过' }],
       // 表格数据
       tableData: []
     }
@@ -142,6 +146,11 @@ export default {
   watch: {},
   // 方法集合
   methods: {
+    // 点击查看
+    myLook (val) {
+      this.myObj = val
+      this.isShow = true
+    },
     // 通过id获取藏品列表
     async getHoldingList (id) {
       const res = await getHoldingList(id)
@@ -150,6 +159,9 @@ export default {
       this.tableData.forEach(v => {
         v.goodsTypeId = this.category(v.goodsTypeId)
         v.integrity = this.spoil(v.integrity)
+        v.numTypeId = this.mycategory(v.numTypeId)
+        v.repair = this.mySave(v.repair)
+        v.auditResultDan = 4
       })
     },
     skip (index) {
@@ -158,6 +170,8 @@ export default {
   },
   // 生命周期 - 创建完成(可以访问当前this实例)
   created () {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {

+ 46 - 35
src/views/holding/holding0_audit_Dia.vue

@@ -7,53 +7,60 @@
     </div>
     <div class="info" v-if="!index">
       <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.goodsTypeId }}</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}}</div> -->
+        <!-- <div><span>文物价格:</span>找不到字段</div> -->
       </div>
       <div class="row">
-        <div><span>文物价格:</span>1111</div>
-        <div><span>完残程度:</span>1111</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>{{ myObj.repair }}</div>
+        <div><span>入藏时间范围:</span>{{ myObj.checkInScope }}</div>
       </div>
     </div>
     <div class="affix" v-else>
       <div class="row">
         <span>藏品图片:</span
-        ><img class="img" src="../../assets/img/user.png" alt="" />
+        ><img class="img" :src="baseURL + myObj.thumb" alt="" />
       </div>
       <div class="row row2">
         <span>类型:</span>
         <el-select v-model="select" style="width: 120px">
-          <el-option label="高清图片" value="GQpicture"></el-option>
-          <el-option label="高清视频" value="GQvido"></el-option>
+          <el-option
+            v-for="item in affix"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </div>
       <!-- 表格 -->
@@ -80,6 +87,7 @@
 </template>
 
 <script>
+import axios from '@/utils/request'
 export default {
   name: 'Holding0_audit_Dia',
   components: {},
@@ -87,24 +95,24 @@ export default {
     dialogFormVisible: {
       type: Boolean,
       default: false
+    },
+    myObj: {
+      type: Object
     }
   },
   data () {
     return {
+      baseURL: '',
       index: 0,
-      select: 'GQpicture',
+      select: 'video',
       // 表格数据
-      tableData: [
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }
+      tableData: [],
+      affix: [
+        { label: '模型', value: 'model' },
+        { label: '视频', value: 'video' },
+        { label: '图片', value: 'img' },
+        { label: '音频', value: 'audio' },
+        { label: '文档', value: 'doc' }
       ]
     }
   },
@@ -124,7 +132,10 @@ export default {
     }
   },
   // 生命周期 - 创建完成(可以访问当前this实例)
-  created () {},
+  created () {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+  },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {},
   beforeCreate () {}, // 生命周期 - 创建之前