Merge branch 'master' of ssh://gogs.hanyiyun.com:2222/liangxuying/LabCenter

src/views/openOrder/components/enclosureDetail.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: 阿小凉
  * @Date: 2022-06-30 17:16:35
- * @LastEditTime: 2022-08-10 14:42:51
+ * @LastEditTime: 2022-09-28 11:19:33
  * @Description: 停调补课审核
  * @LastEditors: 阿小凉
 -->
 <template>
   <el-dialog
     :before-close="handleClose"
-    title="附件详情"
+    :title="title"
     :visible.sync="dialogVisible"
     width="800px"
   >
@@ -36,6 +36,7 @@
       return {
         dialogVisible: false,
         imgList: [],
+        title: '',
       }
     },
 
@@ -44,9 +45,15 @@
         this.imgList = []
         this.dialogVisible = false
       },
-      showEdit(row) {
+      showEdit(row, type) {
         this.imgList = row
         this.dialogVisible = true
+        if (type == 1) {
+          this.title = '附件详情'
+        }
+        if (type == 2) {
+          this.title = '回执详情'
+        }
       },
     },
   }

src/views/openOrder/orderList.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: 阿小凉
  * @Date: 2022-06-30 16:19:47
- * @LastEditTime: 2022-09-26 18:22:52
- * @Description: 
+ * @LastEditTime: 2022-09-28 11:20:22
+ * @Description:
  * @LastEditors: 阿小凉
 -->
 <template>
@@ -160,7 +160,7 @@
               <div
                 v-if="row.enclosure.length > 0"
                 class="status_text"
-                @click="lookEnclosure(row.enclosure_resource)"
+                @click="lookEnclosure(row.enclosure_resource, '1')"
               >
                 查看附件
               </div>
@@ -238,7 +238,16 @@
           min-width="180"
         >
           <template #default="{ row }">
-            <el-button type="text" @click="handleDetail(row)">查看</el-button>
+            <el-button
+              v-if="row.status == 7"
+              type="text"
+              @click="lookEnclosure(row.receipt_resource, '2')"
+            >
+              查看回执
+            </el-button>
+            <el-button type="text" @click="handleDetail(row)">
+              查看详情
+            </el-button>
             <el-button
               v-if="
                 row.status !== 7 &&
@@ -511,7 +520,7 @@
         })
       },
       //查看文件
-      lookEnclosure(row) {
+      lookEnclosure(row, type) {
         // var index = row[0].url.lastIndexOf('.')
         // //获取后缀
         // var ext = row[0].url.substr(index + 1)
@@ -521,7 +530,7 @@
         // } else {
         //   this.$refs['enclosure-detil'].showEdit(row)
         // }
-        this.$refs['enclosure-detil'].showEdit(row)
+        this.$refs['enclosure-detil'].showEdit(row, type)
       },
       //下载申请表
       handlePrint(row) {