中标与发送合同

config/index.js

@@ -24,8 +24,8 @@ module.exports = {
         },
 
         // 本地开发使用   192.168.0.126  localhost
-        // host: '192.168.3.4',
-        host: '192.168.124.10',
+        host: '192.168.3.28',
+        // host: '192.168.124.10',
         port: 8081,
         autoOpenBrowser: true,
         errorOverlay: true,

src/views/bid/index.vue

@@ -34,7 +34,8 @@
         />
       </el-select>
 
-    <span style="fontSize:13px;marginLeft:20px">创建时间</span>
+
+    <span style="fontSize:13px;marginLeft:20px">开始时间</span>
             <el-date-picker
               v-model="applyDateStart"
               size="mini"

src/views/bid/tender/table.vue

@@ -172,7 +172,7 @@
           <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="运输时间" prop="freightTime" width="200" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="运输时间" prop="freightTime" width="230" align="center" :show-overflow-tooltip="true">
       </el-table-column>
       <el-table-column label="投标开始时间" prop="startTime" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>

src/views/bid/tender/tender.vue

@@ -154,7 +154,7 @@
                                         </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" width="152" label="创建时间" :show-overflow-tooltip="true" align="center" />
+                                        <!-- <el-table-column prop="createTime" width="152" label="创建时间" :show-overflow-tooltip="true" align="center" /> -->
                                         <el-table-column prop="logisticsRemark" width="152" label="备注" :show-overflow-tooltip="true" align="center" />
                                   
                                       </el-table>

src/views/bid/tender1/dialog.vue

@@ -45,11 +45,12 @@
                           </el-table-column>
                             <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
-                <!-- <el-table-column label="操作" width="250" fixed="right" 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>
+            <!-- <el-button  slot="reference"   icon="el-icon-check" type="text" @click="dialogVisible=true;dataForm=scope.row">中标</el-button> -->
              <el-upload
+                    :disabled="scope.row.biddingStatus !=7"
                     class="upload-demo"
                     :on-change="handleChange"
                     :on-remove="handleRemove"
@@ -62,10 +63,10 @@
                     :file-list="fileList"
                     multiple
                   >
-                          <el-button @click="handleUpload"  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> -->
+        </el-table-column>
     </el-table>
 
     <!--分页-->
