'123'

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

@@ -935,7 +935,7 @@ public class QuotController extends BaseController
     }
 
     /**
-     * 报价组提交反馈
+     * 保存反馈说明
      */
     @Log(title = "报价组-保存反馈说明", businessType = BusinessType.OTHER)
     @PostMapping("/saveQuotFeedbackExplanation")
@@ -944,6 +944,16 @@ public class QuotController extends BaseController
         quotService.saveQuotFeedbackExplanation(quot);
         return success();
     }
+    /**
+     * 保存报价员备注
+     */
+    @Log(title = "报价组-保存报价员备注", businessType = BusinessType.OTHER)
+    @PostMapping("/saveQuotBjyRemark")
+    public AjaxResult saveQuotBjyRemark(@RequestBody Quot quot)
+    {
+        quotService.saveQuotBjyRemark(quot);
+        return success();
+    }
 
 
     /**

ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java

@@ -159,6 +159,12 @@ public interface QuotMapper
      */
     void saveQuotFeedbackExplanation(Quot quot);
 
+    /**
+     * 报价组-保存报价员备注
+     * @param quot
+     */
+    void saveQuotBjyRemark(Quot quot);
+
     /**
      * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
      * @param tax
@@ -193,4 +199,5 @@ public interface QuotMapper
      * @return
      */
     String selectHandleTime(Quot quot);
+
 }

ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java

@@ -144,6 +144,12 @@ public interface IQuotService
      */
     void saveQuotFeedbackExplanation(Quot quot);
 
+    /**
+     * 报价组-报价员备注
+     * @param quot
+     */
+    void saveQuotBjyRemark(Quot quot);
+
     /**
      * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
      * @param tax
@@ -178,4 +184,5 @@ public interface IQuotService
      * @return
      */
     String selectHandleTime(Quot quot);
+
 }

ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java

@@ -324,6 +324,15 @@ public class QuotServiceImpl implements IQuotService
         quotMapper.saveQuotFeedbackExplanation(quot);
     }
 
+    /**
+     * 报价组-保存报价员备注
+     * @param quot
+     */
+    @Override
+    public void saveQuotBjyRemark(Quot quot) {
+        quotMapper.saveQuotBjyRemark(quot);
+    }
+
     /**
      * 根据该客户税号是否在客户单位表名单里-是否允许特批报价 是否是禁止
      * @param tax

ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml

@@ -171,7 +171,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname,
                a.quot_jsw_check_user_nickname,a.quot_bzr_user_nickname,a.quot_approval_status,a.quot_rbDateUid,
                 a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
-               a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,a.quot_distinguish,
+               a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle,a.quot_distinguish,a.quot_bjy_remark,
 
                 a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
                 a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
@@ -553,6 +553,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="saveQuotFeedbackExplanation" parameterType="Quot">
         update quot set quot_feedback_explanation = #{quotFeedbackExplanation} where quot_id = #{quotId}
     </update>
+    <update id="saveQuotBjyRemark" parameterType="Quot">
+        update quot set quot_bjy_remark = #{quotBjyRemark} where quot_id = #{quotId}
+    </update>
 
 
 

ruoyi-ui/src/api/quot/quot.js

@@ -171,6 +171,14 @@ export function saveQuotFeedbackExplanation(data) {
     data: data
   })
 }
+//保存报价员备注
+export function saveQuotBjyRemark(data) {
+  return request({
+    url: '/quot/quot/saveQuotBjyRemark',
+    method: 'post',
+    data: data
+  })
+}
 
 //生成报价单-PC
 export function madeQuot(data) {

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

@@ -429,7 +429,8 @@
         <el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','HTB_QUOT','admin'])">
           <el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
             <el-form-item label="报价员备注" prop="quotBjyRemark">
-              <el-input type="textarea" autosize v-model="form.quotBjyRemark" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2 || this.form.quotApprovalStatus == 3"/>
+              <el-input type="textarea" style="width:80%" autosize v-model="form.quotBjyRemark" placeholder="报价组填写" :disabled="this.form.quotApprovalStatus == 2 || this.form.quotApprovalStatus == 3"/>
+              <el-button type="primary" icon="el-icon-folder" style="margin-left: 10px" @click="saveQuotBjyRemark" size="mini" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"></el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1082,7 +1083,7 @@
 import { NumberAdd }  from '@/utils/number';// 数值计算
 import { toDecimal,versionList } from "@/api/redBook/redBook";
 
-import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation } from "@/api/quot/quot";
+import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, checkCustom, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle,saveQuotFeedbackExplanation, saveQuotBjyRemark } from "@/api/quot/quot";
 import { getToken } from "@/utils/auth";
 import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
 import { getDicts } from "@/api/system/dict/data";
@@ -1659,6 +1660,13 @@ export default {
         this.$modal.msgSuccess("保存成功");
       });
     },
+    // 保存报价员备注
+    saveQuotBjyRemark(){
+      const param = {'quotId':this.form.quotId,'quotBjyRemark':this.form.quotBjyRemark}
+      saveQuotBjyRemark(param).then(response => {
+        this.$modal.msgSuccess("保存成功");
+      });
+    },
 
     /** 报价组生成报价单按钮 */
     madeQuot(){