'123'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java

@@ -642,7 +642,17 @@ public class RedBookController extends BaseController
     @GetMapping(value = "/{quotId}")
     public AjaxResult getInfo(@PathVariable("quotId") String quotId)
     {
-        return success(redBookService.selectQuotByQuotId(quotId));
+        OAQuot aAQuot = redBookService.selectQuotByQuotId(quotId);
+        String rbDateUid = aAQuot.getRbDateUid();
+
+        List<OAQuotProduct> aAQuotProduct= aAQuot.getSelectedResultData();
+        for(OAQuotProduct p:aAQuotProduct){
+            if(StringUtils.isEmpty(p.getUid_0())){
+                p.setUid_0(rbDateUid);
+            }
+        }
+
+        return success(aAQuot);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/redBook/mapper/OARedBookMapper.java

@@ -114,7 +114,7 @@ public interface OARedBookMapper
      * @param uid_0
      * @return
      */
-    String getFixDatePrice(@Param("name_0") String name_0,@Param("spec") String spec,@Param("voltage") String voltage, @Param("uid_0") String uid_0);
+    String getFixDatePrice(@Param("name_0") String name_0, @Param("uid_0") String uid_0);
 
     /**
      * 导入明细批量获取红本价格-型号、规格、电压、数量

ruoyi-system/src/main/java/com/ruoyi/redBook/service/impl/RedBookServiceImpl.java

@@ -194,7 +194,7 @@ public class RedBookServiceImpl implements IRedBookService
      */
     @Override
     public String getFixDatePrice(String name_0,String spec,String voltage, String uid_0) {
-        return oaRedBookMapper.getFixDatePrice(name_0,spec,voltage,uid_0);
+        return oaRedBookMapper.getFixDatePrice(name_0,uid_0);
     }
 
     /**
@@ -206,7 +206,7 @@ public class RedBookServiceImpl implements IRedBookService
     @DataSource(DataSourceType.OAREDBOOK)
     public List<OAQuotProduct> setRedBookPrice(List<OAQuotProduct> list) {
         for(OAQuotProduct oAQuotProduct : list){
-            String price =  oaRedBookMapper.getFixDatePrice(oAQuotProduct.getName_0(),oAQuotProduct.getSpec(),oAQuotProduct.getVoltage(),oAQuotProduct.getUid_0());
+            String price =  oaRedBookMapper.getFixDatePrice(oAQuotProduct.getName_0(),oAQuotProduct.getUid_0());
             oAQuotProduct.setPrice(price);
             if(StringUtils.isEmpty(price)){
                 oAQuotProduct.setName_1("");

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

@@ -142,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quotCode != null  and quotCode != ''"> and quot_code like concat('%', #{quotCode}, '%')</if>
             <if test="quotCustomerName != null  and quotCustomerName != ''"> and quot_customer_name like concat('%', #{quotCustomerName}, '%')</if>
             <if test="quotProject != null  and quotProject != ''"> and quot_project like concat('%', #{quotProject}, '%')</if>
+            <if test="quotQuotationRequire != null  and quotQuotationRequire != ''"> and quot_quotation_require like concat('%', #{quotQuotationRequire}, '%')</if>
             <if test="quotSalesmanName != null  and quotSalesmanName != ''"> and quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
             <if test="quotPrint != null  and quotPrint != ''"> and quot_print = #{quotPrint}</if>
             <if test="quotApprovalStatus != null  and quotApprovalStatus != ''"> and quot_approval_status = #{quotApprovalStatus}</if>

ruoyi-system/src/main/resources/mapper/redBook/OARedBookMapper.xml

@@ -168,8 +168,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getFixDatePrice" resultType="String">
         select top 1 红本价格  from rb_product_price A
         inner join [rb_productVersion] B on A.version_uid_0=B.uid_0
-        where A.[namevoltage] = #{name_0} and A.规格 = #{spec}
+        where A.[namevoltage] = #{name_0}
-        and A.电压等级 = #{voltage} and B.uid_0 = #{uid_0}
+        and B.uid_0 = #{uid_0}
         and (B.sta_0=1 or sta_0=0)
     </select>
 
@@ -260,7 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         b.uid_0,b.quot_product_id, b.name_0, b.name_1,
         b.spec, b.voltage, b.stu,
-        isnull(b.per,1) per,isnull(b.per2,1) per2,b.price,b.setPrice,b.count,b.allPrice,b.quot_id
+        b.per,b.per2,b.price,b.setPrice,b.count,b.allPrice,b.quot_id
         from OAQuot a
         left join OAQuotProduct b on b.quot_id = a.quot_id
         where a.quot_id = #{quotId}  order by b.number

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

@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="报价要求" prop="quotQuotationRequire" v-if="checkRole(['SALES_MAN'])">
+        <el-input
+          v-model="queryParams.quotQuotationRequire"
+          placeholder="请输入报价要求"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="业务员" prop="quotSalesmanName" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
         <el-input
           v-model="queryParams.quotSalesmanName"

ruoyi-ui/src/views/redBook/productSelect.vue

@@ -395,14 +395,6 @@
             })
           },
 
-
-
-
-
-
-
-
-
           //备注内容设置 展开 || 收起文本
           toggleText(id) {
             if (this.expandedIndex === id) {
@@ -904,9 +896,7 @@
                 for (let j = 0; j < response.data.length; j++) {
                   // 检查型号、规格、电压等级是否相等
                   if (
-                    this.selectedResultData[i].name_0 === response.data[j].name_0 &&
+                    this.selectedResultData[i].name_0 === response.data[j].name_0
-                    this.selectedResultData[i].spec === response.data[j].spec &&
-                    this.selectedResultData[i].voltage === response.data[j].voltage
                   ) {
                     this.selectedResultData[i].price = response.data[j].price;
                     const setPrice = toDecimal(this.selectedResultData[i].price * (this.selectedResultData[i].per?this.selectedResultData[i].per:1) * (this.selectedResultData[i].per2?this.selectedResultData[i].per2:1));