资金管理结项

src/views/fundManage/makerfund.vue

@@ -132,8 +132,9 @@
           >
           <template #default="scope">
             <div>
-              <span v-show="!scope.row.state">未报销</span>
-              <span v-show="scope.row.state">已报销</span>
+              <span v-show="scope.row.state==0">未审核</span>
+              <span v-show="scope.row.state==1">未报销</span>
+              <span v-show="scope.row.state==2">已报销</span>
             </div>
           </template>
         </el-table-column>
@@ -146,17 +147,24 @@
         </el-table-column>
         <el-table-column
           prop="operation"
-          width="350"
+          width="370"
           align="center"
           label="操作"
           >
           <template #default="scope">
               <div class="operations">
-                        <el-button type="primary" class="bt1" size="mini" @click="details(scope.row.fid)">查看详情</el-button>
-                        <el-button type="primary" v-show="scope.row.state==0" style="width: 74px;" class="bt1" size="mini" @click="Audit(scope.row)">审核</el-button>
-                        <el-button type="primary" disabled v-show="scope.row.state==1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
-                        <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)">申请表</el-button>
-                        <el-button @click="endDialogShow" type="primary" class="bt1" size="mini">完结</el-button>
+                <el-button type="primary" class="bt1" size="mini" @click="details(scope.row.fid)">查看详情</el-button>
+
+                <el-button type="primary" v-show="scope.row.state==0" style="width: 74px;" class="bt1" size="mini" @click="Audit(scope.row)">审核</el-button>
+                <el-button type="primary" disabled v-show="scope.row.state==1" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
+                <el-button type="primary" disabled v-show="scope.row.state==2" style="background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" class="bt1" size="mini">已审核</el-button>
+
+                <el-button type="primary" class="bt1" size="mini" @click="edit(scope.row.id,scope.row.status)">申请表</el-button>
+
+                <el-button disabled v-show="scope.row.state==0"  style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
+                <el-button  v-show="scope.row.state==1"  style="width: 74px;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">完结</el-button>
+                <el-button  v-show="scope.row.state==2" style="width: 74px;background-color: #c8c9cc;border-color: #c8c9cc;cursor: no-drop;" @click="endDialogShow(scope.row.fid)" type="primary" class="bt1" size="mini">已完结</el-button>
+
               </div>
           </template>
         </el-table-column>
@@ -402,7 +410,7 @@
       <span class="deleteContent">确定完结?</span>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="confirmEnd" >确认完结</el-button>
-        <el-button @click="dialogVisible1=false"  >取消</el-button>
+        <el-button @click="dialogVisible1=false" >取消</el-button>
       </span>
     </el-dialog>
 <!-- 完结对话框结束-->
