提交

ruoyi-ui/src/views/deptplan/index.vue

@@ -7,10 +7,26 @@
           type="year"
           value-format="yyyy"
           placeholder="选择年"
+          size="small"
           @keyup.enter.native="handleQuery"
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="部门" prop="sysDeptId">
+       <el-select
+         v-model="queryParams.sysDeptId"
+         placeholder="系统内置"
+         clearable
+         size="small"
+       >
+         <el-option
+           v-for="dict in typeOptionstwo"
+           :key="dict.deptId"
+           :label="dict.deptName"
+           :value="dict.deptId"
+         />
+       </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -101,10 +117,35 @@
     />
 
     <!-- 添加或修改 部门招商计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="年度" prop="year">
-          <el-input v-model="form.year" placeholder="请输入年度" />
+          <!-- <el-input v-model="form.year" placeholder="请输入年度" /> -->
+          <el-date-picker
+            v-model="form.year"
+            type="year"
+            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"
+           placeholder="系统内置"
+           clearable
+           size="small"
+           style="width: 100%;"
+         >
+           <el-option
+             v-for="dict in typeOptionstwo"
+             :key="dict.deptId"
+             :label="dict.deptName"
+             :value="dict.deptId"
+           />
+         </el-select>
         </el-form-item>
         <el-form-item label="计划" prop="plan">
           <el-input v-model="form.plan" placeholder="请输入计划" />
@@ -132,7 +173,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, exportPlan } from "@/api/deptplan/plan";
-
+import {listConfigfieu} from "@/api/system/config";
 export default {
   name: "Plan",
   components: {
@@ -168,17 +209,40 @@ export default {
         targetSigningNum: null,
         targetContractAmount: null,
         targetArrivalAmount: null,
-        targetInvestmentNum: null
+        targetInvestmentNum: null,
+        typeOptionstwo:[]
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+         targetSigningNum:[
+                  { required: true, message: '请输入目标签约数', trigger: 'change' }
+                ],
+        targetContractAmount:[
+                  { required: true, message: '请输入目标合同金额', trigger: 'change' }
+                ],
+        targetArrivalAmount:[
+                  { required: true, message: '请输入目标到资金额', trigger: 'change' }
+                ],
+        targetInvestmentNum:[
+                  { required: true, message: '请输入目标投产项目数', trigger: 'change' }
+                ],
+        plan:[
+                  { required: true, message: '请输入计划', trigger: 'change' }
+                ],
+        sysDeptId: [
+                    { required: true, message: '请选择部门', trigger: 'change' }
+                  ],
+        year: [
+                    { type: 'date', required: true, message: '请选择年份', trigger: 'change' }
+                  ],
       }
     };
   },
   created() {
     this.getList();
+    this.getListthuy()
   },
   methods: {
     /** 查询 部门招商计划列表 */
@@ -191,6 +255,17 @@ export default {
         this.loading = false;
       });
     },
+    //部门列表
+    getListthuy() {
+      this.loading = true;
+      listConfigfieu().then((response) => {
+        console.log(response);
+        this.typeOptionstwo = response.data;
+        // this.fileList =  this.queryParams.attachment
+        // this.total = response.total;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

ruoyi-ui/src/views/management/info/index.vue

@@ -54,7 +54,8 @@
       <el-table-column label="项目名称" align="center" prop="name" />
       <el-table-column label="总投资金额(万)" align="center" prop="totAmt" />
       <el-table-column label="填报单位" align="center" prop="deptName" />
-      <el-table-column label="审核情况" align="center" prop="remark" />
+      <el-table-column label="审核情况" align="center" prop="remark" >
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="dictLabel" />
       <el-table-column label="填报日期" width="180" align="center" prop="createTime" />
       <el-table-column label="操作" width="280" align="center" class-name="small-padding fixed-width">