shaogen1995 4 лет назад
Родитель
Сommit
34f19c91da
3 измененных файлов с 19 добавлено и 11 удалено
  1. 14 7
      src/main.js
  2. 2 2
      src/views/holding/holding0_audit.vue
  3. 3 2
      src/views/holding/holding0_result.vue

+ 14 - 7
src/main.js

@@ -13,6 +13,7 @@ const checkBtn = {
     // 类别数据转换
     category (id) {
       const list = [
+        { id: '', name: '' },
         { id: 1, name: '玉石器、宝石' },
         { id: 2, name: '陶瓷' },
         { id: 3, name: '瓷器' },
@@ -49,20 +50,22 @@ const checkBtn = {
         { id: 34, name: '标本、化石' },
         { id: 35, name: '其他' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     // 完残程度数据转换
     spoil (id) {
       const list = [
+        { id: '', name: '' },
         { id: 1, name: '完整' },
         { id: 0, name: '基本完整' },
         { id: -1, name: '残缺' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     // 藏品来源数据处理
     mySource (id) {
       const list = [
+        { id: '', name: '' },
         { id: 1, name: '征集购买' },
         { id: 2, name: '接受捐赠' },
         { id: 3, name: '依法交换' },
@@ -74,21 +77,23 @@ const checkBtn = {
         { id: 9, name: '拣选' },
         { id: 10, name: '其他' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     // 状态的数据处理
     myState (id) {
       const list = [
+        { id: '', name: '' },
         { id: 0, name: '待办理' },
         { id: 1, name: '待审核' },
         { id: 2, name: '审核不通过' },
         { id: 3, name: '已完成' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     // 编号类型数据处理
     mycategory (id) {
       const list = [
+        { id: '', name: '' },
         { id: 1, name: '辅助账号' },
         { id: 2, name: '索书号' },
         { id: 3, name: '档案编号' },
@@ -97,20 +102,22 @@ const checkBtn = {
         { id: 6, name: '出土(水)登记号' },
         { id: 7, name: '其他编号' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     mySave (id) {
       const list = [
+        { id: '', name: '' },
         { id: 0, name: '不需修复' },
         { id: 1, name: '需要修复' },
         { id: 2, name: '继续修复' },
         { id: 3, name: '已修复' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     },
     // 出库类型数据处理
     CKtype (id) {
       const list = [
+        { id: '', name: '' },
         { id: 'exhibition', name: '展览' },
         { id: 'study', name: '研究' },
         { id: 'repair', name: '修复' },
@@ -118,7 +125,7 @@ const checkBtn = {
         { id: 'cultural', name: '文创' },
         { id: 'other', name: '其他' }
       ]
-      return list.filter(v => id === v.id)[0].name
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
     }
   }
 }

+ 2 - 2
src/views/holding/holding0_audit.vue

@@ -188,8 +188,8 @@ 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.numTypeId = this.mycategory(v.numTypeId)
+        v.repair = this.mySave(v.repair)
         this.switch1.push(false)
         // 首先把所有的入库变成0(不入库状态)
         this.mySrt[v.id] = 0

+ 3 - 2
src/views/holding/holding0_result.vue

@@ -138,10 +138,11 @@ export default {
     const res = await getHoldingList(this.mydata.id)
     this.tableData = res.data
     this.tableData.forEach(v => {
+      // console.log(Number(v.integrity))
       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.numTypeId = this.mycategory(v.numTypeId)
+      v.repair = this.mySave(v.repair)
       if (v.isStorage === 1) v.isStorage = '入库'
       else v.isStorage = '不入库'
     })