Merge branch 'master' of http://gitlab.takedata.cc/zhangdong/web-purchase into master

src/components/common/Header.vue

@@ -9,7 +9,7 @@
         <div class="header-right">
             <div class="header-user-con">
 				<!--  -->
-				<div class="serve">客服电话：4006661234</div>
+				<div class="serve">客服电话：13810057696</div>
 				<div class="official" @click="join">官网首页</div>
                 <!-- 全屏显示 -->
                 <div class="btn-fullscreen" @click="handleFullScreen">

src/components/detail/candidate.vue

@@ -6,6 +6,10 @@
                 <div>项目名称：{{ projectName }}</div>
                 <div>发布时间：{{ detail.createTime }}</div>
             </div>
+            <!-- 标题 -->
+            <div class="title">
+                <div class="flex-center">{{title}}</div>
+            </div>
             <div v-if="state">
                 <div v-html="detail.content"></div>
                 <div class="enclosure flex-item">
@@ -78,4 +82,7 @@ export default {
 .enclosure {
     margin: 20px 0;
 }
+.title{
+    margin-top:50px;
+}
 </style>
\ No newline at end of file

src/components/detail/companyDetail.vue

@@ -26,7 +26,7 @@
                     </li>
                     <li>
                         <div>行政区域</div>
-                        <div>{{ detail.companyName }}</div>
+                        <div>{{ detail.area }}</div>
                     </li>
                     <li>
                         <div>单位性质</div>

src/components/detail/organizationDetail.vue

@@ -46,7 +46,7 @@
 				</li>
 				<li>
 					<div>电子邮箱 </div>
-					<div>{{detail.companyName}}</div>
+					<div>{{detail.email}}</div>
 				</li>
 			</ul>
 			<div class="detail-item">

src/components/detail/winNotice.vue

@@ -6,6 +6,10 @@
                 <div>项目名称：{{ projectName }}</div>
                 <div v-if="state">发布时间：{{ detail.createTime }}</div>
             </div>
+            <!-- 标题 -->
+            <div class="title">
+                <div class="flex-center">{{title}}</div>
+            </div>
             <div class="detail1" v-if="state">
                 <div v-html="detail.content"></div>
                 <div class="enclosure flex-item">
@@ -89,4 +93,7 @@ export default {
 .enclosure {
     margin: 50px 0;
 }
+.title{
+    margin-top:50px;
+}
 </style>
\ No newline at end of file

src/pages/purchaser/bid/bidEvaluation/projectManager/fail.vue

@@ -20,7 +20,7 @@
                     <Upload :limit="1" :max="100" tip="最多上传5个文件，每个文件不超过100M。" @input="getfile1"></Upload>
                 </div>
                 <div class="flex-center" style="margin: 100px 0">
-                    <el-button>取消</el-button>
+                    <el-button @click="prev">取消</el-button>
                     <el-button type="primary" style="margin-left: 20px" @click="submitData">提交</el-button>
                 </div>
             </div>
@@ -51,6 +51,10 @@ export default {
         this.projectName = localStorage.getItem('projectName');
     },
     methods: {
+        /* 取消返回上一步 */
+        prev(){
+            this.$router.back()
+        },
         //
         getfile(val) {
             this.file = val;

src/pages/purchaser/bid/bidEvaluation/review/add.vue

@@ -30,7 +30,7 @@
 						<el-input v-model.trim="ruleForm.content" :rows="2" type="textarea" maxlength="300"></el-input>
 					</el-form-item>
 					<el-form-item label="澄清质询问题文件" prop="file">
-						<singleUpload :limit="1" :max="10" tips="最多上传一份，大小不超过10M." @input="getfile"></singleUpload>
+						<singleUpload :limit="1" :max="10" tip="最多上传一份，大小不超过10M." @input="getfile"></singleUpload>
 					</el-form-item>
 				</el-form>
 			</div>

src/pages/purchaser/bid/bidEvaluation/review/review.vue

@@ -12,7 +12,7 @@
                 <div class="flex-item upload">
                     <div>变更信息：</div>
                     <ul class="title flex">
-                        <li v-for="(item, index) in changeList" :key="index">
+                        <li v-for="(item, index) in changeList" :key="index" class="line">
                             <router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{
                                 item.title
                             }}</router-link>
@@ -658,4 +658,7 @@ h5 {
     width: 280px;
     margin: 80px auto 30px;
 }
+.line{
+    line-height:20.8px;
+}
 </style>

src/pages/purchaser/bid/bidEvaluation/review/see.vue

@@ -30,9 +30,9 @@
 					</div>
 				</div>
 				<div  v-if="replystate" class="message-item">
-					<h4>回复问题</h4>
+					<h4>澄清问题回复</h4>
 					<div class="flex">
-						<div>投标人：</div>
+						<div>*投标人：</div>
 						<div>{{questionDetail.createBy}}</div>
 					</div>
 					<div class="flex">

src/pages/purchaser/bid/bidOpen/bidOpenhal.vue

@@ -74,7 +74,7 @@
 					<el-button @click="isfailInfo=true" v-if="!isFailed">流标</el-button>
 					<el-button @click="failDetail" v-else>流标信息</el-button>
 					<div>
-						<el-button icon="el-icon-refresh" @click="refrsh">刷新</el-button>
+						<!-- <el-button icon="el-icon-refresh" @click="refrsh">刷新</el-button> -->
 						<el-button @click="openInfo1" :disabled="!endbidButton" v-if="!issueTable">下发开标一览表</el-button>
 						<el-button @click="openInfo" :disabled="!issueTable">查看开标一览表</el-button>
 					</div>
@@ -364,9 +364,9 @@
 					console.log(e)
 				}
 			},
-			refrsh() {
+			/* refrsh() {
 				history.go(0)
-			},
+			}, */
 			async end() {
 				try {
 					let projectId = localStorage.getItem("projectId")

src/pages/purchaser/bid/bidStage/seeBidSet.vue

@@ -22,31 +22,31 @@
                                 <el-input v-model="ruleForm.signatureTime" style="width: 250px" disabled></el-input>
                             </el-form-item>
                         </div>
-                        <div>
+                        <!-- <div>
                             <el-form-item label="开标人" prop="bidOpener">
                                 <el-select v-model="bidOpener" placeholder="请选择" style="width: 250px" disabled>
                                     <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"> </el-option>
                                 </el-select>
                             </el-form-item>
-                        </div>
+                        </div> -->
                         <div class="flex-between">
                             <!-- <el-form-item label="监标人" prop="supervisionerList">
 				 <ul>
 					 <li v-for="item in ruleForm.supervisionerList" :key="item.id" :label="item.name" :value="item.id"></li>
 				 </ul>
               </el-form-item> -->
-                            <el-form-item label="监标人" prop="supervisionerList">
+                            <!-- <el-form-item label="监标人" prop="supervisionerList">
                                 <el-select v-model="ruleForm.supervisionerList" multiple style="width: 250px" disabled>
                                     <el-option v-for="(item, index) in options" :key="index" :label="item.name" :value="item.id">
                                     </el-option>
                                 </el-select>
-                            </el-form-item>
-                            <el-form-item label="列席人员" prop="delegaterList">
+                            </el-form-item> -->
+                            <!-- <el-form-item label="列席人员" prop="delegaterList">
                                 <el-select v-model="ruleForm.delegaterList" multiple style="width: 250px" disabled>
                                     <el-option v-for="(item, index) in options" :key="index" :label="item.name" :value="item.id">
                                     </el-option>
                                 </el-select>
-                            </el-form-item>
+                            </el-form-item> -->
                             <!--     <el-form-item label="序列人员" prop="delegaterList">
 				<ul>
 					 <li v-for="item in ruleForm.delegaterList" :key="item.id" :label="item.name" :value="item.id"></li>

src/pages/purchaser/bid/bidStage/tenderFeelist/detail.vue

@@ -2,7 +2,7 @@
     <div>
         <div class="content-head">
             <dataBreadcrumb :breads="breads"></dataBreadcrumb>
-            <h3>保证金缴纳</h3>
+            <h3>标书费缴纳</h3>
             <h5>{{ title }}购标信息、邮寄信息、发票信息、缴费信息</h5>
             <div class="flex state">
                 <div>状态:{{ state }}</div>
@@ -263,9 +263,6 @@ export default {
 
 
 <style scoped>
-.message {
-}
-
 .message > div {
     background: #fff;
     margin-bottom: 20px;

src/pages/purchaser/bid/bidSure/contract.vue

@@ -8,7 +8,7 @@
 					<div>项目编号：{{projectCode}}</div>
 					<div>项目名称：{{projectName}}</div>
 				</div>
-				<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="demo-ruleForm">
+				<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="180px" class="demo-ruleForm">
 					<div class="flex-between">
 						<el-form-item label="合同名称:" prop="contractName">
 							<el-input v-model.trim="ruleForm.contractName" placeholder="请输入" maxlength="30"></el-input>
@@ -22,8 +22,8 @@
 						<el-form-item label="工期:" prop="timeLimit">
 							<el-input v-model.trim="ruleForm.timeLimit" placeholder="请输入" maxlength="30"></el-input>
 						</el-form-item>
-						<el-form-item label="合同类型总负责人名称:" prop="principalName">
-							<el-input v-model.trim="ruleForm.principalName" placeholder="请输入" maxlength="30"></el-input>
+						<el-form-item label="合同类型总负责人名称:" prop="principalName" class="titlename"> 
+							<el-input v-model.trim="ruleForm.principalName" placeholder="请输入" maxlength="30" style="titleinput"></el-input>
 						</el-form-item>
 					</div>
 					<div class="flex-between">
@@ -92,7 +92,7 @@
 				projectCode: "",
 				projectName: "",
 				navs: ['合同管理'],
-				breads: ['招投标管理', '中标公告列表'],
+				breads: ['招标管理', '招标项目管理','工作台'],
 				ruleForm: {
 					contractName: "",
 					contractType: "",
@@ -117,7 +117,12 @@
 						required: true,
 						message: '请输入',
 						trigger: 'blur'
-					}],
+                    }],
+                    file: [{
+						required: true,
+						message: '请输入',
+						trigger: 'blur'
+                    }],
 				}
 			}
 		},
