diff --git a/src/components/mycomponent/dialog/reviewDialog.vue b/src/components/mycomponent/dialog/reviewDialog.vue deleted file mode 100644 index 1fb8820..0000000 --- a/src/components/mycomponent/dialog/reviewDialog.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ fileName }} - - - - 下载 - - - - - - - - - - - - {{ fileName2 }} - - - - 下载 - - - - - - - - - - - - 上传录库评审结果 - - - - - - 保存 - - - 取消 - - - - - - - - - diff --git a/src/components/mycomponent/dialog/reviewDialog.vue b/src/components/mycomponent/dialog/reviewDialog.vue deleted file mode 100644 index 1fb8820..0000000 --- a/src/components/mycomponent/dialog/reviewDialog.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ fileName }} - - - - 下载 - - - - - - - - - - - - {{ fileName2 }} - - - - 下载 - - - - - - - - - - - - 上传录库评审结果 - - - - - - 保存 - - - 取消 - - - - - - - - - diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue index 99eb582..1f519f7 100644 --- a/src/views/supplier/inquiry.vue +++ b/src/views/supplier/inquiry.vue @@ -63,7 +63,7 @@ /> - + @@ -104,11 +104,8 @@ hitstoryDialog(row) { this.$refs.inquiryHis.initHistoryDialog(row) }, - inquiryHistoryDialogClose() { - this.isShowHistoryDialog = false - }, inquiryDialogClick(row) { - this.$refs.inquiryDia.initDialog(row) + this.$refs.inquiryDialog.initDialog(row) }, // 获取列表 getListPage(limit = 10, offset = 1) { diff --git a/src/components/mycomponent/dialog/reviewDialog.vue b/src/components/mycomponent/dialog/reviewDialog.vue deleted file mode 100644 index 1fb8820..0000000 --- a/src/components/mycomponent/dialog/reviewDialog.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ fileName }} - - - - 下载 - - - - - - - - - - - - {{ fileName2 }} - - - - 下载 - - - - - - - - - - - - 上传录库评审结果 - - - - - - 保存 - - - 取消 - - - - - - - - - diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue index 99eb582..1f519f7 100644 --- a/src/views/supplier/inquiry.vue +++ b/src/views/supplier/inquiry.vue @@ -63,7 +63,7 @@ /> - + @@ -104,11 +104,8 @@ hitstoryDialog(row) { this.$refs.inquiryHis.initHistoryDialog(row) }, - inquiryHistoryDialogClose() { - this.isShowHistoryDialog = false - }, inquiryDialogClick(row) { - this.$refs.inquiryDia.initDialog(row) + this.$refs.inquiryDialog.initDialog(row) }, // 获取列表 getListPage(limit = 10, offset = 1) { diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue index 4719ef3..35f16c5 100644 --- a/src/views/supplier/inquiryDialog.vue +++ b/src/views/supplier/inquiryDialog.vue @@ -1,7 +1,6 @@ - @@ -25,8 +24,8 @@ inactive-color="#ff4949" :active-text="options[0].label" :inactive-text="options[1].label" - :active-value="'1'" - :inactive-value="'2'" + :active-value="options[0].value" + :inactive-value="options[1].value" > @@ -39,14 +38,14 @@ - + - + - 上传资料预审结果 + 上传资料预审结果附件 @@ -88,18 +87,12 @@ import { getToday } from '@/utils/dateutils' export default { name: 'InquiryDialog', - props: { - dataInfo: { - type: Object, - dataInfo: {} - } - }, computed: { preReviewResult: function() { - if (this.addInfo.preReviewResult === '1') { - return '预审通过' - } else if (this.addInfo.preReviewResult === '2') { - return '预审不通过' + if (this.addInfo.preReviewResult === this.options[0].value) { + return this.options[0].label + } else if (this.addInfo.preReviewResult === this.options[1].value) { + return this.options[1].label } else { return '' } @@ -270,39 +263,6 @@ padding: 0 20px; box-sizing: border-box; - .Dialog-input { - padding: 10px 20px; - display: flex; - - .inputContent { - margin-right: 30px; - display: flex; - flex: 1; - flex-direction: column; - - .inputBox { - width: 350px; - display: flex; - justify-content: space-between; - align-items: center; - } - } - } - - .imgContent { - margin: 20px; - display: flex; - - .img-box { - margin-right: 48px; - width: 100%; - height: 250px; - padding: 10px 40px; - border: 1px solid #000; - - } - } - .btnBox { padding: 30px; box-sizing: border-box; @@ -312,7 +272,7 @@ .save, .close { - width: 100px; + width: 200px; } } diff --git a/src/components/mycomponent/dialog/reviewDialog.vue b/src/components/mycomponent/dialog/reviewDialog.vue deleted file mode 100644 index 1fb8820..0000000 --- a/src/components/mycomponent/dialog/reviewDialog.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ fileName }} - - - - 下载 - - - - - - - - - - - - {{ fileName2 }} - - - - 下载 - - - - - - - - - - - - 上传录库评审结果 - - - - - - 保存 - - - 取消 - - - - - - - - - diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue index 99eb582..1f519f7 100644 --- a/src/views/supplier/inquiry.vue +++ b/src/views/supplier/inquiry.vue @@ -63,7 +63,7 @@ /> - + @@ -104,11 +104,8 @@ hitstoryDialog(row) { this.$refs.inquiryHis.initHistoryDialog(row) }, - inquiryHistoryDialogClose() { - this.isShowHistoryDialog = false - }, inquiryDialogClick(row) { - this.$refs.inquiryDia.initDialog(row) + this.$refs.inquiryDialog.initDialog(row) }, // 获取列表 getListPage(limit = 10, offset = 1) { diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue index 4719ef3..35f16c5 100644 --- a/src/views/supplier/inquiryDialog.vue +++ b/src/views/supplier/inquiryDialog.vue @@ -1,7 +1,6 @@ - @@ -25,8 +24,8 @@ inactive-color="#ff4949" :active-text="options[0].label" :inactive-text="options[1].label" - :active-value="'1'" - :inactive-value="'2'" + :active-value="options[0].value" + :inactive-value="options[1].value" > @@ -39,14 +38,14 @@ - + - + - 上传资料预审结果 + 上传资料预审结果附件 @@ -88,18 +87,12 @@ import { getToday } from '@/utils/dateutils' export default { name: 'InquiryDialog', - props: { - dataInfo: { - type: Object, - dataInfo: {} - } - }, computed: { preReviewResult: function() { - if (this.addInfo.preReviewResult === '1') { - return '预审通过' - } else if (this.addInfo.preReviewResult === '2') { - return '预审不通过' + if (this.addInfo.preReviewResult === this.options[0].value) { + return this.options[0].label + } else if (this.addInfo.preReviewResult === this.options[1].value) { + return this.options[1].label } else { return '' } @@ -270,39 +263,6 @@ padding: 0 20px; box-sizing: border-box; - .Dialog-input { - padding: 10px 20px; - display: flex; - - .inputContent { - margin-right: 30px; - display: flex; - flex: 1; - flex-direction: column; - - .inputBox { - width: 350px; - display: flex; - justify-content: space-between; - align-items: center; - } - } - } - - .imgContent { - margin: 20px; - display: flex; - - .img-box { - margin-right: 48px; - width: 100%; - height: 250px; - padding: 10px 40px; - border: 1px solid #000; - - } - } - .btnBox { padding: 30px; box-sizing: border-box; @@ -312,7 +272,7 @@ .save, .close { - width: 100px; + width: 200px; } } diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue index 41180e5..27ada19 100644 --- a/src/views/supplier/review.vue +++ b/src/views/supplier/review.vue @@ -3,33 +3,16 @@ 供应商编号 - + 供应商名称 - + 录库评审结果 - + + 查询 @@ -51,19 +34,19 @@ :row-style="{ 'text-align': 'center' }" style="width: 100%" > - + - - - + + + - - + + 历史评审 - + 录库评审 @@ -79,27 +62,26 @@ @setLimit="setLimit" /> - - + + - - diff --git a/src/views/supplier/inquiry.vue b/src/views/supplier/inquiry.vue index 99eb582..1f519f7 100644 --- a/src/views/supplier/inquiry.vue +++ b/src/views/supplier/inquiry.vue @@ -63,7 +63,7 @@ /> - + @@ -104,11 +104,8 @@ hitstoryDialog(row) { this.$refs.inquiryHis.initHistoryDialog(row) }, - inquiryHistoryDialogClose() { - this.isShowHistoryDialog = false - }, inquiryDialogClick(row) { - this.$refs.inquiryDia.initDialog(row) + this.$refs.inquiryDialog.initDialog(row) }, // 获取列表 getListPage(limit = 10, offset = 1) { diff --git a/src/views/supplier/inquiryDialog.vue b/src/views/supplier/inquiryDialog.vue index 4719ef3..35f16c5 100644 --- a/src/views/supplier/inquiryDialog.vue +++ b/src/views/supplier/inquiryDialog.vue @@ -1,7 +1,6 @@ - @@ -25,8 +24,8 @@ inactive-color="#ff4949" :active-text="options[0].label" :inactive-text="options[1].label" - :active-value="'1'" - :inactive-value="'2'" + :active-value="options[0].value" + :inactive-value="options[1].value" > @@ -39,14 +38,14 @@ - + - + - 上传资料预审结果 + 上传资料预审结果附件 @@ -88,18 +87,12 @@ import { getToday } from '@/utils/dateutils' export default { name: 'InquiryDialog', - props: { - dataInfo: { - type: Object, - dataInfo: {} - } - }, computed: { preReviewResult: function() { - if (this.addInfo.preReviewResult === '1') { - return '预审通过' - } else if (this.addInfo.preReviewResult === '2') { - return '预审不通过' + if (this.addInfo.preReviewResult === this.options[0].value) { + return this.options[0].label + } else if (this.addInfo.preReviewResult === this.options[1].value) { + return this.options[1].label } else { return '' } @@ -270,39 +263,6 @@ padding: 0 20px; box-sizing: border-box; - .Dialog-input { - padding: 10px 20px; - display: flex; - - .inputContent { - margin-right: 30px; - display: flex; - flex: 1; - flex-direction: column; - - .inputBox { - width: 350px; - display: flex; - justify-content: space-between; - align-items: center; - } - } - } - - .imgContent { - margin: 20px; - display: flex; - - .img-box { - margin-right: 48px; - width: 100%; - height: 250px; - padding: 10px 40px; - border: 1px solid #000; - - } - } - .btnBox { padding: 30px; box-sizing: border-box; @@ -312,7 +272,7 @@ .save, .close { - width: 100px; + width: 200px; } } diff --git a/src/views/supplier/review.vue b/src/views/supplier/review.vue index 41180e5..27ada19 100644 --- a/src/views/supplier/review.vue +++ b/src/views/supplier/review.vue @@ -3,33 +3,16 @@ 供应商编号 - + 供应商名称 - + 录库评审结果 - + + 查询 @@ -51,19 +34,19 @@ :row-style="{ 'text-align': 'center' }" style="width: 100%" > - + - - - + + + - - + + 历史评审 - + 录库评审 @@ -79,27 +62,26 @@ @setLimit="setLimit" /> - - + + + +