Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

src/views/modules/communityService/measure/index.vue

@@ -17,7 +17,7 @@
             <el-form-item label="需求分类" prop="categoryCode">
               <el-cascader
                 v-model="searchForm.categoryCode"
-                :options="demandOptions"
+                :options="searchdemandOptions"
                 :props="{ checkStrictly: true }"
                 clearable
                 @change="handleCateCHange"></el-cascader>
@@ -411,7 +411,7 @@ export default {
           label: '已取消',
           value: 'canceled'
         }, {
-          label: '已派单',
+          label: '已指派',
           value: 'assigned'
         }, {
           label: '已接单',
@@ -448,6 +448,7 @@ export default {
       ],
       reportOptions: [],
       demandOptions: [],
+      searchdemandOptions: [],
       demandUserList: [],
       optionsG: [],
       optionsEditG: [],
@@ -918,6 +919,16 @@ export default {
       })
       return arr
     },
+    getFlagData(data, flag) {
+      if (!Array.isArray(data)) return []
+      let arr1 = data.filter(item => item[flag])
+      let arr2 = arr1.map(item => {
+        if (item.children) return { ...item, children: this.getFlagData(item.children, flag) }
+        else return item
+      })
+      // console.log('arrr-oppp', arr2)
+      return arr2
+    },
     async getGridList(type, agencyId) {
       const { user } = await this.$store.state
       console.log('user---ppp', user)
@@ -969,7 +980,8 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.demandOptions = this.getTreeData(res.data)
+            this.searchdemandOptions = this.getTreeData(res.data)
+            this.demandOptions = this.getFlagData(this.getTreeData(res.data), 'usableFlag')
           }
         })
         .catch(() => {