@@ -167,7 +172,7 @@
 
 <style scoped>
 	.message {
-		width: 70%;
+		width: 80%;
 		margin: 0 auto
 	}
 

src/pages/purchaser/bid/bidSure/publicity.vue

@@ -20,7 +20,7 @@
                         <div class="adjustment">上传附件：</div>
                         <singleUpload
                             :limit="1"
-                            tip="支持上传1个附件,不超过20M"
+                            tip="支持上传1个附件,不超过100M"
                             @input="getfile"
                             :max="20"
                             :fileList="ruleForm.accessoryPOList"

src/pages/purchaser/bid/bidSure/winBid/edit.vue

@@ -13,7 +13,7 @@
         </div>
         <div class="flex-between">
           <div>日期：{{ winDate}}</div>
-          <div>中标金额：{{money}}</div>
+          <div>*中标金额：{{money}}元</div>
         </div>
         <div>
           <div class="flex" style="margin-bottom:50px">
@@ -73,7 +73,7 @@ export default {
 	  this.getGenerateNumber();
 	  this.resultId=this.$route.query.id;
 	  this.money=this.$route.query.money
-	  this.winDate=this.$route.query.winDate
+	  this.winDate=this.$route.query.winDate.substring(0,10)
 	  this.projectCode=localStorage.getItem("projectCode")
 	  this.projectName=localStorage.getItem("projectName")
   },