@@ -187,7 +188,7 @@ export default {
     changeBid(){
       console.log(this.dataForm)
       console.log(this.priceData,"priceData")
-      getContract(this.dataForm.tenderParentId,this.dataForm.biddingRawId,this.priceData.tenderType).then((res)=>{
+      getContract(this.dataForm.tenderSaleId,this.dataForm.biddingSaleId,this.priceData.tenderType).then((res)=>{
         if(res.data.code == 200){
            this.$message({
               message: '操作成功',

src/views/bid/tender1/tender.vue

@@ -148,7 +148,7 @@
                             </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" />
+                            <!-- <el-table-column prop="createTime"  label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" /> -->
                             <el-table-column prop="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                           </el-table>
                           <div class="pagination">

src/views/bid/tender2/dialog.vue

@@ -68,11 +68,11 @@
                         
                             <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">
+                <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>
              <el-upload
+                     :disabled="scope.row.biddingStatus !=7"
                     class="upload-demo"
                     :on-change="handleChange"
                     :on-remove="handleRemove"
@@ -85,10 +85,10 @@
                     :file-list="fileList"
                     multiple
                   >
-                          <el-button @click="handleUpload"  class="el-icon-upload2" size="small" type="text" style="width:90px;font-size:14px ">发送合同</el-button>
+                          <el-button @click="handleUpload"  class="el-icon-upload2" :disabled="scope.row.biddingStatus !=7" size="small" type="text" style="width:90px;font-size:14px ">发送合同</el-button>
                   </el-upload>
           </template>
-        </el-table-column> -->
+        </el-table-column>
     </el-table>
 
     <!--分页-->

src/views/bid/tender2/table.vue

@@ -75,7 +75,7 @@
                             </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" />
+                            <!-- <el-table-column prop="createTime" 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">

src/views/bid/tender2/tender.vue

@@ -153,7 +153,7 @@
                             </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" />
+                            <!-- <el-table-column prop="createTime" 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>

src/views/bid/tender3/dialog.vue

@@ -50,11 +50,12 @@
             <el-table-column prop="biddingPrice" width="100" 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">
+              <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>
+            <!-- <el-button  slot="reference"   icon="el-icon-check" type="text" @click="dialogVisible=true;dataForm=scope.row">中标</el-button> -->
              <el-upload
+                     :disabled="scope.row.biddingStatus !=7"
                     class="upload-demo"
                     :on-change="handleChange"
                     :on-remove="handleRemove"
@@ -67,10 +68,10 @@
                     :file-list="fileList"
                     multiple
                   >
-                          <el-button @click="handleUpload"  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> -->
+        </el-table-column>
     </el-table>
 
     <!--分页-->
@@ -187,7 +188,7 @@ export default {
     changeBid(){
       console.log(this.dataForm)
       console.log(this.priceData,"priceData")
-      getContract(this.dataForm.tenderParentId,this.dataForm.biddingRawId,this.priceData.tenderType).then((res)=>{
+      getContract(this.dataForm.tenderProcessingId,this.dataForm.biddingProcessingId,this.priceData.tenderType).then((res)=>{
         if(res.data.code == 200){
            this.$message({
               message: '操作成功',

src/views/bid/tender3/tender.vue

@@ -178,7 +178,7 @@
 
                             <el-table-column prop="startTime" width="152" label="投标起始时间" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="endTime" width="152" label="投标结束时间" :show-overflow-tooltip="true" align="center" />
-                            <el-table-column prop="createTime" label="创建时间"  width="152" :show-overflow-tooltip="true" align="center" />
+                            <!-- <el-table-column prop="createTime" 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>

src/views/tender/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"
@@ -99,7 +99,7 @@
       </el-table-column> -->
       <el-table-column prop="startTime" label="开始时间" align="center" width="160" />
       <el-table-column prop="endTime" label="截止时间" align="center" width="160" />
-      <el-table-column prop="tenderRemark" label="备注" :show-overflow-tooltip="true" align="center" />
+      <el-table-column prop="tenderRemark" label="备注"  :show-overflow-tooltip="true" align="center" />
 
 
       <el-table-column label="操作" width="250" align="center">

src/views/tender/tender/tender.vue

@@ -190,7 +190,7 @@
                            </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-select v-model="form.transportMode" style="width: 80%;"  filterable placeholder="请选择运输方式">
                                 <el-option
                                   v-for="item in transportMode"
                                   :key="item.id"

src/views/tender/tender1/dialog.vue

@@ -27,7 +27,7 @@
                           </el-table-column>
                             <el-table-column prop="biddingTime" label="投标时间"  width="152" :show-overflow-tooltip="true" align="center" />
                             <el-table-column prop="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
-                   <!-- <el-table-column label="操作" width="250" fixed="right" align="center">
+                   <el-table-column label="操作" width="250" fixed="right" align="center">
           <template slot-scope="scope">
              <el-upload
                     :disabled="scope.row.biddingStatus !=7"
@@ -38,7 +38,7 @@
                     :show-file-list="false"
                     name="multipartFile"
                     style="display:inline-block"
-                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderSaleId +'/'+ priceData.tenderType"
                     list-type="text"
                     :data="fileData"
                     :file-list="fileList"
@@ -48,7 +48,7 @@
                           <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-upload>
           </template>
-       </el-table-column> -->
+       </el-table-column>
     </el-table>
 
     <!--分页-->

src/views/tender/tender2/dialog.vue

@@ -68,7 +68,7 @@
                         
                             <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">
+                       <el-table-column label="操作" width="250" fixed="right" align="center">
           <template slot-scope="scope">
              <el-upload
                     :disabled="scope.row.biddingStatus !=7"
@@ -79,7 +79,7 @@
                     :show-file-list="false"
                     name="multipartFile"
                     style="display:inline-block"
-                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.rawTenderId +'/'+ priceData.tenderType"
                     list-type="text"
                     :data="fileData"
                     :file-list="fileList"
@@ -89,7 +89,7 @@
                           <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-upload>
           </template>
-       </el-table-column> -->
+       </el-table-column>
     </el-table>
 
     <!--分页-->

src/views/tender/tender2/tender.vue

@@ -281,6 +281,7 @@
                                   start-placeholder="开始日期"
                                   end-placeholder="结束日期"
                                 @change="ondeliveryDate"
+                                 placeholder="选择日期"
                                 />
                               </el-form-item>
                           </el-col>

src/views/tender/tender3/dialog.vue

@@ -26,7 +26,7 @@
             <el-table-column prop="biddingPrice" width="100" 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">
+                  <el-table-column label="操作" width="250" fixed="right" align="center">
           <template slot-scope="scope">
              <el-upload
                     :disabled="scope.row.biddingStatus !=7"
@@ -37,7 +37,7 @@
                     :show-file-list="false"
                     name="multipartFile"
                     style="display:inline-block"
-                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderProcessingId +'/'+ priceData.tenderType"
                     list-type="text"
                     :data="fileData"
                     :file-list="fileList"
@@ -47,7 +47,7 @@
                           <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-upload>
           </template>
-       </el-table-column> -->
+       </el-table-column>
     </el-table>
 
     <!--分页-->

src/views/tender/tender3/tender.vue

@@ -267,7 +267,7 @@
                             <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>
+                            <el-input v-model="form.storageAssistFee" style="width: 80%;"  placeholder="请输入出库辅助费"><template slot="append">(元)</template></el-input>
                           </el-form-item>
                           </el-col>
                           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">