修改需求

src/main.js

@@ -14,10 +14,23 @@ Vue.config.productionTip = false
 const checkBtn = {
   data () {
     return {
-      defaultImg: 'this.src="' + require('./assets/img/IMGerror.png') + '"'
+      defaultImg: 'this.src="' + require('./assets/img/IMGerror.jpg') + '"'
     }
   },
   methods: {
+    // 文物级别数据转换
+    myWwjb (id) {
+      const list = [
+        { id: '', name: '' },
+        { id: 3, name: '三级' },
+        { id: 2, name: '二级' },
+        { id: 1, name: '一级' },
+        { id: 0, name: '一般' },
+        { id: -1, name: '未定义' }
+      ]
+      return list.filter(v => id === v.id)[0] ? list.filter(v => id === v.id)[0].name : ''
+    },
+
     // 类别数据转换
     category (id) {
       const list = [

src/utils/request.js

@@ -1,8 +1,8 @@
 import axios from 'axios'
 // export const baseURL = '666初始地址'
 const service = axios.create({
-  baseURL: 'http://192.168.0.135:8006',
-  // baseURL: '',
+  // baseURL: 'http://192.168.0.135:8006',
+  baseURL: '',
   timeout: 5000
 })
 

src/views/collect/collect0.vue

@@ -144,17 +144,22 @@ export default {
         原名: 'primitiveName',
         年代: 'age',
         文物类别: 'goodsTypeName',
-        文物质地: 'texture',
-        数量类型: 'amountType',
-        具体数量: 'amount',
+        文物级别: 'level',
+        质地类型: 'textureType',
+        质地类别: 'textureCategory',
+        质地: 'texture',
         通长: 'length',
         通宽: 'width',
         通高: 'height',
-        具体质量: 'quality',
         完残程度: 'integrity',
-        完残状况: 'repairRemark',
         保存状态: 'repair',
-        入藏时间范围: 'checkInScope'
+        完残状况: 'repairRemark',
+        数量类型: 'amountType',
+        具体数量: 'amount',
+        质量范围: 'qualityScope',
+        具体质量: 'quality',
+        入藏时间范围: 'checkInScope',
+        入藏年度: 'checkInYear'
       },
       json_data: [],
       json_meta: [
@@ -207,6 +212,9 @@ export default {
         else if (v.amountType === 1) v.amountType = '一套多件'
         v.integrity = this.spoil(v.integrity)
         v.repair = this.mySave(v.repair)
+        v.level = this.myWwjb(v.level)
+        if (v.textureType === 0) v.textureType = '单一质地'
+        else if (v.textureType === 1) v.textureType = '复合质地'
       })
     },
     // 分页器
@@ -245,6 +253,9 @@ export default {
         v.numTypeId = this.mycategory(v.numTypeId)
         v.integrity = this.spoil(v.integrity)
         v.repair = this.mySave(v.repair)
+        v.level = this.myWwjb(v.level)
+        if (v.textureType === 0) v.textureType = '单一质地'
+        else if (v.textureType === 1) v.textureType = '复合质地'
       })
     },
     // 控制显示表格还是图片
@@ -276,6 +287,9 @@ export default {
       else if (v.amountType === 1) v.amountType = '一套多件'
       v.integrity = this.spoil(v.integrity)
       v.repair = this.mySave(v.repair)
+      v.level = this.myWwjb(v.level)
+      if (v.textureType === 0) v.textureType = '单一质地'
+      else if (v.textureType === 1) v.textureType = '复合质地'
     })
   },
   beforeCreate () {}, // 生命周期 - 创建之前

src/views/collect/collect0_look.vue

@@ -13,45 +13,51 @@
           </div>
           <div class="info">
             <div class="row">
