Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

src/components/Breadcrumb/index.vue

@@ -34,9 +34,9 @@ export default {
       let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
       const first = matched[0]
 
-      if (!this.isDashboard(first)) {
-        matched = [{ path: '/index', meta: { title: '风险态势分析图' }}].concat(matched)
-      }
+      // if (!this.isDashboard(first)) {
+      //   matched = [{ path: '/index', meta: { title: '风险态势分析图' }}].concat(matched)
+      // }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },

src/views/risk/plan/index.vue

@@ -33,6 +33,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择任务状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.task_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建人名称" prop="createUserName">
         <el-input
           v-model="queryParams.createUserName"
@@ -430,7 +444,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Plan",
-  dicts: ["risk_project_business"],
+  dicts: ["risk_project_business","task_status"],
   components: {
     Treeselect,
   },

src/views/risk/plan/ledger.vue

@@ -16,6 +16,20 @@
       <el-form-item label="项目名称" prop="projectName">
         <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择任务状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.task_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建人名称" prop="createUserName">
         <el-input v-model="queryParams.createUserName" placeholder="请输入创建人员名称" clearable
           @keyup.enter.native="handleQuery" />
@@ -68,7 +82,7 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="statusName" >
         <template slot-scope="scope">
-        
+
           <div>
           		<div v-if="scope.row.statusName=='项目完成'"><el-tag type="info">项目完成</el-tag></div>
           		<div v-else-if="scope.row.statusName=='审批任务'"><el-tag >审批任务</el-tag></div>
@@ -105,6 +119,7 @@
   import { deptTreeSelect } from "@/api/system/user";
   export default {
     name: "Plan",
+    dicts: ["task_status"],
   components: {
     Treeselect,
   },

src/views/riskLedger/detail.vue

@@ -128,6 +128,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.projectId=this.$route.params.projectId;
     this.getList();
     this.getExitList()
   },

src/views/system/user/index.vue

@@ -39,6 +39,15 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="用户昵称" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
@@ -408,6 +417,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
+        nickName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined
@@ -667,4 +677,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>