Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/projectInfo/info.js

@@ -1,4 +1,30 @@
 import request from '@/utils/request'
+
+// 审核/提交项目
+export function setExamine(data) {
+  return request({
+    url: '/bmProject/project/examine',
+    method: 'post',
+    data: data
+  })
+}
+// 驳回项目
+export function setReject(data) {
+  return request({
+    url: '/bmProject/project/reject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 项目管理-线索添加
+export function listProject(data) {
+  return request({
+    url: '/bmProject/project',
+    method: 'post',
+    data: data
+  })
+}
 
 // 查询项目-线索信息列表
 export function listInfo(query) {
@@ -38,7 +64,7 @@ export function updateInfo(data) {
 // 删除项目-线索信息
 export function delInfo(id) {
   return request({
-    url: '/projectInfo/info/' + id,
+    url: '/bmProject/project/' + id,
     method: 'delete'
   })
 }
@@ -50,4 +76,4 @@ export function exportInfo(query) {
     method: 'get',
     params: query
   })
-}
+}

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

@@ -13,7 +13,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="状态" prop="projectStatus">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+        <el-select v-model="queryParams.projectStatus" placeholder="请选择状态" clearable size="small">
           <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
@@ -29,10 +29,10 @@
         <el-button type="primary" plain style="background-color: #1C84C6;color: #fff;border: none;" size="mini" @click="handleAdd"
           v-hasPermi="['projectInfo:info:add']">添加线索</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
           v-hasPermi="['projectInfo:info:edit']">修改</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['projectInfo:info:remove']">销号</el-button>
@@ -55,14 +55,14 @@
       <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="dictLabel"/>
-      <el-table-column label="填报日期"  width="180" align="center" prop="createTime" />
+      <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">
         <template slot-scope="scope">
           <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">查看/审核</el-button>
-          <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">提交审核</el-button>
-          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" @click="handleUpdate(scope.row)"
-            v-hasPermi="['projectInfo:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" style="background: #3FBCEF;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+            @click="infoBtn(scope.row)">{{scope.row.projectStatus%2==1?'提交审核':'撤销审核'}}</el-button>
+          <el-button size="mini" type="text" style="background: #F5A40C;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']">修改</el-button>
           <el-button size="mini" type="text" style="background: #DE1939;color: #FFF;padding: 7px;" @click="handleDelete(scope.row)"
             v-hasPermi="['projectInfo:info:remove']">销号</el-button>
         </template>
@@ -71,8 +71,8 @@
 
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-    <el-dialog title="添加线索"  :visible.sync="flags" append-to-body>
-      <el-form ref="forms" :model="xs_form" :rules="xs_rules" label-width="80px">
+    <el-dialog title="添加线索" :visible.sync="flags" append-to-body>
+      <el-form ref="forms" :model="xs_form" :rules="xs_rules" label-width="100px">
         <el-form-item label="名称:" prop="name">
           <el-input v-model="xs_form.name" placeholder="请输入项目名称" />
         </el-form-item>
@@ -81,22 +81,22 @@
             <el-checkbox label="首位产业" name="type"></el-checkbox>
             <el-checkbox label="战略新兴" name="type"></el-checkbox>
           </el-checkbox-group>
-        </el-form-item>
-        <el-form-item label="所属行业:" prop="industry">
-              <el-radio-group v-model="xs_form.industry">
-                <el-radio :label="item.dictLabel" :value="item.dictValue" v-for="item in industryOptions"></el-radio>
-              </el-radio-group>
-        </el-form-item>
-        <el-form-item label="名称:" prop="name">
-          <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
-            <el-option label="是" value="Y" />
-            <el-option label="否" value="N" />
-          </el-select>
         </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>
+        <el-form-item label="所属行业:" prop="industry">
+          <el-radio-group v-model="xs_form.industry">
+            <el-radio :label="item.dictLabel" :value="item.dictValue" v-for="item in industryOptions"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="状态:" prop="isBackbussiness">
+          <el-select v-model="xs_form.isBackbussiness" placeholder="请选择状态" clearable size="small">
+            <el-option label="是" value="Y" />
+            <el-option label="否" value="N" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="xs_submit">确 定</el-button>
+        <el-button @click="flags=false">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 添加或修改项目-线索信息对话框 -->
@@ -181,12 +181,15 @@
 </template>
 
 <script>
-  import {
+  import {
+    setReject,
+    setExamine,
     listInfo,
     getInfo,
     delInfo,
     addInfo,
     updateInfo,
+    listProject,
     exportInfo
   } from "@/api/projectInfo/info";
   let vm = ''
@@ -197,12 +200,33 @@
     data() {
       vm = this
       return {
-        xs_form: {
-          industryCategory: []
-        },
+        xs_form: {
+          industryCategory: []
+        },
         flags: false,
-        xs_rules: {},
-        times: '',
+        xs_rules: {
+          name: [{
+            required: true,
+            message: "名称不能为空",
+            trigger: "blur"
+          }],
+          industryCategory: [{
+            required: true,
+            message: "请选择产品类别",
+            trigger: "blur"
+          }],
+          industry: [{
+            required: true,
+            message: "请选择所属行业",
+            trigger: "blur"
+          }],
+          isBackbussiness: [{
+            required: true,
+            message: "状态不能为空",
+            trigger: "blur"
+          }],
+        },
+        times: '',
         industryOptions: [],
         statusOptions: [],
         // 遮罩层
@@ -260,9 +284,9 @@
     created() {
       this.getDicts('project_status').then(res => {
         this.statusOptions = res.data
-      })
-      this.getDicts('project_industry').then(res => {
-        this.industryOptions = res.data
+      })
+      this.getDicts('project_industry').then(res => {
+        this.industryOptions = res.data
       })
       this.getList();
     },
@@ -278,6 +302,51 @@
       }
     },
     methods: {
+      infoBtn(scrop) {
+        console.log()
+        if (scrop.projectStatus % 2 == 1) {
+          this.$confirm('是否确认提交审核', "提醒", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+            return setExamine({
+              code: 1,
+              bmProjectId: scrop.id
+            });
+          }).then(() => {
+            this.getList();
+            this.msgSuccess("提交成功");
+          })
+        } else {
+          this.$confirm('是否确认撤销审核', "提醒", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+            return setReject({
+              code: 2,
+              bmProjectId: scrop.id
+            });
+          }).then(() => {
+            this.getList();
+            this.msgSuccess("提交成功");
+          })
+        }
+      },
+      xs_submit() {
+        this.$refs["forms"].validate(valid => {
+          if (valid) {
+            let data = JSON.parse(JSON.stringify(this.xs_form))
+            data.industryCategory = data.industryCategory.join(',')
+            listProject(data).then(res => {
+              this.msgSuccess("添加成功");
+              this.flags = false;
+              this.getList();
+            })
+          }
+        });
+      },
       tiemsChange(e) {
         console.log(e, this.times)
         if (this.times) {
@@ -356,8 +425,7 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
-        this.open = true;
-        this.title = "添加项目-线索信息";
+        this.flags = true;
       },
       /** 修改按钮操作 */
       handleUpdate(row) {