diff --git a/src/api/notice/index.js b/src/api/notice/index.js index 5246bb58..1cc11ae2 100644 --- a/src/api/notice/index.js +++ b/src/api/notice/index.js @@ -9,6 +9,15 @@ export function noticeList(query) { }) } +//附件查询 +export function attachmentQuery(query) { + return request({ + url: '/open/attachment/query', + method: 'get', + params: query + }) +} + //鉴证公告 export function Attestation(query) { return request({ diff --git a/src/assets/images/file_icon.png b/src/assets/images/file_icon.png new file mode 100644 index 00000000..c5c62de2 Binary files /dev/null and b/src/assets/images/file_icon.png differ diff --git a/src/views/notice/attestationDetail.vue b/src/views/notice/attestationDetail.vue index fa4eff5f..ea5c6de4 100644 --- a/src/views/notice/attestationDetail.vue +++ b/src/views/notice/attestationDetail.vue @@ -7,88 +7,33 @@ placeholder @click-left="onClickLeft" /> -

{{attestationDetail.projectName}}成交公示

- - 鉴证书编号：{{attestationDetail.jzsNumOne}}第{{attestationDetail.jzsNumTwo}}号 - - - 项目名称：{{attestationDetail.projectName}} - - - 项目编号：{{attestationDetail.projectCode}} - - - 转出方：{{attestationDetail.outName}} - - - 转出行为批准机构名称：{{attestationDetail.pzjg}} - - - 法定代表人（转出方）：{{attestationDetail.legalPerson}} - - - 注册号（身份证）：{{attestationDetail.idCardNum}} - - - 受让方：{{attestationDetail.inName}} - - - 单位性质：{{attestationDetail.companyNature}} - - - 法定代表人（受让方）：{{attestationDetail.realname}} - - - 注册资本：{{attestationDetail.companyCapital}} - - - 注册号（身份证）：{{attestationDetail.companyLicense}} - - - 标的位置：{{attestationDetail.areaName}} - - - 标的物情况：{{attestationDetail.szCondition}} - - - 转出面积（数量）：{{attestationDetail.allCount}}{{attestationDetail.allCountUnit}} - - - 转出期限：{{attestationDetail.outStartEndTime}} - - - 确权机构：{{attestationDetail.organization}} - - - 权证编号：{{attestationDetail.warrantCode}} - - - 转出方式：{{attestationDetail.rollout}} - - - 交易方式：{{attestationDetail.dealType}} - - - 交易底价：{{attestationDetail.price}}{{attestationDetail.unit}} - - - 成交金额：{{attestationDetail.dealMoneySum}}元 - - - 合同签署日期：{{attestationDetail.contractDate}} - - - 合同编号：{{attestationDetail.contractCode}} - - - 附记：{{attestationDetail.jzsRemark}} - - - 农村产权交易鉴证书 - - - {{attestationDetail.jzsSignDate}} - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -140,7 +85,8 @@ export default { diff --git a/src/views/notice/noticeDetail.vue b/src/views/notice/noticeDetail.vue index 3cd1f780..558f6b4b 100644 --- a/src/views/notice/noticeDetail.vue +++ b/src/views/notice/noticeDetail.vue @@ -7,52 +7,20 @@ placeholder @click-left="onClickLeft" /> -

{{noticeDetail.projectName}}成交公示

- - 项目名称：{{noticeDetail.projectName}} - - - 项目编号：{{noticeDetail.projectCode}} - - - 转出方式：{{noticeDetail.rollout}} - - - 交易方式：{{noticeDetail.dealType}} - - - 成交时间：{{noticeDetail.dealTime}} - - - 标的区域：{{noticeDetail.deptName}} - - - 转出方：{{noticeDetail.outName}} - - - 受让方：{{noticeDetail.memberType == 1 ? noticeDetail.realname:noticeDetail.companyName}} - - - 公示开始时间：{{noticeDetail.dealPublicityStartTime}} - - - 公示结束时间：{{noticeDetail.dealPublicityStopTime}} - - - 转出面积/数量 ：{{noticeDetail.allCount}}{{noticeDetail.allCountUnit}} - - - 转出年限：{{noticeDetail.outStartTime}}至{{noticeDetail.outStopTime}} - - - 成交价格：{{noticeDetail.dealMoney}}{{noticeDetail.unit}} - - - 成交金额：{{noticeDetail.dealMoneySum}}元 - - - 备注： - + + + + + + + + + + + + + + @@ -101,7 +69,8 @@ export default { diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue index 835ac55f..cdda8085 100644 --- a/src/views/project/projectDetail.vue +++ b/src/views/project/projectDetail.vue @@ -391,6 +391,9 @@ export default { this.getDicts("price_unit").then(res => { this.detail.unit = this.selectDictLabel(res.data,response.data.unit); }); + this.getDicts("payment_type").then(res => { + this.detail.paymentType = this.selectDictLabel(res.data,response.data.paymentType); + }); for(let i of this.detail.subjectList){ this.getDicts("area_unit").then(res => { i.areaUnit = this.selectDictLabel(res.data,i.areaUnit); diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue index 4b88ac4e..2ac0abd6 100644 --- a/src/views/project/signUp.vue +++ b/src/views/project/signUp.vue @@ -205,6 +205,7 @@ import {getInfo} from "../../api/login"; import $ from "jquery"; import {signSecond} from "@/api/sunVillage_info/fixedAssets"; + import {Toast} from "vant"; export default { name: "signUp", @@ -307,6 +308,13 @@ export default { $('#canvasTT').css('display','block') }, handleGenerate() { + + this.$toast.loading({ + message: "正在生成签字", + forbidClick: true, + duration: 0, + }); + console.log(this.$refs.esign) this.$refs.esign .generate() // 使用生成器调用把签字的图片转换成为base64图片格式 @@ -330,6 +338,7 @@ export default { }) .catch((err) => { console.log(err) + this.$toast.clear(); // 画布没有签字时会执行这里提示一下 this.$toast.fail('请签名后再保存签字'); diff --git a/src/views/user/bidding/index.vue b/src/views/user/bidding/index.vue index 3d3090ce..3aa7d899 100644 --- a/src/views/user/bidding/index.vue +++ b/src/views/user/bidding/index.vue @@ -14,9 +14,9 @@ finished-text="没有更多了" @load="getList" > -
+
-
+

{{item.projectName}}

{{item.projectShowStatus}}

-
+
-
+

当前价格 + }[item.projectShowStatus]}" v-if="item.biddingType=='1'&&item.projectShowStatus=='竞价中'"> * @@ -60,7 +60,7 @@ '未开始': '#007E72', '已结束': '#848484', '竞价中': '#c21F3a', - }[item.projectShowStatus]}" v-if="item.biddingType!='自由竞价'&&item.money"> + }[item.projectShowStatus]}" v-if="(item.biddingType!='1'&&item.money) || item.projectShowStatus=='已结束'"> {{item.money}}{{item.unit}} @@ -69,13 +69,13 @@ '未开始': '#007E72', '已结束': '#848484', '竞价中': '#c21F3a', - }[item.projectShowStatus]}" v-if="item.biddingType!='自由竞价'&&!item.money"> + }[item.projectShowStatus]}" v-if="item.biddingType!='1'&&!item.money"> 暂无出价

-

+

我的出价 出价记录

+

竞价记录

diff --git a/src/views/user/signature/signatureList.vue b/src/views/user/signature/signatureList.vue index 3c2c1342..4c51fadb 100644 --- a/src/views/user/signature/signatureList.vue +++ b/src/views/user/signature/signatureList.vue @@ -179,6 +179,13 @@ }, // 生成签字图 handleGenerate() { + + this.$toast.loading({ + message: "正在生成签字", + forbidClick: true, + duration: 0, + }); + this.$refs.esign .generate() // 使用生成器调用把签字的图片转换成为base64图片格式 .then((res) => { @@ -197,6 +204,7 @@ }) .catch((err) => { + this.$toast.clear(); // 画布没有签字时会执行这里提示一下 this.$toast.fail('请签名后再保存签字'); diff --git a/src/views/user/signature/signaturePdf.vue b/src/views/user/signature/signaturePdf.vue index b8ed17b4..45b46a1f 100644 --- a/src/views/user/signature/signaturePdf.vue +++ b/src/views/user/signature/signaturePdf.vue @@ -30,11 +30,21 @@ const id = this.$route.query.id; const baseURL = process.env.VUE_APP_BASE_API; previewContractFile(id).then(response => { + + this.$toast.loading({ + message: "正在加载文件", + forbidClick: true, + duration: 20000, + }); + this.url = baseURL + response.msg; let loadingTask = pdf.createLoadingTask(this.url) + loadingTask.promise.then(pdf => { this.numPages = pdf.numPages + this.$toast.clear(); }) + }); }, methods: {