-              <div><span>藏品名称：</span>{{ myObj.name }}</div>
-              <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
+              <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 }}</div>
-              <div><span>藏品编号：</span>{{ myObj.num }}</div>
+              <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 }}</div>
-              <div><span>年代：</span>{{ myObj.age }}</div>
+              <div><span>原名：</span>{{ myObj.primitiveName?myObj.primitiveName:'-' }}</div>
+              <div><span>年代：</span>{{ myObj.age?myObj.age:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>文物类别：</span>{{ myObj.goodsTypeName }}</div>
-              <div><span>文物质地：</span>{{ myObj.texture }}</div>
+              <div><span>文物类别：</span>{{ myObj.goodsTypeName?myObj.goodsTypeName:'-' }}</div>
+              <div><span>文物级别：</span>{{ myObj.level?myObj.level:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>数量类型：</span>{{ myObj.amountType}}</div>
-              <div><span>具体数量：</span>{{ myObj.amount }}</div>
+              <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 }}</div>
-              <div><span>通宽：</span>{{ myObj.width }}</div>
-              <div><span>通高：</span>{{ myObj.height }}</div>
+              <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.goodsTypeName}}</div> -->
-              <div><span>具体质量：</span>{{ myObj.quality }}</div>
-              <div><span>完残程度：</span>{{ myObj.integrity }}</div>
+              <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 }}</div>
+              <div><span>完残状况：</span>{{ myObj.repairRemark?myObj.repairRemark:'-' }}</div>
             </div>
             <div class="row">
