原料中标操作隐藏

config/index.js

@@ -13,8 +13,8 @@ module.exports = {
                 // target: 'http://47.108.151.62:80/pre', //后端接口地址     中间人运营平台
                 // target: 'http://47.108.151.62', //后端接口地址   
                 // target: 'http://192.168.3.12:7001', //后端接口地址   
-                // target: 'http://127.0.0.1:28081', //后端接口地址   
-                target: 'http://47.108.14.99:7001/', //后端接口地址   
+                target: 'http://127.0.0.1:28081', //后端接口地址   
+                // target: 'http://47.108.14.99:7001/', //后端接口地址   
                 changeOrigin: true, //是否跨域
                 pathRewrite: {
                     '^/': '/', //重写,

src/api/bid.js

@@ -154,7 +154,7 @@ export function getTenderRaw(parms) {
 // 已投递列表
 export function getTenderRawList(parms) {
   return request({
-    url: '/tender/raw',
+    url: '/tender/raw/info',
     method: 'get',
     params: parms
   })

src/api/tender.js

@@ -145,7 +145,7 @@ export function getRawAdd(parms) {
 // 已投递列表
 export function getTenderRawList(parms) {
   return request({
-    url: '/tender/raw',
+    url: '/tender/raw/info',
     method: 'get',
     params: parms
   })

src/views/admin/tenant.vue

@@ -44,7 +44,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="授权结束时间" width="160" align="center">
+      <el-table-column label="授权投标结束时间" width="160" align="center">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
@@ -110,7 +110,7 @@
             placeholder="选择开始日期时间"
           />
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime" :label-width="formLabelWidth">
+        <el-form-item label="投标结束时间" prop="endTime" :label-width="formLabelWidth">
           <el-date-picker
             v-model="dataForm.endTime"
             type="datetime"
@@ -173,7 +173,7 @@ export default {
         name: [{ required: true, message: '租户名称不能为空', trigger: 'blur' }],
         code: [{ required: true, message: '租户编号不能为空', trigger: 'blur' }],
         startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
-        endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+        endTime: [{ required: true, message: '投标结束时间不能为空', trigger: 'blur' }],
         status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
       },
       loading: false,

src/views/bid/index.vue

@@ -481,14 +481,14 @@ ckTender3,
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -768,14 +768,14 @@ window.open(officeUrl,'_target')
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/bid/tender/dialog.vue

@@ -181,6 +181,7 @@
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
 import { getLogisticsInfo,getCustomerName ,getContract} from '@/api/bid'
+import { Notification, MessageBox } from 'element-ui'
 
 export default {
   data() {

src/views/bid/tender/table.vue

@@ -152,7 +152,7 @@
       </el-table-column>
       <el-table-column label="保证金" prop="deposit" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
-      <el-table-column prop="appendix" label="附件" align="center" width="100">
+      <el-table-column prop="appendix" label="回执" align="center" width="100">
         <template slot-scope="scope">
             <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>
@@ -172,6 +172,8 @@
           <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>
       <el-table-column label="投标开始时间" prop="startTime" width="150" align="center" :show-overflow-tooltip="true">
       </el-table-column>
       <el-table-column label="投标结束时间" prop="endTime" width="150" align="center" :show-overflow-tooltip="true">
@@ -291,14 +293,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -310,10 +312,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/bid/tender/tender.vue

@@ -150,8 +150,10 @@
                                             <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
                                           </template>
                                         </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 label="运输时间" prop="freightTime" width="200" align="center" :show-overflow-tooltip="true">
+                                        </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="logisticsRemark" width="152" label="备注" :show-overflow-tooltip="true" align="center" />
                                   
@@ -410,14 +412,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -429,10 +431,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res
@@ -656,14 +658,14 @@ window.open(officeUrl,'_target')
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -675,10 +677,10 @@ window.open(officeUrl,'_target')
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
 
           return res

src/views/bid/tender1.vue

@@ -131,8 +131,8 @@
                                             <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="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" />
                                   
@@ -387,14 +387,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -406,10 +406,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res
@@ -628,14 +628,14 @@ window.open(officeUrl,'_target')
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -647,10 +647,10 @@ window.open(officeUrl,'_target')
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res

src/views/bid/tender1/dialog.vue

@@ -45,28 +45,27 @@
                           </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">
-                    <template slot-scope="scope">
-                      <el-button  slot="reference" :disabled="scope.row.biddingStatus !=6" icon="el-icon-check" type="text" @click="handleView(scope.row)">中标</el-button>
-                      <el-upload
-                              :disabled="scope.row.biddingStatus !=7"
-                              class="upload-demo"
-                              :limit="1"
-                              :on-change="handleChange"
-                              :on-remove="handleRemove"
-                              :show-file-list="false"
-                              name="multipartFile"
-                              style="display:inline-block"
-                              :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
-                              list-type="text"
-                              :data="fileData"
-                              :file-list="fileList"
-                              multiple
-                            >
-                                    <el-button @click="handleUpload" :disabled="scope.row.biddingStatus !=7" class="el-icon-upload" size="small" type="text" style="width:90px; ">发送合同</el-button>
-                            </el-upload>
-                    </template>
-                  </el-table-column> -->
+                <!-- <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
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :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-upload>
+          </template>
+        </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -85,6 +84,36 @@
     </div>
 
 
+   <el-dialog
+      title=""
+      :visible.sync="dialogVisible"
+      width="35%"
+      top="35vh"
+      append-to-body
+     >
+      <span style="font-size:16px">此操作将“{{dataForm.customerName}}”，置中标</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-upload
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + dataForm.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    multiple
+                  >
+                          <el-button @click="changeBid"  type="primary"  >确定并发送合同</el-button>
+                  </el-upload>
+        <el-button type="primary" @click="changeBid">确 定</el-button>
+        
+      </span>
+    </el-dialog>
+
 
 
   </div>
@@ -93,7 +122,8 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getBiddingSaleInfo,getCustomerName } from '@/api/bid'
+import { getBiddingSaleInfo,getCustomerName,getContract } from '@/api/bid'
+import { Notification, MessageBox } from 'element-ui'
 
 export default {
   data() {
@@ -143,7 +173,9 @@ export default {
       userDataList:[],
       startTime:"",
       endTime:"",
-        isShow:true
+        isShow:true,
+        fileData:{}
+
     }
   },
   created() {
@@ -151,6 +183,21 @@ export default {
     console.log('res')
   },
   methods: {
+      // 置中标
+    changeBid(){
+      console.log(this.dataForm)
+      console.log(this.priceData,"priceData")
+      getContract(this.dataForm.tenderParentId,this.dataForm.biddingRawId,this.priceData.tenderType).then((res)=>{
+        if(res.data.code == 200){
+           this.$message({
+              message: '操作成功',
+              type: 'success'
+            });
+            this.dialogVisible = false
+            this.getTenantList()
+        }
+      })
+    },
     // 点击时候
     handleUpload(){
       console.log(this.SelectionList,"我被固定了")

src/views/bid/tender1/table.vue

@@ -66,8 +66,8 @@
                                   <el-tag v-if="scope.row.tenderSaleRule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </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="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="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="150" fixed="right" align="center">
@@ -180,14 +180,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -199,10 +199,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/bid/tender1/tender.vue

@@ -146,8 +146,8 @@
                                   <el-tag v-if="scope.row.tenderSaleRule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </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="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="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                           </el-table>
@@ -500,14 +500,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -519,10 +519,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res
@@ -689,14 +689,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -708,10 +708,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
 
           return res

src/views/bid/tender2/dialog.vue

@@ -68,28 +68,27 @@
                         
                             <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="handleView(scope.row)">中标</el-button>
-                          <el-upload
-                                  :disabled="scope.row.biddingStatus !=7"
-                                  class="upload-demo"
-                                  :limit="1"
-                                  :on-change="handleChange"
-                                  :on-remove="handleRemove"
-                                  :show-file-list="false"
-                                  name="multipartFile"
-                                  style="display:inline-block"
-                                  :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
-                                  list-type="text"
-                                  :data="fileData"
-                                  :file-list="fileList"
-                                  multiple
-                                >
-                                        <el-button @click="handleUpload" :disabled="scope.row.biddingStatus !=7" class="el-icon-upload" size="small" type="text" style="width:90px; ">发送合同</el-button>
-                                </el-upload>
-                        </template>
-                      </el-table-column> -->
+                <!-- <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
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :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-upload>
+          </template>
+        </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -107,7 +106,35 @@
 
     </div>
 
-
+   <el-dialog
+      title=""
+      :visible.sync="dialogVisible"
+      width="35%"
+      top="35vh"
+      append-to-body
+     >
+      <span style="font-size:16px">此操作将“{{dataForm.customerName}}”，置中标</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-upload
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + dataForm.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    multiple
+                  >
+                          <el-button @click="changeBid"  type="primary"  >确定并发送合同</el-button>
+                  </el-upload>
+        <el-button type="primary" @click="changeBid">确 定</el-button>
+        
+      </span>
+    </el-dialog>
 
 
   </div>
@@ -116,7 +143,8 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getBiddingRowInfo,getCustomerName } from '@/api/bid'
+import { getBiddingRowInfo,getCustomerName,getContract } from '@/api/bid'
+import { Notification, MessageBox } from 'element-ui'
 
 export default {
   data() {
@@ -166,7 +194,9 @@ export default {
       userDataList:[],
       startTime:"",
       endTime:"",
-        isShow:true
+        isShow:true,
+         showType:false,
+        fileData:{}
     }
   },
   created() {
@@ -174,6 +204,21 @@ export default {
     console.log('res')
   },
   methods: {
+     // 置中标
+    changeBid(){
+      console.log(this.dataForm)
+      console.log(this.priceData,"priceData")
+      getContract(this.dataForm.rawTenderId,this.dataForm.biddingRawId,this.priceData.tenderType).then((res)=>{
+        if(res.data.code == 200){
+           this.$message({
+              message: '操作成功',
+              type: 'success'
+            });
+            this.dialogVisible = false
+            this.getTenantList()
+        }
+      })
+    },
     // 点击时候
     handleUpload(){
       console.log(this.SelectionList,"我被固定了")

src/views/bid/tender2/table.vue

@@ -73,8 +73,8 @@
                                   <el-tag v-if="scope.row.rule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="250" fixed="right" align="center">
@@ -184,14 +184,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -203,10 +203,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/bid/tender2/tender.vue

@@ -151,8 +151,8 @@
                                   <el-tag v-if="scope.row.rule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                 
@@ -504,14 +504,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -523,10 +523,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res
@@ -678,14 +678,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -697,10 +697,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
 
           return res

src/views/bid/tender3/dialog.vue

@@ -50,29 +50,27 @@
             <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">
-                    <template slot-scope="scope">
-                      <el-button  slot="reference"  icon="el-icon-check" type="text" @click="dialogVisible = true">中标</el-button>
-                      <el-button  slot="reference" :disabled="scope.row.biddingStatus !=6" icon="el-icon-check" type="text" @click="dialogVisible = true">中标</el-button>
-                      <el-upload
-                              :disabled="scope.row.biddingStatus !=7"
-                              class="upload-demo"
-                              :limit="1"
-                              :on-change="handleChange"
-                              :on-remove="handleRemove"
-                              :show-file-list="false"
-                              name="multipartFile"
-                              style="display:inline-block"
-                              :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
-                              list-type="text"
-                              :data="fileData"
-                              :file-list="fileList"
-                              multiple
-                            >
-                                    <el-button @click="handleUpload" :disabled="scope.row.biddingStatus !=7" class="el-icon-upload" size="small" type="text" style="width:90px; ">发送合同</el-button>
-                            </el-upload>
-                    </template>
-                  </el-table-column> -->
+              <!-- <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
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + scope.row.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :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-upload>
+          </template>
+        </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -90,19 +88,35 @@
 
     </div>
 
-    <!-- <el-dialog
+   <el-dialog
       title=""
       :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose">
-      <span>是否</span>
+      width="35%"
+      top="35vh"
+      append-to-body
+     >
+      <span style="font-size:16px">此操作将“{{dataForm.customerName}}”，置中标</span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+            <el-upload
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/tender/contract/send/' + dataForm.customerId"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    multiple
+                  >
+                          <el-button @click="changeBid"  type="primary"  >确定并发送合同</el-button>
+                  </el-upload>
+        <el-button type="primary" @click="changeBid">确 定</el-button>
+        
       </span>
-    </el-dialog> -->
-
-
+    </el-dialog>
 
   </div>
 </template>
@@ -110,7 +124,8 @@
 <script>
 import { Listarea } from '@/api/dataForm'
 import { parseTime } from '@/utils/index'
-import { getBiddingList,getCustomerName } from '@/api/bid'
+import { getBiddingList,getCustomerName,getContract } from '@/api/bid'
+import { Notification, MessageBox } from 'element-ui'
 
 export default {
   data() {
@@ -168,6 +183,21 @@ export default {
     console.log('res')
   },
   methods: {
+          // 置中标
+    changeBid(){
+      console.log(this.dataForm)
+      console.log(this.priceData,"priceData")
+      getContract(this.dataForm.tenderParentId,this.dataForm.biddingRawId,this.priceData.tenderType).then((res)=>{
+        if(res.data.code == 200){
+           this.$message({
+              message: '操作成功',
+              type: 'success'
+            });
+            this.dialogVisible = false
+            this.getTenantList()
+        }
+      })
+    },
     // 点击时候
     handleUpload(){
       console.log(this.SelectionList,"我被固定了")

src/views/bid/tender3/table.vue

@@ -92,8 +92,8 @@
                             <el-table-column prop="ifSoothSaveConfirmSample"  label="是否由实际存储库点确认看样单" :show-overflow-tooltip="true" align="center" />
 
 
-                            <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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="250" fixed="right" align="center">
         <template slot-scope="scope">
@@ -204,14 +204,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -223,10 +223,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/bid/tender3/tender.vue

@@ -176,8 +176,8 @@
                             <el-table-column prop="ifSoothSaveConfirmSample"  label="是否由实际存储库点确认看样单" :show-overflow-tooltip="true" align="center" />
                         
 
-                            <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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                  
@@ -531,14 +531,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -550,10 +550,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 1
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 2
-            console.log("当前时间大于结束时间，已结束")
+            console.log("当前时间大于投标结束时间，已结束")
           }
 
           return res
@@ -705,14 +705,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -724,10 +724,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
 
           return res

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>
@@ -324,14 +324,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -547,14 +547,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender/table.vue

@@ -161,11 +161,13 @@
         <el-tag effect="plain" v-if="scope.row.status ==4" type="warning">未开始</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.tenderLogisticsRule == 1" type="success" effect="plain">价低者得</el-tag>
           <el-tag v-if="scope.row.tenderLogisticsRule == 2" effect="plain" >价高者得</el-tag>
         </template>
+      </el-table-column> -->
+      <el-table-column label="运输时间" prop="freightTime" width="200" 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>
@@ -286,14 +288,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender/tender.vue

@@ -26,10 +26,10 @@
                        </el-col>
                     </el-row>
                      <el-row type="flex" class="row-bg">
-                       <el-col :span="8" class="flex_text">
+                       <!-- <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> -->
                          <el-col :span="8" class="flex_text">
                          开始时间 : <span class="flex_name"> {{bidInfo.startTime}} </span>
                        </el-col>
@@ -37,11 +37,12 @@
                          截止时间 :  <span class="flex_name">{{bidInfo.endTime}}
                                     </span>
                        </el-col>
+                         <el-col :span="8" class="flex_text">
+                         　　 备注：<span class="flex_name">{{bidInfo.tenderRemark}} </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">
@@ -109,15 +110,17 @@
                                 <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 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" />
-                            <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="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="150" align="center" fixed="right">
                                 <template slot-scope="scope">
@@ -279,9 +282,9 @@
                     <el-button  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 :title="goodsName" width="90%" center :visible.sync="dialogTableVisible" append-to-body>
+                          <ckDialog ref="ckDialog"></ckDialog>
+                    </el-dialog>
 
     </el-dialog>
     </div>
@@ -472,14 +475,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -659,14 +662,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender1/dialog.vue

@@ -27,7 +27,28 @@
                           </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">
+          <template slot-scope="scope">
+             <el-upload
+                    :disabled="scope.row.biddingStatus !=7"
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :before-upload="beforeUpload"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    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-upload>
+          </template>
+       </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -113,6 +134,46 @@ export default {
     console.log('res')
   },
   methods: {
+        // 文件移除的时候
+    handleRemove(file, fileList) {
+      this.form.fileUrl = ''
+      console.log(file, fileList, this.fileList, '移出')
+    },
+    // 格式限制
+    beforeUpload(file){ 
+      
+      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+     const extension = testmsg === "zip"
+     if (!extension ) {
+       this.$message({
+         message: "上传文件只能是.zip格式!",
+         type: "warning",
+       });
+     }
+
+     return extension;
+
+    },
+    // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
+    handleChange(file, fileList) {
+      console.log(file, fileList, '上传')
+      if (file.response) {
+        console.log(file.response, 'file')
+        if (file.response.code == '200') {
+           this.$message({
+              message: '回执上传成功',
+              type: 'success'
+            });
+          // this.form.fileUrl = file.response.data.filePath
+          // this.form.tenderParentId = file.response.data.tenderParentId
+        } else {
+          Notification.error({
+            title: file.response.msg,
+            duration: 1000
+          })
+        }
+      }
+    },
     onCustmerName(){
         getCustomerName().then((res)=>{
             console.log(res)

src/views/tender/tender1/table.vue

@@ -61,8 +61,8 @@
                                   <el-tag v-if="scope.row.tenderSaleRule == 2" effect="plain" >价高者得</el-tag>
                               </template>
                             </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="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="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="250" fixed="right" align="center">
@@ -178,14 +178,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -197,10 +197,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/tender/tender1/tender.vue

@@ -26,10 +26,10 @@
                        </el-col>
                     </el-row>
                      <el-row type="flex" class="row-bg">
-                       <el-col :span="8" class="flex_text">
+                       <!-- <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> -->
                          <el-col :span="8" class="flex_text">
                          开始时间 : <span class="flex_name"> {{bidInfo.startTime}} </span>
                        </el-col>
@@ -37,12 +37,13 @@
                          截止时间 :  <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">
+                        <el-col :span="8" class="flex_text">
                          　　 备注：<span class="flex_name">{{bidInfo.tenderRemark}}</span>
                        </el-col>
                     </el-row>
+                    <el-row type="flex" class="row-bg">
+                      
+                    </el-row>
                   </el-card>
                    <el-card class="box-card" shadow="nerver">
                         <div slot="header" class="clearfix">
@@ -124,15 +125,15 @@
                               <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 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> -->
+                            <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="saleRemark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                             <el-table-column label="操作" width="150" align="center" fixed="right">
                                 <template slot-scope="scope">
@@ -544,14 +545,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -746,14 +747,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender2/dialog.vue

@@ -68,7 +68,28 @@
                         
                             <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-upload
+                    :disabled="scope.row.biddingStatus !=7"
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :before-upload="beforeUpload"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    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-upload>
+          </template>
+       </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -154,6 +175,46 @@ export default {
     console.log('res')
   },
   methods: {
+        // 文件移除的时候
+    handleRemove(file, fileList) {
+      this.form.fileUrl = ''
+      console.log(file, fileList, this.fileList, '移出')
+    },
+    // 格式限制
+    beforeUpload(file){ 
+      
+      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+     const extension = testmsg === "zip"
+     if (!extension ) {
+       this.$message({
+         message: "上传文件只能是.zip格式!",
+         type: "warning",
+       });
+     }
+
+     return extension;
+
+    },
+    // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
+    handleChange(file, fileList) {
+      console.log(file, fileList, '上传')
+      if (file.response) {
+        console.log(file.response, 'file')
+        if (file.response.code == '200') {
+           this.$message({
+              message: '回执上传成功',
+              type: 'success'
+            });
+          // this.form.fileUrl = file.response.data.filePath
+          // this.form.tenderParentId = file.response.data.tenderParentId
+        } else {
+          Notification.error({
+            title: file.response.msg,
+            duration: 1000
+          })
+        }
+      }
+    },
     onCustmerName(){
         getCustomerName().then((res)=>{
             console.log(res)

src/views/tender/tender2/table.vue

@@ -68,15 +68,15 @@
                               <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 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> -->
+                            <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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="250" fixed="right" align="center">
         <template slot-scope="scope">
@@ -189,14 +189,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender2/tender.vue

@@ -26,10 +26,10 @@
                        </el-col>
                     </el-row>
                      <el-row type="flex" class="row-bg">
-                       <el-col :span="8" class="flex_text">
+                       <!-- <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> -->
                          <el-col :span="8" class="flex_text">
                          开始时间 : <span class="flex_name"> {{bidInfo.startTime}} </span>
                        </el-col>
@@ -37,12 +37,13 @@
                          截止时间 :  <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">
+                       <el-col :span="8" class="flex_text">
                          　　 备注：<span class="flex_name">{{bidInfo.tenderRemark}}</span>
                        </el-col>
                     </el-row>
+                    <el-row type="flex" class="row-bg">
+                       
+                    </el-row>
                   </el-card>
                    <el-card class="box-card" shadow="nerver">
                         <div slot="header" class="clearfix">
@@ -134,15 +135,15 @@
                               <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 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> -->
+                            <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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                             <el-table-column label="操作" width="150" align="center" fixed="right">
                                 <template slot-scope="scope">
@@ -558,14 +559,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -736,14 +737,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")

src/views/tender/tender3/dialog.vue

@@ -26,7 +26,28 @@
             <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">
+          <template slot-scope="scope">
+             <el-upload
+                    :disabled="scope.row.biddingStatus !=7"
+                    class="upload-demo"
+                    :on-change="handleChange"
+                    :on-remove="handleRemove"
+                    :before-upload="beforeUpload"
+                    :show-file-list="false"
+                    name="multipartFile"
+                    style="display:inline-block"
+                    :action="BASE_API+'/common/bidding/receipt/' + scope.row.tenderLogisticsId +'/'+ priceData.tenderType"
+                    list-type="text"
+                    :data="fileData"
+                    :file-list="fileList"
+                    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-upload>
+          </template>
+       </el-table-column> -->
     </el-table>
 
     <!--分页-->
@@ -112,6 +133,46 @@ export default {
     console.log('res')
   },
   methods: {
+        // 文件移除的时候
+    handleRemove(file, fileList) {
+      this.form.fileUrl = ''
+      console.log(file, fileList, this.fileList, '移出')
+    },
+    // 格式限制
+    beforeUpload(file){ 
+      
+      var testmsg = file.name.substring(file.name.lastIndexOf(".") + 1);
+     const extension = testmsg === "zip"
+     if (!extension ) {
+       this.$message({
+         message: "上传文件只能是.zip格式!",
+         type: "warning",
+       });
+     }
+
+     return extension;
+
+    },
+    // 文件状态改变时的钩子，添加文件、上传成功和上传失败时都会被调用
+    handleChange(file, fileList) {
+      console.log(file, fileList, '上传')
+      if (file.response) {
+        console.log(file.response, 'file')
+        if (file.response.code == '200') {
+           this.$message({
+              message: '回执上传成功',
+              type: 'success'
+            });
+          // this.form.fileUrl = file.response.data.filePath
+          // this.form.tenderParentId = file.response.data.tenderParentId
+        } else {
+          Notification.error({
+            title: file.response.msg,
+            duration: 1000
+          })
+        }
+      }
+    },
     onCustmerName(){
         getCustomerName().then((res)=>{
             console.log(res)

src/views/tender/tender3/table.vue

@@ -92,8 +92,8 @@
                             <el-table-column prop="ifSoothSaveConfirmSample"  label="是否由实际存储库点确认看样单" :show-overflow-tooltip="true" align="center" />
 
 
-                            <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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
         <el-table-column label="操作" width="250" fixed="right" align="center">
         <template slot-scope="scope">
@@ -204,14 +204,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -223,10 +223,10 @@ export default {
             console.log("当前时间小于开始时间，未开始")
           }else if(time > start && time < end){
             res.status = 3
-            console.log("当前时间大于开始时间并且小于结束时间，进行中")
+            console.log("当前时间大于开始时间并且小于投标结束时间，进行中")
           }else if(time > end){
             res.status = 5
-            console.log("当前时间大于结束时间，待处理")
+            console.log("当前时间大于投标结束时间，待处理")
           }
           return res
         })

src/views/tender/tender3/tender.vue

@@ -26,10 +26,10 @@
                        </el-col>
                     </el-row>
                      <el-row type="flex" class="row-bg">
-                       <el-col :span="8" class="flex_text">
+                       <!-- <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> -->
                          <el-col :span="8" class="flex_text">
                          开始时间 : <span class="flex_name"> {{bidInfo.startTime}} </span>
                        </el-col>
@@ -37,12 +37,13 @@
                          截止时间 :  <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">
+                         <el-col :span="8" class="flex_text">
                          　　 备注：<span class="flex_name">{{bidInfo.tenderRemark}}</span>
                        </el-col>
                     </el-row>
+                    <el-row type="flex" class="row-bg">
+                     
+                    </el-row>
                   </el-card>
                    <el-card class="box-card" shadow="nerver">
                         <div slot="header" class="clearfix">
@@ -144,12 +145,12 @@
                                   <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" />
@@ -182,9 +183,9 @@
                               </template>
                             </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="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="remark" label="备注" width="162" :show-overflow-tooltip="true" align="center" />
                             <el-table-column label="操作" width="150" align="center" fixed="right">
                                 <template slot-scope="scope">
@@ -515,14 +516,14 @@ export default {
         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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")
@@ -692,14 +693,14 @@ export default {
          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 end = modify.valueOf()        //投标结束时间
           const time = new Date().valueOf()   //当前时间
           console.log(start,"start")
           console.log(end,"end")