From d6faf236f66202c42c390b03419a4add442cce52 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 5 Aug 2022 18:07:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E2=80=8556832=20=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E7=BA=A2=E6=A1=86=E9=87=8C=E8=BE=B9=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step1.vue        | 196 ++++++++++++++----
 1 file changed, 161 insertions(+), 35 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 96029a19b..8016bfce5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -250,40 +250,84 @@
       custom-class="demo-drawer"
     >
       <div class="standard-content">
-        <div class="content">
+        <div class="content" style="overflow-x: hidden">
           <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-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
-                        :loading="searching"
-                        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
-                        class="common-button-default"
-                        size="small"
-                        v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-                        @click="clearSearch">清空
-                </el-button>
-              </el-form-item>
+              <el-row :gutter="24">
+                <el-col :span="6">
+                  <el-form-item label="管理主体" class="search-item search-item-last">
+                    <el-input :disabled="disabledXX"
+                              v-model="projectSearch.managementHostName"
+                              placeholder="请输入管理主体"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="开发主体" class="search-item search-item-last">
+                    <el-input :disabled="disabledXX"
+                              v-model="projectSearch.developmentHostName"
+                              placeholder="请输入开发主体"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="项目群" class="search-item search-item-last">
+                    <el-input :disabled="disabledXX"
+                              v-model="projectSearch.projectGroup"
+                              placeholder="请输入项目群"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="项目状态" class="search-item search-item-last">
+                    <el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" clearable>
+                      <el-option
+                              v-for="opr in xmztOptions"
+                              :key="opr.value"
+                              :value="opr.label"
+                              :label="opr.label"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <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-col>
+                <el-col :span="6">
+                  <el-form-item label="项目细分类" class="search-item search-item-last">
+                    <el-input :disabled="disabledXX"
+                              v-model="projectSearch.categoryName"
+                              placeholder="请输入项目细分类"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item class="search-item btn-box" style="margin-top: 39px;">
+                    <el-button
+                            :loading="searching"
+                            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" style="margin-top: 39px;">
+                    <el-button
+                            class="common-button-default"
+                            size="small"
+                            v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                            @click="clearSearch">清空
+                    </el-button>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-form>
           </div>
           <div class="standard-table-wrap">
@@ -303,6 +347,35 @@
                       type="selection"
                       width="55"
                       align="center" />
+              <el-table-column
+                      prop="managementHostName"
+                      align="center"
+                      width="120"
+                      label="管理主体"
+              />
+              <el-table-column
+                      prop="developmentHostName"
+                      align="center"
+                      width="120"
+                      label="开发主体"
+              />
+              <el-table-column
+                      prop="categoryName"
+                      align="center"
+                      width="120"
+                      label="项目细分类"
+              />
+              <el-table-column
+                      prop="projectGroup"
+                      align="center"
+                      width="100"
+                      label="项目群"
+              />
+              <el-table-column
+                      prop="projectNumber"
+                      align="center"
+                      label="项目编号"
+              />
               <el-table-column
                       prop="projectNumber"
                       align="center"
@@ -311,11 +384,13 @@
               <el-table-column
                       prop="projectName"
                       align="center"
+                      width="250"
                       label="项目名称"
               />
               <el-table-column
                       prop="projectClassification"
                       align="center"
+                      width="120"
                       label="项目分类"
               />
               <el-table-column
@@ -349,6 +424,7 @@ import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process";
 import file from "@/pages/knowledgeGraph/components/file";
+import {solostarData} from "@/api/unqualProcess";
 
 export default {
   name: "xmpg2Step1",
@@ -361,6 +437,11 @@ export default {
     return {
       disabledXX:!!this.$route.query.disabledXX,
       replaceLoading: false,
+      // 项目分类数组
+      notProjectData: [],
+      projectStatus: [],
+      projectData: [],
+      notProjectStatus: [],
       active: "1",  //当前选中的type
       isSubmit: false,
       saveLoading: false,
@@ -423,8 +504,13 @@ export default {
       //项目检索条件
       projectSearch: {
         projectNumber: "",
-        projectName: ""
+        projectName: "",
+        managementHostName: "",
+        developmentHostName: "",
+        categoryName: "",
+        projectGroup: "",
       },
+      xmztOptions: [],
       //项目数据
       ProjectDatas: [],
       page: 1,
@@ -722,11 +808,41 @@ export default {
         this.commentText = mes.commentText
       })
     },
+    selectSort() {
+      solostarData().then(res => {
+        res.data.MaintenanceProjectClassification.forEach((item, index) => {
+          this.projectData.push({
+            label: item,
+            value: index
+          })
+        })
+        res.data.MaintenanceProjectStatus.forEach((item, index) => {
+          this.projectStatus.push({
+            label: item,
+            value: index
+          })
+          this.xmztOptions = this.projectStatus
+        })
+        res.data.notMaintenanceProjectClassification.forEach((item, index) => {
+          this.notProjectData.push({
+            label: item,
+            value: index
+          })
+        })
+        res.data.notMaintenanceProjectStatus.forEach((item, index) => {
+          this.notProjectStatus.push({
+            label: item,
+            value: index
+          })
+        })
+      })
+    }
   },
   mounted() {
     if(this.$route.query.bpnId){
       this.getTaskId()
     }
+    this.selectSort()
     this.getProjectData();
     // 查询各下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -759,6 +875,16 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 
+/deep/ .el-form-item{
+  margin-bottom: 9px !important;
+}
+/deep/ .el-drawer__body{
+  overflow-y: auto !important;
+}
+/deep/ .demo-drawer-footer{
+  height: 5% !important;
+}
+
 .xmpg2-step1 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -831,8 +957,8 @@ export default {
   }
 
   .standard-content {
-    height: 100%;
-    padding: 10px 0 0;
+    height: 91%;
+    padding: 10px 0 0 0;
     .content {
       height: 100%;
       display: flex;