更新

src/components/detail/projectDetail.vue

@@ -10,11 +10,11 @@
 	        <div>项目分类：{{projectdetail.classifyName}}</div>
 	      </div>
 	      <div class="flex-between">
-	        <div>采购单位：{{projectdetail.purchaseAgent}}</div>
-	        <div>项目归属行业：{{projectdetail.industry}}</div>
+	        <div>采购单位：{{companyName}}</div>
+	        <div>项目归属行业：{{projectdetail.industryName}}</div>
 	      </div>
 	      <div class="flex-between">
-	        <div>项目归属地区：{{projectdetail.local}}</div>
+	        <div>项目归属地区：{{projectdetail.region}}</div>
 	        <div>最小投标单位数：{{projectdetail.minTender}}</div>
 	      </div>
 	      <div class="flex-between">
@@ -78,6 +78,7 @@ components: {
 	},
   data() {
     return {
+		companyName:"",
 		projectdetail:"",
       breads: ['投标管理', '我参与的项目', '工作台 '],
       nav: ['供应商'],
@@ -123,7 +124,7 @@ components: {
     
       ],
       ruleForm: {
-        projectName: '',
+        companyName: '',
         projectCode: '',
         classify: '',
         purchaseAgent: '',
@@ -150,6 +151,7 @@ components: {
   created() {
     this.getprojectdetail()
 	this.gettimeInfo()
+	this.companyName=JSON.parse(localStorage.getItem("userInfo")).companyName
   },
   methods: {
       async getprojectdetail() {

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

@@ -12,21 +12,18 @@
 					<div>项目名称：{{projectName}}</div>
 				</div>
 				<div class="flex-between">
-         <div>日期：{{ winDate}}</div>
-         <div>中标金额：{{money}}</div>
-        </div>
-        <div class="flex-between">
-          <div class="flex">
-            <div >上传附件：</div>
-            <singleUpload :limit='1' tip="支持上传一个pdf格式文件，大小不超过100M。" accept='.pdf' @input="getfile"></singleUpload>
-          </div>
-          <div>
-            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="demo-ruleForm">
+					<div style="margin-bottom: 23px;">日期：{{ winDate}}</div>
+					<el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="200px" class="demo-ruleForm">
 						<el-form-item label="招标结果通知书编号" prop="number">
 							<el-input v-model.trim="ruleForm.number" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
 						</el-form-item>
 					</el-form>
 				</div>
+				<div class="flex-between">
+					<div class="flex">
+						<div>上传附件：</div>
+						<singleUpload :limit='1' tip="支持上传一个pdf格式文件，大小不超过100M。" accept='.pdf' @input="getfile"></singleUpload>
+					</div>
 				</div>
 				<div class="flex-center button">
 					<el-button @click="back">取消</el-button>
@@ -38,24 +35,30 @@
 </template>
 
 <script>
-import { editResultBook} from '@api/purchaser/bid'
-import dataTable from '@components/dataTable.vue'
-import singleUpload from '@components/Upload/singleUpload.vue'
-export default {
+	 import {generateNumber} from '@api/common/list'
+	import {
+		editResultBook
+	} from '@api/purchaser/bid'
+	import dataBreadcrumb from '@components/dataBreadcrumb.vue'
+	import dataTable from '@components/dataTable.vue'
+	import singleUpload from '@components/Upload/singleUpload.vue'
+	export default {
 		name: 'bidingList',
 		components: {
 			dataTable,
-    singleUpload
+			singleUpload,
+			dataBreadcrumb
 		},
 		data() {
 			return {
-		money:"",
-		winDate:"",
-		projectCode:"",
-		projectName:"",
+				money: "",
+				winDate: "",
+				projectCode: "",
+				projectName: "",
 				ruleForm: {
 					number: '',
-		fileList:[]
+					fileList: [],
+					resultId: ""
 				},
 				rules: {
 					number: [{
@@ -69,39 +72,52 @@ export default {
 			}
 		},
 		created() {
-	  this.resultId=this.$route.query.id;
-	  this.money=this.$route.query.money
-	  this.winDate=this.$route.query.winDate
-	  this.projectCode=localStorage.getItem("projectCode")
-	  this.projectName=localStorage.getItem("projectName")
+			this.getGenerateNumber();
+			this.ruleForm.resultId = this.$route.query.id;
+			this.winDate = this.$route.query.winDate
+			this.projectCode = localStorage.getItem("projectCode")
+			this.projectName = localStorage.getItem("projectName")
 		},
 		methods: {
- 	  back(){
+			async getGenerateNumber() {
+			    try {
+			      const {
+			        data,
+			        code
+			      } = await generateNumber(5)
+				  this.ruleForm.number=data
+			    } catch (e) {
+			      console.log(e)
+			    }
+			  },
+			back() {
 				this.$router.go(-1)
 			},
- 	  getfile(val){
- 		this.ruleForm.fileList=val
+			getfile(val) {
+				this.ruleForm.fileList = val
 			},
 			//提交表单
 			async submitData() {
 				try {
 					const valid = await this.$refs['ruleForm'].validate()
 					if (valid) {
- 			   let ruleForm=this.ruleForm;
- 			   ruleForm.id=this.resultId
- 			   ruleForm.projectId=localStorage.getItem("projectId")
- 			   ruleForm.companyId=localStorage.getItem("companyId")
-            const { code,msg } = await editResultBook(ruleForm);
+						let ruleForm = this.ruleForm;
+						ruleForm.projectId = localStorage.getItem("projectId")
+						ruleForm.companyId = localStorage.getItem("companyId")
+						const {
+							code,
+							msg
+						} = await editResultBook(ruleForm);
 						if (code === 200) {
 							this.$message({
 								message: msg,
 								type: 'success',
-             			  duration:1500
+								duration: 1500
 							})
-             			setTimeout(()=>{
+							setTimeout(() => {
 								this.$router.go(-1)
-             			},1500)
-            }else{
+							}, 1500)
+						} else {
 							this.$message.error(msg)
 						}
 					}
@@ -111,19 +127,21 @@ export default {
 			}
 		}
 
-}
+	}
 </script>
 
 
 <style scoped>
-	.message{
+	.message {
 		/* 	width:60%; */
 	}
-	.message>div{
+
+	.message>div {
 		margin-bottom: 30px;
 		width: 50%;
 	}
-	.message>.button{
-		margin:100px
+
+	.message>.button {
+		margin: 100px
 	}
 </style>

src/pages/purchaser/bid/bidSure/bidResult/list.vue

@@ -69,7 +69,7 @@ export default {
   }, 
  methods: {
  	edit(row) {
- 		this.$router.push(`/purchaser/bid/bidSure/bidResult/edit?id=${row.id}&winDate=${row.winDate}&money=${row.money}`)
+ 		this.$router.push(`/purchaser/bid/bidSure/bidResult/edit?id=${row.resultId}&winDate=${row.createTime}`)
  	},
  	back() {
  		this.$router.go(-1)

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

@@ -38,6 +38,7 @@
 </template>
 
 <script>
+import {generateNumber} from '@api/common/list'
 import {getTime } from '@utils/time'	
 import { editSentBook} from '@api/purchaser/bid'
 import dataBreadcrumb from '@components/dataBreadcrumb.vue'
@@ -69,6 +70,7 @@ export default {
     }
   },
   created() {
+	  this.getGenerateNumber();
 	  this.resultId=this.$route.query.id;
 	  this.money=this.$route.query.money
 	  this.winDate=this.$route.query.winDate
@@ -82,6 +84,17 @@ export default {
 	  getfile(val){
 		this.ruleForm.fileList=val
 	  },
+	    async getGenerateNumber() {
+	        try {
+	          const {
+	            data,
+	            code
+	          } = await generateNumber(4)
+			  this.ruleForm.number=data
+	        } catch (e) {
+	          console.log(e)
+	        }
+	      },
    //提交表单
    async submitData() {
          try {

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

@@ -63,6 +63,7 @@
 </template>
 
 <script>
+    import {generateNumber} from '@api/common/list'
 	import dataTable from '@components/nopageTable.vue'
 	import dataForm from '@components/dataForm.vue'
 	export default {
@@ -300,6 +301,11 @@
 				this.idx = index
 				this.searchData = Object.assign({}, row)
 				this.dialogVisible = true
+				 const {
+				          data,
+				          code
+				 } =  generateNumber(2)
+				  this.searchData.encoding=data
 			},
 			add() {
 				this.type = 0

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

@@ -464,9 +464,9 @@ export default {
     }
   },
   computed: {
-
   },
   created() {
+	 this.ruleForm.purchaseAgent=JSON.parse(localStorage.getItem("userInfo")).companyName
 	 this.pageObj.companyId=localStorage.getItem("companyId")
     this.userList()
     this.industryList()

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

@@ -25,8 +25,8 @@
 					</el-form-item>
 					<div class="flex-item">
 						<div>是否买断账期：</div>
-						<el-radio v-model="is_payment_days" label="false">否</el-radio>
-						<el-radio v-model="is_payment_days" label="true">是</el-radio>
+						<el-radio v-model="isPaymentDays" label="false">否</el-radio>
+						<el-radio v-model="isPaymentDays" label="true">是</el-radio>
 					</div>
 					<div class="flex-center buttom">
 						<el-button @click="cancel">取消</el-button>
@@ -67,7 +67,7 @@
 		},
 		data() {
 			return {
-				is_payment_days: "",
+				isPaymentDays: "",
 				users: [],
 				dialogFormVisible: false,
 				breads: ['投标管理', '在线报名', '报名'],
@@ -76,7 +76,7 @@
 					userId: '',
 					phone: '1',
 					email: '1',
-					is_payment_days: ""
+					isPaymentDays: ""
 				},
 				rules: {
 					userId: [{
@@ -102,14 +102,14 @@
 			// 提交
 			async sendTo() {
 				try {
-					let is_payment_days = this.is_payment_days
-					if (!is_payment_days) {
+					let isPaymentDays = this.isPaymentDays
+					if (!isPaymentDays) {
 						this.dialogFormVisible = true
 					} else {
 						const valid = await this.$refs['form'].validate()
 						if (valid) {
 							let form = this.form;
-							form.is_payment_days = this.is_payment_days
+							form.isPaymentDays = this.isPaymentDays
 							const {
 								code,
 								msg