From 4b9dfff19ff70db47f99cb93070d0650267c6896 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 06 三月 2025 16:22:19 +0800
Subject: [PATCH] 检验任务-添加查看工时功能
---
src/views/business/reportPreparation/index.vue | 75 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index a64b543..d47b9cf 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -85,7 +85,7 @@
@click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
- <div v-if="issuedVisible" style="height: 80vh;">
+ <div v-if="issuedVisible" style="height: 70vh;">
<onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
</div>
<span slot="footer" class="dialog-footer">
@@ -110,7 +110,7 @@
@click="fullscreen = true;"></i>
<img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
</div>
- <div v-if="approveVisible" style="height: 80vh;">
+ <div v-if="approveVisible" style="height: 70vh;">
<onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
</div>
<span slot="footer" class="dialog-footer">
@@ -184,8 +184,8 @@
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
- <lims-table :tableData="tableDataFile" :column="columnFile" @pagination="paginationFile" height="500px"
- key="tableDataFile" :page="pageFile" :tableLoading="tableLoadingFile"></lims-table>
+ <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
+ key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
</el-dialog>
</div>
</template>
@@ -193,7 +193,6 @@
<script>
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
// import ShowInfo from "../do/b1-material-ins-order/showInfo.vue";
-import file from "@/utils/file";
import {
downAll,
examineReport,
@@ -206,7 +205,7 @@
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
-import { delfile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
+import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
export default {
components: { limsTable, onlyoffice },
data() {
@@ -329,11 +328,6 @@
]
}
],
- pageFile: {
- total: 0,
- size: 10,
- current: 1
- },
isCopper: null,
tableLoading: false,
valueTableData: [],
@@ -403,15 +397,19 @@
formatData: (params) => {
if (params == 0) {
return "涓嶉�氳繃";
- } else {
+ } else if (params == 1) {
return "閫氳繃";
+ } else {
+ return null
}
},
formatType: (params) => {
if (params == 0) {
return "danger";
- } else {
+ } else if (params == 1) {
return "success";
+ } else {
+ return null
}
},
},
@@ -426,15 +424,19 @@
formatData: (params) => {
if (params == 0) {
return "涓嶆壒鍑�";
- } else {
+ } else if (params == 1) {
return "鎵瑰噯";
+ } else {
+ return null
}
},
formatType: (params) => {
if (params == 0) {
return "danger";
- } else {
+ } else if (params == 1) {
return "success";
+ } else {
+ return null
}
},
},
@@ -456,7 +458,7 @@
return this.javaApi + '/insReport/upAll'
},
fileAction() {
- return this.javaApi + '/unqualifiedHandler/uploadFileByUnqualified'
+ return this.javaApi + '/insOrderPlan/uploadFile'
},
fileAction1() {
return this.javaApi + '/insReport/inReport'
@@ -520,15 +522,10 @@
this.tableLoadingFile = false
if (res.code === 200) {
this.tableDataFile = res.data.records
- this.pageFile.total = res.data.total
}
}).catch(err => {
this.tableLoadingFile = false
})
- },
- paginationFile(page) {
- this.pageFile.size = page.limit
- this.getFileList()
},
closeFilesLook() {
this.filesDialogVisible = false
@@ -566,21 +563,26 @@
},
// 鍒犻櫎闄勪欢鏂囦欢
delete(row) {
- this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
+ this.$confirm('姝ゆ搷浣滃皢鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
}).then(() => {
- delfile({ id: row.id }).then(res => {
- if (res.code === 500) {
- return
- }
+ this.tableLoadingFile = true
+ delFile({ id: row.id }).then(res => {
+ this.tableLoadingFile = false
this.$message.success('鍒犻櫎鎴愬姛')
- this.getList()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
+ this.getFileList()
+ }).catch(err => {
+ this.tableLoadingFile = false
+ console.log('err---', err);
})
- }).catch(() => { })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ })
},
// 鏌ョ湅浜т笟閾句俊鎭�
openInfoDialog(row) {
@@ -598,8 +600,11 @@
this.outLoading = true
downAll({ ids: str }).then(res => {
this.outLoading = false
- this.$download.saveAs(this.javaApi + res.message, row.fileName);
+ this.$download.zip(res.data, '鎶ュ憡.zip');
+ }).catch(() => {
+ this.outLoading = false
})
+
},
beforeUpload(file) {
const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');
@@ -863,6 +868,8 @@
this.refreshTable('page')
this.currentInfo = null;
this.approveVisible = false;
+ }).catch(() => {
+ this.loadingApprove = false;
})
},
handle(row) {
--
Gitblit v1.9.3