diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index 663474b..3a1a232 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -61,8 +61,8 @@ overflow: auto; .container { width: 100%; - min-width: 1366px; - min-height: 768px; + min-width: 1300px; + min-height: 600px; height: 100%; overflow: hidden; position: relative; diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue index 0f2afbf..e90fa18 100644 --- a/src/components/tools/StatusSlot.vue +++ b/src/components/tools/StatusSlot.vue @@ -116,6 +116,8 @@ export default { let result = this.statusKey if(this.statusKey === 'mail' || this.statusKey === 'bill') { result = 'mailBill' + } else if (this.statusKey === 'payMailContract') { + result = 'payMailContract' } return result } @@ -168,6 +170,10 @@ export default { if (item.sendDate || item.postNo) { result = `${ item.sendDate }新增邮寄信息,邮寄单号:${ item.postNo }` } + } else if (this.statusKey === 'payMailContract') { + if (item.sendDate || item.postNo) { + result = `${ item.sendDate }新增邮寄信息,邮寄单号:${ item.postNo }` + } } return result } diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index b65fc42..3c4d969 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -148,11 +148,18 @@ export default { } }, haveRead(record) { - putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => { - if (res.success) { - this.loadData() - this.syncHeadNotic(record.anntId) - Bus.$emit('notice-change') + const that = this + this.$confirm({ + title: '确认已读', + content: '是否确认将消息改为已读状态?', + onOk: function () { + putAction(that.url.editCementSend, { anntId: record.anntId }).then((res) => { + if (res.success) { + that.loadData() + that.syncHeadNotic(record.anntId) + Bus.$emit('notice-change') + } + }) } }) }, diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue index edaf320..443fea0 100644 --- a/src/views/mineContract/modules/MineContractModule.vue +++ b/src/views/mineContract/modules/MineContractModule.vue @@ -71,8 +71,8 @@ :dataSource="logisticsInfoList" class="j-table-force-nowrap" > - - 查看物流 + + 查看物流 @@ -122,7 +122,7 @@ export default { { title: '邮寄人', align: 'center', - dataIndex: 'createBy' + dataIndex: 'mailName' }, { title: '快递单号', @@ -174,8 +174,9 @@ export default { this.$emit('openProjectDetail', param) this.close() }, - lookLogistics() { - window.open('https://www.ems.com.cn/', '_blank') + lookLogistics(record) { + const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' + window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) }, handleCancel() { this.close() diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue index 0778225..0fc91d8 100644 --- a/src/views/subBidCommittee/SubBidCommittee.vue +++ b/src/views/subBidCommittee/SubBidCommittee.vue @@ -85,7 +85,7 @@ export default { }, methods: { openDetail(record) { - this.$refs.detail.committeeId = record.id + this.$refs.detail.committee = record this.$refs.detail.open() }, /* diff --git a/src/views/subBidCommittee/modules/SubBidCommitteeDetail.vue b/src/views/subBidCommittee/modules/SubBidCommitteeDetail.vue index f92b3cb..84fdefe 100644 --- a/src/views/subBidCommittee/modules/SubBidCommitteeDetail.vue +++ b/src/views/subBidCommittee/modules/SubBidCommitteeDetail.vue @@ -55,7 +55,7 @@ export default { loading: false, fileLoading: false, // 文件区域的加载效果 fileList: [], - committeeId: '', + committee: '', committeeDetail: {} } }, @@ -64,15 +64,26 @@ export default { this.visible = true this.loading = true let param = { - id: this.committeeId + id: this.committee.id } getSubBidCommitteeDetail(param).then(res => { - this.committeeDetail = res.result - let fileIdsArr = [] - this.committeeDetail.files.forEach(item => { - fileIdsArr.push(item.fileId) - this.initFileList(fileIdsArr) - }) + if (res.success) { + if (res.result) { + this.committeeDetail = res.result + let fileIdsArr = [] + this.committeeDetail.files.forEach(item => { + fileIdsArr.push(item.fileId) + this.initFileList(fileIdsArr) + }) + } else { + this.committeeDetail = { + name: this.committee.name + } + } + + } else { + this.$message.warn(res.message) + } }).finally(() => { this.loading = false }) diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 8b04501..5bac534 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -256,13 +256,21 @@ export default { return value }, haveRead(record) { - putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => { - if (res.success) { - this.loadData() - this.syncHeadNotic(record.anntId) - Bus.$emit('notice-change') + const that = this + this.$confirm({ + title: '确认已读', + content: '是否确认将消息改为已读状态?', + onOk: function () { + putAction(that.url.editCementSend, {anntId: record.anntId}).then((res) => { + if (res.success) { + that.loadData() + that.syncHeadNotic(record.anntId) + Bus.$emit('notice-change') + } + }) } }) + }, } } diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 1822bec..6a57059 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -434,7 +434,7 @@ export default { z-index: 99; width: 50%; box-sizing: border-box; - height: 60%; + height: 80%; position: absolute; right: 0; top: 50%; @@ -445,12 +445,13 @@ export default { height: 100%; overflow: hidden; display: flex; - justify-content: space-between; + justify-content: center; flex-direction: column; .title { display: flex; justify-content: center; + margin-bottom: 10px; img { width: 395px; @@ -481,7 +482,7 @@ export default { } /deep/ .ant-row { - margin-bottom: 0 !important; + margin-bottom: 5px !important; } /deep/ .ant-input-affix-wrapper .ant-input { diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue index a335527..f72a372 100644 --- a/src/views/user/alteration/Alteration.vue +++ b/src/views/user/alteration/Alteration.vue @@ -322,7 +322,7 @@ export default { } .alteration-content { - margin: auto; + //margin: auto; width: 1000px; display: flex; justify-content: center;