瀏覽代碼

历史标的详情

zerp 2 年之前
父節點
當前提交
5c2980c231
共有 7 個文件被更改,包括 850 次插入130 次删除
  1. 8 0
      src/api/bid.js
  2. 9 1
      src/api/tender.js
  3. 136 99
      src/views/bid/index.vue
  4. 361 0
      src/views/bid/table.vue
  5. 276 0
      src/views/tender/dialog.vue
  6. 30 10
      src/views/tender/index.vue
  7. 30 20
      src/views/tender/table.vue

+ 8 - 0
src/api/bid.js

@@ -25,6 +25,14 @@ export function getQueryEdit(parms) {
     data: parms
   })
 }
+// 已投递列表
+export function getLogisticsList(parms) {
+  return request({
+    url: '/logistics/tender',
+    method: 'get',
+    params: parms
+  })
+}
 // 添加列表
 export function getQueryAdd(parms) {
   return request({

+ 9 - 1
src/api/tender.js

@@ -17,10 +17,18 @@ export function getQueryId(parms) {
     params: parms
   })
 }
+// 获取列表
+export function getLogisticsInfo(tenderLogisticsId,size,current) {
+  return request({
+    url: '/bidding/logistics/info/'+tenderLogisticsId+'/'+size+'/'+current,
+    method: 'get',
+    // params: parms
+  })
+}
 // 已投递列表
 export function getLogisticsList(parms) {
   return request({
-    url: ' /common/bidding/logistics/info',
+    url: '/bidding/logistics/page',
     method: 'get',
     params: parms
   })

+ 136 - 99
src/views/bid/index.vue

@@ -259,102 +259,113 @@
     <!-- 详情 -->
     <div class="goodsNameCss">
           <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="标的详情" center>
-                  <div class="head-container" style="margin: 60px 0 10px 0;">
-                     <span style="fontSize:13px">货物名称</span>
-                      <el-input
-                        v-model="param.goodsName"
-                        clearable
-                        placeholder="请输入货物名称"
-                        style="width: 200px;"
-                        size="small"
-                        class="filter-item"
-                         @keyup.enter.native="getParam"
-                         @clear="getParam"
-                      />
-                   <span style="fontSize:13px;marginLeft:30px">始发地</span>
-                      <el-input
-                        v-model="param.departureName"
-                        clearable
-                        placeholder="请输入始发地"
-                        style="width: 200px;"
-                        size="small"
-                        class="filter-item"
-                         @keyup.enter.native="getParam"
-                         @clear="getParam"
-                      />
-     
-                  <span style="fontSize:13px;marginLeft:30px;">目的地</span>
-                      <el-input
-                        v-model="param.destinationName"
-                        clearable
-                        placeholder="请输入货物名称"
-                        style="width: 200px;"
-                        size="small"
-                        class="filter-item"
-                         @keyup.enter.native="getParam"
-                         @clear="getParam"
-                      />
-                      <!-- 搜索 -->
-                      <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
-                      <el-select v-model="param.logisticsIsTender" size="small"  @keyup.enter.native="getParam" @clear="getParam" clearable placeholder="请选择">
-                        <el-option  label="未投标" value="0"> </el-option>
-                        <el-option  label="有投标" value="1"> </el-option>
-                      </el-select>
-                  <el-button class="filter-item" style="marginLeft:20px;marginBottom:20px" size="small" type="primary" icon="el-icon-search" plain @click="getParam">搜索</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%;">
-
-                    <el-table-column prop="goodsName" fixed="left" label="货品名称" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="goodsNumber"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="departureName"  label="始发地" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="destinationName" label="目的地" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="predictDistance" label="预估运输距离(公里/海里)" width="128" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="transportUnitPrice" label="运输单价含税价(元/吨)"  width="120" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column prop="appendix" label="附件" align="center" width="100">
-                        <template slot-scope="scope">
-                            <el-link v-if="scope.row.receiptPathUrl" :href="'http://view.officeapps.live.com/op/view.aspx?src='+scope.row.receiptPathUrl" 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.status ==1">进行中</el-tag>
-                      <el-tag effect="plain" v-if="scope.row.status ==2" type="info">已结束</el-tag>
-                      <el-tag effect="plain" v-if="scope.row.status ==3" type="danger">已作废</el-tag>
-                      <el-tag effect="plain" v-if="scope.row.status ==4" type="warning">未开始</el-tag>
-                    </template>
-                  </el-table-column>
-                    <el-table-column prop="logisticsIsTender" label="是否有人投标" :show-overflow-tooltip="true" align="center" >
-                      <template slot-scope="scope">
-                        <el-tag v-if="scope.row.logisticsIsTender == 0" type="warning">未投标</el-tag>
-                        <el-tag v-if="scope.row.logisticsIsTender == 1" type="warning">有投标</el-tag>
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="tenderLogisticsRule" label="中标规则" :show-overflow-tooltip="true" align="center" >
-                      <template slot-scope="scope">
-                        <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="warning">价低者得</el-tag>
-                        <el-tag v-if="scope.row.tenderLogisticsRule == 2" type="warning">价高者得</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>
-                  <div class="pagination">
-                    <el-pagination
-                      :current-page.sync="param.current"
-                      :page-size="param.size"
-                      layout="total, sizes, prev, pager, next, jumper"
-                      :total="total1"
-                      :page-sizes="[10, 20, 30, 50]"
-                      background
-                      @size-change="handleSizeChangeParam"
-                      @current-change="handleCurrentChangeParam"
-                    />
-                  </div>
-          <div style="height:60px"></div>
-             </div>
+                    <el-card class="box-card" shadow="nerver">
+                      <div slot="header" class="clearfix">
+                        <span class="topClass">投的详情</span>
+                      </div>
+                              <div class="head-container" style="margin: 30px 0 10px 0;">
+                                <span style="fontSize:13px">货物名称</span>
+                                  <el-input
+                                    v-model="param.goodsName"
+                                    clearable
+                                    placeholder="请输入货物名称"
+                                    style="width: 200px;"
+                                    size="small"
+                                    class="filter-item"
+                                    @keyup.enter.native="getParam"
+                                    @clear="getParam"
+                                  />
+                              <span style="fontSize:13px;marginLeft:30px">始发地</span>
+                                  <el-input
+                                    v-model="param.departureName"
+                                    clearable
+                                    placeholder="请输入始发地"
+                                    style="width: 200px;"
+                                    size="small"
+                                    class="filter-item"
+                                    @keyup.enter.native="getParam"
+                                    @clear="getParam"
+                                  />
+                
+                              <span style="fontSize:13px;marginLeft:30px;">目的地</span>
+                                  <el-input
+                                    v-model="param.destinationName"
+                                    clearable
+                                    placeholder="请输入货物名称"
+                                    style="width: 200px;"
+                                    size="small"
+                                    class="filter-item"
+                                    @keyup.enter.native="getParam"
+                                    @clear="getParam"
+                                  />
+                                  <!-- 搜索 -->
+                                  <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                                  <el-select v-model="param.logisticsIsTender" size="small"  @keyup.enter.native="getParam" @clear="getParam" clearable placeholder="请选择">
+                                    <el-option  label="未投标" value="0"> </el-option>
+                                    <el-option  label="有投标" value="1"> </el-option>
+                                  </el-select>
+                              <el-button class="filter-item" style="marginLeft:20px;marginBottom:20px" size="small" type="primary" icon="el-icon-search" plain @click="getParam">搜索</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%;">
+
+                                <el-table-column prop="goodsName" fixed="left" label="货品名称" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="goodsNumber"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="departureName"  label="始发地" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="destinationName" label="目的地" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="predictDistance" label="预估运输距离(公里/海里)" width="128" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="transportUnitPrice" label="运输单价含税价(元/吨)"  width="120" :show-overflow-tooltip="true" align="center" />
+                                <el-table-column prop="appendix" label="附件" align="center" width="100">
+                                    <template slot-scope="scope">
+                                        <el-link v-if="scope.row.receiptPathUrl" :href="'http://view.officeapps.live.com/op/view.aspx?src='+scope.row.receiptPathUrl" 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.status ==1">进行中</el-tag>
+                                  <el-tag effect="plain" v-if="scope.row.status ==2" type="info">已结束</el-tag>
+                                  <el-tag effect="plain" v-if="scope.row.status ==3" type="danger">已作废</el-tag>
+                                  <el-tag effect="plain" v-if="scope.row.status ==4" type="warning">未开始</el-tag>
+                                </template>
+                              </el-table-column>
+                                <el-table-column prop="logisticsIsTender" label="是否有人投标" :show-overflow-tooltip="true" align="center" >
+                                  <template slot-scope="scope">
+                                    <el-tag v-if="scope.row.logisticsIsTender == 0" type="info">未投标</el-tag>
+                                    <el-tag v-if="scope.row.logisticsIsTender == 1" type="warning">有投标</el-tag>
+                                  </template>
+                                </el-table-column>
+                                <el-table-column prop="tenderLogisticsRule" label="中标规则" :show-overflow-tooltip="true" align="center" >
+                                  <template slot-scope="scope">
+                                    <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="success" effect="plain">价低者得</el-tag>
+                                    <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>
+                              <div class="pagination">
+                                <el-pagination
+                                  :current-page.sync="param.current"
+                                  :page-size="param.size"
+                                  layout="total, sizes, prev, pager, next, jumper"
+                                  :total="total1"
+                                  :page-sizes="[10, 20, 30, 50]"
+                                  background
+                                  @size-change="handleSizeChangeParam"
+                                  @current-change="handleCurrentChangeParam"
+                                />
+                              </div>
+                      <div style="height:60px"></div>
+                        </div>
+                    </el-card>
+                  <el-card class="box-card" shadow="nerver">
+                    <div slot="header" class="clearfix">
+                      <span class="topClass">投标详情</span>
+                    </div>
+                  <ckTable ref="ckTable"></ckTable>
+                   </el-card>
                        <div slot="footer" class="paginationParam">
                     <el-button @click="viewDialog = false">取消</el-button>
                     <el-button :loading="loading" type="primary" @click="viewDialog = false">确认</el-button>
@@ -370,7 +381,11 @@
 <script>
 import { getTableList, getQueryId, getQueryAdd, getQueryEdit, getQueryDelete, loadCustomer,apiFile } from '@/api/bid'
 import { Notification, MessageBox } from 'element-ui'
+import ckTable from './table.vue'
 export default {
+   components:{
+    ckTable
+  },
   data() {
     const checkTel = (rule, value, callback) => {
       console.log(this.form.fileUrl)
@@ -753,6 +768,11 @@ window.open(officeUrl,'_target')
       this.param.tenderParentId = row.tenderParentId
       this.param.current = 1
       this.getParam()
+         setTimeout(() => {
+        console.log(this.$refs.ckTable.tenderParentId,"1234")
+       this.$refs.ckTable.tenderParentId = row.tenderParentId
+        this.$refs.ckTable.getTenantList()
+      }, 300);
       this.viewDialog = true
     },
     getParam(tenderParentId) {
@@ -855,8 +875,25 @@ window.open(officeUrl,'_target')
     }
 .paginationParam{
   position: fixed;
-  bottom: 50px;
-  left: 45%;
+  // bottom: 50px;
+  bottom: 0;
+  line-height: 80px;
+  width: 100%;
+  // left: 45%;
+  z-index: 999;
+  background: #fff;
+}
+/deep/ .el-tabs__item{
+  font-size: 16px !important;
+  // padding: 35px  ;
+}
+.el-card {
+  border: 0px solid #fff;
+}
+.clearfix {
+    line-height: 20px;
+    font-size: 18px;
+    font-weight: 600;
+    color: #409EFF;
 }
-
 </style>

+ 361 - 0
src/views/bid/table.vue

@@ -0,0 +1,361 @@
+<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"
+      />
+          <!-- <span style="fontSize:13px;marginLeft:20px">投标时间</span>
+            <el-date-picker
+              v-model="applyDateStart"
+              size="mini"
+              type="datetimerange"
+              style="width: 280px;"
+              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 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 type="expand" prop="biddingLogisticsInfoList">
+      <template slot-scope="props"> -->
+            <!-- <div  :key="index" style="background:rgb(245, 247, 250);padding:15px;margin:10px 0" v-if="isShow">
+                <el-row type="flex" class="row-bg">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light" >运输方式: 
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 1">陆运</span> 
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 2">汽运</span>
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 3">火车运输</span>
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 4">船运</span>
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 5">汽运/火车运输/船运</span>
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 6">汽运/火车运输</span>
+                            <span v-if="props.row.biddingLogisticsInfoList[0].transportMode == 7">汽运/船运</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">投标价格:{{props.row.biddingLogisticsInfoList[0].logisticsBiddingPrice}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">数量:{{props.row.biddingLogisticsInfoList[0].quantity}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">总价:{{props.row.biddingLogisticsInfoList[0].logisticsTotalPrice}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">联系电话:{{props.row.biddingLogisticsInfoList[0].phone}}</div></el-col>
+                </el-row>
+                <el-row type="flex" class="row-bg" style="margin-top:15px">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light">包装方式:
+                           <span  v-if="props.row.biddingLogisticsInfoList[0].packingWay == 1">散粮</span> 
+                           <span v-if="props.row.biddingLogisticsInfoList[0].packingWay == 2">袋装</span> 
+                           <span v-if="props.row.biddingLogisticsInfoList[0].packingWay == 3">散装</span> 
+                           <span v-if="props.row.biddingLogisticsInfoList[0].packingWay == 4">集装箱</span> 
+                        </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">始发车站:{{props.row.biddingLogisticsInfoList[0].departureStation}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">目的车站:{{props.row.biddingLogisticsInfoList[0].destinationStation}}</div></el-col>
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light"> 状态:
+                                 <el-tag  v-if="props.row.biddingLogisticsInfoList[0].logisticsBiddingStatus == 5">已投递</el-tag>
+                                 <el-tag  v-if="props.row.biddingLogisticsInfoList[0].logisticsBiddingStatus == 6">审核中</el-tag>
+                                 <el-tag  v-if="props.row.biddingLogisticsInfoList[0].logisticsBiddingStatus == 7">已中标</el-tag>
+                                 <el-tag  v-if="props.row.biddingLogisticsInfoList[0].logisticsBiddingStatus == 8">未中标</el-tag>
+                         </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">投标时间:{{props.row.biddingLogisticsInfoList[0].logisticsBiddingTime}}</div></el-col>
+                </el-row>
+                <el-row type="flex" class="row-bg" style="margin-top:15px">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light">备注:
+                            {{props.row.biddingLogisticsInfoList[0].logisticsRemark}}
+                        </div>
+                    </el-col>
+                </el-row>
+          </div> -->
+          <!-- <div v-for="(item,index) in props.row.biddingLogisticsInfoList" :key="index" style="background:rgb(245, 247, 250);padding:15px;margin:10px 0" >
+                <el-row type="flex" class="row-bg">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light" >运输方式:
+                            <span v-if="item.transportMode == 1">陆运</span>
+                            <span v-if="item.transportMode == 2">汽运</span>
+                            <span v-if="item.transportMode == 3">火车运输</span>
+                            <span v-if="item.transportMode == 4">船运</span>
+                            <span v-if="item.transportMode == 5">汽运/火车运输/船运</span>
+                            <span v-if="item.transportMode == 6">汽运/火车运输</span>
+                            <span v-if="item.transportMode == 7">汽运/船运</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">投标价格:{{item.logisticsBiddingPrice}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">数量:{{item.quantity}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">总价:{{item.logisticsTotalPrice}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">联系电话:{{item.phone}}</div></el-col>
+                </el-row>
+                <el-row type="flex" class="row-bg" style="margin-top:15px">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light">包装方式:
+                           <span  v-if="item.packingWay == 1">散粮</span> 
+                           <span v-if="item.packingWay == 2">袋装</span> 
+                           <span v-if="item.packingWay == 3">散装</span> 
+                           <span v-if="item.packingWay == 4">集装箱</span> 
+                        </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">始发车站:{{item.departureStation}}</div></el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">目的车站:{{item.destinationStation}}</div></el-col>
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light"> 状态:
+                                 <el-tag  v-if="item.logisticsBiddingStatus == 5">已投递</el-tag>
+                                 <el-tag  v-if="item.logisticsBiddingStatus == 6">审核中</el-tag>
+                                 <el-tag  v-if="item.logisticsBiddingStatus == 7">已中标</el-tag>
+                                 <el-tag  v-if="item.logisticsBiddingStatus == 8">未中标</el-tag>
+                         </div>
+                    </el-col>
+                    <el-col :span="6"><div class="grid-content bg-purple">投标时间:{{item.logisticsBiddingTime}}</div></el-col>
+                </el-row>
+                <el-row type="flex" class="row-bg" style="margin-top:15px">
+                    <el-col :span="6">
+                        <div class="grid-content bg-purple-light">备注:
+                            {{item.logisticsRemark}}
+                        </div>
+                    </el-col>
+                </el-row>
+          </div> -->
+            <!-- <div @click="onshow">{{isShow ?"展开" : "收起"}}</div> -->
+      <!-- </template>
+    </el-table-column> -->
+
+      <el-table-column label="货物" prop="goodsName"   align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+
+      <el-table-column label="数量(吨)" prop="goodsNumber" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+
+      <el-table-column label="始发地" prop="departureName" width="190" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="目的地" prop="destinationName" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="预估距离" prop="predictDistance" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="单价" prop="transportUnitPrice" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="保证金" prop="deposit" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column prop="description" :show-overflow-tooltip="true" label="招标规则" width="100" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="success" effect="plain">价低者得</el-tag>
+          <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="投标开始时间" prop="startTime" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="投标结束时间" prop="endTime" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column label="投标备注" prop="logisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+  
+        <el-table-column label="操作" width="150" fixed="right" align="center">
+        <template slot-scope="scope">
+          <!-- <el-button type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == null" slot="reference" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == 0" slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">改标</el-button> -->
+          <el-button  slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">查看更多</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--分页-->
+    <div class="pagination">
+      <el-pagination
+        :popper-class="current"
+        :page-sizes="[1,10, 20, 30, 50]"
+        :page-size="size"
+        layout="total, sizes, prev, pager, next, jumper"
+        background
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+import { Listarea } from '@/api/dataForm'
+import { parseTime } from '@/utils/index'
+import { getLogisticsList } from '@/api/bid'
+
+export default {
+  data() {
+    return {
+    //   size: 'small',
+      tableData: [],
+      priceData: [],
+      SelectionList:[],
+      goodsName: '',
+      tenderParentId: '',
+      applyDateStart:[],
+      customerType: [
+        { id: 1, name: '有限责任公司(自然人独资)' },
+        { id: 2, name: '有限责任公司(自然人投资或控股)' },
+        { id: 3, name: '股份有限公司' },
+        { id: 4, name: '有限合伙企业' },
+        { id: 5, name: '外商独资公司' },
+        { id: 6, name: '个人独资企业' },
+        { id: 7, name: '国有独资公司' },
+        { id: 8, name: '其他' }
+
+      ],
+      areaList: [],
+      query: {
+        goodsName: '',
+        tenderParentId:""
+      },
+      formLabelWidth: '90px',
+      isEditForm: false,
+      current: '1',
+      size: 10,
+      total: 0, // 总数量
+      dataForm: {
+      },
+
+      loading: false,
+      dialogVisible: false,
+      batchVisible:false,
+       BASE_API: process.env.BASE_API,
+       fileList: [],
+      roles:[],
+      startTime:"",
+      endTime:"",
+        isShow:true
+    }
+  },
+  created() {
+    // this.getTenantList()
+    console.log('res')
+  },
+  methods: {
+      onshow(){
+          this.isShow = !this.isShow
+      },
+    parseTime,
+    getTenantList: function() {
+      this.loading = true
+      const params = new URLSearchParams()
+      params.append('tenderParentId', this.tenderParentId)
+      params.append('goodsName', this.goodsName)
+      params.append('startTime', this.startTime)
+      params.append('endTime', this.endTime)
+      params.append('current', this.current)
+      params.append('size', this.size)
+      getLogisticsList(params).then(response => {
+        console.log(response)
+        this.loading = false
+        this.tableData = response.data.data.records
+        console.log('1' + response.data.data.records)
+        this.total = response.data.data.total
+      })
+    },
+   onApplyDate(){
+      let startTime
+      let endTime
+            if(this.applyDateStart != null){
+              this.startTime =this.applyDateStart[0]
+              this.endTime = this.applyDateStart[1]
+            }else{
+              this.startTime =""
+              this.endTime =""
+            }
+
+      this.getTenantList()
+    },
+
+    handleFind: function() {
+      this.current = '1'
+      this.getTenantList()
+    },
+    handleSizeChange: function(val) {
+      this.size = val
+      this.getTenantList()
+    },
+    // 换页
+    handleCurrentChange: function(val) {
+      const page = val.toString()
+      this.current = page
+      this.getTenantList()
+    },
+    // 查看
+    // lookRecord:function(row){
+    //     this.lookCord=row
+    //     this.dialogVisible = true
+    //     console.log(row)
+    // },
+   handleOneChange(row,i){
+       console.log(row,i)
+       this.$refs.multipleTable.toggleRowSelection(row);
+   },
+    handleSelectionChange(row){
+        console.log(row)
+        this.SelectionList = row
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss" >
+    .ckTable{
+        width: 100%;
+        border: #eee;
+        text-align: center;
+        tr,td{
+        border: 0.5px solid#dfe6ec;
+        line-height: 23px;
+        }
+    }
+   .el-dropdown-link {
+    cursor: pointer;
+    color: #1282f3;
+  }
+  .el-icon-arrow-down {
+    font-size: 12px;
+  }
+  .el-scrollbar__wrap {
+   overflow-y: hidden;
+}
+
+.el-card {
+  border: 0px solid #fff;
+  .topClass{
+    font-weight: 600;
+    font-size: 17px;
+  }
+}
+.el-icon-document{
+  font-size: 70px;
+  color:#409EFF;
+  line-height: 130px;
+}
+/deep/.el-card__body {
+  padding: 20px 10px 0 10px !important;
+}
+/deep/ .el-table__expanded-cell[class*=cell]{
+    padding: 0;
+}
+</style>
+

+ 276 - 0
src/views/tender/dialog.vue

@@ -0,0 +1,276 @@
+<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 == 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>
+                            <span v-if="scope.row.transportMode == 7">汽运/船运</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 == 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.logisticsBiddingStatus == 5">已投递</el-tag>
+            <el-tag effect="plain" v-if="scope.row.logisticsBiddingStatus ==6" type="info">审核中</el-tag>
+            <el-tag effect="plain" v-if="scope.row.logisticsBiddingStatus ==7" type="warning">已中标</el-tag>
+            <el-tag effect="plain" v-if="scope.row.logisticsBiddingStatus ==8" 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>
+
+    <!--分页-->
+    <div class="pagination">
+      <el-pagination
+        :popper-class="current"
+        :page-sizes="[1,10, 20, 30, 50]"
+        :page-size="size"
+        layout="total, sizes, prev, pager, next, jumper"
+        background
+        :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+
+    </div>
+
+
+
+
+  </div>
+</template>
+
+<script>
+import { Listarea } from '@/api/dataForm'
+import { parseTime } from '@/utils/index'
+import { getLogisticsInfo } from '@/api/tender'
+
+export default {
+  data() {
+    return {
+    //   size: 'small',
+      tableData: [],
+      priceData: {},
+      SelectionList:[],
+      goodsName: '',
+      tenderParentId: '',
+      applyDateStart:[],
+      customerType: [
+        { id: 1, name: '有限责任公司(自然人独资)' },
+        { id: 2, name: '有限责任公司(自然人投资或控股)' },
+        { id: 3, name: '股份有限公司' },
+        { id: 4, name: '有限合伙企业' },
+        { id: 5, name: '外商独资公司' },
+        { id: 6, name: '个人独资企业' },
+        { id: 7, name: '国有独资公司' },
+        { id: 8, name: '其他' }
+
+      ],
+      areaList: [],
+      query: {
+        goodsName: '',
+        tenderParentId:""
+      },
+      formLabelWidth: '90px',
+      isEditForm: false,
+      current: '1',
+      size: 10,
+      total: 0, // 总数量
+      dataForm: {
+      },
+
+      loading: false,
+      dialogVisible: false,
+      batchVisible:false,
+       BASE_API: process.env.BASE_API,
+       fileList: [],
+      roles:[],
+      startTime:"",
+      endTime:"",
+        isShow:true
+    }
+  },
+  created() {
+    // this.getTenantList()
+    console.log('res')
+  },
+  methods: {
+      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 => {
+        console.log(response)
+        this.loading = false
+         let data = response.data.data.records
+        console.log(new Date().valueOf(),"当前时间")
+        data.map((res)=>{
+          // 投标时间
+          let startTime = this.priceData.endTime
+
+          const date = new Date(startTime)
+          const start = date.valueOf()         //开始时间
+          const time = new Date().valueOf()   //当前时间
+          console.log(start,"start")
+          if(res.logisticsBiddingStatus < 7){
+              console.log("我不满足")
+                if(time < start){
+                    res.logisticsBiddingStatus = 5
+                    console.log("当前时间小于投标时间,已投递")
+                }else if(time > start){
+                    res.logisticsBiddingStatus = 6
+                    console.log("当前时间小于投标时间,审核中")
+                }
+          }
+          return res
+        })
+        console.log(data)
+        this.tableData = data
+        console.log('1' + response.data.data.records)
+        this.total = response.data.data.total
+      })
+    },
+   onApplyDate(){
+      let startTime
+      let endTime
+            if(this.applyDateStart != null){
+              this.startTime =this.applyDateStart[0]
+              this.endTime = this.applyDateStart[1]
+            }else{
+              this.startTime =""
+              this.endTime =""
+            }
+
+      this.getTenantList()
+    },
+
+    handleFind: function() {
+      this.current = '1'
+      this.getTenantList()
+    },
+    handleSizeChange: function(val) {
+      this.size = val
+      this.getTenantList()
+    },
+    // 换页
+    handleCurrentChange: function(val) {
+      const page = val.toString()
+      this.current = page
+      this.getTenantList()
+    },
+    // 查看
+    // lookRecord:function(row){
+    //     this.lookCord=row
+    //     this.dialogVisible = true
+    //     console.log(row)
+    // },
+   handleOneChange(row,i){
+       console.log(row,i)
+       this.$refs.multipleTable.toggleRowSelection(row);
+   },
+    handleSelectionChange(row){
+        console.log(row)
+        this.SelectionList = row
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss" >
+    .ckTable{
+        width: 100%;
+        border: #eee;
+        text-align: center;
+        tr,td{
+        border: 0.5px solid#dfe6ec;
+        line-height: 23px;
+        }
+    }
+   .el-dropdown-link {
+    cursor: pointer;
+    color: #1282f3;
+  }
+  .el-icon-arrow-down {
+    font-size: 12px;
+  }
+  .el-scrollbar__wrap {
+   overflow-y: hidden;
+}
+
+.el-card {
+  border: 0px solid #fff;
+  .topClass{
+    font-weight: 600;
+    font-size: 17px;
+  }
+}
+.el-icon-document{
+  font-size: 70px;
+  color:#409EFF;
+  line-height: 130px;
+}
+/deep/.el-card__body {
+  padding: 20px 10px 0 10px !important;
+}
+/deep/ .el-table__expanded-cell[class*=cell]{
+    padding: 0;
+}
+</style>
+

+ 30 - 10
src/views/tender/index.vue

@@ -180,15 +180,15 @@
                     </el-table-column> -->
                     <el-table-column prop="tenderLogisticsRule" label="中标规则" :show-overflow-tooltip="true" align="center" >
                       <template slot-scope="scope">
-                        <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="warning">价低者得</el-tag>
-                        <el-tag v-if="scope.row.tenderLogisticsRule == 2" type="warning">价高者得</el-tag>
+                          <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="success" effect="plain">价低者得</el-tag>
+                           <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
                       </template>
                     </el-table-column>
                     <el-table-column prop="startTime" label="起始时间"  width="152" :show-overflow-tooltip="true" align="center" />
                     <el-table-column prop="endTime" label="结束时间"  width="152" :show-overflow-tooltip="true" align="center" />
                     <el-table-column prop="createTime" label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" />
                     <el-table-column prop="logisticsRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
-                    <el-table-column label="操作" width="250" align="center" fixed="right">
+                    <el-table-column label="操作" width="150" align="center" fixed="right">
                         <template slot-scope="scope">
                           <el-button  slot="reference" type="text" v-if="scope.row.status ==1" icon="el-icon-plus" @click="handleAdd(scope.row)">投标</el-button>
                         </template>
@@ -332,18 +332,22 @@
              <!-- </el-tab-pane> -->
                 <!-- <el-tab-pane label="投标详情" name="second"> -->
                    <el-card class="box-card" shadow="nerver">
-          <div slot="header" class="clearfix">
-            <span class="topClass">投标详情</span>
-          </div>
-                  <ckTable ref="ckTable"></ckTable>
+                      <div slot="header" class="clearfix">
+                        <span class="topClass">投标详情</span>
+                      </div>
+                              <ckTable ref="ckTable" @change="costPlannedAmountChange($event)"></ckTable>
                    </el-card>
                 <!-- </el-tab-pane> -->
               <!-- </el-tabs> -->
-                       <div slot="footer" class="paginationParam">
+                   <div slot="footer" class="paginationParam">
                     <el-button @click="viewDialog = false">取消</el-button>
                     <el-button :loading="loading" type="primary" @click="viewDialog = false">确认</el-button>
                   </div>
 
+                         <el-dialog :title="goodsName" width="90%" center :visible.sync="dialogTableVisible" append-to-body>
+                               <ckDialog ref="ckDialog"></ckDialog>
+                          </el-dialog>
+
     </el-dialog>
     </div>
 
@@ -355,10 +359,12 @@
 import { getTableList, getQueryAdd, getQueryEdit, getQueryId } from '@/api/tender'
 import { Notification, MessageBox } from 'element-ui'
 import ckTable from './table.vue'
+import ckDialog from './dialog.vue'
 
 export default {
   components:{
-    ckTable
+    ckTable,
+    ckDialog
   },
   data() {
     const checkTel = (rule, value, callback) => {
@@ -448,13 +454,27 @@ export default {
         {id:5,name:"汽运/火车运输"},
         {id:6,name:"汽运/船运"},
       ],
-       activeName: 'first'
+       activeName: 'first',
+       dialogTableVisible:false,
+       goodsName:""
     }
   },
   created() {
     this.getDictData()
   },
   methods: {
+    // 投标详情 向父元素传递数据
+    costPlannedAmountChange(val){
+      console.log(val)
+ 
+      this.dialogTableVisible = true
+      setTimeout(() => {
+        this.goodsName = val.goodsName
+       this.$refs.ckDialog.priceData = val
+      this.$refs.ckDialog.getTenantList()
+        console.log(this.$refs.ckDialog)
+      }, 300);
+    },
     // 价格投标不能大于合计
     onlogistiicsPrice(val){
       console.log(val)

+ 30 - 20
src/views/tender/table.vue

@@ -2,7 +2,7 @@
   <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
     <div>
-      <span style="font-size:14px">货物:</span>
+      <span style="font-size:14px">货物名称:</span>
       <el-input
         v-model="goodsName"
         clearable
@@ -13,7 +13,7 @@
          @clear="handleFind"
         class="filter-item"
       />
-          <span style="fontSize:13px;marginLeft:20px">投标时间</span>
+          <!-- <span style="fontSize:13px;marginLeft:20px">投标时间</span>
             <el-date-picker
               v-model="applyDateStart"
               size="mini"
@@ -28,16 +28,16 @@
              @change="onApplyDate"
              @clear="onApplyDate"
             />
-
+ -->
 
 
       <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" :default-expand-all="true" :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
-          <el-table-column type="expand" prop="biddingLogisticsInfoList">
-      <template slot-scope="props">
+    <el-table  ref="multipleTable" v-loading="loading" :data="tableData"  :header-cell-style="{ background: '#f5f7fa', }" style="width: 100%" border  >
+          <!-- <el-table-column type="expand" prop="biddingLogisticsInfoList">
+      <template slot-scope="props"> -->
             <!-- <div  :key="index" style="background:rgb(245, 247, 250);padding:15px;margin:10px 0" v-if="isShow">
                 <el-row type="flex" class="row-bg">
                     <el-col :span="6">
@@ -85,7 +85,7 @@
                     </el-col>
                 </el-row>
           </div> -->
-          <div v-for="(item,index) in props.row.biddingLogisticsInfoList" :key="index" style="background:rgb(245, 247, 250);padding:15px;margin:10px 0" >
+          <!-- <div v-for="(item,index) in props.row.biddingLogisticsInfoList" :key="index" style="background:rgb(245, 247, 250);padding:15px;margin:10px 0" >
                 <el-row type="flex" class="row-bg">
                     <el-col :span="6">
                         <div class="grid-content bg-purple-light" >运输方式:
@@ -131,10 +131,10 @@
                         </div>
                     </el-col>
                 </el-row>
-          </div>
+          </div> -->
             <!-- <div @click="onshow">{{isShow ?"展开" : "收起"}}</div> -->
-      </template>
-    </el-table-column>
+      <!-- </template>
+    </el-table-column> -->
 
       <el-table-column label="货物" prop="goodsName"   align="center" :show-overflow-tooltip="true">
       </el-table-column>
@@ -152,19 +152,26 @@
       </el-table-column>
       <el-table-column label="保证金" prop="deposit" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
+      <el-table-column prop="description" :show-overflow-tooltip="true" label="招标规则" width="100" align="center">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.tenderLogisticsRule == 1" type="success" effect="plain">价低者得</el-tag>
+          <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="投标开始时间" prop="startTime" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
       <el-table-column label="投标结束时间" prop="endTime" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-  
-        <!-- <el-table-column label="操作" width="250" fixed="right" align="center">
+      <el-table-column label="投标备注" prop="logisticsRemark" width="150" align="center" :show-overflow-tooltip="true">
+      </el-table-column>
+        <el-table-column label="操作" width="150" fixed="right" align="center">
         <template slot-scope="scope">
-          <el-button type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
+          <!-- <el-button type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
           <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == null" slot="reference" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">投标</el-button>
-          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == 0" slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">改标</el-button>
-          <el-button v-if="scope.row.tenderStatus == 2 || scope.row.tenderStatus == 3" slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">投标详情</el-button>
+          <el-button v-if="scope.row.tenderStatus == 1 && scope.row.status == 0" slot="reference" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">改标</el-button> -->
+          <el-button  slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">查看更多</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <!--分页-->
@@ -235,16 +242,18 @@ export default {
       roles:[],
       startTime:"",
       endTime:"",
-        isShow:true
+        // dialogTableVisible:false
     }
   },
   created() {
-    this.getTenantList()
+    // this.getTenantList()
     console.log('res')
   },
   methods: {
-      onshow(){
-          this.isShow = !this.isShow
+      handleView(row){
+          console.log("我被点击了")
+            this.$emit('change',row)
+        //   this.$parent.dialogTableVisible = true
       },
     parseTime,
     getTenantList: function() {
@@ -349,5 +358,6 @@ export default {
 /deep/ .el-table__expanded-cell[class*=cell]{
     padding: 0;
 }
+
 </style>