diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 7463fc5a6..8404410b8 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -13,7 +13,7 @@ style="height: 10px;width: 10px;margin-bottom: 3px" :src="item.icon" v-if="index < 5"> - + {{ item.name.slice(0, 8) + '...' }} {{ item.name }} @@ -33,7 +33,7 @@ style="height: 10px;width: 10px;margin-bottom: 3px" :src="item.icon" v-if="index < 5"> - + {{ item.name.slice(0, 8) + '...' }} {{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 9c254a3a2..6eda29949 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -31,7 +31,7 @@ > - + @@ -47,6 +47,7 @@ - + @@ -88,6 +89,7 @@ - + @@ -47,6 +47,7 @@ - - + + @@ -96,6 +97,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index bf18da11c..f5edd9808 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -191,10 +191,10 @@ export default { {required: true, message: '请输入企标名称', trigger: 'blur'}, ], planStatus: [ - {required: true, message: '请选择计划状态', trigger: 'change'}, + {required: true, message: '请选择计划状态', trigger: 'blur'}, ], reviseStatus: [ - {required: true, message: '请选择制修订状态', trigger: 'change'}, + {required: true, message: '请选择制修订状态', trigger: 'blur'}, ], resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index c22a3a49c..168e4d9bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -532,11 +532,15 @@ export default { this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--' this.standShow = true }else{ - this.qbfsForm.esId2 = this.selectList[0].id || '--' - this.qbfsForm.esName2 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' - this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' - this.standShow2 = true + if(this.qbfsForm.esName1 === this.selectList[0].esName ){ + this.$message.warning('您选择的合并企标已经存在,请更改!') + }else{ + this.qbfsForm.esId2 = this.selectList[0].id || '--' + this.qbfsForm.esName2 = this.selectList[0].esName || '--' + this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--' + this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--' + this.standShow2 = true + } } this.ListModel = false } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index f26e7448b..923dfb9f3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -31,7 +31,7 @@ > - + @@ -47,6 +47,7 @@ - + @@ -87,6 +88,7 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 413010df3..167f1f909 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -12,10 +12,11 @@
- + @@ -54,6 +55,7 @@
+ 数据加载中...
@@ -273,7 +275,9 @@ export default { commentText: "", comName: "merge", qbfsForm: {}, + formLoading: false, approvalFlag: false, + showFlag: true, taskId: '', bpnId: '', drawerTitle: "", @@ -316,8 +320,8 @@ export default { if(this.taskId){ this.approvalFlag = true this.processTable() + this.getData(); } - this.getData(); }, methods: { processTable() { @@ -344,6 +348,8 @@ export default { }); }, getData() { + this.formLoading = true + this.showFlag = false return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.$route.query.taskIds, @@ -362,7 +368,25 @@ export default { */ getFormFieldList(item) { this.$nextTick(() => { + switch (item.type){ + case '1': + this.comName = "merge" + break + case '2': + this.comName = "delay" + break + case '3': + this.comName = "cancel" + break + case '4': + this.comName = "rename" + break + case '5': + this.comName = "establish" + break + } this.qbfsForm = item; + this.formLoading = false; this.roleForm.dockUser = item.dockUser; this.roleForm.dockUserName = item.dockUserName; this.roleForm.countersigner = item.countersigner; @@ -446,6 +470,7 @@ export default { if (valid) { this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); + console.log(json); this.$http.get("lawss/activiti/startProcess", { type: "25" }, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index e479a69a8..0026498a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -39,21 +39,21 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 57e57c3f0..de246c9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -36,24 +36,24 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 7fd695344..af33fe90f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -36,24 +36,24 @@ - + - + - + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 903dbd509..cd20356b2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -36,24 +36,24 @@ - + - + - + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index dee7151d1..ab065ceaf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -124,7 +124,8 @@ export default { @import '~@/assets/styles/mixins'; #accessStandardsAndRegulations { - height: 100%; + //min-height: calc(100% - 20px); + height: inherit; padding: 0 10px; background: #fff; display: flex; @@ -147,7 +148,7 @@ export default { flex-direction: column; .el-tab-pane { - height: 100%; + height: 10px; flex: auto; display: flex; flex-direction: column; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 49b0ddd9d..5f82860d2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -67,95 +67,97 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -394,9 +396,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -404,10 +408,14 @@ export default { position: relative; flex: auto; width: 100%; - height: calc(100% - 110px) !important; + //height: calc(100% - 110px) !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 3faec3093..26a325bda 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -58,98 +58,100 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + + +
数据获取中 @@ -374,9 +376,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -385,8 +389,12 @@ export default { flex: auto; width: 100%; //height: calc(~'100% - 105px - 56px') !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 032525351..2cdd5f528 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -68,88 +68,90 @@
数据获取中 - + - - - - - - - - - - - - + + + + + + + + + + +
数据获取中 @@ -427,9 +429,11 @@ export default { @import '~@/assets/styles/mixins'; #listOfCountries { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; .container { display: flex; @@ -438,8 +442,12 @@ export default { flex: auto; width: 100%; //height: calc(~'100% - 105px - 56px') !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 734d5021f..5d8122512 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -57,65 +57,67 @@
数据获取中 - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
数据获取中 @@ -1370,9 +1372,11 @@ export default { @import '~@/assets/styles/style'; @import '~@/assets/styles/mixins'; #listTracking { - height: 100%; + //height: 100%; display: flex; flex-direction: column; + min-height: calc(100% - 100px); + overflow-y: auto; /deep/.el-form-item__label{ color: #333333; } @@ -1382,9 +1386,12 @@ export default { position: relative; flex: auto; width: 100%; - height: calc(100% - 110px) !important; + height: calc(~'100% - 30px'); + .table_info { + height: calc(70vh - 90px); + } .pagination { - position: static; + position: inherit; /deep/ .pagination-slot { padding: 0; } diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index b100be5e9..cfe589da2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -83,13 +83,14 @@ - + @@ -208,6 +209,7 @@ +