Browse Source

修改物流

zerp 2 năm trước cách đây
mục cha
commit
e5a559a454

+ 10 - 3
src/views/bid/tender/dialog.vue

@@ -74,9 +74,10 @@
         <template slot-scope="scope">
             <span v-if="scope.row.packingWay == 0">未知</span> 
             <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
+            <span v-if="scope.row.packingWay == 2">包粮</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> 
+            <span v-if="scope.row.packingWay == 4">集装箱</span>  -->
         </template>
       </el-table-column>
          <el-table-column label="状态" align="center" width="100">
@@ -93,9 +94,15 @@
                     <el-link :disabled="scope.row.voucherFile ? false : true" :href="scope.row.voucherFile" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
                 </template>
               </el-table-column>
-      <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
+       <el-table-column label="始发车站" prop="departureStation" width="190" align="center" :show-overflow-tooltip="true">
+           <template slot-scope="scope">
+            <span >{{priceData.departureName}}</span> 
+        </template>
       </el-table-column>
       <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
+         <template slot-scope="scope">
+            <span >{{priceData.destinationName}}</span> 
+        </template>
       </el-table-column>
 
       <el-table-column label="投标时间" prop="logisticsBiddingTime" width="150" align="center" :show-overflow-tooltip="true">

+ 54 - 23
src/views/bid/tender/tender.vue

@@ -45,6 +45,22 @@
                     </el-row>
                   </el-card>
 
+                  <el-card class="box-card" shadow="nerver">
+                        <div slot="header" class="clearfix">
+                          <span class="topClass">招标要求</span>
+                        </div>
+                        <div style="padding:15px 40px;line-height:30px;fontSize:15px">
+                          1、报价必须完整,报价单一经发出,投标方不得随意更改信息及报价表格式(联运需尽量提供分段分解价格),不得插入、删除行或列(联运分段标注除外),不得空报,一旦更改报价表格式,将视为废标处理; <br/>
+                          2、投标方有能力完成物流及相关运输服务、储存监管照片等资料的上传、梳理归档;有能力获取储存监控设备后自行安装和回收管理,办理相关影像资料的录入;  <br/>                                                                              
+                          3、运输过程中投标方需按国林源诚要求提供固定车队,所有车辆/船舶均安装GPS定位系统,主动配合完成车(船)载摄像头安装,并按照国林源诚相关要求完成物流监管系统的监管任务,自愿接受国林源诚统一运输管理;  <br/>                                                             
+                          4、如需转存、倒仓等操作需提前三个工作日以书面形式上报至国林源诚审批备案。作业价格为包干单价,含提送货费、保险费、税金以及市场风险全包等一切费用,报价一旦发出,视为报价有效,不做任何更改说明。<br/>
+                          5、中标方需提供的增值税专用发票为 9  %;若提供其它税率的发票,按中标价折扣运费税差。<br/>
+                          6、如发生运输作业,运输损耗标准按照:按每车计算,省内不得超过每车货物数量的1 ‰,省外不得超过每车货物数量的2‰。<br/>
+                          7、在储存库点作业时,中标公司应有能力提供翻转平台或吊装机至储存库点作业。<br/>                                                                  
+                          8、中标方需按照国林源诚要求保证运输货物完好、不撒漏、防偷盗、防雨湿,如发生任何质量问题,将追究投标方违约责任;<br/>
+                        </div>
+                  </el-card>
+
  
                     <el-card class="box-card" shadow="nerver">
                        <div slot="header" class="clearfix">
@@ -54,14 +70,26 @@
                                 <el-tab-pane label="标的详情" name="first">
                               <div slot="header" class="clearfix">
                                 <span class="topClass">投的详情</span>
-                              </div>
+                              </div style="width:100%">
                                       <div class="head-container" style="margin: 30px 0 10px 0;">
-                                        <span style="fontSize:13px">货品名称</span>
+                                        <div>
+                                         <span style="fontSize:13px;marginLeft:20px">标的编码</span>
+                                          <el-input
+                                            v-model="param.logisticsCode"
+                                            clearable
+                                            placeholder="请输入标的编码"
+                                            style="width: 14%;"
+                                            size="small"
+                                            class="filter-item"
+                                            @keyup.enter.native="getParamFexd"
+                                            @clear="getParamFexd"
+                                          />
+                                        <span style="fontSize:13px;marginLeft:30px">货品名称</span>
                                           <el-input
                                             v-model="param.goodsName"
                                             clearable
                                             placeholder="请输入货物名称"
