sr 4 lat temu
rodzic
commit
9b9b2a2e61

+ 15 - 8
ruoyi-ui/src/views/deptplan/index.vue

@@ -13,7 +13,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="部门" prop="sysDeptId">
-       <el-select
+        <el-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn" :show-all-levels="false"></el-cascader>
+      <!-- <el-select
          v-model="queryParams.sysDeptId"
          placeholder="请选择部门"
          clearable
@@ -24,7 +25,7 @@
            :key="dict.deptId"
            :label="dict.deptName"
            :value="dict.deptId"
-         />
+         /> -->
        </el-select>
       </el-form-item>
       <el-form-item>
@@ -127,13 +128,13 @@
             value-format="yyyy"
             placeholder="选择年"
             style="width: 100%;"
-            @keyup.enter.native="handleQuery"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="部门" prop="sysDeptId">
-         <el-select
-           v-model="form.sysDeptId"
+          <el-cascader :options="typeOptionstwo" :props="{value: 'id'}" @change="changeBtn1" :show-all-levels="false"></el-cascader>
+         <!-- <el-select
+
            placeholder="系统内置"
            clearable
            size="small"
@@ -145,7 +146,7 @@
              :label="dict.deptName"
              :value="dict.deptId"
            />
-         </el-select>
+         </el-select> -->
         </el-form-item>
         <el-form-item label="目标线索数" prop="plan">
           <el-input v-model="form.plan" placeholder="请输入目标线索数" />
@@ -198,6 +199,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      typeOptionstwo:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -245,10 +247,15 @@ export default {
     this.getListthuy()
   },
   methods: {
+    changeBtn(e){
+      this.queryParams.sysDeptId = e[2]
+    },
+    changeBtn1(e){
+      this.form.sysDeptId = e[2]
+    },
     /** 查询 部门招商计划列表 */
     getList() {
       this.loading = true;
-      debugger;
       listPlan(this.queryParams).then(response => {
         this.planList = response.rows;
         this.total = response.total;
@@ -259,7 +266,7 @@ export default {
     getListthuy() {
       this.loading = true;
       listConfigfieu().then((response) => {
-        console.log(response);
+        console.log(response.data)
         this.typeOptionstwo = response.data;
         // this.fileList =  this.queryParams.attachment
         // this.total = response.total;

+ 3 - 3
ruoyi-ui/src/views/system/dept/index.vue

@@ -171,9 +171,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
-        ],
+        // parentId: [
+        //   { required: true, message: "上级部门不能为空", trigger: "blur" }
+        // ],
         deptName: [
           { required: true, message: "部门名称不能为空", trigger: "blur" }
         ],