Merge branch 'v1'

src/api/common/list.js

@@ -186,3 +186,10 @@ export function autodeploy() {
 	}
   })
 }
+
+/* 获取客服电话 */
+export function getMessagephone(){
+    return request({
+        url:'/company/customService',
+        method:'get',
+  })}
\ No newline at end of file

src/components/common/Header.vue

@@ -9,7 +9,7 @@
         <div class="header-right">
             <div class="header-user-con">
 				<!--  -->
-				<div class="serve">客服电话：13810057696</div>
+				<div class="serve">客服电话：{{phone}}</div>
 				<div class="official" @click="join">官网首页</div>
                 <!-- 全屏显示 -->
                 <div class="btn-fullscreen" @click="handleFullScreen">
@@ -48,11 +48,12 @@
     </div>
 </template>
 <script>
-	import { userInfo} from '@api/common/list'
+	import { userInfo,getMessagephone} from '@api/common/list'
 import bus from '../common/bus';
 export default {
     data() {
         return {
+            phone:'',
             organlist: '',
             collapse: false,
             fullscreen: false,
@@ -138,6 +139,12 @@ export default {
             }
             this.fullscreen = !this.fullscreen;
         },
+        /* 获取客服电话 */
+        async getMessagephone(){
+            const {data} = await getMessagephone()
+            console.log(data)
+            this.phone = data.phone
+        }
     
     },
     mounted() {
@@ -147,6 +154,8 @@ export default {
     },
     created() {
      this.getUserInfo();
+     this.getMessagephone()
+
     }
 };
 </script>

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

@@ -26,7 +26,7 @@
 								<el-button size="mini" @click='download(replyDetail.fileUrl)'>下载</el-button>
 							</li>
 						</ul>
-						<div v-else>无</div>
+						<!-- <div v-else>无</div> -->
 					</div>
 				</div>
 				<div  v-if="replystate" class="message-item">

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

@@ -22,7 +22,7 @@
                 <el-input v-model="ruleForm.signatureTime" style="width: 250px;"  onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入分钟数"></el-input>
               </el-form-item>
             </div>
-            <div>
+            <!-- <div>
               <el-form-item label="开标人" prop="bidOpener">
                 <el-select v-model="ruleForm.bidOpener" placeholder="请选择" style="width: 250px;">
                   <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
@@ -37,13 +37,13 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="序列人员" prop="delegaterList">
+              <el-form-item label="列席人员" prop="delegaterList">
                 <el-select v-model="ruleForm.delegaterList" multiple placeholder="请选择" style="width: 250px;">
                   <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> -->
           </el-form>
           <div style="width:200px;margin:100px auto">
             <el-button @click="cancle">取消</el-button>

src/pages/purchaser/bid/bidStage/clearManagement/reply.vue

@@ -24,7 +24,6 @@
 							<el-button @click="download(item.accessoryUrl)">下载</el-button>
 						</li>
 					</ul>
-					<div>无</div>
 				</div>
 			</div>
 			<h3 class="title">澄清内容</h3>

src/pages/purchaser/bid/bidStage/clearManagement/see.vue

@@ -9,11 +9,11 @@
       <div class="describe">澄清问题</div>
       <div class="clear-message">
         <div class="flex-item clear-item">
-          <div>澄清问题标题：</div>
+          <div>*澄清问题标题：</div>
           <div>{{ question.title }}</div>
         </div>
         <div class="flex-item clear-item">
-          <div>澄清问题内容：</div>
+          <div>*澄清问题内容：</div>
           <div v-html="question.content"></div>
         </div>
         <div v-if="question.accessoryList" class="flex-item">
@@ -31,15 +31,15 @@
       <div class="form">
         <div class="clear-message">
           <div class="flex-item clear-item">
-            <div>回复标题：</div>
+            <div>*回复标题：</div>
             <div>{{ clarifies.title }}</div>
           </div>
           <div class="flex-item clear-item">
-            <div>公告发布媒体：</div>
+            <div>*公告发布媒体：</div>
             <div>捷安采官网招投标专区</div>
           </div>
           <div  class="flex-item">
-            <div>澄清问题附件：</div>
+            <div>*回复文件：</div>
             <ul v-if="clarifies.fileList!==undefined && clarifies.fileList.length>0">
               <li v-for="(item,index) in clarifies.fileList" :key="index">
                 <span>{{ item.fileName }}</span>
@@ -253,11 +253,11 @@ export default {
 		font-weight: 600;
 		margin: 20px 0 20px 20px
 	}
-
+/* 
 	.clear-item>div:last-child {
 
 
-	}
+	} */
 
 	.clear-item>div:first-child {
 		margin-right: 30px;

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

@@ -244,7 +244,7 @@ export default {
                 cityId: '',
                 districtId: '',
                 inquiryCode: '',
-                priority: '',
+                priority:0,
                 startTime: '',
                 endTime: '',
                 purchaseAgent: '1',

src/pages/purchaser/bid/workbench.vue

@@ -79,12 +79,12 @@ export default {
                             url: '/purchaser/bid/reviewed/tenderAnnouncement',
                             bright: false
                         },
-                        {
+                        /* {
                             id: 6,
                             label: '投标邀请书',
                             url: '1',
                             bright: false
-                        },
+                        }, */
                         {
                             id: 7,
                             label: '招标文件澄清管理',

src/pages/supply/bid/joinProject/bidStage/clearManagement/see.vue

@@ -2,23 +2,23 @@
   <div>
     <div class="content-head">
       <dataBreadcrumb :breads="breads"></dataBreadcrumb>
-      <h3>查看</h3>
-      <h5>查看</h5>
+      <h3>查看澄清</h3>
+      <h5>查看澄清</h5>
     </div>
 	<!-- 澄清 -->
     <div class="content" v-if="clarifies">
-      <div class="describe">澄清公告信息</div>
+      <div class="describe">澄清问题</div>
       <div class="clear-message">
         <div class="flex-item clear-item">
-          <div>澄清公告标题：</div>
+          <div>*澄清公告标题：</div>
           <div>{{clarifies.title}}</div>
         </div>
         <div class="flex-item clear-item">
-          <div>公告发布媒体：</div>
+          <div>*公告发布媒体：</div>
           <div>捷安采官网招投标专区</div>
         </div>
         <div class="flex-item clear-item" v-if="clarifieslist.length>0">
-          <div>澄清文件：</div>
+          <div>澄清问题附件：</div>
           <ul>
             <li v-for="item in clarifies.clarifieslist"  :key="item.id">
               <span>{{item.fileName}}</span>
@@ -40,15 +40,15 @@
 	  <div class="describe">问题信息</div>
 	  <div class="clear-message">
 	    <div class="flex-item clear-item">
-	      <div>问题标题：</div>
+	      <div>*回复标题：</div>
 	      <div>{{question.title}}</div>
 	    </div>
-	    <div class="flex-item clear-item">
-	      <div>公告发布媒体：</div>
+	    <!-- <div class="flex-item clear-item">
+	      <div>*公告发布媒体：</div>
 	      <div>捷安采官网招投标专区</div>
-	    </div>
+	    </div> -->
 	    <div class="flex-item clear-item" v-if='questionlist.length>0'>
-	      <div>问题文件：</div>
+	      <div>*回复文件：</div>
 	      <ul>
 	        <li v-for="item in questionlist"  :key="item.id">
 	          <span>{{item.fileName}}</span>

src/pages/supply/bid/signupOnline/seePrice.vue

@@ -25,7 +25,7 @@
                             :min="0"
                             :controls="false"
                             :precision="2"
-                            style="width: 100px"
+                            style="width: 100px;height:80%"
                             placeholder="请输入"
                         ></el-input-number>
                     </template>

src/pages/supply/bid/signupOnline/signUp.vue

@@ -23,8 +23,8 @@
 					<el-form-item label="邮箱：">
 						<el-input v-model="form.email" class="input" disabled></el-input>
 					</el-form-item>
-					<div class="flex-item">
-						<div>是否买断账期：</div>
+					<div class="flex-item" prop="account">
+						<div><span class="text">*</span>是否买断账期：</div>
 						<el-radio v-model="isPaymentDays" label="false">否</el-radio>
 						<el-radio v-model="isPaymentDays" label="true">是</el-radio>
 					</div>
@@ -83,7 +83,12 @@
 						required: true,
 						message: '请选择',
 						trigger: 'blur'
-					}]
+                    }],
+                    account: [{
+						required: true,
+						message: '请选择',
+						trigger: 'blur'
+					}],
 
 				}
 			}
@@ -194,4 +199,7 @@
 	.buttom {
 		margin-top: 50px;
 	}
+    .text{
+        color: red;
+    }
 </style>