-                                            style="width: 200px;"
+                                            style="width: 15%;"
                                             size="small"
                                             class="filter-item"
                                             @keyup.enter.native="getParamFexd"
@@ -72,7 +100,7 @@
                                             v-model="param.departureName"
                                             clearable
                                             placeholder="请输入始发地"
-                                            style="width: 200px;"
+                                            style="width: 15%;"
                                             size="small"
                                             class="filter-item"
                                             @keyup.enter.native="getParamFexd"
@@ -84,34 +112,37 @@
                                             v-model="param.destinationName"
                                             clearable
                                             placeholder="请输入货物名称"
-                                            style="width: 200px;"
+                                            style="width: 15%;"
                                             size="small"
                                             class="filter-item"
                                             @keyup.enter.native="getParamFexd"
                                             @clear="getParamFexd"
                                           />
                                           <!-- 搜索 -->
-                                          <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
-                                          <el-select v-model="param.logisticsIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
+                                          <span style="fontSize:13px;marginLeft:30px;">是否投标</span>
+                                          <el-select v-model="param.logisticsIsTender"  style="width: 15%;" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
                                             <el-option  label="未投标" value="0"> </el-option>
                                             <el-option  label="有投标" value="1"> </el-option>
                                           </el-select>
+                                          </div>
+                                          <div style="margin-top:20px">
                                              <span style="fontSize:13px;marginLeft:20px">发标时间</span>
-                              <el-date-picker
-                                v-model="applyDateStart"
-                                size="small"
-                                type="datetimerange"
-                                style="width: 400px;"
-                                range-separator="-"
-                                clearable
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                :default-time="['00:00:00', '23:59:59']"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期"
-                              @change="onApplyDate"
-                              @clear="onApplyDate"
-                              />
-                              <div style="text-align: right;margin-right:40px;margin-top:20px">
+                                                <el-date-picker
+                                                v-model="applyDateStart"
+                                                size="small"
+                                                type="datetimerange"
+                                                style="width: 400px;"
+                                                range-separator="-"
+                                                clearable
+                                                value-format="yyyy-MM-dd HH:mm:ss"
+                                                :default-time="['00:00:00', '23:59:59']"
+                                                start-placeholder="开始日期"
+                                                end-placeholder="结束日期"
+                                              @change="onApplyDate"
+                                              @clear="onApplyDate"
+                                              />
+                                        </div>
+                              <div style="text-align: right;margin-right:40px">
                                    <el-button class="filter-item" style=" width:90px;  " size="small" type="primary" icon="el-icon-search" @click="getParamFexd">搜索</el-button>
                               </div>
                                       <!-- <el-button class="filter-item" style="marginLeft:20px;marginBottom:20px" size="small" type="primary" icon="el-icon-search"  @click="getParamFexd">搜索</el-button> -->
@@ -138,7 +169,7 @@
                                           <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" >
+                                        <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>

+ 2 - 2
src/views/bid/tender1.vue

@@ -91,7 +91,7 @@
                                             @clear="getParam"
                                           />
                                           <!-- 搜索 -->
-                                          <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                                          <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>
@@ -119,7 +119,7 @@
                                           <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" >
+                                        <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>

+ 2 - 2
src/views/bid/tender1/tender.vue

@@ -85,7 +85,7 @@
                                 @keyup.enter.native="getParamFexd"
                                 @clear="getParamFexd"
                               />
-                               <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                               <span style="fontSize:13px;marginLeft:30px;">是否投标</span>
                                           <el-select v-model="param.saleIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
                                             <el-option  label="未投标" value="0"> </el-option>
                                             <el-option  label="有投标" value="1"> </el-option>
@@ -134,7 +134,7 @@
                               <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" >
+                           <el-table-column prop="logisticsIsTender" label="是否投标" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                 <el-tag v-if="scope.row.saleIsTender == 0" type="info">未投标</el-tag>
                                 <el-tag v-if="scope.row.saleIsTender == 1" type="warning">有投标</el-tag>

+ 2 - 2
src/views/bid/tender2/tender.vue

@@ -81,7 +81,7 @@
                                     :value="item.name"
                                   />
                                 </el-select>
