armg 1 год назад
Родитель
Сommit
f1de96d019

+ 44 - 0
ruoyi-ui/src/api/invest/contract.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询合同管理列表
+export function listContract(query) {
+  return request({
+    url: '/invest/contract/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询合同管理详细
+export function getContract(id) {
+  return request({
+    url: '/invest/contract/' + id,
+    method: 'get'
+  })
+}
+
+// 新增合同管理
+export function addContract(data) {
+  return request({
+    url: '/invest/contract',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改合同管理
+export function updateContract(data) {
+  return request({
+    url: '/invest/contract',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除合同管理
+export function delContract(id) {
+  return request({
+    url: '/invest/contract/' + id,
+    method: 'delete'
+  })
+}

+ 44 - 0
ruoyi-ui/src/api/study/information.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询研究资料管理列表
+export function listInformation(query) {
+  return request({
+    url: '/study/information/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询研究资料管理详细
+export function getInformation(id) {
+  return request({
+    url: '/study/information/' + id,
+    method: 'get'
+  })
+}
+
+// 新增研究资料管理
+export function addInformation(data) {
+  return request({
+    url: '/study/information',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改研究资料管理
+export function updateInformation(data) {
+  return request({
+    url: '/study/information',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除研究资料管理
+export function delInformation(id) {
+  return request({
+    url: '/study/information/' + id,
+    method: 'delete'
+  })
+}

+ 4 - 6
ruoyi-ui/src/views/components/tableForm.vue

@@ -1070,20 +1070,18 @@
 <script>
 export default {
   props: {
-    // formType: {
-    //   type: Number,
-    //   default: 1, //1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
-    // },
+    formType: {
+      type: Number,
+      default: 1, //1=立项打分表 2=立项汇总表 3=投决打分表 4=投决汇总表
+    },
   },
   data() {
     return {
-      formType:1,
     };
   },
   mounted() {},
   created() {
     
-    this.formType = parseInt(this.$route.query.formType);
     // this.IdStr=this.$route.params.id;
   },
   methods: {},

+ 23 - 0
ruoyi-ui/src/router/index.js

@@ -109,13 +109,36 @@ export const constantRoutes = [
         name: 'investMeetingmpanyctsIndex',
         component: () => import('@/views/invest/meeting/index.vue')
       },
+      {
+        path: "meeting/mark",
+        name: 'investMeetingmpanyctsMark',
+        component: () => import('@/views/invest/meeting/mark.vue'),
+        meta: { title: '会议' }
+      },
       {
         path: 'information/index',
         component: () => import('@/views/invest/information/index'),
         name: 'investInformationIndex',
+      },
+      {
+        path: 'contract/index',
+        component: () => import('@/views/invest/contract/index'),
+        name: 'investContractIndex',
       }
     ]
   },
+  {
+    path: '/study',
+    component: Layout,
+    hidden: true,
+    children:[
+      {
+        path: 'information/index',
+        component: () => import('@/views/study/information/index.vue'),
+        name: 'studyInformationIndex',
+      },
+    ]
+  },
   
   {
     // path: '/index',

+ 306 - 0
ruoyi-ui/src/views/invest/contract/index.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="合同名称" prop="contractName">
+        <el-input
+          v-model="queryParams.contractName"
+          placeholder="请输入合同名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目ID" prop="projectPoolId">
+        <el-input
+          v-model="queryParams.projectPoolId"
+          placeholder="请输入项目ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目阶段" prop="projectStage">
+        <el-input
+          v-model="queryParams.projectStage"
+          placeholder="请输入项目阶段"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="会议编号" prop="meetingCode">
+        <el-input
+          v-model="queryParams.meetingCode"
+          placeholder="请输入会议编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['invest:contract:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['invest:contract:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['invest:contract:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['invest:contract:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="合同类别" align="center" prop="contractType" />
+      <el-table-column label="项目ID" align="center" prop="projectPoolId" />
+      <el-table-column label="项目阶段" align="center" prop="projectStage" />
+      <el-table-column label="会议编号" align="center" prop="meetingCode" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['invest:contract:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['invest:contract:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改合同管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="form.contractName" placeholder="请输入合同名称" />
+        </el-form-item>
+        <el-form-item label="项目ID" prop="projectPoolId">
+          <el-input v-model="form.projectPoolId" placeholder="请输入项目ID" />
+        </el-form-item>
+        <el-form-item label="项目阶段" prop="projectStage">
+          <el-input v-model="form.projectStage" placeholder="请输入项目阶段" />
+        </el-form-item>
+        <el-form-item label="会议编号" prop="meetingCode">
+          <el-input v-model="form.meetingCode" placeholder="请输入会议编号" />
+        </el-form-item>
+        <el-form-item label="状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="附件业务ID" prop="fileBusinessId">
+          <el-input v-model="form.fileBusinessId" placeholder="请输入附件业务ID" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/invest/contract";
+
+export default {
+  name: "Contract",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 合同管理表格数据
+      contractList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractName: null,
+        contractType: null,
+        projectPoolId: null,
+        projectStage: null,
+        meetingCode: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询合同管理列表 */
+    getList() {
+      this.loading = true;
+      listContract(this.queryParams).then(response => {
+        this.contractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        contractName: null,
+        contractType: null,
+        projectPoolId: null,
+        projectStage: null,
+        meetingCode: null,
+        delFlag: null,
+        fileBusinessId: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加合同管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getContract(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改合同管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateContract(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addContract(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除合同管理编号为"' + ids + '"的数据项?').then(function() {
+        return delContract(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('invest/contract/export', {
+        ...this.queryParams
+      }, `contract_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

+ 16 - 0
ruoyi-ui/src/views/invest/meeting/mark.vue

@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <tableForm :formType="formType"></tableForm>
+  </div>
+</template>
+<script>
+import tableForm from "@/components/tableForm";
+export default {
+  components: { tableForm },
+  data() {
+    return {
+      formType: 1,
+    };
+  },
+};
+</script>

+ 274 - 0
ruoyi-ui/src/views/study/information/index.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="资料名称" prop="contractName">
+        <el-input
+          v-model="queryParams.contractName"
+          placeholder="请输入资料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="附件业务ID" prop="fileBusinessId">
+        <el-input
+          v-model="queryParams.fileBusinessId"
+          placeholder="请输入附件业务ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['study:information:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['study:information:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['study:information:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['study:information:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="informationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="资料名称" align="center" prop="contractName" />
+      <el-table-column label="资料类别" align="center" prop="contractType" />
+      <el-table-column label="附件业务ID" align="center" prop="fileBusinessId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['study:information:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['study:information:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改研究资料管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="资料名称" prop="contractName">
+          <el-input v-model="form.contractName" placeholder="请输入资料名称" />
+        </el-form-item>
+        <el-form-item label="状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入状态" />
+        </el-form-item>
+        <el-form-item label="附件业务ID" prop="fileBusinessId">
+          <el-input v-model="form.fileBusinessId" placeholder="请输入附件业务ID" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInformation, getInformation, delInformation, addInformation, updateInformation } from "@/api/study/information";
+
+export default {
+  name: "Information",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 研究资料管理表格数据
+      informationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractName: null,
+        contractType: null,
+        fileBusinessId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询研究资料管理列表 */
+    getList() {
+      this.loading = true;
+      listInformation(this.queryParams).then(response => {
+        this.informationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        contractName: null,
+        contractType: null,
+        delFlag: null,
+        fileBusinessId: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加研究资料管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInformation(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改研究资料管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInformation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInformation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除研究资料管理编号为"' + ids + '"的数据项?').then(function() {
+        return delInformation(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('study/information/export', {
+        ...this.queryParams
+      }, `information_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>