Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -236,6 +236,41 @@
           <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 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 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 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
                     v-model="projectSearch.projectNumber"
@@ -253,7 +288,7 @@
                     type="primary"
                     class="common-button-primary"
                     size="small"
-                    v-btn-permission=""
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
                     @click="getProjectDataBtn">
                     查询
                   </el-button>
@@ -262,7 +297,7 @@
                   <el-button
                     class="common-button-default"
                     size="small"
-                    v-btn-permission=""
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
                     @click="clearSearch">清空
                   </el-button>
                 </el-form-item>
@@ -794,10 +829,16 @@ export default {
         carType: "",
         detailedListName: ""
       },
+      managementHostName: [], //管理主体名称下拉框
+      developmentHostName: [], //开发主体名称下拉框
+      categoryName: [], //项目细分类下拉框
+      //项目检索条件
       projectSearch: {
         projectNumber: "",
-        projectName: ""
-
+        projectName: "",
+        managementHostName: "", //管理主体
+        developmentHostName: "", //开发主体
+        categoryName: "" //项目细分类
       },
       qdform: {
         projectId:"",
@@ -838,6 +879,32 @@ export default {
     };
   },
   methods: {
+    optionsChange(){
+      /**
+       * 获取项目群筛选项的值
+       */
+      this.$http.post("sarStandProjectLibrary/querySelect", {
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        res.data.managementHostList.forEach(item => {
+          if (item) {
+            this.managementHostName.push(item);   //管理主体
+          }
+        });
+        res.data.developmentHostList.forEach(item => {
+          if (item) {
+            this.developmentHostName.push(item);   //开发主体
+          }
+        });
+        res.data.categoryList.forEach(item => {
+          if (item) {
+            this.categoryName.push(item);   //项目细分类
+          }
+        });
+      });
+    },
     formatIssueDate(str) {
       const momentDate = this.$moment(str)
       if (momentDate.isValid()) {
@@ -1330,6 +1397,7 @@ export default {
     },
   },
   mounted() {
+    this.optionsChange()
     if(this.$route.query.bpnId){
       this.bpnId = this.$route.query.bpnId
         queryTaskFirst({