-              <!-- <div><span>文物价格：</span>1111</div> -->
+              <div><span>数量类型：</span>{{ myObj.amountType?myObj.amountType:'-' }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount?myObj.amount:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>保存状态：</span>{{ myObj.repair }}</div>
-              <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
+              <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>
         </div>
 
@@ -83,42 +89,51 @@
           </div>
           <div class="info">
             <div class="row">
-              <div><span>藏品名称：</span>{{ myObj.name }}</div>
-              <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
+              <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.numTypeId }}</div>
-              <div><span>藏品编号：</span>{{ myObj.num }}</div>
+              <div><span>文物类别：</span>{{ myObj.goodsTypeName?myObj.goodsTypeName:'-' }}</div>
+              <div><span>文物级别：</span>{{ myObj.level?myObj.level:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>原名：</span>{{ myObj.primitiveName }}</div>
-              <div><span>年代：</span>{{ myObj.age }}</div>
+              <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.goodsTypeName }}</div>
-              <div><span>文物质地：</span>{{ myObj.texture }}</div>
+              <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.amountType}}</div>
-              <div><span>具体数量：</span>{{ myObj.amount }}</div>
+              <div><span>完残程度：</span>{{ myObj.integrity?myObj.integrity:'-' }}</div>
+              <div><span>保存状态：</span>{{ myObj.repair?myObj.repair:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>通长：</span>{{ myObj.length }}</div>
-              <div><span>通宽：</span>{{ myObj.width }}</div>
-              <div><span>通高：</span>{{ myObj.height }}</div>
+              <div><span>完残状况：</span>{{ myObj.repairRemark?myObj.repairRemark:'-' }}</div>
             </div>
             <div class="row">
-              <!-- <div><span>文物类别：</span>{{myObj.goodsTypeName}}</div> -->
-              <div><span>具体质量：</span>{{ myObj.quality }}</div>
-              <div><span>完残程度：</span>{{ myObj.integrity }}</div>
+              <div><span>数量类型：</span>{{ myObj.amountType?myObj.amountType:'-' }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount?myObj.amount:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>完残状况：</span>{{ myObj.repairRemark }}</div>
+              <div><span>质量范围：</span>{{ myObj.qualityScope?myObj.qualityScope:'-' }}</div>
+              <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>保存状态：</span>{{ myObj.repair }}</div>
-              <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
+              <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
+              <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
             </div>
+
           </div>
         </div>
         <div class="conten_bot">
@@ -285,7 +300,7 @@ body .el-table::before {
             flex: 1;
             display: flex;
             align-items: center;
-            height: 43px;
+            height: 34px;
             border: 1px solid #ccc;
             font-size: 16px;
             color: black;

src/views/collect/collect1.vue

@@ -276,7 +276,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/collect/collect2.vue

@@ -263,7 +263,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding0.vue

@@ -299,7 +299,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value =

src/views/holding/holding0_DiaEdit.vue

@@ -145,7 +145,7 @@
         </el-form-item>
       </div>
       <div class="row">
-         <el-form-item label="完残状况：">
+         <el-form-item label="完残状况：" prop="repairRemark">
           <el-input v-model="ruleForm.repairRemark" placeholder="请输入"></el-input>
         </el-form-item>
       </div>
@@ -378,7 +378,8 @@ export default {
         name: [{ required: true, message: '不能为空', trigger: 'blur' }],
         registerNum: [{ required: true, message: '不能为空', trigger: 'blur' }],
         age: [{ required: true, message: '不能为空', trigger: 'blur' }],
-        length: [{ required: true, message: '不能为空', trigger: 'blur' }]
+        length: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        repairRemark: [{ max: 50, message: '不能超过50个字符', trigger: 'blur' }]
       },
       // 上传图片和文件
       fileList: [],
@@ -518,6 +519,7 @@ export default {
         this.$emit('updateUI')
       } catch (error) {
         console.log(error)
+        this.$message.warning('有输入不符合表单要求！')
       }
     },
     // 点击取消

src/views/holding/holding0_Dialog.vue

@@ -146,7 +146,7 @@
       </div>
 
       <div class="row">
-         <el-form-item label="完残状况：">
+         <el-form-item label="完残状况：" prop="repairRemark">
           <el-input v-model="ruleForm.repairRemark" placeholder="请输入"></el-input>
         </el-form-item>
       </div>
@@ -382,7 +382,8 @@ export default {
         name: [{ required: true, message: '不能为空', trigger: 'blur' }],
         registerNum: [{ required: true, message: '不能为空', trigger: 'blur' }],
         age: [{ required: true, message: '不能为空', trigger: 'blur' }],
-        length: [{ required: true, message: '不能为空', trigger: 'blur' }]
+        length: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        repairRemark: [{ max: 50, message: '不能超过50个字符', trigger: 'blur' }]
       },
       // 上传图片和文件
       fileList: [],
@@ -551,7 +552,7 @@ export default {
         this.cancel()
       } catch (error) {
         console.log(error)
-        this.$message.warning('有必须输入的字段为空！')
+        this.$message.warning('有输入不符合表单要求！')
       }
     },
     // 点击取消

src/views/holding/holding1.vue

@@ -264,7 +264,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding2.vue

@@ -276,7 +276,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +

src/views/holding/holding3.vue

@@ -98,6 +98,22 @@
                   <el-button type="text" @click="myLook(row)">查看</el-button>
                 </template>
               </el-table-column>
+              <!-- <el-table-column label="入库位置" width="230">
+                <template #default="scope">
+                 {{scope.$index}}
+
+                <el-cascader
+                  ref="cascaderAddr"
+                  placeholder=""
+                  disabled
+                  style="width: 80%"
+                  :props="{ value: 'id', label: 'name' }"
+                  v-model="tableData[scope.$index].storageId"
+                  :options="options"
+                ></el-cascader>
+
+                </template>
+              </el-table-column> -->
             </el-table>
           </div>
           <!-- 图片显示 -->
@@ -126,6 +142,7 @@
   </div>
 </template>
 <script>
+// import { getTreeList } from '@/apis/statistics0'
 import axios from '@/utils/request'
 import { getHolding3List } from '@/apis/holding3'
 import { getGoodsType } from '@/apis/holding'
@@ -135,6 +152,8 @@ export default {
   components: { TabList },
   data () {
     return {
+      // options: [],
+      // 入库位置数据
       // 导出表格的数据
       json_fields: {
         藏品名称: 'name', // 常规字段
@@ -144,17 +163,24 @@ export default {
         原名: 'primitiveName',
         年代: 'age',
         文物类别: 'goodsTypeName',
-        文物质地: 'texture',
-        数量类型: 'amountType',
-        具体数量: 'amount',
+        文物级别: 'level',
+        质地类型: 'textureType',
+        质地类别: 'textureCategory',
+        质地: 'texture',
         通长: 'length',
         通宽: 'width',
         通高: 'height',
-        具体质量: 'quality',
         完残程度: 'integrity',
-        完残状况: 'repairRemark',
         保存状态: 'repair',
-        入藏时间范围: 'checkInScope'
+        完残状况: 'repairRemark',
+        数量类型: 'amountType',
+        具体数量: 'amount',
+        质量范围: 'qualityScope',
+        具体质量: 'quality',
+        入藏时间范围: 'checkInScope',
+        入藏年度: 'checkInYear'
+        // 入库位置: '',
+        // 出库位置: 'outPath'
       },
       json_data: [],
       json_meta: [
@@ -208,6 +234,9 @@ export default {
         else if (v.amountType === 1) v.amountType = '一套多件'
         v.integrity = this.spoil(v.integrity)
         v.repair = this.mySave(v.repair)
+        v.level = this.myWwjb(v.level)
+        if (v.textureType === 0) v.textureType = '单一质地'
+        else if (v.textureType === 1) v.textureType = '复合质地'
       })
     },
     // 分页器
@@ -236,6 +265,27 @@ export default {
       this.imgList = res.data.list
       this.tableData = res.data.list
       this.tableData.forEach(v => {
+        // 位置信息处理
+        // console.log(1111, v.storageId.split(',')[2])
+        // this.options.forEach(p => {
+        //   // eslint-disable-next-line
+        //   if(p.id== v.storageId.split(',')[0]) {
+        //     v.myweizhi = p.name
+        //     p.children.forEach(p2 => {
+        //       // eslint-disable-next-line
+        //       if(p2.id==v.storageId.split(',')[1]) {
+        //         v.myweizhi += '/' + p2.name + '/'
+        //         p2.children.forEach(p3 => {
+        //           // eslint-disable-next-line
+        //           if (p3.id == v.storageId.split(',')[2]) {
+        //             v.myweizhi += p3.name
+        //           }
+        //         })
+        //       }
+        //     })
+        //   }
+        // })
+
         // if (v.textureType === 0) v.textureType = '单一质地'
         // else if (v.textureType === 1) v.textureType = '复合质地'
         if (v.status === 0) v.status = '待入库'
@@ -246,6 +296,9 @@ export default {
         v.numTypeId = this.mycategory(v.numTypeId)
         v.integrity = this.spoil(v.integrity)
         v.repair = this.mySave(v.repair)
+        v.level = this.myWwjb(v.level)
+        if (v.textureType === 0) v.textureType = '单一质地'
+        else if (v.textureType === 1) v.textureType = '复合质地'
       })
     },
     // 控制显示表格还是图片
@@ -255,6 +308,9 @@ export default {
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
   async created () {
+    // 获取位置信息
+    // const res1 = await getTreeList()
+    // this.options = res1.data
     // 获取藏品类型
     const res = await getGoodsType()
     this.mytype = res.data
@@ -277,6 +333,9 @@ export default {
       else if (v.amountType === 1) v.amountType = '一套多件'
       v.integrity = this.spoil(v.integrity)
       v.repair = this.mySave(v.repair)
+      v.level = this.myWwjb(v.level)
+      if (v.textureType === 0) v.textureType = '单一质地'
+      else if (v.textureType === 1) v.textureType = '复合质地'
     })
   },
   beforeCreate () {}, // 生命周期 - 创建之前

src/views/holding/holding3_look.vue

@@ -17,49 +17,53 @@
           <div v-else style="background-color: #85ce61">已出库</div>
         </div>
         <div class="info">
-          <div class="row">
-            <div><span>藏品名称：</span>{{ myObj.name }}</div>
-            <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
-          </div>
-          <div class="row">
-            <div><span>编号类型：</span>{{ myObj.numTypeId }}</div>
-            <div><span>藏品编号：</span>{{ myObj.num }}</div>
-          </div>
-          <div class="row">
-            <div><span>原名：</span>{{ myObj.primitiveName }}</div>
-            <div><span>年代：</span>{{ myObj.age }}</div>
-          </div>
-          <div class="row">
-            <div><span>文物类别：</span>{{ myObj.goodsTypeName }}</div>
-            <div><span>文物质地：</span>{{ myObj.texture }}</div>
-          </div>
-          <div class="row">
-            <div><span>数量类型：</span>{{ myObj.amountType }}</div>
-            <div><span>具体数量：</span>{{ myObj.amount }}</div>
-          </div>
-          <div class="row">
-            <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>{{myObj.goodsTypeName}}</div> -->
-            <div><span>具体质量：</span>{{ myObj.quality }}</div>
-            <div><span>完残程度：</span>{{ myObj.integrity }}</div>
-          </div>
-
             <div class="row">
-                <div><span>完残状况：</span>{{ myObj.repairRemark }}</div>
+              <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.goodsTypeName?myObj.goodsTypeName:'-' }}</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>1111</div> -->
-          </div>
-          <div class="row">
-            <div><span>保存状态：</span>{{ myObj.repair }}</div>
-            <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
-          </div>
-          <div class="row">
             <div>
               <span>入库位置：</span>{{ rukuTxt ? rukuTxt : "-" }}
             </div>
@@ -102,41 +106,49 @@
           </div>
           <div class="info">
             <div class="row">
-              <div><span>藏品名称：</span>{{ myObj.name }}</div>
-              <div><span>总登记号：</span>{{ myObj.registerNum }}</div>
+              <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.numTypeId }}</div>
-              <div><span>藏品编号：</span>{{ myObj.num }}</div>
+              <div><span>文物类别：</span>{{ myObj.goodsTypeName?myObj.goodsTypeName:'-' }}</div>
+              <div><span>文物级别：</span>{{ myObj.level?myObj.level:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>原名：</span>{{ myObj.primitiveName }}</div>
-              <div><span>年代：</span>{{ myObj.age }}</div>
+              <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.goodsTypeName }}</div>
-              <div><span>文物质地：</span>{{ myObj.texture }}</div>
+              <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.amountType }}</div>
-              <div><span>具体数量：</span>{{ myObj.amount }}</div>
+              <div><span>完残程度：</span>{{ myObj.integrity?myObj.integrity:'-' }}</div>
+              <div><span>保存状态：</span>{{ myObj.repair?myObj.repair:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>通长：</span>{{ myObj.length }}</div>
-              <div><span>通宽：</span>{{ myObj.width }}</div>
-              <div><span>通高：</span>{{ myObj.height }}</div>
+              <div><span>完残状况：</span>{{ myObj.repairRemark?myObj.repairRemark:'-' }}</div>
             </div>
             <div class="row">
-              <!-- <div><span>文物类别：</span>{{myObj.goodsTypeName}}</div> -->
-              <div><span>具体质量：</span>{{ myObj.quality }}</div>
-              <div><span>完残程度：</span>{{ myObj.integrity }}</div>
+              <div><span>数量类型：</span>{{ myObj.amountType?myObj.amountType:'-' }}</div>
+              <div><span>具体数量：</span>{{ myObj.amount?myObj.amount:'-' }}</div>
             </div>
             <div class="row">
-                <div><span>完残状况：</span>{{ myObj.repairRemark }}</div>
+              <div><span>质量范围：</span>{{ myObj.qualityScope?myObj.qualityScope:'-' }}</div>
+              <div><span>具体质量：</span>{{ myObj.quality?myObj.quality:'-' }}</div>
             </div>
             <div class="row">
-              <div><span>保存状态：</span>{{ myObj.repair }}</div>
-              <div><span>入藏时间范围：</span>{{ myObj.checkInScope }}</div>
+              <div><span>入藏时间范围：</span>{{ myObj.checkInScope?myObj.checkInScope:'-' }}</div>
+              <div><span>入藏年度：</span>{{ myObj.checkInYear?myObj.checkInYear:'-' }}</div>
             </div>
             <div class="row">
               <div>
@@ -345,7 +357,7 @@ body .el-table::before {
     }
   }
   .info {
-    margin: 20px 0 0 55px;
+    margin: 10px 0 0 55px;
     width: 90%;
     // margin-bottom: 60px;
     .row {
@@ -366,7 +378,7 @@ body .el-table::before {
       & > div {
         padding-left: 20px;
         flex: 1;
-        height: 38px;
+        height: 33px;
         display: flex;
         align-items: center;
         border: 1px solid #ccc;

src/views/holding/holding5.vue

@@ -263,7 +263,7 @@ export default {
         date.push(this.gettime(e[i]))
       }
       this.myData.startTime = date[0]
-      this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
+      if (date[1]) this.myData.endTime = date[1].replace('00:00:00', '23:59:59')
     },
     gettime (data) {
       const value = data.getFullYear() + '-' +