Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/system/config.js

@@ -27,15 +27,15 @@ export function listConfigtwo(query) {
 export function listConfigthert(query) {
   return request({
     url: '/projectInvestor/investor/list',
-    method: 'get'
-    // params:
+    method: 'get',
+    params:query
   })
 }
 export function listConfigfour(query) {
   return request({
     url: '/projectPersion/persion/list',
-    method: 'get'
-    // params:
+    method: 'get',
+    params:query
   })
 }
 //字典

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

@@ -15,7 +15,7 @@
       <el-form-item label="部门" prop="sysDeptId">
        <el-select
          v-model="queryParams.sysDeptId"
-         placeholder="系统内置"
+         placeholder="请选择部门"
          clearable
          size="small"
        >

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

@@ -54,13 +54,17 @@
       <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">
+        <template slot-scope="scope">
+          <div v-html="scope.row.remark"></div>
+        </template>
       </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">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;"  v-hasPermi="['projectInfo:info:edit']" @click="chei(scope.row)" >查看/审核</el-button>
+          <el-button size="mini" type="text" style="background: #0669B2;color: #FFF;padding: 7px;" v-hasPermi="['projectInfo:info:edit']"
+            @click="chei(scope.row)">查看/审核</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> -->

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

@@ -846,6 +846,7 @@ export default {
           });
         })
         .then(() => {
+          this.$router.go(-1);
           this.getList();
           this.msgSuccess("审核成功");
         });
@@ -865,6 +866,7 @@ export default {
           });
         })
         .then(() => {
+          this.$router.go(-1);
           this.getList();
           this.msgSuccess("驳回成功");
         });

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

@@ -192,7 +192,16 @@ export default {
     } else {
       this.naueactive = this.$route.query.setrd - 0 - 1;
     }
-    console.log(this.naueactive);
+    this.tabIndex = this.$route.query.tabIndex-0 || 0
+    if(this.tabIndex==0){
+      this.currentContent = 'one'
+    }else if(this.tabIndex==2){
+      this.currentContent = 'four'
+    }else if(this.tabIndex==3){
+      this.currentContent = 'two'
+    }else if(this.tabIndex==4){
+      this.currentContent = 'three'
+    }
     this.getList();
     this.getDicts("sys_yes_no").then((response) => {
       this.typeOptions = response.data;
@@ -329,6 +338,7 @@ export default {
     changeTab(index) {
       console.log(34);
       this.tabIndex = index.index;
+      
       this.currentContent = index.component;
       // this.$router.push('/tab');
     },

ruoyi-ui/src/views/statistical/clue/index.vue

@@ -116,8 +116,15 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 1,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {
@@ -177,7 +184,7 @@
     scrollbar-width: none;
     /* firefox */
     -ms-overflow-style: none;
-    
+
     /* IE 10+ */
     &::-webkit-scrollbar {
       display: none;

ruoyi-ui/src/views/statistical/putProduction/index.vue

@@ -112,8 +112,15 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 4,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {

ruoyi-ui/src/views/statistical/sign/index.vue

@@ -136,8 +136,15 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 2,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {

ruoyi-ui/src/views/statistical/underConstruction/index.vue

@@ -116,8 +116,15 @@
           this.unitList = res.rows
         })
       },
-      dec_btn() {
-
+      dec_btn(row) {
+        this.$router.push({
+          path: '/management/row/index',
+          query: {
+            setid: row.id,
+            setrd: row.projectStatus,
+            tabIndex: 3,
+          },
+        })
       },
       bh_brn(scope) {
         this.$confirm('是否确认销号', "提醒", {

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

@@ -107,7 +107,7 @@
         <el-table-column
           label="身份证号码"
           align="center"
-          prop="idCode"
+          prop="idcode"
           :show-overflow-tooltip="true"
         />
         <el-table-column label="联系方式" align="center" prop="phone" />
@@ -830,6 +830,11 @@ export default {
             message: "投资方联系方式不能为空",
             trigger: "blur",
           },
+          {
+            pattern: /^0{0,1}(13[0-9]|15[7-9]|153|156|18[7-9])[0-9]{8}$/,
+            message: "手机号格式不对",
+            trigger: "blur",
+          }
         ],
         needAmt: [
           { required: true, message: "预计投资额不能为空", trigger: "blur" },
@@ -870,11 +875,15 @@ export default {
       ntry: [],
       // 判断是修改还是增加
       sbuen: 0, //0  新增   1  修改
+      jeutu:{
+        bmProjectId:0
+      }
       // id:0
     };
   },
   created() {
     this.bmProjectId = this.$route.query.setid;
+    this.jeutu.bmProjectId = this.bmProjectId
     this.setrd = this.$route.query.setrd;
     console.log(this.bmProjectId);
     this.getList();
@@ -902,6 +911,7 @@ export default {
           });
         })
         .then(() => {
+          this.$router.go(-1);
           this.getList();
           this.msgSuccess("审核成功");
         });
@@ -921,6 +931,7 @@ export default {
           });
         })
         .then(() => {
+          this.$router.go(-1);
           this.getList();
           this.msgSuccess("驳回成功");
         });
@@ -1018,6 +1029,7 @@ export default {
           // this.queryParams.phone = 987
           console.log(this.queryParams, 98755);
           // this.queryParams = this.queryParams.bmProjectId
+          this.fileListhye = []
           this.fileListhye = this.queryParams.attachment.split(",");
           for (var i = 0; i < this.fileListhye.length; i++) {
             this.fileList.push({
@@ -1036,7 +1048,7 @@ export default {
     //企业列表
     getListtwo() {
       this.loading = true;
-      listConfigthert().then((response) => {
+      listConfigthert(this.jeutu).then((response) => {
         console.log(response);
         this.configList = response.rows;
         // this.fileList =  this.queryParams.attachment
@@ -1047,7 +1059,7 @@ export default {
     //自然人列表
     getListther() {
       this.loading = true;
-      listConfigfour(this.bmProjectId).then((response) => {
+      listConfigfour(this.jeutu).then((response) => {
         console.log(response.rows);
         this.configListtwoL = response.rows;
         // this.fileList =  this.queryParams.attachment