'123'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java

@@ -451,6 +451,18 @@ public class BidController extends BaseController
         return ajax;
     }
 
+    /**
+     * 根据调价版本uid获取铜铝价格
+     * @param rbUid
+     * @return
+     */
+    @DataSource(DataSourceType.OAREDBOOK)
+    @GetMapping(value = "/getTongLvPrice/{rbUid}")
+    public AjaxResult getTongLvPrice(@PathVariable("rbUid") String rbUid)
+    {
+        return success(bidService.getTongLvPrice(rbUid));
+    }
+
     /**
      * 获取redis 调价日期
      * @param type

ruoyi-system/src/main/java/com/ruoyi/bid/domain/RbTongLvPrice.java

@@ -0,0 +1,22 @@
+package com.ruoyi.bid.domain;
+
+public class RbTongLvPrice {
+    private String tong_price_0;
+    private String lv_price_0;
+
+    public String getTong_price_0() {
+        return tong_price_0;
+    }
+
+    public void setTong_price_0(String tong_price_0) {
+        this.tong_price_0 = tong_price_0;
+    }
+
+    public String getLv_price_0() {
+        return lv_price_0;
+    }
+
+    public void setLv_price_0(String lv_price_0) {
+        this.lv_price_0 = lv_price_0;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.bid.mapper;
 
 import java.util.List;
 import com.ruoyi.bid.domain.Bid;
+import com.ruoyi.bid.domain.RbTongLvPrice;
 import com.ruoyi.bid.domain.SysOaBid;
 import com.ruoyi.redBook.domain.RbVersionDateResult;
 
@@ -98,4 +99,11 @@ public interface BidMapper
      * @return
      */
     String rb_price_version();
+
+    /**
+     * 根据调价版本uid获取铜铝价格
+     * @param rbUid
+     * @return
+     */
+    RbTongLvPrice getTongLvPrice(String rbUid);
 }

ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java

@@ -2,6 +2,7 @@ package com.ruoyi.bid.service;
 
 import java.util.List;
 import com.ruoyi.bid.domain.Bid;
+import com.ruoyi.bid.domain.RbTongLvPrice;
 import com.ruoyi.bid.domain.SysOaBid;
 import com.ruoyi.quot.domain.Quot;
 import com.ruoyi.redBook.domain.RbVersionDateResult;
@@ -101,4 +102,10 @@ public interface IBidService
      */
     String rb_price_version();
 
+    /**
+     * 根据调价版本uid获取铜铝价格
+     * @param rbUid
+     * @return
+     */
+    RbTongLvPrice getTongLvPrice(String rbUid);
 }

ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.bid.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.bid.domain.RbTongLvPrice;
 import com.ruoyi.bid.domain.SysOaBid;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.DataSource;
@@ -158,4 +159,14 @@ public class BidServiceImpl implements IBidService
     public String rb_price_version() {
         return bidMapper.rb_price_version();
     }
+
+    /**
+     * 根据调价版本uid获取铜铝价格
+     * @param rbUid
+     * @return
+     */
+    @Override
+    public RbTongLvPrice getTongLvPrice(String rbUid) {
+        return bidMapper.getTongLvPrice(rbUid);
+    }
 }

ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml

@@ -454,4 +454,10 @@
                 where sta_0=1 or sta_0=0 group by date_0
             )a order by date_0 desc
     </select>
+
+    <select id="getTongLvPrice" resultType="RbTongLvPrice">
+        select tong_price_0,lv_price_0
+        from rb_productVersion
+        where uid_0 = #{rbUid}
+    </select>
 </mapper>

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

@@ -106,3 +106,11 @@ export function versionList(query) {
     params: query
   })
 }
+
+//根据调价版本uid获取铜铝价格
+export function getTongLvPrice(rbUid) {
+  return request({
+    url: '/bid/bid/getTongLvPrice/'+rbUid,
+    method: 'get'
+  })
+}

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

@@ -402,7 +402,7 @@
           </el-table-column>
         </el-table>
 
-        <div v-if="!checkRole(['SALES_MAN']) ">
+        <div v-if="checkPermi(['bid:bid:tbxxInfo'])">
           <el-divider content-position="left" class="customer_divider_text">投标信息</el-divider>
           <el-row :gutter="8">
             <el-col :span="8">
@@ -899,7 +899,7 @@
 <script>
 import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
 import { getToken } from "@/utils/auth";
-import { versionList,bidAssign,listBid, getBid, delBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid, rejectBid } from "@/api/bid/bid";
+import { versionList,getTongLvPrice,bidAssign,listBid, getBid, delBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid, rejectBid } from "@/api/bid/bid";
 /** 弹窗放大、拖拽 */
 import elDragDialog from "@/directive/dialog/dragDialog";
 /** 导入技术确认单详情组件*/
@@ -1059,9 +1059,12 @@ export default {
         this.versionList = response.versionList;
       });
     },
-    //选择调价日期
+    //选择调价日期-获取铜铝价格
-    async selectRbDate(uid) {
+    async selectRbDate(rbUid) {
-
+      getTongLvPrice(rbUid).then(response => {
+        this.form.bidTongPrice = response.data.tong_price_0;
+        this.form.bidLvPrice = response.data.lv_price_0;
+      })
     },
     // 取消按钮
     cancel() {

ruoyi-ui/src/views/components/Tools/PeopleSelect/index.vue

@@ -311,7 +311,6 @@
       getList() {
         listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
             this.userList = response.rows;
-            console.log(this.userList);
           }
         );
       },