Skip to content

W
web-purchase
Commit 5923aa0a authored by 张冬's avatar 张冬
Browse files
Options

11.6修改

parent 50726f98
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 126 deletions
src/components/Upload/Upload.vue
View file @ 5923aa0a
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
let objName = getFileNameUUID(); let objName = getFileNameUUID();
// 调用 ali-oss 中的方法 // 调用 ali-oss 中的方法
put(`${objName}${file.name}`, file).then((res) => { put(`${objName}${file.name}`, file).then((res) => {
console.log(file); console.log(res)
this.fileList.push(res); this.fileList.push(res);
this.emitInput(this.fileList); this.emitInput(this.fileList);
}); });
......
src/components/citySelect/cityEdit.vue 0 → 100644
View file @ 5923aa0a
<template>
<div>
<el-select v-model="provinceId1" style="width: 167px; margin-right: 25px" @change="getProvince">
<el-option v-for="item in provinceArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
</el-select>
<el-select v-model="cityId1" style="width: 167px; margin-right: 25px" @change="getCity">
<el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
</el-select>
<el-select v-model="districtId1" style="width: 167px; margin-right: 25px" @change="getDistrict">
<el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
</el-select>
</div>
</template>
<script>
import { cityList } from '@/api/common/list';
// import arrAll from './area.js'
export default {
data() {
return {
provinceArr: [],
cityArr: [],
districtArr: [],
provinceId1:"",
cityId1:"",
districtId1:""
};
},
props: ['provinceId', 'cityId', 'districtId'],
watch: {
provinceId(newName, oldName) {
this.provinceId1=this.provinceId
this.getcityArr(newName);
},
cityId(newName, oldName) {
this.cityId1=this.cityId
this.getdistrictArr(newName);
},
districtId(newName, oldName) {
this.districtId1=this.districtId
this.getdistrictArr(newName);
}
},
created() {
this.getProvinceArr();
// this.getcityArr(this.provinceId);
// this.getdistrictArr(this.cityId);
},
methods: {
// 获取省列表
async getProvinceArr() {
console.log('请求省————————————————————');
const { code, data } = await cityList(0);
if (code === 200) {
this.provinceArr = data;
}
},
// 获取市列表
async getcityArr(id) {
console.log(id);
const { code, data } = await cityList(id);
if (code === 200) {
this.cityArr = data;
}
},
// 获取区列表
async getdistrictArr(id) {
const { code, data } = await cityList(id);
if (code === 200) {
this.districtArr = data;
}
},
getProvince() {
this.getcityArr(this.provinceId1);
this.cityId1 = '';
this.districtId1 = '';
this.$emit('sendprovinceId', this.provinceId1);
},
getCity() {
this.getdistrictArr(this.cityId1);
this.districtId1 = '';
this.$emit('sendcityId', this.cityId1);
},
getDistrict() {
this.$emit('senddistrictId', this.districtId1);
}
}
// getCounty() {
// for (var i = 0; i < this.cityArr.length; i++) {
// var obj = this.cityArr[i]
// if (this.city == obj.name) {
// this.countyArr = obj.sub
// this.county = ''
// this.$emit('getCounty', this.city)
// }
// }
// },
// getDistrict() {
// this.$emit('getCity', this.county)
// }
};
</script>
<style>
</style>
src/components/citySelect/citySelect.vue
View file @ 5923aa0a
<template> <template>
<div> <div>
<el-select v-model="provinceId" style="width:167px;margin-right: 25px;" @change="getProvince"> <el-select v-model="provinceId" style="width: 167px; margin-right: 25px" @change="getProvince">
<el-option v-for="item in provinceArr" :value="item.id" :key="item.id" :label="item.name"> <el-option v-for="item in provinceArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
</el-option> </el-select>
</el-select> <el-select v-model="cityId" style="width: 167px; margin-right: 25px" @change="getCity">
<el-select v-model="cityId" style="width:167px;margin-right: 25px;" @change="getCity"> <el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
<el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name"> </el-select>
</el-option> <el-select v-model="districtId" style="width: 167px; margin-right: 25px" @change="getDistrict">
</el-select> <el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name"> </el-option>
<el-select v-model="districtId" style="width:167px;margin-right: 25px;" @change="getDistrict"> </el-select>
<el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name"> </div>
</el-option>
</el-select>
</div>
</template> </template>
<script> <script>
import { import { cityList } from '@/api/common/list';
cityList
} from '@/api/common/list'
// import arrAll from './area.js' // import arrAll from './area.js'
export default { export default {
data() {
data() { return {
return { provinceArr: [],
provinceId: '', cityArr: [],
cityId: '', districtArr: []
districtId: '', };
provinceArr: [],
cityArr: [],
districtArr: []
}
},
created() {
this.getProvinceArr()
},
methods: {
// 获取省列表
async getProvinceArr() {
const {
code,
data
} = await cityList(0)
if (code === 200) {
this.provinceArr = data
}
}, },
// 获取市列表 props: ['provinceId', 'cityId', 'districtId'],
async getcityArr(id) { watch: {
const { provinceId(newName, oldName) {
code, this.getcityArr(newName);
data },
} = await cityList(id) cityId(newName, oldName) {
if (code === 200) { this.getdistrictArr(newName);
this.cityArr = data }
}
}, },
// 获取区列表 created() {
async getdistrictArr(id) { this.getProvinceArr();
const { // this.getcityArr(this.provinceId);
code, // this.getdistrictArr(this.cityId);
data
} = await cityList(id)
if (code === 200) {
this.districtArr = data
}
}, },
methods: {
// 获取省列表
async getProvinceArr() {
console.log('请求省————————————————————');
const { code, data } = await cityList(0);
if (code === 200) {
this.provinceArr = data;
}
},
// 获取市列表
async getcityArr(id) {
console.log(id);
const { code, data } = await cityList(id);
if (code === 200) {
this.cityArr = data;
}
},
// 获取区列表
async getdistrictArr(id) {
const { code, data } = await cityList(id);
if (code === 200) {
this.districtArr = data;
}
},
getProvince() {
getProvince() { this.getcityArr(this.provinceId);
this.getcityArr(this.provinceId) this.cityId = '';
this.cityId = '' this.districtId = '';
this.districtId = '' this.$emit('sendprovinceId', this.provinceId);
this.$emit('sendprovinceId', this.provinceId) },
getCity() {
}, this.getdistrictArr(this.cityId);
getCity() { this.districtId = '';
this.getdistrictArr(this.cityId) this.$emit('sendcityId', this.cityId);
this.districtId = '' },
this.$emit('sendcityId', this.cityId) getDistrict() {
}, this.$emit('senddistrictId', this.districtId);
getDistrict() { }
this.$emit('senddistrictId', this.districtId)
} }
}
// getCounty() { // getCounty() {
// for (var i = 0; i < this.cityArr.length; i++) { // for (var i = 0; i < this.cityArr.length; i++) {
// var obj = this.cityArr[i] // var obj = this.cityArr[i]
// if (this.city == obj.name) { // if (this.city == obj.name) {
// this.countyArr = obj.sub // this.countyArr = obj.sub
// this.county = '' // this.county = ''
// this.$emit('getCounty', this.city) // this.$emit('getCounty', this.city)
// } // }
// } // }
// }, // },
// getDistrict() { // getDistrict() {
// this.$emit('getCity', this.county) // this.$emit('getCity', this.county)
// } // }
} };
</script> </script>
<style> <style>
......
src/components/detail/priceDetail.vue
View file @ 5923aa0a
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
<dataTable :table-data="detail.commodityVOList" :columns="columns"></dataTable> <dataTable :table-data="detail.commodityVOList" :columns="columns"></dataTable>
<div class="appendix list pos"> <div class="appendix list pos">
<div>附件</div> <div>附件</div>
<ul v-if="detail.accessoryVOList !== undefined && detail.accessoryVOList.length > 0" class="filelist"> <ul v-if="detail.accessoryPOList !== undefined && detail.accessoryPOList.length > 0" class="filelist">
<li v-for="(item, index) in detail.accessoryVOList" :key="index"> <li v-for="(item, index) in detail.accessoryPOList" :key="index">
<div @click="open(item.accessoryUrl)" class="link">{{ item.fileName }}</div> <div @click="open(item.accessoryUrl)" class="link">{{ item.fileName }}</div>
</li> </li>
</ul> </ul>
......
src/pages/purchaser/bid/bidEvaluation/projectManager/content.vue
View file @ 5923aa0a
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</div> </div>
<div>开标信息：<span @click="changeOpen">开标一览表</span></div> <div>开标信息：<span @click="changeOpen">开标一览表</span></div>
</div> </div>
<div class="flex upload"> <div class="flex-item upload">
<div>变更信息：</div> <div>变更信息：</div>
<ul class="title flex"> <ul class="title flex-item">
<li v-for="(item, index) in changeList" :key="index"> <li v-for="(item, index) in changeList" :key="index">
<router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{ <router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{
item.title item.title
......
src/pages/purchaser/bid/bidEvaluation/review/review.vue
View file @ 5923aa0a
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div class="flex-item upload"> <div class="flex-item upload">
<div>变更信息：</div> <div>变更信息：</div>
<ul class="title flex"> <ul class="title flex-item">
<li v-for="(item, index) in changeList" :key="index" class="line"> <li v-for="(item, index) in changeList" :key="index" class="line">
<router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{ <router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{
item.title item.title
......
src/pages/purchaser/bid/bidEvaluation/review/see.vue
View file @ 5923aa0a
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<div>澄清回复截止时间：{{replyDetail.cutOffTime}}</div> <div>澄清回复截止时间：{{replyDetail.cutOffTime}}</div>
</div> </div>
<div>澄清问题内容：{{replyDetail.content}}</div> <div>澄清问题内容：{{replyDetail.content}}</div>
<div class="flex-between"> <div class="flex-item">
<div >澄清问题文件:</div> <div style="margin-right:30px">澄清问题文件:</div>
<ul class="upload" v-if="replyDetail.fileName"> <ul class="upload" v-if="replyDetail.fileName">
<li class="flex-item"> <li class="flex-item">
<span>{{replyDetail.fileName}}</span> <div class="link" style="margin-right:15x">{{replyDetail.fileName}}</div>
<el-button size="mini" @click='download(replyDetail.fileUrl)'>下载</el-button> <el-button size="mini" @click='download(replyDetail.fileUrl)'>下载</el-button>
</li> </li>
</ul> </ul>
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<div>{{questionDetail.replyContent}}</div> <div>{{questionDetail.replyContent}}</div>
</div> </div>
<div class="flex-item"> <div class="flex-item">
<div>回复附件:</div> <div style="margin-right:30px">回复附件:</div>
<ul class="upload" v-if="questionDetail.fileName"> <ul class="upload" v-if="questionDetail.fileName">
<li class="flex-item"> <li class="flex-item">
<div>{{questionDetail.fileName}}</div> <div style="margin-right:15x" class="link">{{questionDetail.fileName}}</div>
<el-button size="mini" @click="download(questionDetail.fileUrl)">下载</el-button> <el-button size="mini" @click="download(questionDetail.fileUrl)">下载</el-button>
</li> </li>
</ul> </ul>
...@@ -143,7 +143,5 @@ ...@@ -143,7 +143,5 @@
margin-bottom: 30px; margin-bottom: 30px;
} }
.upload span {
color: #113DEE
}
</style> </style>
src/pages/purchaser/bid/bidSure/notice.vue
View file @ 5923aa0a
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="flex-between"> <div class="flex-between">
<div class="flex"> <div class="flex">
<div class="adjustment">上传附件：</div> <div class="adjustment">上传附件：</div>
<singleUpload :limit="1" tip="支持上传1个附件,不超过20M" @input="getfile" :fileList="ruleForm.accessoryPOList"></singleUpload> <singleUpload :limit="1" tip="支持上传1个附件,不超过20M" :max="20" @input="getfile" :fileList="ruleForm.accessoryPOList"></singleUpload>
</div> </div>
<div>发布媒体：捷安采官网</div> <div>发布媒体：捷安采官网</div>
</div> </div>
......
src/pages/purchaser/bid/bidSure/see.vue
View file @ 5923aa0a
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
</div> </div>
<div>开标信息：<span @click="changeOpen">开标一览表</span></div> <div>开标信息：<span @click="changeOpen">开标一览表</span></div>
</div> </div>
<div class="flex upload"> <div class="flex-item upload">
<div>变更信息：</div> <div>变更信息：</div>
<ul class="title flex"> <ul class="title flex-item">
<li v-for="(item, index) in changeList" :key="index"> <li v-for="(item, index) in changeList" :key="index">
<router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{ <router-link :to="{ path: '/purchaser/bid/bidStage/changeList/see', query: { id: item.noticeId } }">{{
item.title item.title
......
src/pages/purchaser/bid/editProject/editProject.vue
View file @ 5923aa0a
...@@ -117,6 +117,7 @@ export default { ...@@ -117,6 +117,7 @@ export default {
for (let item of data.commodityVOList) { for (let item of data.commodityVOList) {
item.time = item.createTime; item.time = item.createTime;
item.createTime =new Date(item.createTime).getTime(); item.createTime =new Date(item.createTime).getTime();
item.updateTime =new Date(item.updateTime).getTime();
} }
console.log(data); console.log(data);
this.detail = data; this.detail = data;
......
src/pages/purchaser/bid/editProject/message.vue
View file @ 5923aa0a
...@@ -31,6 +31,9 @@ ...@@ -31,6 +31,9 @@
<div class="flex-between"> <div class="flex-between">
<el-form-item label="项目归属地区：" prop="region"> <el-form-item label="项目归属地区：" prop="region">
<citySelect <citySelect
:provinceId="ruleForm.provinceId"
:cityId="ruleForm.cityId"
:districtId="ruleForm.districtId"
@sendprovinceId="getprovinceId" @sendprovinceId="getprovinceId"
@sendcityId="getcityId" @sendcityId="getcityId"
@senddistrictId="getdistrictId" @senddistrictId="getdistrictId"
...@@ -97,7 +100,13 @@ ...@@ -97,7 +100,13 @@
<div> <div>
<div class="describe">保证金费用信息</div> <div class="describe">保证金费用信息</div>
<div class="message-form"> <div class="message-form">
<el-form ref="earnestInfoPO" :model="ruleForm.earnestInfoPO" :rules="formrules" label-width="200px" class="demo-ruleForm"> <el-form
ref="earnestInfoPO"
:model="ruleForm.earnestInfoPO"
:rules="formrules"
label-width="200px"
class="demo-ruleForm"
>
<div> <div>
<el-form-item label="是否需要投标保证金：" prop="isNeedEarnest"> <el-form-item label="是否需要投标保证金：" prop="isNeedEarnest">
<el-radio-group v-model="ruleForm.isNeedEarnest"> <el-radio-group v-model="ruleForm.isNeedEarnest">
...@@ -246,7 +255,7 @@ import dataTable from '@components/nopageTable.vue'; ...@@ -246,7 +255,7 @@ import dataTable from '@components/nopageTable.vue';
import dataTableList from '@components/dataTable.vue'; import dataTableList from '@components/dataTable.vue';
import upload from '@components/Upload/Upload.vue'; import upload from '@components/Upload/Upload.vue';
import changeNav from '@components/changeNav.vue'; import changeNav from '@components/changeNav.vue';
import citySelect from '@components/citySelect/citySelect.vue'; import citySelect from '@components/citySelect/cityEdit.vue';
// const bidMethods = [{ // const bidMethods = [{
// value: '公开', // value: '公开',
...@@ -571,20 +580,22 @@ export default { ...@@ -571,20 +580,22 @@ export default {
}, },
// 到下一步 // 到下一步
async next() { async next() {
const valid = await this.$refs['ruleForm'].validate(); let ruleForm = this.ruleForm;
const valid1 = await this.$refs['bidBookInfoPO'].validate(); console.log(ruleForm.provinceId, ruleForm.cityId, ruleForm.districtId);
let valid2 = ''; // const valid = await this.$refs['ruleForm'].validate();
if (this.ruleForm.isNeedEarnest) { // const valid1 = await this.$refs['bidBookInfoPO'].validate();
valid2 = await this.$refs['earnestInfoPO'].validate(); // let valid2 = '';
} // if (this.ruleForm.isNeedEarnest) {
const valid3 = await this.$refs['contentForm'].validate(); // valid2 = await this.$refs['earnestInfoPO'].validate();
let isNext = ''; // }
if (this.ruleForm.isNeedEarnest) { // const valid3 = await this.$refs['contentForm'].validate();
isNext = valid && valid1 && valid2 && valid3; // let isNext = '';
} else { // if (this.ruleForm.isNeedEarnest) {
isNext = valid && valid1 && valid3; // isNext = valid && valid1 && valid2 && valid3;
} // } else {
return isNext; // isNext = valid && valid1 && valid3;
// }
// return isNext;
}, },
// 邀请状态下选择供应商 // 邀请状态下选择供应商
choice(row) { choice(row) {
......
src/pages/purchaser/bid/releaseProject/message.vue
View file @ 5923aa0a
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件：" prop="file"> <el-form-item label="附件：" prop="file">
<upload :tip="tip" :limit="20" :max="15" accept=".PDF,.JPG,.JPEG,.ZIP,.RAR,.docx,.doc,.docx" @input="getfile"></upload> <upload :tip="tip" :limit="20" :max="25" accept=".PDF,.JPG,.JPEG,.ZIP,.RAR,.docx,.doc,.docx" @input="getfile"></upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
......
src/pages/purchaser/bid/reviewed/inquiryAnnouncement.vue
View file @ 5923aa0a
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
placeholder="请输入" placeholder="请输入"
maxlength="30" maxlength="30"
style="width: 250px" style="width: 250px"
type="number" onkeyup="value=value.replace(/[^\d]/g,'')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</div> </div>
......
src/pages/supply/bid/joinProject/bidEvaluation/reply.vue
View file @ 5923aa0a
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="textarea"></el-input> type="textarea"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="回复文件" prop="file"> <el-form-item label="回复文件" prop="file">
<singleUpload :limit="1" tip="上传一份,不超过10M" @input="getfile"></singleUpload> <singleUpload :limit="1" tip="上传一份,不超过10M" :max="10" @input="getfile"></singleUpload>
</el-form-item> </el-form-item>
</el-form> </el-form>
......
src/pages/supply/bid/joinProject/bidSure/bidresultAdvice.vue
View file @ 5923aa0a
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</div> </div>
<div v-if="state" class="flex-between"> <div v-if="state" class="flex-between">
<div>日期：{{detail.createTime}}</div> <div>日期：{{detail.createTime}}</div>
<div>招标结果通知书编号：{{detail.resultId}}</div> <div>招标结果通知书编号：{{detail.number}}</div>
</div> </div>
<div v-if="state"> <div v-if="state">
<div class="flex" > <div class="flex" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment