'123'

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

@@ -133,7 +133,7 @@ public class QuotController extends BaseController
      * @return
      * @throws Exception
      */
-    @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list')")
+    @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list,priceVerification:priceVerification:list')")
     @Log(title = "上传报价附件", businessType = BusinessType.INSERT)
     @PostMapping("/quotFile")
     public AjaxResult quotFile(@RequestParam("quotFile") MultipartFile file,@RequestParam("relation_id") String relation_id,@RequestParam("file_type") String file_type) throws Exception
@@ -169,7 +169,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')")
     @GetMapping("/quotFileList")
     public TableDataInfo quotFileList(QuotFile quotFile)
     {

ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/QuotJsqrServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.technicalConfirm.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.technicalConfirm.domain.QuotJsqr;
 import com.ruoyi.technicalConfirm.mapper.QuotJsqrMapper;
@@ -41,6 +42,7 @@ public class QuotJsqrServiceImpl implements IQuotJsqrService
      * @return 报价单-技术确认单
      */
     @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
     public List<QuotJsqr> selectQuotJsqrList(QuotJsqr quotJsqr)
     {
         return quotJsqrMapper.selectQuotJsqrList(quotJsqr);

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

@@ -44,6 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="quotHjCode != null  and quotHjCode != ''"> and quot_hj_code like concat('%', #{quotHjCode}, '%')</if>
             <if test="params.beginQuotHjPricingDate != null and params.beginQuotHjPricingDate != '' and params.endQuotHjPricingDate != null and params.endQuotHjPricingDate != ''"> and quot_hj_pricing_date between #{params.beginQuotHjPricingDate} and #{params.endQuotHjPricingDate}</if>
+            <!-- 数据范围过滤 -->
+            <!--${params.dataScope}-->
         </where>
     </select>
 

ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml

@@ -111,6 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotJsqrCode != null  and quotJsqrCode != ''"> and quot_jsqr_code like concat('%', #{quotJsqrCode}, '%')</if>
             <if test="quotJsxzApprovalStatus != null  and quotJsxzApprovalStatus != ''"> and q.quot_jsxz_approval_status = #{quotJsxzApprovalStatus}</if>
             <if test="quotCode != null  and quotCode != ''"> and q.quot_code like concat('%', #{quotCode}, '%')</if>
+            <!-- 数据范围过滤 -->
+            <!--${params.dataScope}-->
         </where>
         order by a.update_time desc
     </select>

ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue

@@ -122,8 +122,7 @@
   }
   <!-- 弹窗底部内容样式 -->
   .dialog-footer {
-    padding: 20px;
+    padding: 10px 20px 20px;
-    padding-top: 10px;
     text-align: right;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;

ruoyi-ui/src/views/priceVerification/priceVerification/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="核价单号" prop="quotHjCode">
         <el-input
           v-model="queryParams.quotHjCode"
@@ -86,10 +86,6 @@
     height: 550px;
     max-height: 580px; /* 设置最大高度，根据需要调整 */
   }
-  <!-- 日期空间宽度设置 -->
-  :deep(.el-p .el-input__wrapper){
-    width: 100% !important;
-  }
 </style>
 <script>
 import { listPriceVerification } from "@/api/priceVerification/priceVerification";
@@ -174,7 +170,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      const quotHjId = row.quotJsqrId || this.ids
+      const quotHjId = row.quotHjId || this.ids
       this.open = true;
       this.title = "报价单-核价单";
       this.quotHjIdProp = quotHjId;//传参设置

ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue

@@ -667,8 +667,7 @@
 <style>
   <!-- 弹窗底部内容样式 -->
   .dialog-footer {
-    padding: 20px;
+    padding: 10px 20px 20px;
-    padding-top: 10px;
     text-align: right;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;