xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-06-04 15:12:15 +08:00
parent 16c372dd67
commit eda91f92ee
4 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ABAP_AS_WITH_POOL.jcoDestination
View File

@ -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

9
ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
View File

@ -23,14 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectQuotFileVo"/>
<where>
and relation_id = #{relationId}
<if test="fileType != null and fileType != ''">
<if test="fileType == 'quotJsgfFile'">
and file_type in ('quotJsgfFile','quotXjFile')
</if>
<if test="fileType != 'quotJsgfFile'">
and file_type = #{fileType}
</if>
</if>
and file_type = #{fileType}
</where>
order by file_time desc
</select>

50
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -424,7 +424,7 @@
</el-table-column>
</el-table>
<el-divider content-position="left" class="customer_divider_text">询价附件(先保存再上传产品清单且必须是EXCEL文件)</el-divider>
<el-divider content-position="left" class="customer_divider_text">清单附件(先保存再上传且必须是EXCEL文件)</el-divider>
<div v-hasPermi="['quot:quot:quotXjFile']">
<el-upload class="upload-demo"
ref="upload"
@ -460,6 +460,42 @@
</el-table-column>
</el-table>
<el-divider content-position="left" class="customer_divider_text">技术附件(先保存再上传)</el-divider>
<div v-hasPermi="['quot:quot:quotJsgfFile']">
<el-upload class="upload-demo"
ref="upload"
name="quotFile"
:action="uploadUrl"
:headers="headers"
:data="{ relation_id: this.form.quotId,file_type: 'quotJsgfFile' }"
:on-success="handleAvatarSuccess"
:show-file-list="false"
:limit="1"
v-if="this.form.quotApprovalStatus == '0'">
<el-button size="small" type="primary" @click="uploadFile('quotJsgfFile')">上传文件</el-button>
</el-upload>
</div>
<el-table class="down" :data="quotJsgfFileList" border stripe style="width: 100%;margin-top: 10px;" height="300px">
<el-table-column prop="fileName" label="文件名称" ></el-table-column>
<el-table-column prop="fileSize" label="文件大小" width="150px">
<template slot-scope="scope">
<span v-if="scope.row.fileSize / 1024 / 1024 < 1">{{(scope.row.fileSize / 1024).toFixed(2) + 'KB'}}</span>
<span v-else>{{(scope.row.fileSize / 1024 / 1024).toFixed(2) + 'MB'}}</span>
</template>
</el-table-column>
<el-table-column prop="fileTime" label="上传时间" width="200px"></el-table-column>
<el-table-column width="150px" label="操作">
<template slot-scope="scope">
<el-button :key="Math.random()" size="small" type="text">
<a @click="downloadFile(scope.row.fileUrl)">下载</a>
</el-button>
<el-button :key="Math.random()" size="small" type="text" v-if="form.quotApprovalStatus == '0'">
<a @click="deleteFile(scope.row.fileId,'quotJsgfFile')">删除</a>
</el-button>
</template>
</el-table-column>
</el-table>
<div v-if="checkPermi(['quot:quot:jsxzInfo'])">
<el-divider content-position="left" class="customer_divider_text">技术协助</el-divider>
<el-row :gutter="8">
@ -526,9 +562,9 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="8">
<!--<el-row :gutter="8">
<el-col :span="24">
<el-divider content-position="center">技术规范要求(询价附件)</el-divider>
<el-divider content-position="center">技术规范要求(技术附件)</el-divider>
<div v-hasPermi="['quot:quot:quotJsgfFile']">
<el-upload class="upload-demo"
ref="upload"
@ -568,7 +604,7 @@
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-row>-->
<div v-if="showTl">
<el-divider content-position="center">特缆协助</el-divider>
<el-row :gutter="8">
@ -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();

2
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
View File

@ -79,7 +79,7 @@
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">技术规范要求(询价附件)</el-divider>
<el-divider content-position="center">技术规范要求(技术附件)</el-divider>
<el-row :gutter="8">
<el-col :span="24">
<el-table class="down" :data="quotJsgfFileList" border stripe style="width: 100%;" height="150px">