diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index f67dcdb..decb9d9 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
#for tests only !
-#Tue Jun 04 13:59:05 CST 2024
+#Tue Jun 04 14:39:31 CST 2024
jco.destination.pool_capacity=10
jco.client.lang=ZH
jco.client.ashost=172.19.0.120
@@ -7,5 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC
jco.client.sysnr=00
jco.destination.peak_limit=10
-jco.client.passwd=g]8^b-oV5)bg?0=#[a~}U*AcfC4BmB/D}?F8E5.6%iG`lg]L
+jco.client.passwd=g5KKZrvN-+Xtpu=Z,M*tL_-D%OFI;:Yt+;TW!Ku,Y~NxIG%z
jco.client.client=300
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
index 94b5075..2ccf1ba 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
@@ -23,14 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and relation_id = #{relationId}
-
-
- and file_type in ('quotJsgfFile','quotXjFile')
-
-
- and file_type = #{fileType}
-
-
+ and file_type = #{fileType}
order by file_time desc
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 19910c0..eaa4f6b 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -424,7 +424,7 @@
- 询价附件(先保存再上传产品清单且必须是EXCEL文件)
+ 清单附件(先保存再上传且必须是EXCEL文件)
+ 技术附件(先保存再上传)
+
+
+ 上传文件
+
+
+
+
+
+
+ {{(scope.row.fileSize / 1024).toFixed(2) + 'KB'}}
+ {{(scope.row.fileSize / 1024 / 1024).toFixed(2) + 'MB'}}
+
+
+
+
+
+
+ 下载
+
+
+ 删除
+
+
+
+
+
技术协助
@@ -526,9 +562,9 @@
-
+
特缆协助
@@ -1448,7 +1484,7 @@ export default {
});
}
},
- //获取报价单-技术规范附件列表 (包含询价附件)
+ //获取报价单-技术规范附件列表
getQuotJsgfFileList(){
const param = {relationId:this.form.quotId,fileType:'quotJsgfFile'}
quotFileList(param).then(response => {
@@ -1516,7 +1552,7 @@ export default {
this.$modal.msgSuccess(res.msg);
if(activeName=='quotXjFile'){
this.getQuotXjFileList();
- }else if(activeName=='quotJsInfo'){
+ }else if(activeName=='quotJsgfFile'){
this.getQuotJsgfFileList();
}else if(activeName=='quotFkFile'){
this.getQuotFkFileList();
@@ -1538,7 +1574,7 @@ export default {
quotFileDelete(fileId).then(response => {
if(activeName=='quotXjFile'){
this.getQuotXjFileList();
- }else if(activeName=='quotJsInfo'){
+ }else if(activeName=='quotJsgfInfo'){
this.getQuotJsgfFileList();
}else if(activeName=='quotFkFile'){
this.getQuotFkFileList();
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
index c66365c..5f35acf 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
@@ -79,7 +79,7 @@
- 技术规范要求(询价附件)
+ 技术规范要求(技术附件)