diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 61751a987..779be09ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -149,76 +149,77 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + + + + + + + + + +
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 31429b97f..fecc071a4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -11,7 +11,7 @@
审批历史
-
+
@@ -132,143 +132,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
- - -
- - -
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 4e537e0a6..a9b8e2959 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -10,7 +10,7 @@
人员信息
-
+
@@ -163,50 +163,49 @@ - - - -
-
- 添加 - 批量删除 -
-
- - - - - - - - - - - +
-
-
+ + + +
+
+ 添加 + 批量删除 +
+
+ + + + + + + + + + +
@@ -221,6 +220,8 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index ee767fa04..64aaa2992 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,55 +131,55 @@ - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + +
+ + +
+
+
- - -
- - -
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index cb4584e91..84d1538ad 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -15,7 +15,7 @@ -
+
- - - -
-
- 添加 - - 批量删除 - - - 批量分发落实人 - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + +
+
+ 添加 + + 批量删除 + + + 批量分发落实人 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -341,7 +342,7 @@ type="primary" class="common-button-primary" size="small" - @click="getProject"> + @click="getProjectBtn"> 查询 @@ -360,7 +361,7 @@ style="width: 100%" border ref="table" - height="100%" + class="table-height" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectThree" @@ -679,6 +680,10 @@ export default { } }, + getProjectBtn(){ + this.pageNo = 1, + this.getProject() + }, getProject() { this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { productLine: this.projectLineId, @@ -967,16 +972,14 @@ export default { padding: 0 20px 0; } } - + position: relative; + height: 100%; .choiceBtn { .el-button--primary { width: 150px; } } - position: relative; - height: 100%; - .headerTabs { height: 52px; display: flex; @@ -1035,6 +1038,10 @@ export default { .demo-drawer-content { margin-top: 10px; } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d53e467ad..ad6f211cc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,201 +131,201 @@ - - - -
-
- 批量编辑 - -
+
+ + + +
+
+ 批量编辑 +
- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
+ + +
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 913ab3266..47848c7d6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
- - -
- - -
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index a8c69fcbc..3452a93fc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
- - -
- - -
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index af28d33af..9b38a0e3c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -10,7 +10,7 @@
审批历史
-
+
@@ -131,143 +131,143 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
- - -
- - -
-
-