From 033dadd6ef0f4ef4de496a860083227d5b1b3922 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 20 May 2024 09:03:19 +0800
Subject: [PATCH] '123'
---
ABAP_AS_WITH_POOL.jcoDestination | 4 +-
.../web/controller/quot/QuotController.java | 6 +--
.../mapper/priceVerification/QuotHjMapper.xml | 4 +-
.../resources/mapper/quot/QuotFileMapper.xml | 9 +++-
.../priceVerification/hjInfo.vue | 31 ++++++------
.../priceVerification/index.vue | 2 +-
ruoyi-ui/src/views/quot/quot/index.vue | 50 +++++++++----------
.../technicalConfirm/jsxzInfo.vue | 2 +-
8 files changed, 57 insertions(+), 51 deletions(-)
diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination
index d815712..06248e4 100644
--- a/ABAP_AS_WITH_POOL.jcoDestination
+++ b/ABAP_AS_WITH_POOL.jcoDestination
@@ -1,5 +1,5 @@
#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.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=654321
+jco.client.passwd=wneBD(:uBgYaG3?tEZZW_d~92AB;6|@X;s=FehY#L^VVLLbl
jco.client.client=300
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
index f797c64..ea2d572 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
@@ -91,7 +91,7 @@ public class QuotController extends BaseController
* 新增报价
*/
@PreAuthorize("@ss.hasPermi('quot:quot:add')")
- @Log(title = "报价", businessType = BusinessType.INSERT)
+ @Log(title = "报价单新增", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Quot quot)
{
@@ -106,7 +106,7 @@ public class QuotController extends BaseController
* 修改报价
*/
@PreAuthorize("@ss.hasPermi('quot:quot:edit')")
- @Log(title = "报价", businessType = BusinessType.UPDATE)
+ @Log(title = "报价单修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Quot quot)
{
@@ -118,7 +118,7 @@ public class QuotController extends BaseController
* 删除报价
*/
@PreAuthorize("@ss.hasPermi('quot:quot:remove')")
- @Log(title = "报价", businessType = BusinessType.DELETE)
+ @Log(title = "报价单删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{quotIds}")
public AjaxResult remove(@PathVariable String[] quotIds)
{
diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml
index c3742a5..e9c34c9 100644
--- a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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 quot q on q.quot_ht_id = a.quot_hj_id
+ left join quot q on q.quot_hj_id = a.quot_hj_id
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
index 9477836..6f816bc 100644
--- a/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quot/QuotFileMapper.xml
@@ -23,7 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and relation_id = #{relationId}
- and file_type = #{fileType}
+
+
+ and file_type in ('quotJsgfFile','quotXjFile')
+
+
+ and file_type = #{fileType}
+
+
order by file_time desc
diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
index a0bd14d..1536794 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
@@ -67,22 +67,21 @@
-
-
-
- 上传文件
-
-
-
+ 核价附件
+
+
+ 上传文件
+
+
diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue
index c77a118..b156bfb 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/index.vue
@@ -50,7 +50,7 @@
- {{ parseTime(scope.row.quotHjPricingDate, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.quotHjPricingDate) }}
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index fb82569..c74ce83 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -104,11 +104,16 @@
-
+
{{ parseTime(scope.row.quotInquiryDate) }}
+
+
+ {{ parseTime(scope.row.quotQuotationDate) }}
+
+
@@ -223,10 +228,10 @@
-
+
-
+
@@ -373,22 +378,21 @@
-
-
-
- 上传文件
-
-
-
+ 技术规范要求(询价附件)
+
+
+ 上传文件
+
+
@@ -573,11 +577,7 @@
-
-
-
-
-
+ 核价附件
@@ -1131,7 +1131,7 @@ export default {
this.quotFkFileList = response.rows;
});
},
- //获取报价单-技术规范附件列表
+ //获取报价单-技术规范附件列表 (包含询价附件)
getQuotJsgfFileList(){
const param = {relationId:this.form.quotId,fileType:'quotJsgfFile'}
quotFileList(param).then(response => {
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
index e5bbfdb..d638180 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
@@ -78,7 +78,7 @@
- 技术规范要求
+ 技术规范要求(询价附件)