Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/ProjectDec/SignContract.vue

@@ -1300,6 +1300,7 @@ export default {
   methods: {
     //审核
     applyBtn() {
+      var that=this
       this.$confirm("是否确认审核", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1308,7 +1309,7 @@ export default {
         .then(function () {
           return setExamine({
             code: 3,
-            bmProjectId: this.queryParams.bmProjectId,
+            bmProjectId: that.queryParams.bmProjectId,
           });
         })
         .then(() => {
@@ -1318,6 +1319,7 @@ export default {
     },
     //驳回
     backBtn() {
+      var that=this
       this.$confirm("是否确认驳回", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1326,7 +1328,7 @@ export default {
         .then(function () {
           return setReject({
             code: 2,
-            bmProjectId: this.queryParams.bmProjectId,
+            bmProjectId: that.queryParams.bmProjectId,
           });
         })
         .then(() => {

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

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目名称" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable size="small" @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item label="填报单位" prop="deptName">
         <el-input v-model="queryParams.deptName" placeholder="请输入填报单位" clearable size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="项目名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="填报日期" prop="addtime">
         <el-date-picker value-format="yyyy-MM-dd" @change="tiemsChange" v-model="times" type="daterange"
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="状态" prop="projectStatus">
-        <el-select v-model="queryParams.projectStatus" placeholder="请选择状态"  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>
@@ -89,8 +89,8 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="返乡创业:" prop="isBackbussiness">
-          <el-select v-model="xs_form.isBackbussiness" placeholder="请选择状态"  size="small">
+        <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>
@@ -284,7 +284,6 @@
       };
     },
     created() {
-      this.xs_form.isBackbussiness = "N"
       this.getDicts('project_status').then(res => {
         this.statusOptions = res.data
       })

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

@@ -810,6 +810,7 @@ export default {
   methods: {
     //审核
     applyBtn() {
+      var that=this
       this.$confirm("是否确认审核", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -818,7 +819,7 @@ export default {
         .then(function () {
           return setExamine({
             code: 3,
-            bmProjectId: this.bmProjectId,
+            bmProjectId: that.bmProjectId,
           });
         })
         .then(() => {
@@ -828,6 +829,7 @@ export default {
     },
     //驳回
     backBtn() {
+      var that=this
       this.$confirm("是否确认驳回", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -836,7 +838,7 @@ export default {
         .then(function () {
           return setReject({
             code: 2,
-            bmProjectId: this.bmProjectId,
+            bmProjectId: that.bmProjectId,
           });
         })
         .then(() => {
@@ -1140,6 +1142,7 @@ export default {
     handleAdd(index) {
       this.numhu = index;
       this.reset();
+      this.fileListtherrt = []
       if (this.numhu == 0) {
         this.open = true;
       } else if (this.numhu == 2) {
@@ -1367,6 +1370,7 @@ export default {
     quipment(index) {
       this.resettwo();
       this.numhu = index;
+      this.fileListtherrt = []
       this.opentwo = true;
       this.titletwo = "添加参数";
     },
@@ -1394,7 +1398,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .roiyy {
   position: fixed;
-  top: 130px;
+  top: 95px;
   left: 0;
   width: 100%;
   padding-left: 230px;

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

@@ -26,13 +26,13 @@
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-button
           type="danger"
-          @click="applyBtn"
+          @click="infoBtn"
           v-hasPermi="['bmProject:project:pass']"
           >审核</el-button
         >
         <el-button
           type="danger"
-          @click="backBtn"
+          @click="infoBtn"
           v-hasPermi="['bmProject:project:reject']"
           >驳回</el-button
         >
@@ -155,10 +155,7 @@ import {
   updateProduct,
   exportProduct,
 } from "@/api/production/production.js";
-import{
-  setExamine,
-  setReject
-} from "@/api/projectInfo/info.js";
+
 export default {
   name: "production",
   data() {
@@ -315,7 +312,7 @@ export default {
         .then(function () {
           setExamine({
             code: 1,
-            bmProjectId:this.bmProjectId,
+            bmProjectId: scope.id,
           });
         })
         .then(() => {
@@ -323,39 +320,41 @@ export default {
           this.msgSuccess("提交成功");
         });
     },
-    applyBtn() {
-      this.$confirm("是否确认审核", "提醒", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return setExamine({
-            code: 3,
-            bmProjectId: this.bmProjectId,
-          });
+
+    infoBtn(scrop) {
+      if (scrop.projectStatus % 2 == 1) {
+        this.$confirm("是否确认审核", "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("审核成功");
-        });
-    },
-    backBtn() {
-      this.$confirm("是否确认驳回", "提醒", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return setReject({
-            code: 2,
-            bmProjectId: scrop.id,
+          .then(function () {
+            return setExamine({
+              code: 3,
+              bmProjectId: scrop.id,
+            });
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("审核成功");
           });
+      } else {
+        this.$confirm("是否确认驳回", "提醒", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("驳回成功");
-        });
+          .then(function () {
+            return setReject({
+              code: 2,
+              bmProjectId: scrop.id,
+            });
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("驳回成功");
+          });
+      }
     },
     // 取消按钮
     cancel() {

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

@@ -5,7 +5,7 @@
         项目详情 >
       </span>
     </div> -->
-    <div style="height: 85px"></div>
+    <div style="height: 15px"></div>
 
     <div class="naue">
       <!-- //步骤条 -->

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

@@ -184,7 +184,7 @@
 
       },
       getList() {
-        getStatisticst('4,5,6,7,8,9').then(res => {
+        getStatisticst('4,5').then(res => {
           this.infoList = res.rows
         })
       },

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

@@ -880,6 +880,7 @@ export default {
   methods: {
     //审核
     applyBtn() {
+      var that=this
       this.$confirm("是否确认审核", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -888,7 +889,7 @@ export default {
         .then(function () {
           return setExamine({
             code: 3,
-            bmProjectId: this.bmProjectId,
+            bmProjectId: that.bmProjectId,
           });
         })
         .then(() => {
@@ -898,6 +899,7 @@ export default {
     },
     //驳回
     backBtn() {
+      var that=this
       this.$confirm("是否确认驳回", "提醒", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -906,7 +908,7 @@ export default {
         .then(function () {
           return setReject({
             code: 2,
-            bmProjectId: this.bmProjectId,
+            bmProjectId: that.bmProjectId,
           });
         })
         .then(() => {
@@ -1289,7 +1291,7 @@ export default {
 <style  lang="scss"  >
 .roiyy {
   position: fixed;
-  top: 130px;
+  top: 95px;
   left: 0;
   width: 100%;
   padding-left: 230px;