yuanyiming 1 éve
szülő
commit
0c7bea2cbb

+ 16 - 8
src/views/activityManage/makerActvity.vue

@@ -237,7 +237,7 @@
               </div>
             </div> -->
             <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="Commit(1)" v-if="isManager==0" class="AllDialogBtn">确认提交</el-button>
+              <el-button type="primary" @click="Commit(1)" v-if="isManager==0" class="AllDialogBtn">确认</el-button>
               <el-button type="primary" @click="Commit(2)"  v-if="isManager==1" class="AllDialogBtn">通过</el-button>
               <el-button type="primary" @click="rejectApply"  v-if="isManager==1" class="AllDialogBtn">撤回</el-button>
               <el-button @click="init" class="AllDialogBtn">取消</el-button>
@@ -521,18 +521,18 @@ import { ActivityWord } from '@/components/tool/getWord';
                 st:3,
               }).then(res2=>{
                 if(res2.data==1){
-                  this.$message.success("结成功");
+                  this.$message.success("结成功");
                   this.endDialog = false;
                   this.getData()
                 }else{
-                  this.$message.error("结失败")
+                  this.$message.error("结失败")
                 }
                 this.getData();
               }).catch(err2=>{
                 console.log(err2)
               })
             }else{
-              this.$message.error("结失败")
+              this.$message.error("结失败")
             }
           })
         },
@@ -574,12 +574,20 @@ import { ActivityWord } from '@/components/tool/getWord';
             st:val,
           }).then(res=>{
             if(res.data==1){
-              this.$message.success("审核成功");
+              if (val==1) {
+                this.$message.success("提交成功");
+              }else if(val==2){
+                this.$message.success("已通过");
+              }
               this.auditDialog = false;
               for(let i in this.processTable)this.processTable[i] = '';
               this.getData()
             }else{
-              this.$message.error("审核失败")
+              if (val==1) {
+                this.$message.error("提交失败");
+              }else if(val==2){
+                this.$message.err2("通过失败");
+              }
             }
             this.getData();
           }).catch(err=>{
@@ -594,12 +602,12 @@ import { ActivityWord } from '@/components/tool/getWord';
             st:0,
           }).then(res=>{
             if(res.data==1){
-              this.$message.success("已回");
+              this.$message.success("已回");
               this.auditDialog = false;
               for(let i in this.processTable)this.processTable[i] = '';
               this.getData()
             }else{
-              this.$message.error("回失败")
+              this.$message.error("回失败")
             }
             this.getData();
           }).catch(err=>{

+ 8 - 2
src/views/fundManage/makerfund.vue

@@ -305,7 +305,7 @@
         </div> -->
 
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="auditPass(1)"  v-if="isManager==0" class="AllDialogBtn">审核</el-button>
+          <el-button type="primary" @click="auditPass(1)"  v-if="isManager==0" class="AllDialogBtn">提交</el-button>
 
 
           <el-button type="primary" @click="auditPass(2)"  v-if="isManager==1" class="AllDialogBtn">通过</el-button>
@@ -440,7 +440,13 @@
                 // console.log(res);
                   this.dialogVisible=false;
                   if (res.data) {
-                      this.$message.success('审核成功')
+                    if (val==0) {
+                      this.$message.success('已撤回')
+                    }else if(val==1){
+                      this.$message.success('提交成功')
+                    }else{
+                      this.$message.success('已通过')
+                    }
                       this.getData()
                     }else{
                       this.$message.error('审核失败')

+ 2 - 2
src/views/projectApply/projectApplication.vue

@@ -436,7 +436,7 @@
       <div class="deleteContent">确定删除项目?</div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dialogDel" class="AllDialogBtn"
-          >确认删除</el-button
+          >确认</el-button
         >
         <el-button @click="init" class="AllDialogBtn">取消</el-button>
       </span>
@@ -613,7 +613,7 @@ export default {
           (res) => {
             // console.log(res);
             this.dialogVisible = false;
-            this.$message.success("提交成功");
+            this.$message.success("已通过");
             this.getData();
           },
           (err) => {