From 0c285153bdee6074d321f6cb1e49d8650222f984 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 05 三月 2025 10:14:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/index.vue | 1
src/layout/components/Navbar.vue | 4 +-
src/views/system/user/profile/index.vue | 6 +-
src/views/business/inspectionReview/index.vue | 12 +++---
src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue | 22 +++++++++--
src/views/business/reportPreparation/index.vue | 54 ++++++++++++--------------
src/views/statisticalCharts/qualificationRateStatistics/index.vue | 2 -
src/api/business/rawMaterialOrder.js | 2
8 files changed, 55 insertions(+), 48 deletions(-)
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index 31f9cb3..48b6b51 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -272,7 +272,7 @@
})
}
// 妫�楠屽崟涓嬬殑闄勪欢鍒楄〃-鍒犻櫎
-export function delfile(query) {
+export function delFile(query) {
return request({
url: '/insOrderPlan/delfile',
method: 'delete',
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e9566ab..79036de 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -10,7 +10,7 @@
</div>
<div class="right-menu">
<div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar" />
+ <el-avatar shape="square" :size="30">{{ nickName.substring(0, 1) }}</el-avatar>
<span class="userName">{{ nickName }}</span>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
@@ -88,7 +88,7 @@
RuoYiDoc,
},
computed: {
- ...mapGetters(["avatar", "device", "nickName"]),
+ ...mapGetters(["device", "nickName"]),
setting: {
get() {
return this.$store.state.settings.showSettings;
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index c724ca4..6d48595 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -343,14 +343,14 @@
},
})
},
- // 涓婁紶鎶ュ憡
- handleUpload(row) {
-
- },
// 涓嬭浇鎶ュ憡
download(row) {
- let url = this.javaApi + '/word/' + (row.urlS === null || row.urlS === '') ? row.url : row.urlS
- this.$download.saveAs(url, row.fileName);
+ 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();
},
// 杩樺師鎿嶄綔
handleRestore(row) {
diff --git a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
index 1f2faab..6ff5627 100644
--- a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
@@ -46,13 +46,27 @@
methods: {
// 杩涘巶妫�楠屾姤鍛婁笅杞�
downLoad0 () {
- let url = this.javaApi+'/word/' + this.downLoadInfo.enterUrlS ? this.downLoadInfo.enterUrlS : this.downLoadInfo.enterUrl
- this.$download.saveAs(url, this.downLoadInfo.fileName);
+ let url = this.downLoadInfo.enterUrlS ? this.downLoadInfo.enterUrlS : this.downLoadInfo.enterUrl
+ if(url){
+ url = url.split('.')[0]+'.pdf'
+ const link = document.createElement('a');
+ link.href = this.javaApi + url;
+ link.target = '_blank';
+ document.body.appendChild(link);
+ link.click();
+ }
},
// 瀛ｅ害妫�楠屾姤鍛婁笅杞�
downLoad1 () {
- let url = this.javaApi+'/word/' + this.downLoadInfo.quarterUrlS ? this.downLoadInfo.quarterUrlS : this.downLoadInfo.quarterUrl
- this.$download.saveAs(url, this.downLoadInfo.fileName);
+ let url = this.downLoadInfo.quarterUrlS ? this.downLoadInfo.quarterUrlS : this.downLoadInfo.quarterUrl
+ if(url){
+ url = url.split('.')[0]+'.pdf'
+ const link = document.createElement('a');
+ link.href = this.javaApi + url;
+ link.target = '_blank';
+ document.body.appendChild(link);
+ link.click();
+ }
}
},
}
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 9ca8094..29da53d 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: [],
@@ -464,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'
@@ -528,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
@@ -574,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) {
@@ -871,6 +865,8 @@
this.refreshTable('page')
this.currentInfo = null;
this.approveVisible = false;
+ }).catch(() => {
+ this.loadingApprove = false;
})
},
handle(row) {
diff --git a/src/views/index.vue b/src/views/index.vue
index 84a4050..7f0f7d8 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -130,7 +130,6 @@
radius: ['40%', '60%'],
avoidLabelOverlap: false,
itemStyle: {
- borderRadius: 5,
borderColor: '#fff',
borderWidth: 2
},
diff --git a/src/views/statisticalCharts/qualificationRateStatistics/index.vue b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
index dae06dd..6b03b09 100644
--- a/src/views/statisticalCharts/qualificationRateStatistics/index.vue
+++ b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
@@ -216,7 +216,6 @@
right: '22%',
avoidLabelOverlap: false,
itemStyle: {
- borderRadius: 5,
borderColor: '#fff',
borderWidth: 2
},
@@ -250,7 +249,6 @@
right: '22%',
avoidLabelOverlap: false,
itemStyle: {
- borderRadius: 5,
borderColor: '#fff',
borderWidth: 2
},
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 529c564..e42c7b2 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -7,9 +7,9 @@
<span>涓汉淇℃伅</span>
</div>
<div>
- <div class="text-center">
- <userAvatar />
- </div>
+<!-- <div class="text-center">-->
+<!-- <userAvatar />-->
+<!-- </div>-->
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />鐢ㄦ埛鍚嶇О
--
Gitblit v1.9.3