From 4f94a66bc8ad9a57295f161de9195d5528b1d181 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 08 四月 2025 11:55:16 +0800
Subject: [PATCH] 基础数据维护+原辅材下单修改
---
src/views/business/reportPreparation/index.vue | 83 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 44 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 9ca8094..b0d524c 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -22,11 +22,13 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
<el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</el-form-item>
</el-form>
+ </div>
+ <div style="text-align: right;margin-bottom: 10px">
+ <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -85,7 +87,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 +112,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 +186,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 +195,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,8 +207,9 @@
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 {
+ name: 'ReportPreparation',
components: { limsTable, onlyoffice },
data() {
return {
@@ -255,7 +257,7 @@
{ label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
{ label: '鎶芥', value: '鎶芥' },
{ label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
- { label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection' },
+ { label: '鍙潬鎬ф楠�', value: 'Quarterly inspection' },
],
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
isReport: 1,
@@ -329,11 +331,6 @@
]
}
],
- pageFile: {
- total: 0,
- size: 10,
- current: 1
- },
isCopper: null,
tableLoading: false,
valueTableData: [],
@@ -464,7 +461,7 @@
return this.javaApi + '/insReport/upAll'
},
fileAction() {
- return this.javaApi + '/unqualifiedHandler/uploadFileByUnqualified'
+ return this.javaApi + '/insOrderPlan/uploadFile'
},
fileAction1() {
return this.javaApi + '/insReport/inReport'
@@ -528,15 +525,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
@@ -558,37 +550,33 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
},
// 鍒犻櫎闄勪欢鏂囦欢
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) {
@@ -606,8 +594,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');
@@ -621,6 +612,7 @@
},
fileBeforeUpload(file) {
let flag = true
+ console.log('file----', file)
if (file.size > 1024 * 1024 * 10) {
this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
this.$refs.upload.clearFiles()
@@ -746,6 +738,7 @@
},
// 鏌ョ湅鎶ュ憡
viewIssued(row) {
+ console.log('this.javaApi', this.javaApi)
this.currentInfo = row;
let fileName = (row.urlS === null || row.urlS === '') ? row.url : row.urlS
let fileType = "docx"
@@ -824,7 +817,7 @@
},
// 鑾峰彇浜哄憳鍒楄〃
getAuthorizedPerson() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
@@ -871,6 +864,8 @@
this.refreshTable('page')
this.currentInfo = null;
this.approveVisible = false;
+ }).catch(() => {
+ this.loadingApprove = false;
})
},
handle(row) {
--
Gitblit v1.9.3