@@ -129,9 +129,6 @@ export default {
 
 
 <style scoped>
-	.message{
-	/* 	width:60%; */
-	}
 	.message>div{
 	margin-bottom: 30px;
 	width: 50%;

src/pages/purchaser/bid/editProject/editProject.vue

@@ -27,8 +27,9 @@
                 <fileUpload ref="fileUpload" :ruleForm="detail"></fileUpload>
             </div>
         </div>
-        <div class="centerButton">
-            <el-button @click="edit">编辑</el-button>
+        <div class="centerButton ">
+            <el-button @click="noedit">取消</el-button>
+            <el-button @click="edit">提交</el-button>
         </div>
     </div>
 </template>
@@ -61,6 +62,10 @@ export default {
         this.getenquiryProjectId();
     },
     methods: {
+        /* 取消 */
+        noedit(){
+            this.$router.go(-1)
+        },
         async edit() {
             await this.$refs.message.next();
             await this.$refs.timeSet.next();
@@ -138,4 +143,8 @@ export default {
     padding-bottom: 20px;
     margin-right: 20px;
 }
+.centerButton{
+    display: flex;
+    justify-content: center;
+}
 </style>

src/pages/purchaser/bid/reviewed/SeeinquiryAnnouncement.vue

@@ -25,8 +25,8 @@
         <el-dialog title="报价明细" :visible.sync="dialogFormVisible">
             <dataTable :table-data="tableData" :columns="columns"></dataTable>
             <div slot="footer" class="dialog-footer">
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">关 闭</el-button>
+                <!-- <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button> -->
             </div>
         </el-dialog>
     </div>
@@ -54,7 +54,7 @@ export default {
             projectName: '',
             Bidderlist: [],
             detail: '',
-            breads: ['投标管理 ', '在线报名', '询价公告'],
+            breads: ['招标管理 ', '在线报名', '询价公告'],
             columns: [
                 {
                     label: '标的名称',

src/pages/purchaser/bid/reviewed/SeetenderAnnouncement.vue

@@ -25,7 +25,7 @@ export default {
     },
     data() {
         return {
-            breads: ['投标管理', '在线报名', '招标公告'],
+            breads: ['招标管理', '在线报名', '招标公告'],
             auditStatus: ''
         };
     },

src/pages/purchaser/bid/workbench.vue

@@ -155,7 +155,7 @@ export default {
                         },
                         {
                             id: 15,
-                            label: '发布中标人公示',
+                            label: '确认中标人',
                             url: '/purchaser/bid/bidSure/determine',
                             bright: false
                         },
@@ -167,7 +167,7 @@ export default {
                         },
                         {
                             id: 17,
-                            label: '发布中标通知书',
+                            label: '查看中标通知书',
                             url: '/purchaser/bid/bidSure/winBid/list',
                             bright: false
                         },

src/pages/ssss/test.vue

+<!--  -->
+<template>
+  <div class='home'>Home</div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+    };
+  },
+
+/*   created: {}, */
+
+  methods: {}
+}
+
+</script>
+<style scoped>
+</style>
\ No newline at end of file

src/pages/supply/bid/joinProject/bidEvaluation/see.vue

@@ -17,6 +17,14 @@
 						<div>澄清问题内容：</div>
 						<div v-html="questiondetail.content"></div>
 					</div>
+                    <div class="flex clear-item">
+						<div>问题发布时间</div>
+						<div>{{questiondetail.createTime}}</div>
+					</div>
+                    <div class="flex clear-item">
+						<div>澄清回复截止时间</div>
+						<div>{{questiondetail.endTime}}</div>
+					</div>
 					<div class="flex">
 						<div>澄清问题附件：</div>
 						<ul>

src/pages/supply/bid/joinProject/bidOpen/bidOpenhal.vue

@@ -84,7 +84,15 @@
         <el-dialog :visible.sync="dialogFormVisible" title="开标规则说明">
             <div class="explain">
                 <h1>开标说明</h1>
-                <div>一系列说明</div>
+                <div>1、网上开标共有解密、签名两个环节，投标人根据开标大厅中间滚动提示进行相应操作。</div>
+<div>2、截标前当天大厅开放，已上传投标文件的投标人可在解密倒计时结東前进入开标大厅。</div>
+<div>3、截标后主持人宣布开标，所有投标人进行解密操作，解密时间共计30分钟投标人须在解密倒计时结束前
+完成解密。解密倒计时结東后，因投标人原因造成投标文件未解密的根据《电子招标投标办法其投标文件》视
+为撤销。</div>
+<div>4、解密倒计时结東或所有投标文件均已解密，投标人可查询所有投标人的开标情况并进行签名，签名时间
+共计10分钟。</div>
+<div>5.、所有投标人完成签名操作或签名倒计时结束后，项目经理开标结束，投标人可离开开标大厅。开标过程
+中，投标人可点击开标大厅右上角在线聊天与主持人沟通。开标结束后视为开标过程无异议。</div>
             </div>
             <div class="flex-center">
                 <el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>

src/pages/supply/bid/joinProject/bidStage/bond/bond.vue

@@ -126,7 +126,7 @@ export default {
         };
         return {
             type: '',
-            breads: ['招标管理', '招标项目管理', '工作台'],
+            breads: ['投标管理', '我参与的项目', '工作台'],
             ruleForm: {
                 companyName: '',
                 companyTel: '',

src/pages/supply/bid/joinProject/bidStage/fileDownload.vue

@@ -5,7 +5,7 @@
 			<changeNav :navs="navs"></changeNav>
 			<div class="flex-item icon-style">
 				<i class="el-icon-warning" style="margin:0 10px"></i>
-				<div>若已购标请联系平台方审核，若未购标请及时购买，客服电话：400-6666-6666.</div>
+				<div>若已购标请联系平台方审核，若未购标请及时购买</div>
 			</div>
 			<div class="flex-arround info">
 				<div>项目标号:{{projectCode}}</div>

src/pages/supply/bid/joinProject/bidStage/tenderFee/detail.vue

@@ -160,7 +160,7 @@ export default {
             isdisabled: true,
             title: '查看',
             state: '',
-            breads: ['招标管理', '招标项目管理', '工作台'],
+            breads: ['投标管理', '招标项目管理', '工作台'],
             ruleForm: {},
             formrules: {
                 companyName: [
@@ -227,9 +227,6 @@ export default {
 
 
 <style scoped>
-.message {
-}
-
 .message > div {
     background: #fff;
     margin-bottom: 20px;

src/pages/supply/bid/joinProject/bidSubmit/bidSubmit.vue

@@ -16,7 +16,7 @@
 					<div>
 						<div v-if="!state">投标状态：待递交投标文件</div>
 						<div v-else>投标状态：投标文件递交成功</div>
-						<div>投标文件成功递交时间：{{form.createTime}}</div>
+						<div>投标文件成功递交时间：{{form.updateTime}}</div>
 					</div>
 					<div>
 						<div>投标截止（开标）时间：{{openBidTime}}</div>

src/pages/supply/bid/joinProject/bidSure/bidresultAdvice.vue

@@ -9,7 +9,7 @@
          <div>项目名称：{{projectName}}</div>
         </div>
         <div v-if="state" class="flex-between">
-          <div>日期：2018-12-12</div>
+          <div>日期：{{createTime}}</div>
           <div>招标结果通知书编号：11111</div>
         </div>
         <div v-if="state">
@@ -40,7 +40,7 @@ export default {
   },
   data() {
     return {
-      breads: ['投标管理 ', '我参加的项目', '工作s台'],
+      breads: ['投标管理 ', '我参加的项目', '工作台'],
       navs: ['招标结果通知书'],
 	  projectCode:"",
 	  projectName:"",

src/pages/supply/bid/joinProject/workbench.vue

@@ -150,7 +150,7 @@ export default {
                         },
                         {
                             id: 62,
-                            label: '中标公示查看',
+                            label: '中标公告查看',
                             url: '/supply/bid/joinProject/bidSure/noticeSee',
                             bright: false
                         },
@@ -179,13 +179,13 @@ export default {
                     modulars: [
                         {
                             id: 66,
-                            label: '递交标书费',
+                            label: '递交标书费缴纳证明',
                             url: '/supply/bid/joinProject/bidStage/tenderFee',
                             bright: false
                         },
                         {
                             id: 67,
-                            label: '递交保证金',
+                            label: '递交保证金缴纳证明',
                             url: '/supply/bid/joinProject/bidStage/bond',
                             bright: false
                         }

src/pages/supply/markBid/markBid.vue

@@ -90,7 +90,7 @@
 					}]
 				},
 				active: 0,
-				breads: ['投标管理', '工作台']
+				breads: ['投标管理', '我参与的项目','工作台']
 			}
 		},
 		methods: {