From 86ce55d0d76c5ad4373f3b23431261c6e08f243c Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 12 Aug 2022 15:46:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E2=80=8556933=20=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B-=E9=80=89=E6=8B=A9=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E5=A4=AA=E5=B0=91=20?=
 =?UTF-8?q?=E5=88=92=E5=88=B0=E6=9C=80=E5=BA=95=E4=B8=8B=E5=B0=B1=E6=B2=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=86=20=E5=BA=94=E8=AF=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=8420=E5=A4=9A=E8=B7=B3=20=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=9C=892000=E5=A4=9A=E4=B8=8D?=
 =?UTF-8?q?=E8=A1=8C=E5=8A=A0=E5=88=86=E9=A1=B5=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmqdqr/step1.vue       | 260 ++++++++++--------
 1 file changed, 142 insertions(+), 118 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 6b41912b7..b9103c71d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -232,122 +232,127 @@
       size="900px"
       custom-class="demo-drawer"
     >
-      <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
-            <div class="left">
-              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
-                <el-form-item label="管理主体" class="search-item search-item-last">
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.managementHostName"
-                             @change="optionsChange(projectSearch)"
-                             placeholder="请选择管理主体" filterable clearable>
-                    <el-option
-                      v-for="(item, index) in managementHostName"
-                      :key="index"
-                      :value="item"
-                      :label="item"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="开发主体" class="search-item search-item-last">
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.developmentHostName"  @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
-                    <el-option
-                      v-for="(item, index) in developmentHostName"
-                      :key="index"
-                      :value="item"
-                      :label="item"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="项目细分类" class="search-item search-item-last">
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.categoryName"  @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
-                    <el-option
-                      v-for="(item, index) in categoryName"
-                      :key="index"
-                      :value="item"
-                      :label="item"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="项目编号" class="search-item search-item-last">
-                  <el-input :disabled="disabledXX"
-                    v-model="projectSearch.projectNumber"
-                    placeholder="请输入项目编号"
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="项目名称" class="search-item search-item-last">
-                  <el-input :disabled="disabledXX"
-                    v-model="projectSearch.projectName"
-                    placeholder="请输入项目名称"
-                  ></el-input>
-                </el-form-item>
-                <el-form-item class="search-item btn-box">
-                  <el-button :disabled="disabledXX"
-                    type="primary"
-                    class="common-button-primary"
-                    size="small"
-                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="getProjectDataBtn">
-                    查询
-                  </el-button>
-                </el-form-item>
-                <el-form-item class="search-item btn-box">
-                  <el-button :disabled="disabledXX"
-                    class="common-button-default"
-                    size="small"
-                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-                    @click="clearSearch">清空
-                  </el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-            <el-table
-              :data="ProjectDatas"
-              tooltip-effect="dark"
-              style="width: 100%"
-              border
-              class="table-height"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+      <div class="standard-content">
+        <div class="content">
+          <div class="standard-table-search">
+            <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+              <el-form-item label="管理主体" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.managementHostName"
+                           @change="optionsChange(projectSearch)"
+                           placeholder="请选择管理主体" filterable clearable>
+                  <el-option
+                          v-for="(item, index) in managementHostName"
+                          :key="index"
+                          :value="item"
+                          :label="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="开发主体" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.developmentHostName"  @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
+                  <el-option
+                          v-for="(item, index) in developmentHostName"
+                          :key="index"
+                          :value="item"
+                          :label="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="项目细分类" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.categoryName"  @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
+                  <el-option
+                          v-for="(item, index) in categoryName"
+                          :key="index"
+                          :value="item"
+                          :label="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="项目编号" class="search-item search-item-last">
+                <el-input :disabled="disabledXX"
+                          v-model="projectSearch.projectNumber"
+                          placeholder="请输入项目编号"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" class="search-item search-item-last">
+                <el-input :disabled="disabledXX"
+                          v-model="projectSearch.projectName"
+                          placeholder="请输入项目名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button :disabled="disabledXX"
+                           type="primary"
+                           class="common-button-primary"
+                           size="small"
+                           v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                           @click="getProjectDataBtn">
+                  查询
+                </el-button>
+              </el-form-item>
+              <el-form-item class="search-item btn-box">
+                <el-button :disabled="disabledXX"
+                           class="common-button-default"
+                           size="small"
+                           v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                           @click="clearSearch">清空
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="standard-table-wrap">
+            <div style="height: calc(100% - 65px); ">
+              <div class="left">
+              </div>
+              <el-table
+                      :data="ProjectDatas"
+                      tooltip-effect="dark"
+                      style="width: 100%"
+                      border
+                      class="table-height"
+                      :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectProjectChange"
-              @select="handleSelectionChange"
-              ref="projectSelection"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center" />
-              <el-table-column
-                prop="projectNumber"
-                align="center"
-                label="项目编号"
-              />
-              <el-table-column
-                prop="projectName"
-                align="center"
-                label="项目名称"
-              />
-              <el-table-column
-                prop="projectClassification"
-                align="center"
-                label="项目分类"
-              />
-              <el-table-column
-                prop="uname"
-                align="center"
-                label="项目经理"
-              />
-            </el-table>
+                      @selection-change="selectProjectChange"
+                      @select="handleSelectionChange"
+                      ref="projectSelection"
+              >
+                <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center" />
+                <el-table-column
+                        prop="projectNumber"
+                        align="center"
+                        label="项目编号"
+                />
+                <el-table-column
+                        prop="projectName"
+                        align="center"
+                        label="项目名称"
+                />
+                <el-table-column
+                        prop="projectClassification"
+                        align="center"
+                        label="项目分类"
+                />
+                <el-table-column
+                        prop="uname"
+                        align="center"
+                        label="项目经理"
+                />
+              </el-table>
+            </div>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
           </div>
           <pagination
-            :page="page"
-            :pageSize="pageSize"
-            :total="total"
-            @pageChange="pageChange"
-            @pageSizeChange="pageSizeChange"
+                  :page="page"
+                  :pageSize="pageSize"
+                  :total="total"
+                  @pageChange="pageChange"
+                  @pageSizeChange="pageSizeChange"
           />
         </div>
       </div>
@@ -770,6 +775,7 @@ export default {
   },
   data() {
     return {
+      replaceLoading: false,
       disabledXX:!!this.$route.query.disabledXX,
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
@@ -1126,6 +1132,7 @@ export default {
     },
     //查询项目列表
     getProjectData() {
+      this.replaceLoading = true
       this.$http.get("sarStandProjectLibrary/queryProjectConfirm", {
         PageSize: this.pageSize,
         Page: this.page,
@@ -1135,8 +1142,9 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
+        this.replaceLoading = false
       }, e => {
-
+        this.replaceLoading = false
       });
     },
     //清空查询列表
@@ -1542,10 +1550,6 @@ export default {
       }
     }
   }
-  .table-height{
-    height: calc(~'100% - 65px');
-    overflow: auto;
-  }
   .drawer-table{
     /deep/.el-drawer__body{
       overflow-y: hidden;
@@ -1554,6 +1558,26 @@ export default {
       overflow-y: hidden;
     }
   }
+  .standard-content {
+    height: 92%;
+    padding: 10px 0 0;
+    .content {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 10px;
+      .standard-table-wrap {
+        flex: auto;
+        overflow-y: auto;
+      }
+      .pagination {
+        position: static;
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
+      }
+    }
+  }
 }
 </style>
 <style lang="less">