-                                 <span style="fontSize:13px;marginLeft:30px;">是否有人投标</span>
+                                 <span style="fontSize:13px;marginLeft:30px;">是否投标</span>
                               <el-select v-model="param.rawIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
                                 <el-option  label="未投标" value="0"> </el-option>
                                 <el-option  label="有投标" value="1"> </el-option>
@@ -139,7 +139,7 @@
                               <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" >
+                            <el-table-column prop="logisticsIsTender" label="是否投标" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                 <el-tag v-if="scope.row.rawIsTender == 0" type="info">未投标</el-tag>
                                 <el-tag v-if="scope.row.rawIsTender == 1" type="warning">有投标</el-tag>

+ 5 - 4
src/views/bid/tender3/dialog.vue

@@ -42,18 +42,19 @@
             <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
             </template>
           </el-table-column>
-
-            <el-table-column prop="quantity"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
-            <el-table-column prop="phone" width="152" label="联系电话" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="storageAssistFee" width="100" label="出库辅助费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="rentalFee"  label="租赁费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="processFee"  label="加工费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="biddingPrice" width="100" label="投标价格" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="quantity"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="phone" width="152" label="联系电话" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
               <el-table-column label="操作" width="250" fixed="right" align="center">
           <template slot-scope="scope">
             <el-button  slot="reference"  :disabled="scope.row.biddingStatus !=6"  icon="el-icon-check" type="text" @click="dialogVisible=true;dataForm=scope.row">中标</el-button>
             <!-- <el-button  slot="reference"   icon="el-icon-check" type="text" @click="dialogVisible=true;dataForm=scope.row">中标</el-button> -->
+            <!-- :disabled="scope.row.biddingStatus !=7" -->
              <el-upload
                      :disabled="scope.row.biddingStatus !=7"
                     class="upload-demo"
@@ -68,7 +69,7 @@
                     :file-list="fileList"
                     multiple
                   >
-                          <el-button @click="handleUpload"  :disabled="scope.row.biddingStatus !=7" class="el-icon-upload2" size="small" type="text" style="width:90px;font-size:14px ">发送合同</el-button>
+                          <el-button @click="handleUpload" :disabled="scope.row.biddingStatus !=7"  class="el-icon-upload2" size="small" type="text" style="width:90px;font-size:14px ">发送合同</el-button>
                   </el-upload>
           </template>
         </el-table-column>

+ 2 - 2
src/views/bid/tender3/table.vue

@@ -46,7 +46,7 @@
                             <el-table-column prop="level"   label="等级" :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>
+                                    <el-link :disabled="scope.row.receiptPathUrl ? false : true" :href="scope.row.receiptPathUrl" type="primary" target="_target"><i class="el-icon-view"></i> 下载</el-link>
                                 </template>
                               </el-table-column>
 
@@ -60,7 +60,7 @@
                             </template>
                           </el-table-column>
 
-                          <!-- <el-table-column prop="processingIsTender" label="是否有人投标" width="100" :show-overflow-tooltip="true" align="center" >
+                          <!-- <el-table-column prop="processingIsTender" label="是否投标" width="100" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.processingIsTender == 0" type="success" effect="plain">是</el-tag>
                                   <el-tag v-if="scope.row.processingIsTender == 1" effect="plain" >否</el-tag>

+ 6 - 1
src/views/bid/tender3/tender.vue

@@ -92,6 +92,11 @@
                                     :value="item.id"
                                   />
                                 </el-select> -->
+                            <!-- <span style="fontSize:13px;marginLeft:30px;">是否作废</span>
+                            <el-select v-model="param.rawIsTender" size="small"  @keyup.enter.native="getParamFexd" @clear="getParamFexd" clearable placeholder="请选择">
+                                <el-option  label="未作废" value="0"> </el-option>
+                                <el-option  label="已作废" value="1"> </el-option>
+                              </el-select> -->
                             <span style="fontSize:13px;marginLeft:20px">发标时间</span>
                               <el-date-picker
                                 v-model="applyDateStart"
@@ -138,7 +143,7 @@
                             </template>
                           </el-table-column>
 
-                           <el-table-column prop="logisticsIsTender" label="是否有人投标" :show-overflow-tooltip="true" align="center" >
+                           <el-table-column prop="logisticsIsTender" label="是否投标" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                 <el-tag v-if="scope.row.processingIsTender == 0" type="info">未投标</el-tag>
                                 <el-tag v-if="scope.row.processingIsTender == 1" type="warning">有投标</el-tag>

+ 2 - 2
src/views/tender/index.vue

