维护

src/api/bid.js

@@ -8,7 +8,7 @@ export function getTableList(parms) {
     params: parms
   })
 }
-// 获取列表
+// 获取列表   --  物流
 export function getQueryId(parms) {
   return request({
     url: '/logistics',
@@ -17,6 +17,15 @@ export function getQueryId(parms) {
     params: parms
   })
 }
+// 获取列表   --  销售
+export function getSaleId(parms) {
+  return request({
+    url: '/tender/sale/page',
+    // url: '/common/tender/logistics',
+    method: 'get',
+    params: parms
+  })
+}
 // 修改列表
 export function getQueryEdit(parms) {
   return request({

src/views/bid/index.vue

@@ -256,9 +256,10 @@
       </div>
     </el-dialog>
 
-    <!-- 详情 -->
+   
     <div class="goodsNameCss">
-          <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="标的详情" center>
+       <!-- 物流详情 -->
+          <el-dialog :append-to-body="true" fullscreen :visible.sync="viewDialog" title="" center>
                <el-card class="box-card" shadow="nerver">
                     <div slot="header" class="clearfix">
                       <span class="topClass">基本信息</span>
@@ -438,7 +439,184 @@
                                <ckDialog ref="ckDialog"></ckDialog>
                           </el-dialog>
 
-    </el-dialog>
+          </el-dialog>
+
+        <!-- 销售详情 -->
+          <el-dialog :append-to-body="true" fullscreen :visible.sync="saleViewDialog" title="" center>
+               <el-card class="box-card" shadow="nerver">
+                    <div slot="header" class="clearfix">
+                      <span class="topClass">基本信息</span>
+                    </div>
+
+                    <el-row type="flex" class="row-bg">
+                       <el-col :span="8" class="flex_text">
+                         　　标题 : <span class="flex_name"> {{bidInfo.tenderTitle}}</span>
+                       </el-col>
+                         <el-col :span="8" class="flex_text">
+                         　　状态 : <span class="flex_name"> <el-tag effect="plain" v-if="bidInfo.status ==1">进行中</el-tag>
+                                <el-tag effect="plain" v-if="bidInfo.status ==2" type="info">已结束</el-tag>
+                                <el-tag effect="plain" v-if="bidInfo.status ==3" type="danger">已作废</el-tag>
+                                <el-tag effect="plain" v-if="bidInfo.status ==4" type="warning">未开始</el-tag>
+                                </span>
+                       </el-col>
+                         <el-col :span="8" class="flex_text">
+                         招标类型 :  <span class="flex_name"><el-tag v-if="bidInfo.tenderType == 1"  >物流</el-tag>
+                                    <el-tag v-if="bidInfo.tenderType == 2" >原料</el-tag>
+                                    <el-tag v-if="bidInfo.tenderType == 3" >销售</el-tag>
+                                    <el-tag v-if="bidInfo.tenderType == 4" >加工承揽</el-tag>
+                                    </span>
+                       </el-col>
+                    </el-row>
+                     <el-row type="flex" class="row-bg">
+                       <el-col :span="8" class="flex_text">
+                         招标规则 : <span class="flex_name">    <el-tag v-if="bidInfo.tenderRule == 1" type="success" effect="plain">价低者得</el-tag>
+          <el-tag v-if="bidInfo.tenderRule == 2" effect="plain" >价高者得</el-tag></span>
+                       </el-col>
+                         <el-col :span="8" class="flex_text">
+                         开始时间 : <span class="flex_name"> {{bidInfo.startTime}} </span>
+                       </el-col>
+                         <el-col :span="8" class="flex_text">
+                         截止时间 :  <span class="flex_name">{{bidInfo.endTime}}
+                                    </span>
+                       </el-col>
+                    </el-row>
+                    <el-row type="flex" class="row-bg">
+                       <el-col :span="24" class="flex_text">
+                         　　 备注：<span class="flex_name">{{bidInfo.tenderRemark}}</span>
+                       </el-col>
+                    </el-row>
+                  </el-card>
+
+ 
+                    <el-card class="box-card" shadow="nerver">
+                       <div slot="header" class="clearfix">
+                          <span class="topClass"> 所有标的</span>
+                        </div>
+                          <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
+                                <el-tab-pane label="标的详情" name="first">
+                              <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-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" @change="costPlannedAmountChange($event)"></ckTable>
+                                    <!-- </el-card> -->
+                                </el-tab-pane>
+
+                          </el-tabs>
+                    </el-card>
+
+                       <div slot="footer" class="paginationParam">
+                    <!-- <el-button @click="viewDialog = false">取消</el-button> -->
+                    <el-button :loading="loading" type="primary" @click="saleViewDialog = 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>
 
   </div>
@@ -446,7 +624,7 @@
 </template>
 
 <script>
-import { getTableList, getQueryId, getQueryAdd, getQueryEdit, getQueryDelete, loadCustomer,apiFile } from '@/api/bid'
+import { getTableList, getQueryId, getQueryAdd, getQueryEdit, getQueryDelete, loadCustomer,apiFile,getSaleId } from '@/api/bid'
 import { Notification, MessageBox } from 'element-ui'
 import ckTable from './table.vue'
 import ckDialog from './dialog.vue'
@@ -540,7 +718,8 @@ export default {
       dialogTableVisible:false,
       goodsName:"",
       activeName:"first",
-      bidInfo:{}
+      bidInfo:{},
+      saleViewDialog:false,
     }
   },
   created() {
@@ -861,16 +1040,27 @@ window.open(officeUrl,'_target')
       this.bidInfo = row
       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
+      let tenderType = row.tenderType
+      if(tenderType == 1){
+        this.viewDialog = true
+         this.getParam()
+        console.log("物流")
+      }else if(tenderType == 3){
+        this.saleViewDialog = true
+        console.log("销售")
+      }
     },
     getParam(tenderParentId) {
       const data = this.param
       this.tableLoading = true
+      // getSaleId
+      // this.
       getQueryId(data).then((res) => {
         console.log(res.data.data.records, '')
         let data = res.data.data.records

src/views/tender/index.vue

@@ -322,7 +322,7 @@
                           </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>
+                              <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>
@@ -331,7 +331,7 @@
                             <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                           <el-form-item label="合计" prop="quantity">
-                              <el-input  :value="form.logisticsBiddingPrice ? (form.quantity *form.logisticsBiddingPrice).toFixed(4) : 0" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(吨/元)</template></el-input>
+                              <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> -->