投标列表

config/index.js

@@ -13,6 +13,7 @@ module.exports = {
                 // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
                 // target: 'http://127.0.0.1:28080', //后端接口地址   
                 target: 'http://192.168.3.12:7001', //后端接口地址   
+                // target: 'http://47.108.14.99:19800', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {
                     '^/': '/', //重写,
@@ -22,7 +23,7 @@ module.exports = {
         },
 
         // 本地开发使用   192.168.0.126  localhost
-        host: '192.168.3.226',
+        host: '192.168.3.2',
         // host: '192.168.124.14',
         port: 8081,
         autoOpenBrowser: true,

src/api/tender.js

@@ -11,9 +11,17 @@ export function getTableList(parms) {
 // 获取列表
 export function getQueryId(parms) {
   return request({
-    url: '/bidding/query-by-tender-id',
-    method: 'post',
-    data: parms
+    url: '/common/tender/logistics',
+    method: 'get',
+    params: parms
+  })
+}
+// 已投递列表
+export function getLogisticsList(parms) {
+  return request({
+    url: ' /common/bidding/logistics/info',
+    method: 'get',
+    params: parms
   })
 }
 // 修改列表
@@ -27,7 +35,7 @@ export function getQueryEdit(parms) {
 // 添加列表
 export function getQueryAdd(parms) {
   return request({
-    url: '/bidding/new',
+    url: ' /common/bidding/logistics',
     method: 'post',
     data: parms
   })

src/views/bid/index.vue

@@ -34,7 +34,7 @@
         />
       </el-select>
 
-    <span style="fontSize:13px;marginLeft:20px">发布时间</span>
+    <span style="fontSize:13px;marginLeft:20px">创建时间</span>
             <el-date-picker
               v-model="applyDateStart"
               size="mini"
@@ -147,7 +147,7 @@
     </div>
 
     <!--新增-->
-    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialog" :title="isAdd ? '发布新标' : '修改新标'" width="40%">
+    <el-dialog :append-to-body="true"  :close-on-click-modal="false" :visible.sync="dialog" :title="isAdd ? '发布新标' : '修改新标'" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="tenderTitle">
           <div class="padding" style="width: 80%;">
@@ -242,7 +242,7 @@
             size="mini"
             range-separator="~"
             value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '15:00:00']"
+            :default-time="['00:00:00', '23:59:59']"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             @change="oncustom"
@@ -302,7 +302,7 @@
                       </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" border v-loading="tableLoading" style="width: 100%;">
+                  <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" />
@@ -339,8 +339,7 @@
                     <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
@@ -429,7 +428,7 @@ export default {
       ],
       tenderRule:[
         {id:1,name:"价低者得"},
-        {id:2,name:"价高者"},
+        {id:2,name:"价高者得"},
 
       ],
       queryTypeOptions: [
@@ -470,6 +469,7 @@ export default {
               this.query.startTime =""
               this.query.endTime =""
             }
+      this.handleFind()
     },
     onShowType(){
       console.log(this.form.tenderType+"this.form.tenderType ")
@@ -858,4 +858,5 @@ window.open(officeUrl,'_target')
   bottom: 50px;
   left: 45%;
 }
+
 </style>

src/views/tender/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
 
- <div class="head-container" style="margin: 10px 0 10px 0;">
+   <div class="head-container" style="margin: 10px 0 10px 0;">
       <!-- 搜索 -->
       <span style="fontSize:13px">标题</span>
       <el-input
@@ -14,7 +14,7 @@
         @keyup.enter.native="handleFind"
          @clear="handleFind"
       />
-      <span style="fontSize:13px;marginLeft:20px">招标类型</span>
+      <!-- <span style="fontSize:13px;marginLeft:20px">招标类型</span>
       <el-select v-model="query.tenderType" style="width: 200px;" @keyup.enter.native="handleFind" @clear="handleFind" size="small" clearable  value-key="areaId" filterable placeholder="请选择招标类型">
         <el-option
           v-for="item in tenderType"
@@ -22,18 +22,37 @@
           :label="item.name"
           :value="item.id"
         />
+      </el-select> -->
+
+        <span style="fontSize:13px;marginLeft:20px">招标规则</span>
+      <el-select v-model="query.tenderRule" style="width: 200px;" @keyup.enter.native="handleFind" @clear="handleFind" size="small" clearable  value-key="areaId" filterable placeholder="请选择招标规则">
+        <el-option
+          v-for="item in tenderRule"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
 
-      <el-button class="filter-item" size="small" type="primary" icon="el-icon-search" plain @click="handleFind">搜索</el-button>
-      <el-button
-        class="filter-item"
-        size="small"
-        type="primary"
-        icon="el-icon-plus"
-        @click="handleAdd"
-      >发布新标
-      </el-button>
-    </div>
+    <span style="fontSize:13px;marginLeft:20px">创建时间</span>
+            <el-date-picker
+              v-model="applyDateStart"
+              size="mini"
+              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>
+          <div style="float:right">
+           <el-button class="filter-item" size="small" type="primary" icon="el-icon-search"  @click="handleFind">搜索</el-button>
+      </div>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" style="width: 100%;">
       <el-table-column label="序号" fixed="left" width="60" align="center">
@@ -76,7 +95,7 @@
       <el-table-column prop="fileUrl" label="附件" align="center" width="200">
         <template slot-scope="scope">
           <!-- <el-button type="text" @click="onLoad(scope.row.appendix)">下载</el-button> -->
-          <el-link :href="'http://view.officeapps.live.com/op/view.aspx?src='+scope.row.fileUrl" type="primary" target="_target"><i class="el-icon-view"></i> 查看</el-link>
+          <!-- <el-link :href="'http://view.officeapps.live.com/op/view.aspx?src='+scope.row.fileUrl" type="primary" target="_target"><i class="el-icon-view"></i> 查看</el-link> -->
           <el-link :href="scope.row.fileUrl" type="primary" target="_target"><i class="el-icon-download"></i> 下载</el-link>
         </template>
       </el-table-column>
@@ -89,7 +108,7 @@
         <template slot-scope="scope">
           <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  slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">投标详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -108,206 +127,225 @@
     </div>
 
     <!-- 投标详情 -->
-    <el-dialog :append-to-body="true" fullscreen :visible.sync="dialog" title="投标详情" center>
-        <!-- <el-steps :active="active" align-center finish-status="success">
-          <el-step title="选择标" ></el-step>
-          <el-step title="投递标"></el-step>
-        </el-steps> -->
-      <ckTable ref="ckTable" @click="handleSelectionChange" v-show="active == 0"></ckTable>
-
-    <div style="height:20px"></div>
-
-       <table border="1px" cellpadding="10" cellspacing="0" class="ckTable" v-show="active == 1">
-        <tr>
-            <td colspan="4" style="font-weight: 600;fontSize:20px">物 流 报 价 单</td>
-        </tr>
-        <tr>
-            <td style="width:15%;color: #909399;fontWeight: 600;">发起单位：</td>
-            <td style="width:30%">上海国林源诚物流发展有限公司</td>
-            <td style="width:15%;color: #909399;fontWeight: 600;">招标方式：</td>
-            <td style="width:30%">邀请招标</td>
-        </tr>
-    </table>
-      <!-- <el-table  :data="dialogTableData" border v-show="active == 1">
-            <el-table-column label="货物" width="275px" fixed="left" align="center" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <span>散稻</span>
-              </template>
-            </el-table-column>
-
-             <el-table-column label="数量（吨）" width="250" align="center" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                  <span> 10</span>
-                </template>
-              </el-table-column>
-
-      <el-table-column label="预估运输距离（公里/海里）" width="300" align="center" >
-        <template slot-scope="scope">
-            <el-input v-model="input"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="运输单价含税价（元/吨）" width="275" align="center" >
-        <template slot-scope="scope">
-            <el-input v-model="input"></el-input>
-        </template>
-      </el-table-column>
-      <el-table-column label="合计运输金额（元）" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>10000.2002</span>
-        </template>
-      </el-table-column>
+      <!-- 详情 -->
+    <div class="goodsNameCss">
+          <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="" center>
+              <!-- <el-tabs v-model="activeName" @tab-click="handleClick"> -->
+                <!-- <el-tab-pane label="所有标的" name="first"> -->
+                      <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"
+                      />
+
+                  <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @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="起始时间"  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">
+                        <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>
+                      </el-table-column>
+                  </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-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '投标' : '修标'" width="50%">
+                      <el-form ref="form" :model="form" :rules="rules1" label-width="80px">
+                        <el-form-item label="货物名称">
+                           <!-- <span>{{form.biddingLogisticsRemark}}</span> -->
+                           <el-tag>{{form.goodsName}}</el-tag>
+                            <!-- <el-input  v-model="form.goodsName" style="width:50%" readonly></el-input> -->
+                        </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>
+                          </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>
+                          </el-col>
+                         </el-row>
+                        
+                        <el-row :gutter="20">
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                            <el-form-item label="包装方式" prop="packingWay">
+                              <el-select v-model="form.packingWay" style="width: 80%;"  filterable placeholder="请选择包装方式">
+                                  <el-option
+                                    v-for="item in packingWay"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                  />
+                                </el-select>
+                            </el-form-item>
+                           </el-col>
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                           <el-form-item label="运输方式" prop="transportMode">
+                             <el-select v-model="form.transportMode" style="width: 80%;"  filterable placeholder="请选择包装方式">
+                                <el-option
+                                  v-for="item in transportMode"
+                                  :key="item.id"
+                                  :label="item.name"
+                                  :value="item.id"
+                                />
+                              </el-select>
+                           </el-form-item>
+                        </el-col>
+                        </el-row>
+
+                        <el-row :gutter="20">
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                          <el-form-item label="数量" prop="quantity">
+                              <el-input v-model="form.quantity" readonly style="width: 80%;" placeholder="数量"><template slot="append">(吨)</template></el-input>
+                           <!-- <span style="fontSize:16px" effect="plain">{{form.quantity}} (吨)</span> -->
+                            <!-- <el-input v-model="form.quantity" 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="logisticsBiddingPrice">
+                              <el-input v-model="form.logisticsBiddingPrice" @input="onlogistiicsPrice" style="width: 80%;" placeholder="请输入金额"><template slot="append">元</template></el-input>
+                              <div style="color:#909399;fontSize:15px"> * <span style="color:#909399;fontSize:13px;position: relative;top:-5px">最大价格 {{form.transportUnitPrice}} </span> </div>
+                            </el-form-item>
+                          </el-col>
+                        </el-row>
+
+                            <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.logisticsBiddingPrice ? (form.quantity *form.logisticsBiddingPrice).toFixed(4) : 0" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(吨/元)</template></el-input>
+                           <!-- <span style="fontSize:16px"  effect="plain">{{}} (吨/元)</span> -->
+                           <!-- <el-tag  style="fontSize:14px"  effect="plain">{{form.logisticsBiddingPrice=="NAN" ? (form.quantity *form.logisticsBiddingPrice).toFixed(4) : 0}} (吨/元)</el-tag> -->
+                            <!-- <el-input v-model="form.quantity" 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="logisticsBiddingPrice">
+                              <el-upload
+                                  class="upload-demo"
+                                  :limit="1"
+                                  :on-preview="handlePreview"
+                                  :on-change="handleChange"
+                                  :on-remove="handleRemove"
+                                  :before-remove="beforeRemove"
+                                  :on-exceed="handleExceed"
+                                  :action="BASE_API+'/common/bidding/voucher'"
+                                  name="multipartFile"
+                                  list-type="text"
+                                  :file-list="fileList"
+                                  multiple
+                                >
+                                    <el-button class="el-icon-upload" >上传凭证</el-button>
+                                </el-upload>
+                            </el-form-item>
+                          </el-col>
+                        </el-row>
+
+                        <el-row :gutter="20">
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                          <el-form-item label="联系电话" prop="phone">
+                            <el-input v-model="form.phone" 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="biddingLogisticsRemark">
+                                <el-input
+                                  v-model="form.biddingLogisticsRemark"
+                                  type="textarea"
+                                  style="width: 93%;"
+                                  :autosize="{ minRows: 2, maxRows: 10}"
+                                  maxlength="500"
+                                  show-word-limit
+                                  placeholder="请输入内容"
+                                />
+                              </el-form-item>
+                          </el-col>
+                        </el-row>
+                      </el-form>
+                      <div slot="footer" class="dialog-footer">
+                        <el-button @click="dialog = false">取消</el-button>
+                        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+                      </div>
+                    </el-dialog>
+             <!-- </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>
+                   </el-card>
+                <!-- </el-tab-pane> -->
+              <!-- </el-tabs> -->
+                       <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-table> -->
-
-    <!-- <div style="height:10px"></div> -->
-
-        <table border="1px" cellpadding="10" cellspacing="0" class="ckTable">
-        <tr>
-            <td style="width:25%;color: #909399;fontWeight: 600;">项目要求</td>
-            <td style="width:75%;textAlign:left">
-                1、报价必须完整，报价单一经发出，投标方不得随意更改信息及报价表格式（联运需尽量提供分段分解价格），不得插入、删除行或列（联运分段标注除外），不得空报，一旦更改报价表格式，将视为废标处理；<br/>
-                2、投标方有能力完成物流及相关运输服务、储存监管照片等资料的上传、梳理归档；有能力获取储存监控设备后自行安装和回收管理，办理相关影像资料的录入；<br/>
-                3、运输过程中投标方需按国林源诚要求提供固定车队，所有车辆/船舶均安装GPS定位系统，主动配合完成车（船）载摄像头安装，并按照国林源诚相关要求完成物流监管系统的监管任务，自愿接受国林源诚统一运输管理；<br/>
-                4、如需转存、倒仓等操作需提前三个工作日以书面形式上报至国林源诚审批备案。作业价格为包干单价，含提送货费、保险费、税金以及市场风险全包等一切费用，报价一旦发出，视为报价有效，不做任何更改说明。
-                5、中标方需提供的增值税专用发票为 9  %；若提供其它税率的发票，按中标价折扣运费税差。<br/>
-                6、如发生运输作业，运输损耗标准按照：按每车计算，省内不得超过每车货物数量的1 ‰，省外不得超过每车货物数量的2‰。<br/>
-                7、在储存库点作业时，中标公司应有能力提供翻转平台或吊装机至储存库点作业<br/>
-                8、中标方需按照国林源诚要求保证运输货物完好、不撒漏、防偷盗、防雨湿，如发生任何质量问题，将追究投标方违约责任；
-            </td>
-        </tr>
-        <tr>
-            <td style="width:25%;color: #909399;fontWeight: 600;">开标时间</td>
-            <td>以系统实际开标为准</td>
-        </tr>
-        <tr>
-            <td style="width:25%;color: #909399;fontWeight: 600;">保证金</td>
-            <td>中标公司按照10元/吨的保证金于中标后3个工作日支付至上海国林源诚物流发展有限公司指定收款银行</td>
-        </tr>
-        <tr>
-            <td style="width:25%;color: #909399;fontWeight: 600;">投标方服务承诺</td>
-            <td>本公司承诺以上内容真实有效</td>
-        </tr>
-    </table>
-    <div style="height:100px"></div>
-
-      <div class="btn_fixed">
-        <el-button style="margin-top: 12px;" type="primary" plain @click="dialog = false">取消</el-button>
-         <el-button style="margin-top: 12px;" type="primary" plain @click="active--" v-show="active == 1">上一步</el-button>
-        <el-button style="margin-top: 12px;" type="primary" plain @click="next" v-show="active == 0">下一步</el-button>
-      </div>
-
-    </el-dialog>
-
-
-    <!--新增-->
-    <!-- <el-dialog :append-to-body="true" :visible.sync="dialog" :title="isAdd ? '投标' : '修标'" width="50%">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="报价方式">
-          <el-tag v-if="form.priceQuotes == 1">总价</el-tag>
-          <el-tag v-if="form.priceQuotes == 2">单价</el-tag>
-        </el-form-item>
-        <el-form-item label="报价" prop="price">
-          <el-input v-model="form.price" style="width: 250px;" placeholder="请输入金额"><template slot="append">元</template></el-input>
-        </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input
-            v-model="form.remarks"
-            type="textarea"
-            style="width: 370px;"
-            :autosize="{ minRows: 2, maxRows: 10}"
-            maxlength="500"
-            show-word-limit
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <el-form-item label="附件" :required="true" prop="appendix">
-          <el-upload
-            class="upload-demo"
-            drag
-            :limit="1"
-            :on-preview="handlePreview"
-            :on-change="handleChange"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            :on-exceed="handleExceed"
-            :action="BASE_API+'/bidding/upload'"
-            list-type="text"
-            :file-list="fileList"
-            multiple
-          >
-            <i class="el-icon-upload" />
-            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          </el-upload>
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialog = false">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
-      </div>
-    </el-dialog> -->
-
-    <!-- 详情 -->
-    <el-dialog :append-to-body="true" :visible.sync="viewDialog" title="投标详情" width="90%" center>
-      <el-table center :data="Paramdata" style="width: 100%;">
-
-        <el-table-column prop="customerName" label="客户名称" align="center" />
-
-        <el-table-column label="报价方式" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.priceQuotes == 1" color="#5783E6" style="border-color:#5783E6" effect="dark">总价</el-tag>
-            <el-tag v-if="scope.row.priceQuotes == 2" effect="dark" color="#82C497" style="border-color:#82C497">单价</el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="price" :show-overflow-tooltip="true" label="报价金额" align="center" >
-          <template slot-scope="scope">
-            <div>
-              {{ scope.row.price | toThousandFilter }}
-              <!-- {{ 0.0000 | toThousandFilter }} -->
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="remarks" label="备注" :show-overflow-tooltip="true" align="center" />
-        <el-table-column prop="appendix" label="附件" align="center" width="100">
-          <template slot-scope="scope">
-            <!-- <el-link type="primary" :href="scope.row.appendix">查看</el-link> -->
-            <el-button type="text" v-if="scope.row.appendix" @click="onLoad(scope.row.appendix)">下载</el-button>
-            <el-button type="text" v-else disabled>下载</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="投极时间" align="center" />
-        <el-table-column prop="userName" label=" 投标帐号" align="center" />
-        <el-table-column prop="status" label=" 投标结果" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.status == null" type="info">未参与</el-tag>
-            <el-tag v-if="scope.row.status == 0" type="warning">已提交</el-tag>
-            <el-tag v-if="scope.row.status == 1" type="success">已中标</el-tag>
-            <el-tag v-if="scope.row.status == 2" type="danger">未中标</el-tag>
-          <!-- <span v-if="scope.row.status == 0">已提交</span>
-          <span v-if="scope.row.status == 1">中标</span>
-          <span v-if="scope.row.status == 2">未中标</span> -->
-          </template>
-        </el-table-column>
-
-      </el-table>
-      <div class="pagination">
-        <el-pagination
-          :current-page.sync="param.page"
-          :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 slot="footer" class="dialog-footer">
-        <el-button @click="viewDialog = false">取消</el-button>
-        <el-button :loading="loading" type="primary" @click="viewDialog = false">确认</el-button>
-      </div>
     </el-dialog>
+    </div>
 
   </div>
 
@@ -344,6 +382,26 @@ export default {
       currentPage: 1,
       pageSize: 10,
       total: 0, // 总数量
+      rules1:{
+        departureStation:[
+          { required: true, message: '始发车站不为空', trigger: 'blur' },
+        ],
+         destinationStation:[
+          { required: true, message: '目的车站不为空', trigger: 'blur' },
+        ],
+         logisticsBiddingPrice:[
+          { required: true, message: '投标价格不为空', trigger: 'blur' },
+        ],
+         packingWay:[
+          { required: true, message: '包装方式不为空', trigger: 'blur' },
+        ],
+         phone:[
+          { required: true, message: '联系电话不为空', trigger: 'blur' },
+        ],
+         transportMode:[
+          { required: true, message: '运输方式不为空', trigger: 'blur' },
+        ],
+      },
       rules: {
 
         price: [
@@ -357,7 +415,10 @@ export default {
       query: {
         type: '',
         value: '',
-        tenderType:""
+         tenderRule:"",
+        tenderType:"",
+        startTime:"",
+        endTime:""
       },
       fileList: [],
       param: {
@@ -366,13 +427,64 @@ export default {
       },
       total1: 0,
       Paramdata: [],
-      dialogTableData:[]
+      applyDateStart:[],
+      dialogTableData:[],
+       tenderRule:[
+        {id:1,name:"价低者得"},
+        {id:2,name:"价高者得"},
+
+      ],
+      packingWay:[
+        {id:1,name:"散粮"},
+        {id:2,name:"袋装"},
+        {id:3,name:"散装"},
+        {id:4,name:"集装箱"},
+      ],
+      transportMode:[
+        {id:1,name:"陆运"},
+        {id:2,name:"汽运"},
+        {id:3,name:"火车运输"},
+        {id:4,name:"汽运/火车运输/船运"},
+        {id:5,name:"汽运/火车运输"},
+        {id:6,name:"汽运/船运"},
+      ],
+       activeName: 'first'
     }
   },
   created() {
     this.getDictData()
   },
   methods: {
+    // 价格投标不能大于合计
+    onlogistiicsPrice(val){
+      console.log(val)
+       if(val>this.form.transportUnitPrice){
+         this.form.logisticsBiddingPrice = this.form.transportUnitPrice
+         console.log("我是大于")
+       }
+       if(val.indexOf('.') !== -1 && val == '.'){
+         this.form.logisticsBiddingPrice =0
+       }
+       if(val== "+" || val== "-"){
+         this.form.logisticsBiddingPrice = 0
+       }
+       if(val<0){
+         this.form.logisticsBiddingPrice = 0
+       }
+    },
+    onApplyDate(){
+      let startTime
+      let endTime
+            if(this.applyDateStart != null){
+              this.query.startTime =this.applyDateStart[0]
+              this.query.endTime = this.applyDateStart[1]
+            }else{
+              this.query.startTime =""
+              this.query.endTime =""
+            }
+
+      this.handleFind()
+    },
     next() {
       console.log(this.$refs.ckTable)
         if (this.active++ > 2) this.active = 0;
@@ -389,6 +501,10 @@ export default {
       params.append('size', this.pageSize)
       params.append('tenderType', this.query.tenderType)
       params.append('tenderTitle', this.query.value)
+      params.append('tenderRule', this.query.tenderRule)
+      params.append('startTime',this.query.startTime )
+      params.append('endTime', this.query.endTime)
+
       getTableList(params).then(res => {
           console.log(res)
         // this.data = res.data.data.records
@@ -438,7 +554,7 @@ export default {
 
     // 文件移除的时候
     handleRemove(file, fileList) {
-      this.form.appendix = ''
+      this.form.voucherFile = ''
       console.log(file, fileList, this.fileList, '移出')
     },
     // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
@@ -447,7 +563,7 @@ export default {
       if (file.response) {
         console.log(file.response, 'file')
         if (file.response.code == '200') {
-          this.form.appendix = file.response.data
+          this.form.voucherFile = file.response.data.filePath
         } else {
           Notification.error({
             title: file.response.msg,
@@ -485,6 +601,7 @@ export default {
         if (valid) {
           if (this.isAdd) {
             // 新增字典
+            console.log(this.form)
             this.loading = true
             getQueryAdd(this.form).then((res) => {
               if (res.data.code === 200) {
@@ -520,8 +637,11 @@ export default {
       this.isAdd = true
       this.form = {}
       this.fileList = []
-      this.form.tenderId = row.id
-      this.form.priceQuotes = row.priceQuotes
+      this.form.tenderLogisticsId = row.logisticsBidId
+      this.form.tenderParentId = this.param.tenderParentId
+      this.form.quantity = row.goodsNumber
+      this.form.goodsName = row.goodsName
+      this.form.transportUnitPrice = row.transportUnitPrice
       if (this.$refs['form']) {
         this.$refs['form'].resetFields()
       }
@@ -542,17 +662,63 @@ export default {
         this.fileList = [{ name: name, url: this.form.appendix }]
       }
     },
+    handleClick(row,val){
+      console.log(row,val)
+      if(row.name == "second"){
+       this.$refs.ckTable.tenderParentId = this.param.tenderParentId
+        this.$refs.ckTable.getTenantList()
+      }
+    },
     handleView(row) {
-      this.param.tenderId = row.id
-      this.param.page = 1
+      this.param.tenderParentId = row.tenderParentId
+      // this.$refs.ckTable.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() {
       const data = this.param
+      this.tableLoading = true
       getQueryId(data).then((res) => {
-        console.log(res.data.data.records, '')
-        this.Paramdata = res.data.data.records
+       console.log(res.data.data.records, '')
+        let data = res.data.data.records
+         data.map((res)=>{
+          // 开始时间
+          let startTime = res.startTime
+          // 结束时间
+          let endTime = res.endTime
+
+          const date = new Date(startTime)
+          const modify = new Date(endTime)
+
+          const start = date.valueOf()         //开始时间
+          const end = modify.valueOf()        //结束时间
+          const time = new Date().valueOf()   //当前时间
+          console.log(start,"start")
+          console.log(end,"end")
+         if(res.isInvalid == 2){
+             res.status = 3
+            console.log("作废了")
+          }else if(time < start){
+            res.status = 4
+            console.log("当前时间小于开始时间，未开始")
+          }else if(time > start && time < end){
+            res.status = 1
+            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+          }else if(time > end){
+            res.status = 2
+            console.log("当前时间大于结束时间，已结束")
+          }
+
+          return res
+        })
+        this.Paramdata = data
+        this.tableLoading = false
         this.total1 = res.data.data.total
       })
     },
@@ -602,5 +768,28 @@ export default {
         line-height: 23px;
         }
     }
+.paginationParam{
+  position: fixed;
+  // 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>
 

src/views/tender/table.vue

@@ -1,144 +1,187 @@
 <template>
-  <div class="app-container">
+  <div class="" style="margin: 30px 0 10px 0;">
     <!-- 查询和其他操作 -->
     <div>
       <span style="font-size:14px">货物：</span>
       <el-input
-        v-model="customerName"
+        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>
-    <table border="1px" cellpadding="10" cellspacing="0" class="ckTable">
-        <tr>
-            <td colspan="4" style="font-weight: 600;fontSize:20px">物 流 报 价 单</td>
-        </tr>
-        <tr>
-            <td style="width:15%;color: #909399;fontWeight: 600;">发起单位：</td>
-            <td style="width:30%">上海国林源诚物流发展有限公司</td>
-            <td style="width:15%;color: #909399;fontWeight: 600;">招标方式：</td>
-            <td style="width:30%">邀请招标</td>
-        </tr>
-    </table>
-    <el-table  ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%" border :row-key="(row)=>{return row.customerId}" @row-click="handleOneChange" @selection-change="handleSelectionChange">
 
-      <!-- <el-table-column label="公司编号"  align="center" fixed="left"  :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.customerId }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-      :reserve-selection="true"
-      type="selection"
-      width="55">
+    <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="货物" width="210" fixed="left" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>散稻</span>
-        </template>
-      </el-table-column>
 
-      <el-table-column label="数量（吨）" width="150" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span> 10</span>
-        </template>
+      <el-table-column label="货物" prop="goodsName"   align="center" :show-overflow-tooltip="true">
       </el-table-column>
 
-      <el-table-column label="始发地" width="190" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>河南</span>
-        </template>
+      <el-table-column label="数量（吨）" prop="goodsNumber" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
 
-      <el-table-column label="始发车站" align="center" width="190" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>河南东站</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="目的地" width="150" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.legalPerson }}</span>
-        </template>
+      <el-table-column label="始发地" prop="departureName" width="190" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="目的车站" width="150" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.businessScope }}</span>
-        </template>
+      <el-table-column label="目的地" prop="destinationName" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="包装方式" width="150" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <!-- <span>{{ scope.row.registeredCapital }}</span> -->
-          <span>散粮</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="运输方式" width="200" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>汽运/火车运输/船运</span>
-        </template>
+      <el-table-column label="预估距离" prop="predictDistance" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="预估运输距离（公里/海里）" width="120" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.businessDate }}</span>
-        </template>
+      <el-table-column label="单价" prop="transportUnitPrice" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="运输单价含税价（元/吨）" width="120" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.residence }}</span>
-        </template>
+      <el-table-column label="保证金" prop="deposit" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="合计运输金额（元）" width="120" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createDate }}</span>
-        </template>
+      <el-table-column label="投标开始时间" prop="startTime" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column label="备注" width="250" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span>保证金500 运输完成之后返还</span>
-        </template>
+      <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="操作" width="250" 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 v-if="scope.row.tenderStatus == 2 || scope.row.tenderStatus == 3" slot="reference" icon="el-icon-view" type="text" @click="handleView(scope.row)">投标详情</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!--分页-->
     <div class="pagination">
       <el-pagination
-        :popper-class="currentPage"
+        :popper-class="current"
         :page-sizes="[1,10, 20, 30, 50]"
-        :page-size="pageSize"
+        :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
         background
         :total="total"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       />
-      <!-- <el-pagination
-        :current-page.sync="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="total"
-        background
-        @current-change="handleCurrentChange"
-      /> -->
-    </div>
 
-
-   
+    </div>
 
 
 
@@ -148,19 +191,19 @@
 
 <script>
 import { Listarea } from '@/api/dataForm'
-import { customerList, addCustomer, editCustomer, deleteCustomer,userRoles } from '@/api/record'
 import { parseTime } from '@/utils/index'
-import { getUserInfo,vailUserName } from '@/api/user'
+import { getLogisticsList } from '@/api/tender'
 
 export default {
   data() {
     return {
-      size: 'small',
+    //   size: 'small',
       tableData: [],
       priceData: [],
       SelectionList:[],
-      customerName: '',
-      typeId: '',
+      goodsName: '',
+      tenderParentId: '',
+      applyDateStart:[],
       customerType: [
         { id: 1, name: '有限责任公司（自然人独资）' },
         { id: 2, name: '有限责任公司(自然人投资或控股)' },
@@ -174,12 +217,13 @@ export default {
       ],
       areaList: [],
       query: {
-        name: ''
+        goodsName: '',
+        tenderParentId:""
       },
       formLabelWidth: '90px',
       isEditForm: false,
-      currentPage: '1',
-      pageSize: 10,
+      current: '1',
+      size: 10,
       total: 0, // 总数量
       dataForm: {
       },
@@ -189,8 +233,10 @@ export default {
       batchVisible:false,
        BASE_API: process.env.BASE_API,
        fileList: [],
-      roles:[]
-
+      roles:[],
+      startTime:"",
+      endTime:"",
+        isShow:true
     }
   },
   created() {
@@ -198,15 +244,20 @@ export default {
     console.log('res')
   },
   methods: {
+      onshow(){
+          this.isShow = !this.isShow
+      },
     parseTime,
     getTenantList: function() {
       this.loading = true
       const params = new URLSearchParams()
-      params.append('type', this.typeId)
-      params.append('customerName', this.customerName)
-      params.append('current', this.currentPage)
-      params.append('size', this.pageSize)
-      customerList(params).then(response => {
+      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
@@ -214,20 +265,32 @@ export default {
         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.currentPage = '1'
+      this.current = '1'
       this.getTenantList()
     },
     handleSizeChange: function(val) {
-      this.pageSize = val
+      this.size = val
       this.getTenantList()
     },
     // 换页
     handleCurrentChange: function(val) {
       const page = val.toString()
-      this.currentPage = page
+      this.current = page
       this.getTenantList()
     },
     // 查看