@@ -80,12 +80,12 @@
           <el-tag v-if="scope.row.tenderType == 4" >加工承揽</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="description" :show-overflow-tooltip="true" label="招标规则" width="100" align="center">
+      <el-table-column prop="description" :show-overflow-tooltip="true" label="招标规则" width="100" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.tenderRule == 1" type="success" effect="plain">价低者得</el-tag>
           <el-tag v-if="scope.row.tenderRule == 2" effect="plain" >价高者得</el-tag>
         </template>
-      </el-table-column> -->
+      </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.isInvalid == 1"  >正常</el-tag>

+ 11 - 4
src/views/tender/tender/dialog.vue

@@ -47,15 +47,22 @@
         <template slot-scope="scope">
             <span v-if="scope.row.packingWay == 0">未知</span> 
             <span v-if="scope.row.packingWay == 1">散粮</span> 
-            <span v-if="scope.row.packingWay == 2">袋装</span> 
+            <span v-if="scope.row.packingWay == 2">包粮</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> 
+            <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">
+           <template slot-scope="scope">
+            <span >{{priceData.departureName}}</span> 
+        </template>
       </el-table-column>
       <el-table-column label="目的车站" prop="destinationStation" width="150" align="center" :show-overflow-tooltip="true">
+         <template slot-scope="scope">
+            <span >{{priceData.destinationName}}</span> 
+        </template>
       </el-table-column>
 
        <el-table-column label="状态" align="center" width="100">
@@ -91,7 +98,7 @@
                     multiple
                     accept=".zip"
                   >
-                          <el-button @click="handleUpload" :disabled="scope.row.biddingStatus !=7" class="el-icon-upload2" size="small" type="text" style="width:90px;fontSize:14px ">上传回执</el-button>
+                          <el-button :disabled="scope.row.biddingStatus !=7" class="el-icon-upload2" size="small" type="text" style="width:90px;fontSize:14px ">上传回执</el-button>
                   </el-upload>
           </template>
        </el-table-column>
