0430日付申请修改lhj1140

src/components/Finance/DailyFeePayment.vue

@@ -46,6 +46,14 @@
                         </el-option>
                     </el-select>
                 </div>
+                <div class="feeType-box">
+                    <label>是否付款: </label>
+                    <el-select @change="downtrigger()" v-model="isPaySign" filterable placeholder="请输入总经理审核状态">
+                        <el-option key="-1" label="全部" value="-1"></el-option>
+                        <el-option key="0" label="未付款" value="0"></el-option>
+                        <el-option key="1" label="已付款" value="1"></el-option>
+                    </el-select>
+                </div>
                 <div class="feeType-box">
                     <label>费用描述:</label>
                     <el-input @input="downtrigger()" v-model="formInline.feeDesc" placeholder="费用描述"></el-input>
@@ -123,6 +131,13 @@
                         label="总经理审核"
                         width="100">
                     </el-table-column>
+                    <el-table-column
+                        label="是否付款"
+                        width="100">
+                        <template slot-scope="scope">
+                            {{ scope.row.isPay==1?'已付款':'未付款' }}
+                        </template>
+                    </el-table-column>
                     <el-table-column
                         prop="Id"
                         label="操 作">
@@ -223,6 +238,7 @@ export default {
                 }
             ],
             userNameValue:'',
+            isPaySign:"-1",//是否付款
             feeSubTypeData:[
                 {
                     id: -1,
@@ -288,7 +304,8 @@ export default {
                     feeTypeId: that.feeTypValue,           //费用类型
                     feeSubTypeId: that.feeSubTypeValue,       //费用子类型
                     feeDesc: that.formInline.feeDesc,    //描述
-                    createUserId: that.userNameValue //申请人
+                    createUserId: that.userNameValue, //申请人
+                    isPaySign:that.isPaySign //是否支付
                 }
             }).then(function (res) {
                 console.log(res)
@@ -372,9 +389,32 @@ export default {
         addDaily(){
             this.$router.push({ path: "/home/DailyFeeedit"});
         },
+        //编辑保存全局变量
         handleEdit(index, row) {
+            this.$store.state.PaymentRequest = {
+                feeTypValue:this.feeTypValue,
+                feeSubTypeValue:this.feeSubTypeValue,
+                financialValue:this.financialValue,
+                GMValue:this.GMValue,
+                feeDesc:this.formInline.feeDesc,
+                userNameValue:this.userNameValue,
+                isPaySign:this.isPaySign,
+                pgindex:this.currentPage,
+            };
             this.$router.push({path: '/home/DailyFeeedit?id=' + row.id +''});
         },
+        //判断全局变量是否有值
+        estimatePaymentRequest(){
+            console.log(this.$store.state.PaymentRequest);
+            this.feeTypValue=this.$store.state.PaymentRequest.feeTypValue?this.$store.state.PaymentRequest.feeTypValue:-1;
+            this.feeSubTypeValue=this.$store.state.PaymentRequest.feeSubTypeValue?this.$store.state.PaymentRequest.feeSubTypeValue:-1;
+            this.financialValue=this.$store.state.PaymentRequest.financialValue?this.$store.state.PaymentRequest.financialValue:-1;
+            this.GMValue=this.$store.state.PaymentRequest.GMValue?this.$store.state.PaymentRequest.GMValue:-1;
+            this.formInline.feeDesc=this.$store.state.PaymentRequest.feeDesc?this.$store.state.PaymentRequest.feeDesc:'';
+            this.userNameValue=this.$store.state.PaymentRequest.userNameValue?this.$store.state.PaymentRequest.userNameValue:'';
+            this.isPaySign=this.$store.state.PaymentRequest.isPaySign?this.$store.state.PaymentRequest.isPaySign:'-1';
+            this.currentPage=this.$store.state.PaymentRequest.pgindex?this.$store.state.PaymentRequest.pgindex:1;
+        },
         handleDelete(index, row,rows) {
             console.log(index, row);
             this.$confirm('此操作将删除该条信息, 是否继续?', '提示', {
@@ -462,7 +502,16 @@ export default {
             });
         }
     },
+    beforeRouteLeave(to,from,next) {
+        if(to.name=='DailyFeeedit'){
+            next();
+        }else{
+            this.$store.state.PaymentRequest={};
+             next();
+        }
+    },
     created(){
+        this.estimatePaymentRequest();
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.judgmentpms();

src/components/Resource/InvitationOfficialActivityData.vue

@@ -42,7 +42,7 @@
                 </div>
             </div>
             <template>
-                <el-table :data="tableData" border
+                <el-table height="680" :data="tableData" border
                     style="width: 100%;margin-top: 10px;" v-loading="loading" element-loading-text="拼命加载中...">
                     <el-table-column prop="num" label="序 号" width="55">
                         <template slot-scope="scope">

src/store/index.js

@@ -11,7 +11,8 @@ const store = new Vuex.Store({
 		return {
 			phone :'',
             webSocketMsg:'1',
-            Termsofinvitation:{},
+            Termsofinvitation:{},//商邀表格全局变量
+            PaymentRequest:{},//日常付款全局变量
 		}
 	},
 	// 在 mutations 内封装数据更新方法