标的详情

config/dev.env.js

@@ -1,5 +1,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '""'
+  BASE_API: '"/bidding"'
 }

config/index.js

@@ -11,7 +11,7 @@ module.exports = {
         proxyTable: {
             '/bid2': {
                 // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
-                // target: 'http://127.0.0.1:28080', //后端接口地址   
+                // target: 'http://47.108.151.62', //后端接口地址   
                 // target: 'http://192.168.3.12:7001', //后端接口地址   
                 target: 'http://127.0.0.1:28081', //后端接口地址   
                 // target: 'http://47.108.14.99:7001', //后端接口地址   

src/api/bid.js

@@ -120,6 +120,17 @@ export function getBiddingSaleList(parms) {
   })
 }
 
+// 标的详情
+export function getBiddingSaleInfo(parms) {
+  return request({
+    url: '/bidding/sale',
+    method: 'get',
+    params: parms
+  })
+}
+
+
+
 /**
  *   原料相关接口
  * 
@@ -142,6 +153,15 @@ export function getTenderRawList(parms) {
   })
 }
 
+// 标的详情
+export function getBiddingRowInfo(parms) {
+  return request({
+    url: ' /bidding/raw',
+    method: 'get',
+    params: parms
+  })
+}
+
 /**
  * 加工承揽
  * 
@@ -170,4 +190,5 @@ export function getBiddingList(parms) {
     method: 'get',
     params: parms
   })
-}
+}
+// 

src/api/tender.js

@@ -66,6 +66,19 @@ export function loadCustomer(parms) {
 }
 
 
+/**
+ * 获取客户
+ * 
+ * ** */
+
+export function getCustomerName(parms) {
+  return request({
+    url: '/customer/customerName',
+    method: 'get',
+    params: parms
+  })
+}
+
 
 /**
  * 
@@ -99,6 +112,14 @@ export function getBiddingSaleList(parms) {
     params: parms
   })
 }
+// 标的详情
+export function getBiddingSaleInfo(parms) {
+  return request({
+    url: '/bidding/sale',
+    method: 'get',
+    params: parms
+  })
+}
 /**
  *   原料相关接口
  * 
@@ -129,7 +150,14 @@ export function getTenderRawList(parms) {
     params: parms
   })
 }
-
+// 标的详情
+export function getBiddingRowInfo(parms) {
+  return request({
+    url: ' /bidding/raw',
+    method: 'get',
+    params: parms
+  })
+}
 /**
  * 加工承揽
  * 
@@ -153,6 +181,7 @@ export function getBiddingAdd(parms) {
   })
 }
 
+
 // 已投递列表
 export function getTenderInfoList(parms) {
   return request({
@@ -169,4 +198,4 @@ export function getBiddingList(parms) {
     method: 'get',
     params: parms
   })
-}
+}

src/views/admin/user.vue

@@ -73,11 +73,20 @@
 
           <el-table-column label="投标类型" align="center">
             <template slot-scope="scope">
-               <el-tag v-if="scope.row.tenderType == 0">
+               <el-tag type='warning' v-if="scope.row.tenderType == 0">
                  招标方
                 </el-tag>
-                <el-tag type='warning' v-else>
-                 投标方
+                <el-tag   v-if="scope.row.tenderType == 1">
+                 投标方/物流
+                </el-tag>
+                 <el-tag   v-if="scope.row.tenderType == 2">
+                 投标方/原料
+                </el-tag>
+                 <el-tag  v-if="scope.row.tenderType == 3">
+                 投标方/销售
+                </el-tag>
+                 <el-tag   v-if="scope.row.tenderType == 4">
+                 投标方/加工承揽
                 </el-tag>
             </template>
           </el-table-column>

src/views/bid/index.vue

@@ -694,42 +694,66 @@ window.open(officeUrl,'_target')
       let tenderType = row.tenderType
       if(tenderType == 1){
         this.$refs.ckTender.viewDialog = true
+        let param =  {
+        tenderParentId:row.tenderParentId,
+          current: 1,
+          size: 10
+        }
          setTimeout(() => {
+           
             this.$refs.ckTender.activeName="first"
-            this.$refs.ckTender.param.tenderParentId = row.tenderParentId
+            this.$refs.ckTender.param = param
             this.$refs.ckTender.bidInfo = row
-            this.$refs.ckTender.param.current = 1
+            this.$refs.ckTender.applyDateStart = []
+            // this.$refs.ckTender.param.current = 1
             this.$refs.ckTender.getParam()
             console.log("物流")
       }, 300);
       }else if(tenderType == 2){
         this.$refs.ckTender2.viewDialog = true
+        let param =  {
+          tenderParentId:row.tenderParentId,
+          current: 1,
+          size: 10
+        }
          setTimeout(() => {
             this.$refs.ckTender2.activeName="first"
-            this.$refs.ckTender2.param.tenderParentId = row.tenderParentId
+            this.$refs.ckTender2.param = param
             this.$refs.ckTender2.bidInfo = row
-            this.$refs.ckTender2.param.current = 1
+            this.$refs.ckTender2.applyDateStart = []
             this.$refs.ckTender2.getParam()
             console.log("原料")
       }, 300);
       }else if(tenderType == 3){
         this.$refs.ckTender1.viewDialog = true
+        let param =  {
+          tenderParentId:row.tenderParentId,
+          current: 1,
+          size: 10
+        }
           setTimeout(() => {
               this.$refs.ckTender1.activeName="first"
-              this.$refs.ckTender1.param.tenderParentId = row.tenderParentId
+              this.$refs.ckTender1.param = param
               this.$refs.ckTender1.bidInfo = row
-              this.$refs.ckTender1.param.current = 1
+            this.$refs.ckTender1.applyDateStart = []
               this.$refs.ckTender1.getParam()
         }, 300);
+        console.log("销售")
       }else if(tenderType == 4){
         this.$refs.ckTender3.viewDialog = true
+         let param =  {
+          tenderParentId:row.tenderParentId,
+          current: 1,
+          size: 10
+        }
           setTimeout(() => {
               this.$refs.ckTender3.activeName="first"
-              this.$refs.ckTender3.param.tenderParentId = row.tenderParentId
+              this.$refs.ckTender3.param = param
               this.$refs.ckTender3.bidInfo = row
-              this.$refs.ckTender3.param.current = 1
+            this.$refs.ckTender3.applyDateStart = []
               this.$refs.ckTender3.getParam()
         }, 300);
+        console.log("加工承揽")
       }
     },
     getParam(tenderParentId) {

src/views/bid/tender/dialog.vue

@@ -84,7 +84,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -132,7 +132,7 @@ export default {
         {id:0,name:"否"},
         {id:1,name:"是"}
       ],
-      historyValue:0,
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -140,7 +140,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -177,7 +177,7 @@ export default {
         console.log(this.priceData)
       const params = new URLSearchParams()
       params.append('customerId', this.goodsName)
-      params.append('historyValue', this.historyValue)
+      params.append('isHistory', this.historyValue)
       params.append('tenderLogisticsId', this.priceData.logisticsBidId)
       params.append('current', this.current)
       params.append('size', this.size)
@@ -228,7 +228,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender/table.vue

@@ -318,6 +318,7 @@ export default {
           return res
         })
         this.tableData = data
+        this.total = response.data.data.total
       })
     },
    onApplyDate(){

src/views/bid/tender/tender.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-              <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="" center>
+              <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="" center >
                <el-card class="box-card" shadow="nerver">
                     <div slot="header" class="clearfix">
                       <span class="topClass">基本信息</span>
@@ -56,7 +56,7 @@
                                 <span class="topClass">投的详情</span>
                               </div>
                                       <div class="head-container" style="margin: 30px 0 10px 0;">
-                                        <span style="fontSize:13px">货物名称</span>
+                                        <span style="fontSize:13px">货品名称</span>
                                           <el-input
                                             v-model="param.goodsName"
                                             clearable
@@ -96,7 +96,22 @@
                                             <el-option  label="未投标" value="0"> </el-option>
                                             <el-option  label="有投标" value="1"> </el-option>
                                           </el-select>
-                              <div style="text-align: right;margin-right:40px">
+                                             <span style="fontSize:13px;marginLeft:20px">发标时间</span>
+                              <el-date-picker
+                                v-model="applyDateStart"
+                                size="small"
+                                type="datetimerange"
+                                style="width: 400px;"
+                                range-separator="-"
+                                clearable
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                :default-time="['00:00:00', '23:59:59']"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                              @change="onApplyDate"
+                              @clear="onApplyDate"
+                              />
+                              <div style="text-align: right;margin-right:40px;margin-top:20px">
                                    <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="getParamFexd">搜索</el-button>
                               </div>
                                       <!-- <el-button class="filter-item" style="marginLeft:20px;marginBottom:20px" size="small" type="primary" icon="el-icon-search"  @click="getParamFexd">搜索</el-button> -->
@@ -135,10 +150,10 @@
                                             <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
                                           </template>
                                         </el-table-column>
-                                        <el-table-column prop="startTime" label="起始时间" :show-overflow-tooltip="true" align="center" />
-                                        <el-table-column prop="endTime" label="结束时间" :show-overflow-tooltip="true" align="center" />
-                                        <el-table-column prop="createTime" label="创建时间" :show-overflow-tooltip="true" align="center" />
-                                        <el-table-column prop="logisticsRemark" label="备注" :show-overflow-tooltip="true" align="center" />
+                                        <el-table-column prop="startTime" width="152" label="起始时间" :show-overflow-tooltip="true" align="center" />
+                                        <el-table-column prop="endTime" width="152" label="结束时间" :show-overflow-tooltip="true" align="center" />
+                                        <el-table-column prop="createTime" width="152" label="创建时间" :show-overflow-tooltip="true" align="center" />
+                                        <el-table-column prop="logisticsRemark" width="152" label="备注" :show-overflow-tooltip="true" align="center" />
                                   
                                       </el-table>
                                       <div class="pagination">
@@ -299,10 +314,10 @@ export default {
       this.dialogTableVisible = true
       setTimeout(() => {
         this.goodsName = val.goodsName
-       this.$refs.ckDialog.historyValue = 0
+       this.$refs.ckDialog.historyValue = ""
        this.$refs.ckDialog.goodsName = ""
        this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
+      this.$refs.ckDialog.handleFind()
         console.log(this.$refs.ckDialog)
       }, 300);
     },
@@ -310,13 +325,14 @@ export default {
       let startTime
       let endTime
             if(this.applyDateStart != null){
-              this.query.startTime =this.applyDateStart[0]
-              this.query.endTime = this.applyDateStart[1]
+              this.param.startTime =this.applyDateStart[0]
+              this.param.endTime = this.applyDateStart[1]
             }else{
-              this.query.startTime =""
-              this.query.endTime =""
+              this.param.startTime =""
+              this.param.endTime =""
             }
-      this.handleFind()
+
+      this.getParamFexd()
     },
     onShowType(){
       console.log(this.form.tenderType+"this.form.tenderType ")
@@ -599,7 +615,8 @@ window.open(officeUrl,'_target')
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+       this.$refs.ckTable.goodsName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
     // 详情

src/views/bid/tender1/dialog.vue

@@ -1,82 +1,57 @@
 <template>
   <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
-    <!-- <div>
-      <span style="font-size:14px">货物：</span>
-      <el-input
-        v-model="goodsName"
-        clearable
-        placeholder="请输入货物"
-        style="width: 200px;margin-bottom:20px"
-        size="small"
-         @keyup.enter.native="handleFind"
-         @clear="handleFind"
-        class="filter-item"
-      />
-
+    <div class="" style="margin: 10px 0 30px 0;">
+      <span style="font-size:14px">客户名称：</span>
+      <el-select v-model="goodsName" filterable style="width: 200px;" clearable size="small" placeholder="请选择" @clear="handleFind">
+            <el-option v-for="item in userDataList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
+          </el-select>
+      <span style="font-size:14px;margin-left:20px">是否为历史记录：</span>
+       <el-select v-model="historyValue" style="width: 200px;" @keyup.enter.native="handleFind" @clear="handleFind" size="small" clearable  value-key="areaId" filterable placeholder="请选择">
+        <el-option
+          v-for="item in history"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
+      </el-select>
 
 
       <el-button style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="handleFind">查询
       </el-button>
-    </div> -->
+    </div>
 
     <el-table  ref="multipleTable" v-loading="loading" :data="tableData"  :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
+                            <el-table-column prop="customerName" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="tenderSaleId" width="150" fixed="left" label="标的编号" :show-overflow-tooltip="true" align="center" />
 
-      <el-table-column label="运输方式" prop="goodsName"   align="center" :show-overflow-tooltip="true">
-           <template slot-scope="scope">
-                            <span v-if="scope.row.transportMode == 1">陆运</span>
-                            <!-- <span v-if="scope.row.transportMode == 2">汽运</span> -->
-                            <span v-if="scope.row.transportMode == 2">火车运输</span>
-                            <span v-if="scope.row.transportMode == 3">船运</span>
-                            <span v-if="scope.row.transportMode == 4">汽运/火车运输/船运</span>
-                            <span v-if="scope.row.transportMode == 5">汽运/火车运输</span>
-                            <span v-if="scope.row.transportMode == 6">汽运/船运</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="投标价格" prop="logisticsBiddingPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="数量（吨）" prop="quantity" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="总价" prop="logisticsTotalPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="联系电话" prop="phone" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-       <el-table-column  :show-overflow-tooltip="true" label="包装方式" width="100" align="center">
-        <template slot-scope="scope">
-            <span v-if="scope.row.packingWay == 0">未知</span> 
-            <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
-            <span v-if="scope.row.packingWay == 3">散装</span> 
-            <span v-if="scope.row.packingWay == 4">集装箱</span> 
-        </template>
-      </el-table-column>
-
-      <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-       <el-table-column label="状态" align="center" width="100">
-            <template slot-scope="scope">
-            <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
-            </template>
-       </el-table-column>
-      <el-table-column label="投标时间" prop="logisticsBiddingTime" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="备注" prop="biddingLogisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
+                            <el-table-column prop="quantity"  label="数量（吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="biddingPrice"  width="90" label="投标价格（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="totalPrice" width="90" label="总价（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="phone" width="170" label="联系电话" :show-overflow-tooltip="true" align="center" />
+                             <el-table-column prop="appendix" label="凭证" align="center" width="100">
+                                <template slot-scope="scope">
+                                    <el-link :disabled="scope.row.voucherFile ? false : true" :href="scope.row.voucherFile" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
+                                </template>
+                              </el-table-column>
+                           <el-table-column label="状态" align="center" width="100">
+                            <template slot-scope="scope">
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
+                            </template>
+                          </el-table-column>
+                            <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
+                 
     </el-table>
 
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -97,7 +72,7 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getLogisticsInfo } from '@/api/tender'
+import { getBiddingSaleInfo,getCustomerName } from '@/api/bid'
 
 export default {
   data() {
@@ -120,6 +95,11 @@ export default {
         { id: 8, name: '其他' }
 
       ],
+      history:[
+        {id:0,name:"否"},
+        {id:1,name:"是"}
+      ],
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -127,7 +107,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -139,26 +119,37 @@ export default {
        BASE_API: process.env.BASE_API,
        fileList: [],
       roles:[],
+      userDataList:[],
       startTime:"",
       endTime:"",
         isShow:true
     }
   },
   created() {
-    // this.getTenantList()
+    this.onCustmerName()
     console.log('res')
   },
   methods: {
+    onCustmerName(){
+        getCustomerName().then((res)=>{
+            console.log(res)
+            this.userDataList = res.data.data
+        })
+    },
       onshow(){
           this.isShow = !this.isShow
       },
     parseTime,
     getTenantList: function() {
         console.log(this.priceData)
-        let tenderLogisticsId =this.priceData.logisticsBidId
-        let current =this.current
-        let size =this.size
-      getLogisticsInfo(tenderLogisticsId,size,current).then(response => {
+      const params = new URLSearchParams()
+      params.append('customerId', this.goodsName)
+      params.append('isHistory', this.historyValue)
+      params.append('tenderSaleId', this.priceData.tenderSaleId)
+      params.append('current', this.current)
+      params.append('size', this.size)
+      this.loading =true
+      getBiddingSaleInfo(params).then(response => {
         console.log(response)
         this.loading = false
          let data = response.data.data.records
@@ -185,7 +176,7 @@ export default {
         })
         console.log(data)
         this.tableData = data
-        console.log('1' + response.data.data.records)
+        console.log('1' + response.data.data)
         this.total = response.data.data.total
       })
     },
@@ -204,7 +195,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender1/table.vue

@@ -84,7 +84,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -135,7 +135,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -226,7 +226,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender1/tender.vue

@@ -85,11 +85,11 @@
                                 @keyup.enter.native="getParamFexd"
                                 @clear="getParamFexd"
                               />
-                               <!-- <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                               <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
                                           <el-select v-model="param.saleIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
                                             <el-option  label="未投标" value="0"> </el-option>
                                             <el-option  label="有投标" value="1"> </el-option>
-                                          </el-select> -->
+                                          </el-select>
                             <span style="fontSize:13px;marginLeft:20px">发标时间</span>
                               <el-date-picker
                                 v-model="applyDateStart"
@@ -105,14 +105,14 @@
                               @change="onApplyDate"
                               @clear="onApplyDate"
                               />
-                              <div style="text-align: right;margin-right:40px">
+                              <div style="text-align: right;margin-right:40px;margin-top:20px">
                                    <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="getParamFexd">搜索</el-button>
                               </div>
                           <div style="height:20px"></div>
                           <el-table center :data="Paramdata" :header-cell-style="{ background: '#f5f7fa', }" border v-loading="tableLoading" stripe style="width: 100%;">
 
                             <el-table-column prop="tenderCode" width="150" fixed="left" label="标的编号" :show-overflow-tooltip="true" align="center" />
-                            <el-table-column prop="productName" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="productName" width="150" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="productEncode" width="150" label="产品内部编码" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="processingLocation"   label="加工地点（所在加工厂） " :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="number"  label="数量（吨）" :show-overflow-tooltip="true" align="center" />
@@ -146,9 +146,9 @@
                                   <el-tag v-if="scope.row.tenderSaleRule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="startTime"  label="起始时间" :show-overflow-tooltip="true" align="center" />
-                            <el-table-column prop="endTime" label="结束时间" :show-overflow-tooltip="true" align="center" />
-                            <el-table-column prop="createTime" label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="startTime" width="152" label="起始时间" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="endTime" width="152" label="结束时间" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="createTime"  label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                           </el-table>
                           <div class="pagination">
@@ -430,9 +430,15 @@ export default {
  
       this.dialogTableVisible = true
       setTimeout(() => {
-        this.goodsName = val.goodsName
-       this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
+      //   this.goodsName = val.goodsName
+      //  this.$refs.ckDialog.priceData = val
+      // this.$refs.ckDialog.getTenantList()
+        // console.log(this.$refs.ckDialog)
+         this.goodsName = val.goodsName
+          this.$refs.ckDialog.historyValue = ""
+          this.$refs.ckDialog.goodsName = ""
+          this.$refs.ckDialog.priceData = val
+          this.$refs.ckDialog.handleFind()
         console.log(this.$refs.ckDialog)
       }, 300);
     },
@@ -647,7 +653,8 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+         this.$refs.ckTable.productName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
     handleView(row) {

src/views/bid/tender2/dialog.vue

@@ -1,82 +1,80 @@
 <template>
   <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
-    <!-- <div>
-      <span style="font-size:14px">货物：</span>
-      <el-input
-        v-model="goodsName"
-        clearable
-        placeholder="请输入货物"
-        style="width: 200px;margin-bottom:20px"
-        size="small"
-         @keyup.enter.native="handleFind"
-         @clear="handleFind"
-        class="filter-item"
-      />
-
+    <div class="" style="margin: 10px 0 30px 0;">
+      <span style="font-size:14px">客户名称：</span>
+      <el-select v-model="goodsName" filterable style="width: 200px;" clearable size="small" placeholder="请选择" @clear="handleFind">
+            <el-option v-for="item in userDataList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
+          </el-select>
+      <span style="font-size:14px;margin-left:20px">是否为历史记录：</span>
+       <el-select v-model="historyValue" style="width: 200px;" @keyup.enter.native="handleFind" @clear="handleFind" size="small" clearable  value-key="areaId" filterable placeholder="请选择">
+        <el-option
+          v-for="item in history"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
+      </el-select>
 
 
       <el-button style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="handleFind">查询
       </el-button>
-    </div> -->
+    </div>
 
     <el-table  ref="multipleTable" v-loading="loading" :data="tableData"  :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
+                            <el-table-column prop="customerName" width="170" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="rawTenderId" width="150" fixed="left" label="标的编号" :show-overflow-tooltip="true" align="center" />
 
-      <el-table-column label="运输方式" prop="goodsName"   align="center" :show-overflow-tooltip="true">
-           <template slot-scope="scope">
-                            <span v-if="scope.row.transportMode == 1">陆运</span>
-                            <!-- <span v-if="scope.row.transportMode == 2">汽运</span> -->
-                            <span v-if="scope.row.transportMode == 2">火车运输</span>
-                            <span v-if="scope.row.transportMode == 3">船运</span>
-                            <span v-if="scope.row.transportMode == 4">汽运/火车运输/船运</span>
-                            <span v-if="scope.row.transportMode == 5">汽运/火车运输</span>
-                            <span v-if="scope.row.transportMode == 6">汽运/船运</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="投标价格" prop="logisticsBiddingPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="数量（吨）" prop="quantity" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="总价" prop="logisticsTotalPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="联系电话" prop="phone" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-       <el-table-column  :show-overflow-tooltip="true" label="包装方式" width="100" align="center">
-        <template slot-scope="scope">
-            <span v-if="scope.row.packingWay == 0">未知</span> 
-            <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
-            <span v-if="scope.row.packingWay == 3">散装</span> 
-            <span v-if="scope.row.packingWay == 4">集装箱</span> 
-        </template>
-      </el-table-column>
-
-      <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-       <el-table-column label="状态" align="center" width="100">
-            <template slot-scope="scope">
-            <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
-            </template>
-       </el-table-column>
-      <el-table-column label="投标时间" prop="logisticsBiddingTime" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="备注" prop="biddingLogisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
+                            <el-table-column prop="quantity"  label="数量（吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="biddingPrice"  width="90" label="投标价格（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="totalPrice" width="90" label="总价（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="priceProvision"  width="100" label="价格条款" :show-overflow-tooltip="true" align="center" >
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.priceProvision ==1"> 港口平仓价</span>
+                                    <span v-if="scope.row.priceProvision ==2"> 到厂价</span>
+                                    <span v-if="scope.row.priceProvision ==3"> 自提价</span>
+                                </template>
+                            </el-table-column>
+                                 <el-table-column label="状态" align="center" width="100">
+                            <template slot-scope="scope">
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
+                            </template>
+                          </el-table-column>
+                            <el-table-column prop="dateManufacture" label="生产日期"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryStartTime" width="170" label="交货开始" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryEndTime" width="170" label="交货结束" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryLocation" width="170" label="交货地点" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="invoiceRate"  label="发票税率（%）" :show-overflow-tooltip="true" align="center" >
+                              <template slot-scope="scope">
+                                  <span>{{scope.row.invoiceRate}}</span> <span v-if="scope.row.invoiceRate"> %</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop=""  width="90" label="发票种类" :show-overflow-tooltip="true" align="center" >
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.invoiceType ==1"> 普票</span>
+                                    <span v-if="scope.row.invoiceType ==2"> 专票</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="phone" width="170" label="联系电话" :show-overflow-tooltip="true" align="center" />
+                             <el-table-column prop="appendix" label="凭证" align="center" width="100">
+                                <template slot-scope="scope">
+                                    <el-link :disabled="scope.row.voucherFile ? false : true" :href="scope.row.voucherFile" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
+                                </template>
+                              </el-table-column>
+                        
+                            <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
+                 
     </el-table>
 
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -97,7 +95,7 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getLogisticsInfo } from '@/api/tender'
+import { getBiddingRowInfo,getCustomerName } from '@/api/bid'
 
 export default {
   data() {
@@ -120,6 +118,11 @@ export default {
         { id: 8, name: '其他' }
 
       ],
+      history:[
+        {id:0,name:"否"},
+        {id:1,name:"是"}
+      ],
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -127,7 +130,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -139,26 +142,37 @@ export default {
        BASE_API: process.env.BASE_API,
        fileList: [],
       roles:[],
+      userDataList:[],
       startTime:"",
       endTime:"",
         isShow:true
     }
   },
   created() {
-    // this.getTenantList()
+    this.onCustmerName()
     console.log('res')
   },
   methods: {
+    onCustmerName(){
+        getCustomerName().then((res)=>{
+            console.log(res)
+            this.userDataList = res.data.data
+        })
+    },
       onshow(){
           this.isShow = !this.isShow
       },
     parseTime,
     getTenantList: function() {
         console.log(this.priceData)
-        let tenderLogisticsId =this.priceData.logisticsBidId
-        let current =this.current
-        let size =this.size
-      getLogisticsInfo(tenderLogisticsId,size,current).then(response => {
+      const params = new URLSearchParams()
+      params.append('customerId', this.goodsName)
+      params.append('isHistory', this.historyValue)
+      params.append('rawTenderId', this.priceData.rawTenderId)
+      params.append('current', this.current)
+      params.append('size', this.size)
+      this.loading =true
+      getBiddingRowInfo(params).then(response => {
         console.log(response)
         this.loading = false
          let data = response.data.data.records
@@ -185,7 +199,7 @@ export default {
         })
         console.log(data)
         this.tableData = data
-        console.log('1' + response.data.data.records)
+        console.log('1' + response.data.data)
         this.total = response.data.data.total
       })
     },
@@ -204,7 +218,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {
@@ -274,5 +288,8 @@ export default {
 /deep/ .el-table__expanded-cell[class*=cell]{
     padding: 0;
 }
+.pagination{
+  padding-bottom: 30px;
+}
 </style>
 

src/views/bid/tender2/table.vue

@@ -87,7 +87,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -138,7 +138,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -232,7 +232,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender2/tender.vue

@@ -81,6 +81,11 @@
                                     :value="item.name"
                                   />
                                 </el-select>
+                                 <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                              <el-select v-model="param.rawIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
+                                <el-option  label="未投标" value="0"> </el-option>
+                                <el-option  label="有投标" value="1"> </el-option>
+                              </el-select>
                             <span style="fontSize:13px;marginLeft:20px">发标时间</span>
                               <el-date-picker
                                 v-model="applyDateStart"
@@ -96,7 +101,7 @@
                               @change="onApplyDate"
                               @clear="onApplyDate"
                               />
-                              <div style="text-align: right;margin-right:40px">
+                              <div style="text-align: right;margin-right:40px;margin-top:20px">
                                    <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="getParamFexd">搜索</el-button>
                               </div>
                           <div style="height:20px"></div>
@@ -430,10 +435,15 @@ export default {
  
       this.dialogTableVisible = true
       setTimeout(() => {
-        this.goodsName = val.goodsName
-       this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
-        console.log(this.$refs.ckDialog)
+      //   this.goodsName = val.goodsName
+      //  this.$refs.ckDialog.priceData = val
+      // this.$refs.ckDialog.getTenantList()
+      //   console.log(this.$refs.ckDialog)
+       this.goodsName = val.goodsName
+          this.$refs.ckDialog.historyValue = ""
+          this.$refs.ckDialog.goodsName = ""
+          this.$refs.ckDialog.priceData = val
+          this.$refs.ckDialog.handleFind()
       }, 300);
     },
     // 价格投标不能大于合计
@@ -647,7 +657,9 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        // this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.goodsName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
 

src/views/bid/tender3/dialog.vue

@@ -56,7 +56,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -104,7 +104,7 @@ export default {
         {id:0,name:"否"},
         {id:1,name:"是"}
       ],
-      historyValue:0,
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -112,7 +112,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -149,7 +149,7 @@ export default {
         console.log(this.priceData)
       const params = new URLSearchParams()
       params.append('customerId', this.goodsName)
-      params.append('historyValue', this.historyValue)
+      params.append('isHistory', this.historyValue)
       params.append('biddingProcessingId', this.priceData.tenderProcessingId)
       params.append('current', this.current)
       params.append('size', this.size)
@@ -200,7 +200,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender3/table.vue

@@ -107,7 +107,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -158,7 +158,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -250,7 +250,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/bid/tender3/tender.vue

@@ -461,11 +461,16 @@ export default {
       this.dialogTableVisible = true
       setTimeout(() => {
         this.goodsName = val.goodsName
-       this.$refs.ckDialog.historyValue = 0
-       this.$refs.ckDialog.goodsName = ""
-       this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
-        console.log(this.$refs.ckDialog)
+      // //  this.$refs.ckDialog.historyValue = 0
+      //  this.$refs.ckDialog.goodsName = ""
+      //  this.$refs.ckDialog.priceData = val
+      // this.$refs.ckDialog.getTenantList()
+      //   console.log(this.$refs.ckDialog)
+       this.goodsName = val.goodsName
+          this.$refs.ckDialog.historyValue = ""
+          this.$refs.ckDialog.goodsName = ""
+          this.$refs.ckDialog.priceData = val
+          this.$refs.ckDialog.handleFind()
       }, 300);
     },
     // 价格投标不能大于合计
@@ -679,7 +684,9 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        // this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.productName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
 

src/views/client/record.vue

@@ -263,7 +263,7 @@
           <el-row :gutter="20">
               <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
                <el-form-item label="投标类型" prop="customerBidType" :label-width="formLabelWidth">
-                    <el-select v-model="dataForm.customerBidType" style="width:100%"  clearable value-key="areaId" filterable placeholder="请选择公司类型">
+                    <el-select v-model="dataForm.customerBidType" style="width:100%"  clearable value-key="areaId" filterable placeholder="请选择投标类型">
                       <el-option
                         v-for="item in customerBidType"
                         :key="item.id"

src/views/tender/index.vue

@@ -483,13 +483,20 @@ export default {
     handleView(row) {
       let tenderType = row.tenderType
       console.log(row.tenderType,"tenderType")
+      let param =  {
+        tenderParentId:row.tenderParentId,
+          current: 1,
+          size: 10
+        }
       if(tenderType == 1){
         this.$refs.ckTender.viewDialog = true
          setTimeout(() => {
             this.$refs.ckTender.activeName="first"
-            this.$refs.ckTender.param.tenderParentId = row.tenderParentId
+            // this.$refs.ckTender.param.tenderParentId = row.tenderParentId
             this.$refs.ckTender.bidInfo = row
-            this.$refs.ckTender.param.current = 1
+            this.$refs.ckTender.param = param
+            // this.$refs.ckTender.param.current = 1
+            this.$refs.ckTender.applyDateStart = []
             this.$refs.ckTender.getParam()
             console.log("物流")
       }, 300);
@@ -497,9 +504,11 @@ export default {
          this.$refs.ckTender2.viewDialog = true
          setTimeout(() => {
             this.$refs.ckTender2.activeName="first"
-            this.$refs.ckTender2.param.tenderParentId = row.tenderParentId
+            // this.$refs.ckTender2.param.tenderParentId = row.tenderParentId
             this.$refs.ckTender2.bidInfo = row
-            this.$refs.ckTender2.param.current = 1
+            this.$refs.ckTender2.param = param
+            // this.$refs.ckTender2.param.current = 1
+            this.$refs.ckTender2.applyDateStart = []
             this.$refs.ckTender2.getParam()
          }, 300);
         console.log("原料")
@@ -507,9 +516,11 @@ export default {
         this.$refs.ckTender1.viewDialog = true
          setTimeout(() => {
             this.$refs.ckTender1.activeName="first"
-            this.$refs.ckTender1.param.tenderParentId = row.tenderParentId
+            // this.$refs.ckTender1.param.tenderParentId = row.tenderParentId
             this.$refs.ckTender1.bidInfo = row
-            this.$refs.ckTender1.param.current = 1
+            this.$refs.ckTender1.param = param
+            // this.$refs.ckTender1.param.current = 1
+            this.$refs.ckTender1.applyDateStart = []
             this.$refs.ckTender1.getParam()
       }, 300);
         console.log("销售")
@@ -517,9 +528,11 @@ export default {
         this.$refs.ckTender3.viewDialog = true
          setTimeout(() => {
             this.$refs.ckTender3.activeName="first"
-            this.$refs.ckTender3.param.tenderParentId = row.tenderParentId
+            // this.$refs.ckTender3.param.tenderParentId = row.tenderParentId
             this.$refs.ckTender3.bidInfo = row
-            this.$refs.ckTender3.param.current = 1
+            this.$refs.ckTender3.param = param
+            // this.$refs.ckTender3.param.current = 1
+            this.$refs.ckTender3.applyDateStart = []
             this.$refs.ckTender3.getParam()
       }, 300);
         console.log("加工承揽")

src/views/tender/tender/tender.vue

@@ -63,7 +63,22 @@
                                 @keyup.enter.native="getParamFexd"
                                 @clear="getParamFexd"
                               />
-                  
+                            </el-select>
+                            <span style="fontSize:13px;marginLeft:20px">发标时间</span>
+                              <el-date-picker
+                                v-model="applyDateStart"
+                                size="small"
+                                type="datetimerange"
+                                style="width: 400px;"
+                                range-separator="-"
+                                clearable
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                :default-time="['00:00:00', '23:59:59']"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                              @change="onApplyDate"
+                              @clear="onApplyDate"
+                              />
                           <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="getParamFexd">搜索</el-button>
                           <div style="height:20px"></div>
                           <el-table center :data="Paramdata" :header-cell-style="{ background: '#f5f7fa', }" border v-loading="tableLoading" stripe style="width: 100%;">
@@ -146,13 +161,13 @@
                         </el-form-item>
                          <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
-                            <el-form-item label="始发车站" prop="departureStation">
-                              <el-input v-model="form.departureStation" style="width: 80%;" placeholder="请输入始发车站"></el-input>
+                            <el-form-item label="始发地" prop="departureStation">
+                              <el-input v-model="form.departureStation" style="width: 80%;" placeholder="请输入始发地"></el-input>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
-                             <el-form-item label="目的车站" prop="destinationStation">
-                                <el-input v-model="form.destinationStation" style="width: 80%;" placeholder="请输入目的车站"></el-input>
+                             <el-form-item label="目的地" prop="destinationStation">
+                                <el-input v-model="form.destinationStation" style="width: 80%;" placeholder="请输入目的地"></el-input>
                               </el-form-item>
                           </el-col>
                          </el-row>
@@ -417,14 +432,14 @@ export default {
        }
     },
     onApplyDate(){
-      let startTime
+ let startTime
       let endTime
             if(this.applyDateStart != null){
-              this.query.startTime =this.applyDateStart[0]
-              this.query.endTime = this.applyDateStart[1]
+              this.param.startTime =this.applyDateStart[0]
+              this.param.endTime = this.applyDateStart[1]
             }else{
-              this.query.startTime =""
-              this.query.endTime =""
+              this.param.startTime =""
+              this.param.endTime =""
             }
 
       this.handleFind()
@@ -610,7 +625,8 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.goodsName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
     handleView(row) {

src/views/tender/tender1/dialog.vue

@@ -1,82 +1,40 @@
 <template>
   <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
-    <!-- <div>
-      <span style="font-size:14px">货物：</span>
-      <el-input
-        v-model="goodsName"
-        clearable
-        placeholder="请输入货物"
-        style="width: 200px;margin-bottom:20px"
-        size="small"
-         @keyup.enter.native="handleFind"
-         @clear="handleFind"
-        class="filter-item"
-      />
-
-
 
-      <el-button style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="handleFind">查询
-      </el-button>
-    </div> -->
 
     <el-table  ref="multipleTable" v-loading="loading" :data="tableData"  :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
-
-      <el-table-column label="运输方式" prop="goodsName"   align="center" :show-overflow-tooltip="true">
-           <template slot-scope="scope">
-                            <span v-if="scope.row.transportMode == 1">陆运</span>
-                            <!-- <span v-if="scope.row.transportMode == 2">汽运</span> -->
-                            <span v-if="scope.row.transportMode == 2">火车运输</span>
-                            <span v-if="scope.row.transportMode == 3">船运</span>
-                            <span v-if="scope.row.transportMode == 4">汽运/火车运输/船运</span>
-                            <span v-if="scope.row.transportMode == 5">汽运/火车运输</span>
-                            <span v-if="scope.row.transportMode == 6">汽运/船运</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="投标价格" prop="logisticsBiddingPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="数量（吨）" prop="quantity" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="总价" prop="logisticsTotalPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="联系电话" prop="phone" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-       <el-table-column  :show-overflow-tooltip="true" label="包装方式" width="100" align="center">
-        <template slot-scope="scope">
-            <span v-if="scope.row.packingWay == 0">未知</span> 
-            <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
-            <span v-if="scope.row.packingWay == 3">散装</span> 
-            <span v-if="scope.row.packingWay == 4">集装箱</span> 
-        </template>
-      </el-table-column>
-
-      <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-       <el-table-column label="状态" align="center" width="100">
-            <template slot-scope="scope">
-            <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
-            </template>
-       </el-table-column>
-      <el-table-column label="投标时间" prop="logisticsBiddingTime" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="备注" prop="biddingLogisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
+                            <el-table-column prop="customerName" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="tenderSaleId" width="150" fixed="left" label="标的编号" :show-overflow-tooltip="true" align="center" />
+
+                            <el-table-column prop="quantity"  label="数量（吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="biddingPrice"  width="90" label="投标价格（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="totalPrice" width="90" label="总价（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="phone" width="170" label="联系电话" :show-overflow-tooltip="true" align="center" />
+                             <!-- <el-table-column prop="appendix" label="凭证" align="center" width="100">
+                                <template slot-scope="scope">
+                                    <el-link :disabled="scope.row.voucherFile ? false : true" :href="scope.row.voucherFile" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
+                                </template>
+                              </el-table-column> -->
+                           <el-table-column label="状态" align="center" width="100">
+                            <template slot-scope="scope">
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
+                            </template>
+                          </el-table-column>
+                            <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
+                 
     </el-table>
 
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+          current-page.sync="current"
+         :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -97,7 +55,7 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getLogisticsInfo } from '@/api/tender'
+import { getBiddingSaleInfo,getCustomerName } from '@/api/tender'
 
 export default {
   data() {
@@ -120,6 +78,11 @@ export default {
         { id: 8, name: '其他' }
 
       ],
+      history:[
+        {id:0,name:"否"},
+        {id:1,name:"是"}
+      ],
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -127,7 +90,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -139,26 +102,37 @@ export default {
        BASE_API: process.env.BASE_API,
        fileList: [],
       roles:[],
+      userDataList:[],
       startTime:"",
       endTime:"",
         isShow:true
     }
   },
   created() {
-    // this.getTenantList()
+    this.onCustmerName()
     console.log('res')
   },
   methods: {
+    onCustmerName(){
+        getCustomerName().then((res)=>{
+            console.log(res)
+            this.userDataList = res.data.data
+        })
+    },
       onshow(){
           this.isShow = !this.isShow
       },
     parseTime,
     getTenantList: function() {
         console.log(this.priceData)
-        let tenderLogisticsId =this.priceData.logisticsBidId
-        let current =this.current
-        let size =this.size
-      getLogisticsInfo(tenderLogisticsId,size,current).then(response => {
+      const params = new URLSearchParams()
+      // params.append('customerId', this.goodsName)
+      // params.append('isHistory', this.historyValue)
+      params.append('tenderSaleId', this.priceData.tenderSaleId)
+      params.append('current', this.current)
+      params.append('size', this.size)
+      this.loading =true
+      getBiddingSaleInfo(params).then(response => {
         console.log(response)
         this.loading = false
          let data = response.data.data.records
@@ -185,7 +159,7 @@ export default {
         })
         console.log(data)
         this.tableData = data
-        console.log('1' + response.data.data.records)
+        console.log('1' + response.data.data)
         this.total = response.data.data.total
       })
     },
@@ -204,7 +178,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {
@@ -274,5 +248,8 @@ export default {
 /deep/ .el-table__expanded-cell[class*=cell]{
     padding: 0;
 }
+.pagination{
+  padding-bottom: 30px;
+}
 </style>
 

src/views/tender/tender1/table.vue

@@ -79,7 +79,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"

src/views/tender/tender1/tender.vue

@@ -137,7 +137,7 @@
                             <el-table-column label="操作" width="150" align="center" fixed="right">
                                 <template slot-scope="scope">
                                   <el-button  slot="reference" type="text" :disabled="scope.row.status !=3" icon="el-icon-plus" @click="handleAdd(scope.row)">投标</el-button>
-                                  <el-button  slot="reference" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)">投标</el-button>
+                                  <!-- <el-button  slot="reference" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)">投标</el-button> -->
                                 </template>
                               </el-table-column>
                           </el-table>
@@ -250,7 +250,9 @@
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                             <el-form-item label="投标价格" prop="biddingPrice">
                              <div  class="mo-input--number">
-                              <el-input-number style="width:100%"  v-model.number="form.biddingPrice"  step-strictly controls-position="right" :step="form.biddingStartPrice" :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number>
+                              <!-- <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="form.biddingPrice"  step-strictly controls-position="right"  :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number> -->
+                              <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="form.biddingPrice"  step-strictly controls-position="right" :step="form.biddingStartPrice" :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number>
+                              <!-- <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="biddingPrice"  step-strictly controls-position="right" :step="13" :min="208"  :max="308"></el-input-number> -->
                                <div class="define-append">(吨/元)</div>
                              </div>
                               <div style="color:#909399;fontSize:15px"> * <span style="color:#909399;fontSize:13px;position: relative;top:-5px">价格范围：{{form.lowestPrice}} ~ {{form.highestPrice}}(元)，起价：{{form.biddingStartPrice}}（元） </span> </div>
@@ -261,7 +263,7 @@
                                <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                           <el-form-item label="合计" prop="quantity">
-                              <el-input  :value="form.biddingPrice ? (form.quantity *form.biddingPrice).toFixed(4) : 0" readonly style="width: 70%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input>
+                              <el-input  :value="form.biddingPrice ? (form.quantity *form.biddingPrice).toFixed(4) : 0" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input>
                          
                           </el-form-item>
                           </el-col>
@@ -470,10 +472,20 @@ export default {
       setTimeout(() => {
         this.goodsName = val.goodsName
        this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
+      this.$refs.ckDialog.handleFind()
         console.log(this.$refs.ckDialog)
       }, 300);
     },
+    handleNumberChange(val,row){
+      console.log(val,row)
+      // if(val > row){
+      //   console.log("我是加")
+      //   this.form.biddingPrice =  row + this.form.biddingStartPrice 
+      // }else if (val < row){
+      //   console.log("我是减")
+      //   this.form.biddingPrice =  row - this.form.biddingStartPrice     
+      // }
+    },
     // 价格投标不能大于合计
     onlogistiicsPrice(val){
       console.log(val)
@@ -698,7 +710,8 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.productName =""
+        this.$refs.ckTable.handleFind()
       }
     },
     handleView(row) {

src/views/tender/tender2/dialog.vue

@@ -1,82 +1,81 @@
 <template>
   <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
-    <!-- <div>
-      <span style="font-size:14px">货物：</span>
-      <el-input
-        v-model="goodsName"
-        clearable
-        placeholder="请输入货物"
-        style="width: 200px;margin-bottom:20px"
-        size="small"
-         @keyup.enter.native="handleFind"
-         @clear="handleFind"
-        class="filter-item"
-      />
-
+    <!-- <div class="" style="margin: 10px 0 30px 0;">
+      <span style="font-size:14px">客户名称：</span>
+      <el-select v-model="goodsName" filterable style="width: 200px;" clearable size="small" placeholder="请选择" @clear="handleFind">
+            <el-option v-for="item in userDataList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
+          </el-select>
+      <span style="font-size:14px;margin-left:20px">是否为历史记录：</span>
+       <el-select v-model="historyValue" style="width: 200px;" @keyup.enter.native="handleFind" @clear="handleFind" size="small" clearable  value-key="areaId" filterable placeholder="请选择">
+        <el-option
+          v-for="item in history"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
+      </el-select> 
 
 
       <el-button style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="handleFind">查询
       </el-button>
-    </div> -->
-
+    </div>
+-->
     <el-table  ref="multipleTable" v-loading="loading" :data="tableData"  :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
+                            <el-table-column prop="customerName" width="170" fixed="left" label="产品名称" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="rawTenderId" width="150" fixed="left" label="标的编号" :show-overflow-tooltip="true" align="center" />
 
-      <el-table-column label="运输方式" prop="goodsName"   align="center" :show-overflow-tooltip="true">
-           <template slot-scope="scope">
-                            <span v-if="scope.row.transportMode == 1">陆运</span>
-                            <!-- <span v-if="scope.row.transportMode == 2">汽运</span> -->
-                            <span v-if="scope.row.transportMode == 2">火车运输</span>
-                            <span v-if="scope.row.transportMode == 3">船运</span>
-                            <span v-if="scope.row.transportMode == 4">汽运/火车运输/船运</span>
-                            <span v-if="scope.row.transportMode == 5">汽运/火车运输</span>
-                            <span v-if="scope.row.transportMode == 6">汽运/船运</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="投标价格" prop="logisticsBiddingPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="数量（吨）" prop="quantity" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="总价" prop="logisticsTotalPrice" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="联系电话" prop="phone" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-       <el-table-column  :show-overflow-tooltip="true" label="包装方式" width="100" align="center">
-        <template slot-scope="scope">
-            <span v-if="scope.row.packingWay == 0">未知</span> 
-            <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
-            <span v-if="scope.row.packingWay == 3">散装</span> 
-            <span v-if="scope.row.packingWay == 4">集装箱</span> 
-        </template>
-      </el-table-column>
-
-      <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-      <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-       <el-table-column label="状态" align="center" width="100">
-            <template slot-scope="scope">
-            <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
-            <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
-            </template>
-       </el-table-column>
-      <el-table-column label="投标时间" prop="logisticsBiddingTime" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
-
-      <el-table-column label="备注" prop="biddingLogisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
-      </el-table-column>
+                            <el-table-column prop="quantity"  label="数量（吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="biddingPrice"  width="90" label="投标价格（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="totalPrice" width="90" label="总价（元/吨）" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="priceProvision"  width="100" label="价格条款" :show-overflow-tooltip="true" align="center" >
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.priceProvision ==1"> 港口平仓价</span>
+                                    <span v-if="scope.row.priceProvision ==2"> 到厂价</span>
+                                    <span v-if="scope.row.priceProvision ==3"> 自提价</span>
+                                </template>
+                            </el-table-column>
+                                 <el-table-column label="状态" align="center" width="100">
+                            <template slot-scope="scope">
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus == 5">已投递</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==6" type="info">审核中</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==7" type="warning">已中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==8" type="danger">未中标</el-tag>
+                              <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
+                            </template>
+                          </el-table-column>
+                            <el-table-column prop="dateManufacture" label="生产日期"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryStartTime" width="170" label="交货开始" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryEndTime" width="170" label="交货结束" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="deliveryLocation" width="170" label="交货地点" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="invoiceRate"  label="发票税率（%）" :show-overflow-tooltip="true" align="center" >
+                              <template slot-scope="scope">
+                                  <span>{{scope.row.invoiceRate}}</span> <span v-if="scope.row.invoiceRate"> %</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop=""  width="90" label="发票种类" :show-overflow-tooltip="true" align="center" >
+                                <template slot-scope="scope">
+                                    <span v-if="scope.row.invoiceType ==1"> 普票</span>
+                                    <span v-if="scope.row.invoiceType ==2"> 专票</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="phone" width="170" label="联系电话" :show-overflow-tooltip="true" align="center" />
+                             <!-- <el-table-column prop="appendix" label="凭证" align="center" width="100">
+                                <template slot-scope="scope">
+                                    <el-link :disabled="scope.row.voucherFile ? false : true" :href="scope.row.voucherFile" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
+                                </template>
+                              </el-table-column> -->
+                        
+                            <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
+                 
     </el-table>
 
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+         current-page.sync="current"
+         :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -97,7 +96,7 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getLogisticsInfo } from '@/api/tender'
+import { getBiddingRowInfo,getCustomerName } from '@/api/tender'
 
 export default {
   data() {
@@ -120,6 +119,11 @@ export default {
         { id: 8, name: '其他' }
 
       ],
+      history:[
+        {id:0,name:"否"},
+        {id:1,name:"是"}
+      ],
+      historyValue:"",
       areaList: [],
       query: {
         goodsName: '',
@@ -139,26 +143,37 @@ export default {
        BASE_API: process.env.BASE_API,
        fileList: [],
       roles:[],
+      userDataList:[],
       startTime:"",
       endTime:"",
         isShow:true
     }
   },
   created() {
-    // this.getTenantList()
+    this.onCustmerName()
     console.log('res')
   },
   methods: {
+    onCustmerName(){
+        getCustomerName().then((res)=>{
+            console.log(res)
+            this.userDataList = res.data.data
+        })
+    },
       onshow(){
           this.isShow = !this.isShow
       },
     parseTime,
     getTenantList: function() {
         console.log(this.priceData)
-        let tenderLogisticsId =this.priceData.logisticsBidId
-        let current =this.current
-        let size =this.size
-      getLogisticsInfo(tenderLogisticsId,size,current).then(response => {
+      const params = new URLSearchParams()
+      // params.append('customerId', this.goodsName)
+      // params.append('isHistory', this.historyValue)
+      params.append('rawTenderId', this.priceData.rawTenderId)
+      params.append('current', this.current)
+      params.append('size', this.size)
+      this.loading =true
+      getBiddingRowInfo(params).then(response => {
         console.log(response)
         this.loading = false
          let data = response.data.data.records
@@ -185,7 +200,7 @@ export default {
         })
         console.log(data)
         this.tableData = data
-        console.log('1' + response.data.data.records)
+        console.log('1' + response.data.data)
         this.total = response.data.data.total
       })
     },
@@ -274,5 +289,8 @@ export default {
 /deep/ .el-table__expanded-cell[class*=cell]{
     padding: 0;
 }
+.pagination{
+  padding-bottom: 30px;
+}
 </style>
 

src/views/tender/tender2/table.vue

@@ -92,7 +92,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
@@ -143,7 +143,7 @@ export default {
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      current: '1',
+      current: 1,
       size: 10,
       total: 0, // 总数量
       dataForm: {
@@ -237,7 +237,7 @@ export default {
     },
 
     handleFind: function() {
-      this.current = '1'
+      this.current = 1
       this.getTenantList()
     },
     handleSizeChange: function(val) {

src/views/tender/tender2/tender.vue

@@ -491,7 +491,7 @@ export default {
       setTimeout(() => {
         this.goodsName = val.goodsName
        this.$refs.ckDialog.priceData = val
-      this.$refs.ckDialog.getTenantList()
+      this.$refs.ckDialog.handleFind()
         console.log(this.$refs.ckDialog)
       }, 300);
     },
@@ -716,7 +716,8 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.goodsName = ""
+        this.$refs.ckTable.handleFind()
       }
     },
 

src/views/tender/tender3/table.vue

@@ -107,7 +107,7 @@
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="current"
+        :current-page="current"
         :page-sizes="[1,10, 20, 30, 50]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"

src/views/tender/tender3/tender.vue

@@ -672,7 +672,8 @@ export default {
       console.log(row,val)
       if(row.name == "second"){
        this.$refs.ckTable.tenderParentId = this.param.tenderParentId
-        this.$refs.ckTable.getTenantList()
+        this.$refs.ckTable.productName =""
+        this.$refs.ckTable.handleFind()
       }
     },