@@ -164,6 +171,7 @@ export default {
       batchVisible:false,
        BASE_API: process.env.BASE_API,
        fileList: [],
+       fileData:{},
       roles:[],
       startTime:"",
       endTime:"",
@@ -172,7 +180,6 @@ export default {
   },
   created() {
     // this.getTenantList()
-    console.log('res')
   },
   methods: {
        // 文件移除的时候

+ 46 - 11
src/views/tender/tender/tender.vue

@@ -45,6 +45,25 @@
                      
                     </el-row>
                   </el-card>
+
+
+                  <el-card class="box-card" shadow="nerver">
+                        <div slot="header" class="clearfix">
+                          <span class="topClass">招标要求</span>
+                        </div>
+                        <div style="padding:15px 40px;line-height:30px;fontSize:15px">
+                          1、报价必须完整,报价单一经发出,投标方不得随意更改信息及报价表格式(联运需尽量提供分段分解价格),不得插入、删除行或列(联运分段标注除外),不得空报,一旦更改报价表格式,将视为废标处理; <br/>
+                          2、投标方有能力完成物流及相关运输服务、储存监管照片等资料的上传、梳理归档;有能力获取储存监控设备后自行安装和回收管理,办理相关影像资料的录入;  <br/>                                                                              
+                          3、运输过程中投标方需按国林源诚要求提供固定车队,所有车辆/船舶均安装GPS定位系统,主动配合完成车(船)载摄像头安装,并按照国林源诚相关要求完成物流监管系统的监管任务,自愿接受国林源诚统一运输管理;  <br/>                                                             
+                          4、如需转存、倒仓等操作需提前三个工作日以书面形式上报至国林源诚审批备案。作业价格为包干单价,含提送货费、保险费、税金以及市场风险全包等一切费用,报价一旦发出,视为报价有效,不做任何更改说明。<br/>
+                          5、中标方需提供的增值税专用发票为 9  %;若提供其它税率的发票,按中标价折扣运费税差。<br/>
+                          6、如发生运输作业,运输损耗标准按照:按每车计算,省内不得超过每车货物数量的1 ‰,省外不得超过每车货物数量的2‰。<br/>
+                          7、在储存库点作业时,中标公司应有能力提供翻转平台或吊装机至储存库点作业。<br/>                                                                  
+                          8、中标方需按照国林源诚要求保证运输货物完好、不撒漏、防偷盗、防雨湿,如发生任何质量问题,将追究投标方违约责任;<br/>
+                        </div>
+                  </el-card>
+
+
                    <el-card class="box-card" shadow="nerver">
                         <div slot="header" class="clearfix">
                           <span class="topClass"> 所有标的</span>
@@ -104,18 +123,18 @@
                               <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" >
+                            <!-- <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" >
+                            <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>
                             <el-table-column label="运输时间" prop="freightTime" width="200" align="center" :show-overflow-tooltip="true">
                             </el-table-column>
                             <el-table-column prop="startTime" label="投标起始时间"  width="152" :show-overflow-tooltip="true" align="center" />
@@ -160,20 +179,32 @@
                         <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-input  v-model="form.goodsName" style="width:50%" disabled readonly></el-input> -->
                         </el-form-item>
-                         <el-row :gutter="20">
+                        <el-row :gutter="20">
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                            <el-form-item label="始发地">
+                              <el-input v-model="form.departureName" readonly 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="目的地" >
+                                <el-input v-model="form.destinationName" readonly 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="departureStation">
-                              <el-input v-model="form.departureStation" style="width: 80%;" placeholder="请输入始发地"></el-input>
+                              <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-input v-model="form.destinationStation"  style="width: 80%;" placeholder="请输入目的地"></el-input>
                               </el-form-item>
                           </el-col>
-                         </el-row>
+                         </el-row> -->
                         
                         <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
@@ -379,9 +410,10 @@ export default {
       ],
       packingWay:[
         {id:1,name:"散粮"},
-        {id:2,name:"袋装"},
-        {id:3,name:"散装"},
-        {id:4,name:"集装箱"},
+        {id:2,name:"包粮"},
+        // {id:2,name:"袋装"},
+        // {id:3,name:"散装"},
+        // {id:4,name:"集装箱"},
       ],
       transportMode:[
         {id:1,name:"陆运"},
@@ -603,6 +635,9 @@ export default {
       this.form.tenderParentId = this.param.tenderParentId
       this.form.quantity = row.goodsNumber
       this.form.goodsName = row.goodsName
+      console.log(row) 
+      this.form.departureName = row.departureName;
+      this.form.destinationName = row.destinationName;
       this.form.transportUnitPrice = row.transportUnitPrice
       if (this.$refs['form']) {
         this.$refs['form'].resetFields()

+ 3 - 3
src/views/tender/tender1/tender.vue

@@ -125,12 +125,12 @@
                               <el-tag effect="plain" v-if="scope.row.status ==4" type="warning">未开始</el-tag>
                             </template>
                           </el-table-column>
-                          <!-- <el-table-column prop="tenderSaleRule" width="100" label="中标规则" :show-overflow-tooltip="true" align="center" >
+                          <el-table-column prop="tenderSaleRule" width="100" label="中标规则" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.tenderSaleRule == 1" type="success" effect="plain">价低者得</el-tag>
                                   <el-tag v-if="scope.row.tenderSaleRule == 2" effect="plain" >价高者得</el-tag>
                               </template>
-                            </el-table-column> -->
+                            </el-table-column>
                             <el-table-column prop="startTime" width="152" label="投标起始时间" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="endTime" width="152" label="投标结束时间" :show-overflow-tooltip="true" align="center" />
                             <!-- <el-table-column prop="createTime" label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" /> -->
@@ -252,7 +252,7 @@
                             <el-form-item label="投标价格" prop="biddingPrice">
                              <div  class="mo-input--number">
                               <!-- <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="form.biddingPrice"  step-strictly controls-position="right"  :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number> -->
-                              <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="form.biddingPrice"  step-strictly controls-position="right" :step="form.biddingStartPrice" :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number>
+                              <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="form.biddingPrice"  controls-position="right" :step="form.biddingStartPrice" :min="form.lowestPrice"  :max="form.highestPrice"></el-input-number>
                               <!-- <el-input-number style="width:100%" @change="handleNumberChange" v-model.number="biddingPrice"  step-strictly controls-position="right" :step="13" :min="208"  :max="308"></el-input-number> -->
                                <div class="define-append">(吨/元)</div>
                              </div>

+ 2 - 2
src/views/tender/tender2/tender.vue

@@ -135,12 +135,12 @@
                               <el-tag effect="plain" v-if="scope.row.status ==4" type="warning">未开始</el-tag>
                             </template>
                           </el-table-column>
-                          <!-- <el-table-column prop="tenderLogisticsRule" label="中标规则" width="100" :show-overflow-tooltip="true" align="center" >
+                          <el-table-column prop="tenderLogisticsRule" label="中标规则" width="100" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.rule == 1" type="success" effect="plain">价低者得</el-tag>
                                   <el-tag v-if="scope.row.rule == 2" effect="plain" >价高者得</el-tag>
                               </template>
-                            </el-table-column> -->
+                            </el-table-column>
                             <el-table-column prop="startTime" width="152" label="投标起始时间" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="endTime" width="152" label="投标结束时间" :show-overflow-tooltip="true" align="center" />
                             <!-- <el-table-column prop="createTime" label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" /> -->

+ 3 - 3
src/views/tender/tender3/dialog.vue

@@ -18,12 +18,12 @@
             <el-tag effect="plain" v-if="scope.row.biddingStatus ==9" type="danger">已作废</el-tag>
             </template>
           </el-table-column>
-
-            <el-table-column prop="quantity"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
-            <el-table-column prop="phone" width="152" label="联系电话" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="storageAssistFee" width="100" label="出库辅助费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="rentalFee"  label="租赁费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="processFee"  label="加工费" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="biddingPrice" width="100" label="投标价格" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="quantity"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
+            <el-table-column prop="phone" width="152" label="联系电话" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
             <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                   <el-table-column label="操作" width="250" fixed="right" align="center">

+ 1 - 1
src/views/tender/tender3/table.vue

@@ -60,7 +60,7 @@
                             </template>
                           </el-table-column>
 
-                          <!-- <el-table-column prop="processingIsTender" label="是否有人投标" width="100" :show-overflow-tooltip="true" align="center" >
+                          <!-- <el-table-column prop="processingIsTender" label="是否投标" width="100" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.processingIsTender == 0" type="success" effect="plain">是</el-tag>
                                   <el-tag v-if="scope.row.processingIsTender == 1" effect="plain" >否</el-tag>

+ 60 - 25
src/views/tender/tender3/tender.vue

@@ -139,18 +139,18 @@
                             </template>
                           </el-table-column>
 
-                          <!-- <el-table-column prop="processingIsTender" label="是否有人投标" width="100" :show-overflow-tooltip="true" align="center" >
+                          <!-- <el-table-column prop="processingIsTender" label="是否投标" width="100" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.processingIsTender == 0" type="success" effect="plain">是</el-tag>
                                   <el-tag v-if="scope.row.processingIsTender == 1" effect="plain" >否</el-tag>
                               </template>
                             </el-table-column> -->
-                          <!-- <el-table-column prop="tenderLogisticsRule" label="中标规则" width="100" :show-overflow-tooltip="true" align="center" >
+                          <el-table-column prop="tenderLogisticsRule" label="中标规则" width="100" :show-overflow-tooltip="true" align="center" >
                               <template slot-scope="scope">
                                   <el-tag v-if="scope.row.rule == 1" type="success" effect="plain">价低者得</el-tag>
                                   <el-tag v-if="scope.row.rule == 2" effect="plain" >价高者得</el-tag>
                               </template>
-                            </el-table-column> -->
+                            </el-table-column>
                             <el-table-column prop="quantity"  label="数量(吨)" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="nearFutureWater"  label="近期水分%" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="nearFutureImpurity"  label="近期杂质%" :show-overflow-tooltip="true" align="center" />
@@ -239,7 +239,9 @@
                          <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                             <el-form-item label="产地">
-                              <el-input v-model="form.comesFrom" readonly style="width: 80%;" placeholder=""></el-input>
+                              <div>
+                              <el-input v-model="form.comesFrom" readonly style="width: 88%;" placeholder=""></el-input>
+                              </div>
                             </el-form-item>
                           </el-col>
 
@@ -254,12 +256,16 @@
                         <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                            <el-form-item label="加工费" prop="processFee">
-                              <el-input v-model="form.processFee" style="width: 80%;" @blur="(form.processFee <= 0) ? form.processFee='' : form.processFee" placeholder="请输入加工费"><template slot="append">(元)</template></el-input>
+                              <div class="typeNumber">
+                                <el-input v-model.number="form.processFee" type="number" style="width: 88%;" @blur="(form.processFee <= 0) ? form.processFee='' : form.processFee" placeholder="请输入加工费"><template slot="append">(元)</template></el-input>
+                              </div>
                             </el-form-item>
                           </el-col>
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                            <el-form-item label="租赁费" prop="rentalFee">
-                              <el-input v-model="form.rentalFee" style="width: 80%;"  @blur="(form.rentalFee <= 0) ? form.rentalFee='' : form.rentalFee" placeholder="请输入租赁费"><template slot="append">(元)</template></el-input>
+                              <div class="typeNumber">
+                                <el-input v-model.number="form.rentalFee" type="number" style="width: 80%;"  @blur="(form.rentalFee <= 0) ? form.rentalFee='' : form.rentalFee" placeholder="请输入租赁费"><template slot="append">(元)</template></el-input>
+                              </div>
                             </el-form-item>
                           </el-col>
                         </el-row>
@@ -267,11 +273,26 @@
                             <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
                           <el-form-item label="出库辅助费" prop="storageAssistFee">
-                            <el-input v-model="form.storageAssistFee" style="width: 80%;"  placeholder="请输入出库辅助费"><template slot="append">(元)</template></el-input>
+                            <div class="typeNumber">
+                            <el-input v-model.number="form.storageAssistFee" type="number" style="width: 88%;"  placeholder="请输入出库辅助费"><template slot="append">(元)</template></el-input>
+                            </div>
+                          </el-form-item>
+                          </el-col>
+                          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
+                             <el-form-item label="合计" prop="quantity">
+                               <el-input  :value="form.rentalFee && form.processFee ? ((form.rentalFee + form.storageAssistFee + form.processFee) * form.quantity).toFixed(4) : 0" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></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="联系电话" >
+                            <el-input v-model="form.phone" style="width: 88%;" maxlength="11" placeholder="请输入联系电话"></el-input>
                           </el-form-item>
                           </el-col>
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
-                               <el-form-item label="上传凭证" >
+                              <el-form-item label="上传凭证" >
                               <el-upload
                                   class="upload-demo"
                                   :limit="1"
@@ -294,16 +315,16 @@
 
                         <el-row :gutter="20">
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
-                          <el-form-item label="联系电话" >
+                          <!-- <el-form-item label="联系电话" >
                             <el-input v-model="form.phone" style="width: 80%;" maxlength="11" placeholder="请输入联系电话"></el-input>
-                          </el-form-item>
+                          </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.remark"
                                   type="textarea"
-                                  style="width: 93%;"
+                                  style="width: 88%;"
                                   :autosize="{ minRows: 2, maxRows: 10}"
                                   maxlength="500"
                                   show-word-limit
@@ -606,19 +627,19 @@ export default {
             // 新增字典
             console.log(this.form)
             this.loading = true
-            getBiddingAdd(this.form).then((res) => {
-              if (res.data.code === 200) {
-                this.$message({ message: '操作成功', type: 'success' })
-              } else {
-                this.$message({ message: res.data.msg, type: 'error' })
-              }
-              this.dialog = false
-              this.loading = false
-              this.getDictData()
-              this.$refs['form'].resetFields()
-            }).catch(err => {
-              this.loading = false
-            })
+            // getBiddingAdd(this.form).then((res) => {
+            //   if (res.data.code === 200) {
+            //     this.$message({ message: '操作成功', type: 'success' })
+            //   } else {
+            //     this.$message({ message: res.data.msg, type: 'error' })
+            //   }
+            //   this.dialog = false
+            //   this.loading = false
+            //   this.getDictData()
+            //   this.$refs['form'].resetFields()
+            // }).catch(err => {
+            //   this.loading = false
+            // })
           } else {
             // 更新字典
             getQueryEdit(this.form).then((res) => {
@@ -648,7 +669,7 @@ export default {
       this.form.processingCode = row.processingCode
       this.form.quantity = row.quantity
       // 出库辅助费默认为0
-      this.$set(this.form, "storageAssistFee", "0")
+      this.$set(this.form, "storageAssistFee", 0)
       if (this.$refs['form']) {
         this.$refs['form'].resetFields()
       }
@@ -837,5 +858,19 @@ export default {
 
  box-shadow: 0px 0px 0px 0px rgba(0,0,0,0.5)
 }
+
+
+
+// 去掉数字类型
+.typeNumber{
+ /deep/ input::-webkit-outer-spin-button,
+      input::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+  }
+ /deep/ input[type="number"]{
+      -moz-appearance: textfield;
+  }
+
+}
 </style>