暂时跑通

src/apis/holding.js

@@ -87,11 +87,3 @@ export const auditH0Tow = (data) => {
     data
   })
 }
-// 批量入库
-export const entering = (data) => {
-  return axios({
-    method: 'post',
-    url: '/cms/goods/isStorages',
-    data
-  })
-}

src/views/holding/holding0.vue

@@ -66,7 +66,7 @@
               </el-table-column>
               <el-table-column label="操作" width="150">
                 <template #default='{row}'>
-                  <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'||row.status==='审核通过'">查看</el-button>
+                  <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'||row.status==='审核通过'" @click="mylook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待办理'||row.status==='草稿中'||row.status==='待审核'" @click="editH0(row)">编辑</el-button>
                   <el-button type="text" v-if="row.status==='待审核'||row.status==='草稿中'" @click="auditH0(row)">审核</el-button>
                   <el-button type="text" @click="removeH0(row.id)" v-if="row.status!=='审核通过'">删除</el-button>
@@ -125,6 +125,13 @@ export default {
   },
   // 方法集合
   methods: {
+    // 点击查看
+    mylook (val) {
+      this.$router.push({
+        path: '/layout/holding0_result',
+        query: val
+      })
+    },
     // 点击编辑
     editH0 (val) {
       this.$router.push({

src/views/holding/holding0_audit.vue

@@ -120,7 +120,7 @@
 
 <script>
 import axios from '@/utils/request'
-import { getHoldingList, auditH0Tow, entering } from '@/apis/holding'
+import { getHoldingList, auditH0Tow } from '@/apis/holding'
 import TabList from '@/components/tabLeft.vue'
 import Holding0AuditDia from './holding0_audit_Dia.vue'
 export default {
@@ -165,9 +165,8 @@ export default {
     },
     // 点击提交
     async submit () {
-      const res = await auditH0Tow({ id: this.myData.id, status: this.myresult, reason: this.fromData.textarea })
-      const res2 = await entering(this.mySrt)
-      if (res.code === 0 && res2.code === 0) {
+      const res = await auditH0Tow({ id: this.myData.id, status: this.myresult, reason: this.fromData.textarea, isStorages: this.mySrt })
+      if (res.code === 0) {
         this.$message.success('提交成功')
         this.$router.push('/layout/holding0')
       }

src/views/holding/holding0_result.vue

@@ -15,31 +15,31 @@
         <div class="info">
           <div>
             <h4>登记编号：</h4>
-            <span>DJ2021081701</span>
+            <span>{{mydata.num}}</span>
           </div>
           <div>
             <h4>登记人员：</h4>
-            <span>Admin</span>
+            <span>{{mydata.realName}}</span>
           </div>
           <div>
             <h4>藏品来源：</h4>
-            <span>考古发掘与采集</span>
+            <span>{{mydata.sourceName}}</span>
           </div>
           <div>
             <h4>单位或个人：</h4>
-            <span>个人</span>
+            <span>{{mydata.unit}}</span>
           </div>
         </div>
         <div class="explain">
           <p>
             <span>登记说明：</span
-            >考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集
+            >{{mydata.description}}
           </p>
         </div>
         <div class="explain">
           <p>
             <span>审核说明：</span
-            >考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集考古发掘与采集
+            >{{mydata.reason}}
           </p>
         </div>
         <!-- 表格 -->
@@ -54,35 +54,25 @@
             style="width: 100%"
           >
             <el-table-column label="缩略图" width="120">
-              <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>
-            <el-table-column prop="name" label="总登记号" width="235">
+            <el-table-column prop="registerNum" label="总登记号" width="235">
             </el-table-column>
-            <el-table-column prop="address" label="藏品名称"> </el-table-column>
-            <el-table-column prop="name" label="类别" width="130">
+            <el-table-column prop="name" label="藏品名称"> </el-table-column>
+            <el-table-column prop="goodsTypeId" label="文物类别" width="130">
             </el-table-column>
-            <el-table-column prop="name" label="完残程度" width="220">
+            <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="130">
-              <template #default>
-                <el-select
-                  v-model="auditResult"
-                  placeholder="请选择"
-                >
-                  <el-option label="入库" value="0"></el-option>
-                  <el-option label="不入库" value="1"></el-option>
-                  <el-option label="不通过" value="2"></el-option>
-                </el-select>
-              </template>
+            <el-table-column prop="isStorage" label="审核结果" width="130">
             </el-table-column>
           </el-table>
         </div>
@@ -92,18 +82,28 @@
           </div>
       </div>
     </div>
+        <!-- 点击查看显示弹窗 -->
+    <Holding0AuditDia :dialogFormVisible.sync='isShow' :myObj='myObj'/>
+
   </div>
 </template>
 
 <script>
+import Holding0AuditDia from './holding0_audit_Dia.vue'
+import axios from '@/utils/request'
+import { getHoldingList } from '@/apis/holding'
 import TabList from '@/components/tabLeft.vue'
 export default {
   name: 'holding0_result',
   // import引入的组件需要注入到对象中才能使用
-  components: { TabList },
+  components: { TabList, Holding0AuditDia },
   data () {
     // 这里存放数据
     return {
+      myObj: {},
+      // 服务器前缀地址
+      baseURL: '',
+      mydata: {},
       // 点击查看显示弹窗
       isShow: false,
       fromData: {
@@ -114,18 +114,7 @@ export default {
       },
       auditResult: '',
       // 表格数据
-      tableData: [
-        {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        },
-        {
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }
-      ]
+      tableData: []
     }
   },
   // 监听属性 类似于data概念
@@ -134,12 +123,29 @@ export default {
   watch: {},
   // 方法集合
   methods: {
+    // 点击查看
+    myLook (val) {
+      this.myObj = val
+      this.isShow = true
+    },
     skip (index) {
       this.$router.push(`/layout/holding${index}`).catch(() => {})
     }
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
-  created () {},
+  async created () {
+    // 获取服务器前缀地址
+    this.baseURL = axios.defaults.baseURL
+    this.mydata = this.$route.query
+    const res = await getHoldingList(this.mydata.id)
+    this.tableData = res.data
+    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)
+    })
+  },
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted () {},
   beforeCreate () {}, // 生命周期 - 创建之前

src/views/holding/holding3.vue

@@ -23,8 +23,8 @@
               >
               </el-option>
             </el-select>
-            <span>藏品年代：</span>
-            <el-select v-model="age" placeholder="请选择">
+            <span v-if="0">藏品年代：</span>
+            <el-select v-if="0" v-model="age" placeholder="请选择">
               <el-option
                 v-for="item in source2"
                 :key="item.value"