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

'123'

This commit is contained in:
xd 2024-05-20 09:03:19 +08:00
parent eb04079880
commit 033dadd6ef
8 changed files with 57 additions and 51 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 ! #for tests only !
#Fri May 17 16:58:54 CST 2024 #Mon May 20 08:55:39 CST 2024
jco.destination.pool_capacity=10 jco.destination.pool_capacity=10
jco.client.lang=ZH jco.client.lang=ZH
jco.client.ashost=172.19.0.120 jco.client.ashost=172.19.0.120
@ -7,5 +7,5 @@ jco.client.saprouter=
jco.client.user=RFC jco.client.user=RFC
jco.client.sysnr=00 jco.client.sysnr=00
jco.destination.peak_limit=10 jco.destination.peak_limit=10
jco.client.passwd=654321 jco.client.passwd=wneBD(:uBgYaG3?tEZZW_d~92AB;6|@X;s=FehY#L^VVLLbl
jco.client.client=300 jco.client.client=300

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -91,7 +91,7 @@ public class QuotController extends BaseController
* 新增报价 * 新增报价
*/ */
@PreAuthorize("@ss.hasPermi('quot:quot:add')") @PreAuthorize("@ss.hasPermi('quot:quot:add')")
@Log(title = "报价", businessType = BusinessType.INSERT) @Log(title = "报价单新增", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody Quot quot) public AjaxResult add(@RequestBody Quot quot)
{ {
@ -106,7 +106,7 @@ public class QuotController extends BaseController
* 修改报价 * 修改报价
*/ */
@PreAuthorize("@ss.hasPermi('quot:quot:edit')") @PreAuthorize("@ss.hasPermi('quot:quot:edit')")
@Log(title = "报价", businessType = BusinessType.UPDATE) @Log(title = "报价单修改", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody Quot quot) public AjaxResult edit(@RequestBody Quot quot)
{ {
@ -118,7 +118,7 @@ public class QuotController extends BaseController
* 删除报价 * 删除报价
*/ */
@PreAuthorize("@ss.hasPermi('quot:quot:remove')") @PreAuthorize("@ss.hasPermi('quot:quot:remove')")
@Log(title = "报价", businessType = BusinessType.DELETE) @Log(title = "报价单删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{quotIds}") @DeleteMapping("/{quotIds}")
public AjaxResult remove(@PathVariable String[] quotIds) public AjaxResult remove(@PathVariable String[] quotIds)
{ {

4
ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml
View File

@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="quotHjJoins"> <sql id="quotHjJoins">
left join sys_user u on u.user_name=a.create_by left join sys_user u on u.user_name=a.create_by
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join quot q on q.quot_ht_id = a.quot_hj_id left join quot q on q.quot_hj_id = a.quot_hj_id
</sql> </sql>
<sql id="selectQuotHjVo"> <sql id="selectQuotHjVo">
@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectQuotHjByQuotHjId" parameterType="String" resultMap="QuotHjResult"> <select id="selectQuotHjByQuotHjId" parameterType="String" resultMap="QuotHjResult">
<include refid="selectQuotHjVo"/> <include refid="selectQuotHjVo"/>
where quot_hj_id = #{quotHjId} where a.quot_hj_id = #{quotHjId}
</select> </select>
<insert id="insertQuotHj" parameterType="QuotHj"> <insert id="insertQuotHj" parameterType="QuotHj">

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

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

31
ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
View File

@ -67,22 +67,21 @@
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="核价附件"> <el-divider content-position="center">核价附件</el-divider>
<div v-hasPermi="['priceVerification:priceVerification:uploadFile']"> <div v-hasPermi="['priceVerification:priceVerification:uploadFile']">
<el-upload class="upload-demo" <el-upload class="upload-demo"
ref="upload" ref="upload"
name="quotFile" name="quotFile"
:action="uploadUrl" :action="uploadUrl"
:headers="headers" :headers="headers"
:data="{ relation_id: this.form.quotHjId,file_type: 'quotHjFile' }" :data="{ relation_id: this.form.quotHjId,file_type: 'quotHjFile' }"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:show-file-list="false" :show-file-list="false"
:limit="1" :limit="1"
v-if="this.form.quotHjApprovalStatus == '1'"> v-if="this.form.quotHjApprovalStatus == '1'">
<el-button size="small" type="primary">上传文件</el-button> <el-button size="small" type="primary">上传文件</el-button>
</el-upload> </el-upload>
</div> </div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">

2
ruoyi-ui/src/views/priceVerification/priceVerification/index.vue
View File

@ -50,7 +50,7 @@
</el-table-column> </el-table-column>
<el-table-column label="核价日期" align="center" prop="quotHjPricingDate" width="180"> <el-table-column label="核价日期" align="center" prop="quotHjPricingDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.quotHjPricingDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.quotHjPricingDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createName" width="150px"/> <el-table-column label="创建人" align="center" prop="createName" width="150px"/>

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

@ -104,11 +104,16 @@
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/> <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
<el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/> <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
<el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/> <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
<el-table-column label="询价日期" align="center" prop="quotInquiryDate" width="150px"> <el-table-column label="询价日期" align="center" prop="quotInquiryDate" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.quotInquiryDate) }}</span> <span>{{ parseTime(scope.row.quotInquiryDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报价日期" align="center" prop="quotQuotationDate" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.quotQuotationDate) }}</span>
</template>
</el-table-column>
<el-table-column label="反馈说明" align="center" prop="quotFeedbackExplanation" width="150px"/> <el-table-column label="反馈说明" align="center" prop="quotFeedbackExplanation" width="150px"/>
<el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px"> <el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -223,10 +228,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="反馈说明" prop="quotFeedbackExplanation"> <el-form-item label="反馈说明" prop="quotFeedbackExplanation">
<el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写" :disabled="true"/> <el-input type="textarea" autosize v-model="form.quotFeedbackExplanation" placeholder="报价组填写"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -373,22 +378,21 @@
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="技术规范要求"> <el-divider content-position="center">技术规范要求(询价附件)</el-divider>
<div v-hasPermi="['quot:quot:quotJsgfFile']"> <div v-hasPermi="['quot:quot:quotJsgfFile']">
<el-upload class="upload-demo" <el-upload class="upload-demo"
ref="upload" ref="upload"
name="quotFile" name="quotFile"
:action="uploadUrl" :action="uploadUrl"
:headers="headers" :headers="headers"
:data="{ relation_id: this.form.quotId,file_type: 'quotJsgfFile' }" :data="{ relation_id: this.form.quotId,file_type: 'quotJsgfFile' }"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:show-file-list="false" :show-file-list="false"
:limit="1" :limit="1"
v-if="this.form.quotJsxzApprovalStatus == '0'"> v-if="this.form.quotJsxzApprovalStatus == '0'">
<el-button size="small" type="primary">上传文件</el-button> <el-button size="small" type="primary">上传文件</el-button>
</el-upload> </el-upload>
</div> </div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">
@ -573,11 +577,7 @@
</el-row> </el-row>
<el-row :gutter="8"> <el-row :gutter="8">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="核价附件"></el-form-item> <el-divider content-position="center">核价附件</el-divider>
</el-col>
</el-row>
<el-row :gutter="8">
<el-col :span="24">
<el-table class="down" :data="quotHjFileList" border stripe style="width: 100%;" height="150px"> <el-table class="down" :data="quotHjFileList" border stripe style="width: 100%;" height="150px">
<el-table-column prop="fileName" label="文件名称" width="450px"></el-table-column> <el-table-column prop="fileName" label="文件名称" width="450px"></el-table-column>
<el-table-column prop="fileSize" label="文件大小" width="100px"> <el-table-column prop="fileSize" label="文件大小" width="100px">
@ -1131,7 +1131,7 @@ export default {
this.quotFkFileList = response.rows; this.quotFkFileList = response.rows;
}); });
}, },
//获取报价单-技术规范附件列表 //获取报价单-技术规范附件列表 (包含询价附件)
getQuotJsgfFileList(){ getQuotJsgfFileList(){
const param = {relationId:this.form.quotId,fileType:'quotJsgfFile'} const param = {relationId:this.form.quotId,fileType:'quotJsgfFile'}
quotFileList(param).then(response => { quotFileList(param).then(response => {

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

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