diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index ffbe8a46c..1f23010b6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -277,9 +277,6 @@ export default {
nextStatus: ""
},
formRules: {
- nextStatus: [
- { required: true, message: "", trigger: "change" }
- ]
},
associationOptions: [{
value: "修订",
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 33ebc9065..22bd02fd2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -206,7 +206,7 @@
type="primary"
size="mini"
class="common-button-primary"
- @click="QYBZget">查询
+ @click="QYBZgetBtn">查询
@@ -753,6 +753,10 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
+ QYBZgetBtn(){
+ this.QYBZform.page = 1
+ this.QYBZget()
+ },
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
}
}
}
+ .table-height{
+ height: calc(~'100% - 65px');
+ overflow: auto;
+ }
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 186d5cb50..8e5d7073e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -372,7 +372,7 @@
type="primary"
size="mini"
class="common-button-primary"
- @click="QYBZget">查询
+ @click="QYBZgetBtn">查询
@@ -858,7 +858,7 @@ export default {
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
- this.$message.warning('请选择一条标准')
+ this.$message.warning('您只能选择一条标准进行带入')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
@@ -879,6 +879,11 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
+ //企业标准查询
+ QYBZgetBtn(){
+ this.QYBZform.page = 1
+ this.QYBZget()
+ },
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -1170,5 +1175,9 @@ export default {
}
}
}
+ .table-height{
+ height: calc(~'100% - 65px');
+ overflow: auto;
+ }
}