更新

src/api/common/list.js

@@ -143,6 +143,13 @@ export function projectClassify(projectId) {
     method: 'get'
   })
 }
+// 创建项目获取项目编号
+export function generateNumber(type) {
+  return request({
+    url: `project/generateNumber/${type}`,
+    method: 'get'
+  })
+}
 
 
 

src/pages/purchaser/bid/administrationList.vue

@@ -104,6 +104,7 @@ export default {
 	   localStorage.setItem('projectId',row.projectId);
 	   localStorage.setItem('projectName',row.projectName);
 	   localStorage.setItem('projectCode',row.projectCode);
+	    localStorage.setItem('projectStatus',row.status);
     },
     handlerelease(){
       this.$router.push('/purchaser/bid/releaseProject')

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

@@ -387,16 +387,28 @@
 					let projectId = localStorage.getItem("projectId")
 					const {
 						data,
-						code
+						code,
+						msg
 					} = await timeInfo(projectId)
-					let remaintime = Number(data.remainTime);
-					if (remaintime < 0) {
-						this.openbidButton = true
-					} else {
-						this.remaintime = remaintime
+					if(code==200){
+						let remaintime = Number(data.remainTime);
+						if (remaintime < 0) {
+							this.openbidButton = true
+						} else {
+							this.remaintime = remaintime
+						}
+						this.storagedecodeTime = Number(data.decodeTime)
+						this.storagesignatureTime = Number(data.signatureTime)
+					}else{
+						 this.$message({
+						              message: msg,
+						              type: 'error',
+									  duration:3000
+						            })
+									setTimeout(()=>{
+									this.$router.go(-1)
+						},3000)
 					}
-					this.storagedecodeTime = Number(data.decodeTime)
-					this.storagesignatureTime = Number(data.signatureTime)
 				} catch (e) {
 					console.log(e)
 				}

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

@@ -10,7 +10,7 @@
         </div>
         <div class="flex-between">
           <div>开标时间：2020-08-08 18:08:00</div>
-          <div>项目状态：开标阶段</div>
+          <div>项目状态：{{projectStatus}}</div>
         </div>
         <div>
           <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
@@ -70,6 +70,7 @@ export default {
   },
   data() {
     return {
+		projectStatus:"",
       options: [],
 	  bidOpeners:[],
       ruleForm: {
@@ -105,7 +106,8 @@ export default {
   },
   created() {
 	  this.projectCode=localStorage.getItem("projectCode")
-	   this.projectName=localStorage.getItem("projectName")
+	  this.projectName=localStorage.getItem("projectName")
+	  this.projectStatus=localStorage.getItem("projectStatus")
   	this.getopener()
 	this.getmamager()
   },

src/pages/purchaser/bid/releaseProject/message.vue

@@ -95,7 +95,7 @@
             <div v-show="ruleForm.isNeedEarnest">
               <div>
                 <el-form-item label="投标保证金金额：" prop="money">
-					<el-input-number v-model="earnestInfoPO.money" :min="0" :controls="false" :precision="2" ></el-input-number>
+					<el-input-number v-model="earnestInfoPO.money" :min="0" :controls="false" :precision="2" placeholder="请输入"></el-input-number>
                 </el-form-item>
               </div>
               <div class="flex-between">
@@ -108,7 +108,7 @@
               </div>
               <div class="flex-between">
                 <el-form-item label="保证金结算账户名：" prop="userName">
-                  <el-input v-model.trim="earnestInfoPO.accountName" placeholder="请输入" maxlength="30"></el-input>
+                  <el-input v-model.trim="earnestInfoPO.userName" placeholder="请输入" maxlength="30"></el-input>
                 </el-form-item>
                 <el-form-item label="保证金结算联系电话：" prop="phone">
                   <el-input v-model.trim="earnestInfoPO.phone" placeholder="请输入" maxlength="30"></el-input>
@@ -205,7 +205,7 @@ import {
   userList,
   industryList,
   projectClassifyList,
-
+  generateNumber
 } from '@/api/common/list'
 
 import dataForm from '@components/dataForm.vue'
@@ -366,6 +366,11 @@ export default {
           required: true,
           message: '请输入',
           trigger: 'blur'
+        }],
+		userName: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         }],
         projectCode: [{
           required: true,
@@ -429,7 +434,7 @@ export default {
         money: '',
         account: '',
         bank: '',
-        accountName: '',
+        userName: '',
         phone: ''
       },
       ruleForm: {
@@ -466,6 +471,7 @@ export default {
     this.userList()
     this.industryList()
     this.projectClassifyList()
+	this.getGenerateNumber()
     // this.supplierList()
   },
   methods: {
@@ -512,14 +518,14 @@ export default {
 	},
     // 到下一步
     async next() {
-      const valid =  this.$refs['ruleForm'].validate()
-      const valid1 = this.$refs['bidBookInfoPO'].validate()
+      const valid = await this.$refs['ruleForm'].validate()
+      const valid1 = await this.$refs['bidBookInfoPO'].validate()
 	  let valid2=""
       if (this.ruleForm.isNeedEarnest) {
-        valid2 = this.$refs['earnestInfoPO'].validate()
+        valid2 = await this.$refs['earnestInfoPO'].validate()
 		console.log(valid2)
       }
-      const valid3 = this.$refs['contentForm'].validate()
+      const valid3 = await this.$refs['contentForm'].validate()
       let isNext = ''
       if (this.ruleForm.isNeedEarnest) {
 		  console.log(valid2)
@@ -601,6 +607,12 @@ export default {
       const res = await projectClassifyList()
       this.projectTypes = res
     },
+	// 获取编号
+	async getGenerateNumber() {
+	  const {data} = await generateNumber(1)
+	  this.ruleForm.projectCode = data
+	},
+	
     // 获取所有供应商列表
     // async supplierList() {
     //   try {

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

@@ -117,6 +117,7 @@
 </template>
 
 <script>
+	import {  generateNumber} from '@/api/common/list'
 import dataTable from '@components/nopageTable.vue'
 import dataBreadcrumb from '@components/dataBreadcrumb.vue'
 import citySelect from '@components/citySelect/citySelect.vue'
@@ -289,9 +290,9 @@ export default {
 	this.projectName=localStorage.getItem("projectName")
 	this.getcommoditylist()
 	this.getinqueryinfo()
+	this.getGenerateNumber()
   },
   methods: {
-    
     // 获取上传文件
     getfile(val) {
    
@@ -302,6 +303,11 @@ export default {
 	  }
 	    this.ruleForm.accessoryPOList = val
 	},
+	// 获取编号
+	async getGenerateNumber() {
+	  const {data} = await generateNumber(3)
+	  this.ruleForm.inquiryCode = data
+	},
     // 获取市ID
     getprovinceId(val) {
       this.ruleForm.provinceId = val
@@ -320,13 +326,14 @@ export default {
     //提交表单
     async submit() {
       try {
-        const valid =  this.$refs['ruleForm'].validate()
-		const valid1 =  this.$refs['ruleForm1'].validate()
-		const valid2 =  this.$refs['ruleForm2'].validate()
+        const valid = await this.$refs['ruleForm'].validate()
+		const valid1 =await  this.$refs['ruleForm1'].validate()
+		const valid2 =await  this.$refs['ruleForm2'].validate()
         console.log(valid)
-        if (valid&valid1&valid2) {
+        if (valid&&valid1&&valid2) {
 			let ruleForm=this.ruleForm;
 			ruleForm.projectId=localStorage.getItem("projectId")
+			console.log("通过")
           const {
             code,
             msg

src/utils/request.js

@@ -39,14 +39,14 @@ service.interceptors.response.use(
   },
   error => {
 	  console.log(error.response.status)
-    // if(error.response.status == 401){
-    // 	 Message.error("登陆失效,请重新登录!")
-    //    localStorage.removeItem('token');
-    //    setTimeout(function () {
-    //      location.href = 'http://60.205.251.80:8081/login/user/';
-		  // // location.href = 'http://localhost:3000/login/user/';
-    //    }, 2000);
-    // }
+    if(error.response.status == 401){
+    	 Message.error("登陆失效,请重新登录!")
+       localStorage.removeItem('token');
+       setTimeout(function () {
+         location.href = 'http://60.205.251.80:8081/login/user/';
+		  // location.href = 'http://localhost:3000/login/user/';
+       }, 2000);
+    }
   }
 )	
 export default service