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

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -855,7 +855,9 @@ export default {
 
       // 项目分类数组
       notProjectData: [],
-      projectData: []
+      projectStatus: [],
+      projectData: [],
+      notProjectStatus: [],
     };
   },
   methods: {
@@ -879,7 +881,7 @@ export default {
     // 获取标准类别List数据
     getAllInforList() {
       this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
-        this.xmztOptions = res.data.XMZT;
+        // this.xmztOptions = res.data.XMZT;
         this.scxxOptions = res.data.SCXX;
         this.countryList = res.data.COUNTRY;
         this.energyKindOptions = res.data.ENERGYTYPES;
@@ -1213,10 +1215,12 @@ export default {
         if (this.localProTableSearch.prodectCode === "Maintenance") {
           this.localProTableList = res.data.Maintenance.records;
           this.productTypeOptions = this.projectData
+          this.xmztOptions = this.projectStatus
           this.total = res.data.Maintenance.total;
         } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
           this.localProTableList = res.data.notMaintenance.records;
           this.productTypeOptions = this.notProjectData
+          this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
         // this.localProTableList.map((item) => {
@@ -1546,18 +1550,30 @@ export default {
     },
     selectSort() {
       solostarData().then(res=>{
-        res.data.MaintenanceProjectStatus.forEach((item, index)=>{
+        res.data.MaintenanceProjectClassification.forEach((item, index)=>{
           this.projectData.push({
             label: item,
             value: index
           })
         })
-        res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
+        res.data.MaintenanceProjectStatus.forEach((item, index)=>{
+          this.projectStatus.push({
+            label: item,
+            value: index
+          })
+        })
+        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
+          })
+        })
       })
     }
   },