From 356798b340129d0087c88b871c5c01cd9c3733de Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Sun, 21 Apr 2024 13:50:23 +0800
Subject: [PATCH] '123'

---
 .../web/controller/quot/QuotController.java   |  2 +-
 .../priceVerification/hjInfo.vue              | 12 ++-----
 ruoyi-ui/src/views/quot/quot/index.vue        | 31 +++++++++++--------
 .../technicalConfirm/index.vue                | 22 -------------
 .../technicalConfirm/jsxzInfo.vue             | 22 +++++++++----
 5 files changed, 38 insertions(+), 51 deletions(-)

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 50c95f5..2d09bb9 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
@@ -181,7 +181,7 @@ public class QuotController extends BaseController
     /**
      * 删除附件列表
      */
-    @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list')")
+    @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list,priceVerification:priceVerification:list')")
     @PostMapping("/quotFileDelete")
     public AjaxResult quotFileDelete(QuotFile quotFile) {
         String fileId = quotFile.getFileId();
diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
index b9e85dc..a0bd14d 100644
--- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
+++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
@@ -120,17 +120,10 @@
   </div>
 </template>
 <style>
-  <!-- 日期空间宽度设置 -->
+  /* 日期空间宽度设置 */
   :deep(.el-p .el-input__wrapper){
     width: 100% !important;
   }
-  <!-- 弹窗底部内容样式 -->
-  .dialog-footer {
-    padding: 10px 20px 20px;
-    text-align: right;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-  }
 </style>
 <script>
 import { getPriceVerification, commitHj, rejectHj } from "@/api/priceVerification/priceVerification";
@@ -205,7 +198,8 @@ export default {
       //报价单-核价协助状态 设置为 已协助
       commitHj(this.form).then(response => {
         this.open = false;
-        this.getList();
+        this.$modal.msgSuccess("提交成功");
+        this.$emit('refreshList');
       })
     },
 
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index 886c46f..15e6a55 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -561,6 +561,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="8">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="quotHjRemark">
+                  <el-input type="textarea" autosize v-model="form.quotHjRemark" :disabled="true"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="8">
               <el-col :span="24">
                 <el-form-item label="核价附件"></el-form-item>
@@ -624,7 +631,7 @@
           </el-tab-pane>
         </el-tabs>
         <!-- 特缆、中压、低压、其他协助反馈附件对话框 -->
-        <el-dialog class="fkfjDialog" :title="addFileTitle" :visible.sync="addFileOpen" width="800px" append-to-body>
+        <el-dialog custom-class="fkfjDialog" :title="addFileTitle" :visible.sync="addFileOpen" width="800px" append-to-body>
           <!--<el-upload class="upload-demo"
                      ref="upload"
                      name="quotFile"
@@ -679,7 +686,7 @@
   </div>
 </template>
 <style>
-  /*弹窗设置*/
+  /* 弹窗设置 */
   .el-dialog__body {
     padding: 10px 10px;
     color: #606266;
@@ -694,21 +701,19 @@
     height: 100%;
     overflow-y: auto;
   }
-  <!-- 特缆、中压、低压、其他协助反馈附件对话框设置 -->
-  .fkfjDialog .el-dialog__body {
-    padding: 10px 10px;
-    color: #606266;
-    font-size: 14px;
-    word-break: break-all;
-    overflow-y: auto; /* 自动显示垂直滚动条 */
-    height: 300px;
-    max-height: 380px; /* 设置最大高度，根据需要调整 */
-  }
-  <!-- 日期空间宽度设置 -->
+
+  /* 日期控件宽度设置 */
   :deep(.el-p .el-input__wrapper){
     width: 100% !important;
   }
 </style>
+<style>
+  /* 特缆、中压、低压、其他协助反馈附件对话框设置 */
+  .fkfjDialog .el-dialog__body{
+    height: 280px;
+    max-height: 300px; /* 设置最大高度，根据需要调整 */
+  }
+</style>
 <script>
 import { listQuot, getQuot, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, feedbackQuot, rejectQuot } from "@/api/quot/quot";
 import { getToken } from "@/utils/auth";
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
index ec36ff7..2e165db 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
@@ -95,28 +95,6 @@
     <jsqrDialog ref="jsqrDialog" @refreshList="getList"></jsqrDialog>
   </div>
 </template>
-<style>
-  /*弹窗设置*/
-  .el-dialog__body {
-    padding: 10px 10px;
-    color: #606266;
-    font-size: 14px;
-    word-break: break-all;
-    overflow-y: auto; /* 自动显示垂直滚动条 */
-    height: 500px;
-    max-height: 580px; /* 设置最大高度，根据需要调整 */
-  }
-
-  .fkfjDialog .el-dialog__body {
-    padding: 10px 10px;
-    color: #606266;
-    font-size: 14px;
-    word-break: break-all;
-    overflow-y: auto; /* 自动显示垂直滚动条 */
-    height: 300px;
-    max-height: 380px; /* 设置最大高度，根据需要调整 */
-  }
-</style>
 <script>
 import { listJsqr} from "@/api/technicalConfirm/technicalConfirm";
 // 导入技术确认单详情组件
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
index 39088b0..e5bbfdb 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue
@@ -667,12 +667,22 @@
   </div>
 </template>
 <style>
-  <!-- 弹窗底部内容样式 -->
-  .dialog-footer {
-    padding: 10px 20px 20px;
-    text-align: right;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+  /* 弹窗设置 */
+  .el-dialog__body {
+    padding: 10px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+    overflow-y: auto; /* 自动显示垂直滚动条 */
+    height: 500px;
+    max-height: 580px; /* 设置最大高度，根据需要调整 */
+  }
+</style>
+<style>
+  /* 特缆、中压、低压、其他协助反馈附件对话框设置 */
+  .fkfjDialog .el-dialog__body{
+    height: 280px;
+    max-height: 300px; /* 设置最大高度，根据需要调整 */
   }
 </style>
 <script>