From c67a8c5b44524e06cd58d9751e4b72aa62954412 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 13:48:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/business/inspectionReview/index.vue | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index fcebf1b..d065a44 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -27,18 +27,6 @@
:rowClassName="rowClassName" :height="'calc(100vh - 270px)'" @pagination="pagination"
key="tableData0"></lims-table>
</div>
-<!-- <div style="width: 100%;height: 100%;" v-if="activeFace >0 && isCopper == null">-->
-<!-- <Add :active="activeFace" :currentId="currentId"/>-->
-<!-- </div>-->
-<!-- <div style="width: 100%;height: 100%;" v-if="activeFace >0 && isCopper == 0">-->
-<!-- <CustomsInspection :active="activeFace" :customsInspection="customsInspection" :currentId="currentId"/>-->
-<!-- </div>-->
-<!-- <div style="width: 100%;height: 100%;" v-if="activeFace >0 && isCopper == 1">-->
-<!-- <CopperOrder :active="activeFace" :currentId="currentId"></CopperOrder>-->
-<!-- </div>-->
-<!-- <Inspection v-if="state>0" @goback="goback" :orderId="orderId" :sonLaboratory="componentData.entity.sonLaboratory" :typeSource="typeSource" :state="state"/>-->
-<!-- <!–浜т笟閾句俊鎭煡鐪�–>-->
-<!-- <ShowInfo v-if="showInfoDialog" :showInfoDialog="showInfoDialog" ref="showInfoDialog"></ShowInfo>-->
<!--鎶ュ憡鏌ョ湅-->
<el-dialog title="鎶ュ憡鏌ョ湅" :visible.sync="issuedVisible" width="80vw" :modal-append-to-body="false"
:fullscreen="fullscreen">
@@ -65,7 +53,6 @@
import {selectInsOrderPlanList, selectUserCondition} from "@/api/business/inspectionTask";
import {mapGetters} from "vuex";
import {upReportUrl} from "@/api/business/insReport";
-import {delfile} from "@/api/business/rawMaterialOrder";
import filePreview from "@/components/Preview/filePreview.vue";
export default {
@@ -179,10 +166,12 @@
},
{
name: "涓婁紶",
- type: "text",
- clickFun: (row) => {
- this.handleUpload(row);
- },
+ type: "upload",
+ accept: '.doc,.docx',
+ url: '/insReport/inReport',
+ uploadIdFun: (row) => {
+ return row.insReportId
+ }
},
{
name: "杩樺師",
@@ -355,17 +344,13 @@
})
},
// 涓婁紶鎶ュ憡
- handleUpload () {
+ handleUpload (row) {
},
// 涓嬭浇鎶ュ憡
download(row) {
- let url = (row.urlS===null||row.urlS==='')?row.url:row.urlS
- const link = document.createElement('a');
- link.href = this.javaApi + url;
- link.target = '_blank';
- document.body.appendChild(link);
- link.click();
+ let url = this.javaApi+'/word/' + (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ this.$download.saveAs(url, row.fileName);
},
// 杩樺師鎿嶄綔
handleRestore(row) {
--
Gitblit v1.9.3