@@ -415,6 +423,7 @@
       data() {
         return {
           ProjectFundData:{},
+          projectFundState:'',
           dialogVisible1:false,
           dialogVisible:false,         //立即审核
           revocation:false,            //撤回
@@ -472,13 +481,12 @@
           // console.log(111);
           let param={
             uid:this.$store.state.userInfo.userid,
-            fid:this.ProjectFundData.fid
+            fid:this.ProjectFundData.fid,
+            status:1
           }
-          console.log(param);
           this.ajax
               .post(this.$store.state.api+"/UpdateMakerFundState",param)
               .then(res=>{
-                  // console.log(res);
                   this.dialogVisible=false;
                   if (res.data) {
                       this.$message.success('审核成功')
@@ -490,11 +498,32 @@
                 console.log(err);
               })
         },
-        endDialogShow(){      //完结对话框显示
+        endDialogShow(val){      //完结对话框显示
             this.dialogVisible1=true
+            this.projectFundState=val
+            console.log(val);
         },
         confirmEnd(){        //确定完结
-          this.dialogVisible1=false
+          let param={
+            uid:this.$store.state.userInfo.userid,
+            fid:this.projectFundState,
+            status:2
+          }
+          console.log(param);
+          this.ajax
+              .post(this.$store.state.api+"/UpdateMakerFundState",param)
+              .then(res=>{
+                console.log(res);
+                  this.dialogVisible1=false
+                  if (res.data) {
+                      this.$message.success('完结成功')
+                      this.getData()
+                    }else{
+                      this.$message.error('完结失败')
+                    }
+              },err=>{
+                console.log(err);
+              })
         },
        
         handleCurrentChange(val) {   //当页数发生改变的时候调用获取列表数据请求
@@ -538,7 +567,6 @@
         init(){         
           this.dialogVisible=false
         },
-        
         details(Id){       //跳转详情页面
           this.$router.push(`/makerfundDetails?Id=${Id}`)
         }

src/views/fundManage/makerfundApply.vue

@@ -471,11 +471,15 @@ export default {
             // this.imageUrl=require("../../assets/img/jj.jpg")
         },
         getData(){
+            let param={
+                uid:this.$store.state.userInfo.userid,
+                fid:''
+            }
             this.ajax
-                .get(this.$store.state.api+'/SelectMakerFundSelects',{uid:this.$store.state.userInfo.userid})
+                .get(this.$store.state.api+'/SelectMakerFundSelects',param)
                 .then(res=>{
-                    // console.log(res.data);
-                    this.projectFilter=res.data[0]
+                    console.log(res.data);
+                    this.projectFilter=res.data[1]
                 },err=>{
                     console.log(err);
                 })

src/views/projectManage/ProjectManagementFund1.vue

@@ -237,18 +237,13 @@
                       console.log(err);
                     })
           },
-        // lookDetail(){
-
-        // },
         content(){
           this.$router.push('/ProjectManagementFund1')
         },
         remark(){
           this.$router.push('/ProjectManagementFund2')
         },
-        // addBtn(){
-        //   // this.fundDetail=true;
-        // },
+      
         back(){
           this.$router.push('/ProjectManagement')
         }

src/views/projectManage/ProjectManagementFund2.vue

@@ -1,7 +1,6 @@
 <template>
   <!-- 项目管理 资金申报明细 -->
     <div class="ProjectManagementFund2">
-      <div class="right">
         <div class="vfpHeader">
             <div class="titleOne">预算经费</div>
             <el-button type="primary" @click="$router.back()">返回</el-button>
@@ -22,200 +21,57 @@
         tooltip-effect="dark"
         stripe
         class="fontSize"
-        style="height: 570px;"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        @selection-change="handleSelectionChange">
+        >
         
         <el-table-column
-          prop="projectName"
+          prop="title"
           align="center"
           label="活动名称"
           >
         </el-table-column>
         <el-table-column
-          prop="projectPerson"
+          prop="pro_leader"
           align="center"
-
           label="负责人"
           >
         </el-table-column>
         <el-table-column
-          prop="relevancy"
+          prop="type"
           align="center"
 
           label="项目类型"
           >
         </el-table-column>
         <el-table-column
-          prop="budget"
+          prop="fund"
           align="center"
-
           label="申请经费(元)"
           >
         </el-table-column>
         <el-table-column
-          prop="dept"
+          prop="name"
           align="center"
-
           label="所在部门"
           >
         </el-table-column>
 
         <el-table-column
-          prop="date"
+          prop="dateTime"
           align="center"
-
           label="申请时间"
          >
         </el-table-column>
-        <!-- <el-table-column
-          prop="operation"
-          label="操作"
-          align="center"
-          width="250px"
-          >
-          <template #default="scope">
-              <div class="operations"> -->
-                        <!-- <el-button type="primary" class="bt1" @click="MADetails(scope)" size="mini" >查看详情</el-button>
-                        <el-button type="primary" class="bt1" size="mini">表单查看</el-button> -->
-              <!-- </div>
-          </template>
-        </el-table-column> -->
       </el-table>
       <!-- 表格结束 -->
 
 
-      <div class="pmFund1Footer">
         <el-pagination
         background
+        class="paginations"
         layout="prev, pager, next"
         :total="1">
         </el-pagination>
-      </div>
-
-      </div>
-
-
-
-
-      <!-- 查看详情对话框开始 -->
-      <!-- <el-dialog
-        title="创客资金申请"
-        :visible.sync="fundDetail"
-        width="900px"
-        class="projectApplicationfundAddDialog2"
-        :before-close="init">
-        <hr>
-        <div style="display: flex;align-items: center;flex-wrap: wrap;">
-          <div class="deleteContent1">
-            <div class="dagSpan">项目名称</div>
-              <el-select v-model="values.projectName" transfer="true" :popper-append-to-body="false"
-                style="width: 70%;" placeholder="请选择">
-                <el-option
-                  v-for="item in projectNameOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-          </div>
-          <div class="deleteContent1">
-              <div class="dagSpan">项目类型</div>
-              <el-select v-model="values.projectType"  placeholder="请选择">
-                <el-option
-                  v-for="item in projectTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-          </div>
-        </div>
-         -->
-        <!-- <div class="dagRemark"> -->
-          <!-- 经费支出支出类别(单位:元) -->
-        <!-- </div> -->
-
-        <!-- 支出类别(单位:元)第一部分开始 -->
-        <!-- <div class="dagInpS">
-          <div class="dagInpS1">
-            <div class="dagSpan">直接经费</div>
-            <el-select v-model="values.fund"
-            transfer="true" :popper-append-to-body="false"
-            placeholder="请选择">
-                <el-option
-                  v-for="item in fundOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">预算</div>
-            <el-input v-model="datas.budget1" placeholder="请输入内容"></el-input>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">已支付</div>
-            <el-input v-model="datas.Paid1" placeholder="请输入内容"></el-input>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">余额</div>
-            <el-input v-model="datas.balance1" placeholder="请输入内容"></el-input>
-          </div>
-        </div>
-        <div class="dagInpS2">
-            <div class="dagSpan2">事由</div>
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入内容"
-                v-model="datas.reason1">
-              </el-input>
-        </div> -->
-        <!-- 支出类别(单位:元)第一部分结束-->
-
- <!-- 支出类别(单位:元)第二部分开始 -->
- <!-- <div class="dagInpS">
-          <div class="dagInpS1">
-            <div class="dagSpan" style="width: 70px;">其他</div>
-            <el-input v-model="datas.rests" style="width: 200px;" placeholder="请输入内容"></el-input>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">预算</div>
-            <el-input v-model="datas.budget2"  placeholder="请输入内容"></el-input>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">已支付</div>
-            <el-input v-model="datas.Paid2" placeholder="请输入内容"></el-input>
-          </div>
-          <div class="dagInpS1">
-            <div class="dagSpan">余额</div>
-            <el-input v-model="datas.balance2" placeholder="请输入内容"></el-input>
-          </div>
-        </div>
-        <div class="dagInpS2">
-            <div class="dagSpan2">事由</div>
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                class="textArea"
-                placeholder="请输入内容"
-                v-model="datas.reason2">
-              </el-input>
-        </div> -->
-        <!-- 支出类别(单位:元)第二部分结束-->
-
-
-
-        <!-- <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="init" style="font-size:16px" size="small">生成表单</el-button>
-          <el-button type="primary" @click="init" style="font-size:16px" size="small">返回</el-button>
-        </span>
-      </el-dialog> -->
-      <!-- 查看详情对话框结束 -->
 
   </div>
   </template>
@@ -224,97 +80,35 @@
       export default {
         data() {
           return {
-            fundDetail:false,
-              projectNameOptions:[        //查看详情里面的
-                {
-                  value: '1',
-                  label: '北京烤鸭'
-                },
-                {
-                  value: '2',
-                  label: '胡辣汤'
-                },
-              ],
-              projectTypeOptions:[    //查看详情里面的
-                  {
-                    value: '1',
-                    label: '军事'
-                  },
-                  {
-                    value: '2',
-                    label: '饮食'
-                  },
-              ],
-              fundOptions:[    //查看详情里面的
-                  {
-                    value: '1',
-                    label: '10000'
-                  },
-                  {
-                    value: '饮食',
-                    label: '100000000'
-                  },
-              ],
-              values:{
-                projectName:'',
-                projectType:'',
-                fund:''
-              },
-              tableData:[
-                {
-
-                }
-              ],  //列表展示数据
-              datas:{
-                budget1:'',   //预算
-                budget2:'',
-                Paid1:'',     //已支付
-                Paid2:'',
-                balance1:'',   //余额
-                balance2:'',
-                reason1:'',
-                reason2:'',
-                rests:"",
-              }
+            tableData:[]
           }
         },
         methods:{
-        //   getData(){
-        //   this.ajax.get(this.$store.state.api+"/GetAllActivity",{
-        //     uid:this.$store.state.userInfo.userid,
-        //     pid:JSON.parse(localStorage.getItem('pid')),
-        //     cid:this.pavalues.value1,
-        //     leader:this.pavalues.value2,
-        //     state:this.pavalues.value3,
-        //     page:this.Page.nowPage,
-        //     lim:this.Page.lim,
-        //   }).then(res=>{
-        //     let data = res.data;
-        //     this.tableData = data[0];
-        //     this.options = data[1];
-        //     this.options1 = data[2];
-        //     this.options2 = data[3];
-        //     this.Page.total = data[4][0]['total'];
-        //   }).catch(err=>{
-        //     this.$message.error(err.message)
-        //   })
-        // },
-          init(){
-            this.fundDetail=false;
-          },
           content(){
-          //   alert('111')
             this.$router.push('/ProjectManagementFund1')
           },
           remark(){
             this.$router.push('/ProjectManagementFund2')
           },
-          MADetails(){
-            this.fundDetail=true;
-          },
-          handleSelectionChange(){
-
+          getData(){
+            let param={
+              uid:this.$store.state.userInfo.userid,
+              cid:JSON.parse(localStorage.getItem('pid'))
+            }
+            // console.log(param);
+            // return
+            this.ajax
+                .get(this.$store.state.api+'/SelectFundDetail',param)
+                .then(res=>{
+                    console.log(res.data[0]);
+                    this.tableData=res.data[0]
+                },err=>{
+                    console.log(err);
+                })
           },
+        },
+        mounted(){
+          this.getData()
         }
       }
   </script>

src/views/projectSettlement/projectSettlement5.vue

@@ -206,6 +206,7 @@
             },
             getFile(val) {    //上传文件
               this.file.push(val);
+              this.$message.success('上传成功')
             },
 
             getData(){       //获取基础信息
@@ -331,14 +332,7 @@
             margin-top: 20px;
           }
         }
-        .dialog-footer {
-          display: flex;
-          justify-content: center;
-          box-sizing: border-box;
-          .btn5 {
-            font-size: 16px;
-          }
-        }
+        
       }
 
 
@@ -407,7 +401,16 @@
         .addDialogCon{
           margin-top: 20px;
         }
+        
       }
+      .dialog-footer {
+          display: flex;
+          justify-content: center;
+          box-sizing: border-box;
+          .btn5 {
+            font-size: 16px;
+          }
+        }
     }