Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/ExpenseReview.vue

@@ -14,16 +14,21 @@
                     </el-select>
                     <el-input
                     style="width:200px;"
-                    @input="Inquireclick()"
+
                     placeholder="请输入查询内容"
                     v-model="input"
                     clearable>
                     </el-input>
+                    <el-button 
+                    type="primary"
+                    size=""
+                    title="查看费用清单"
+                    @click="Inquireclick()">查 询</el-button>
                 </div>
             </div>
             <template>
                 <el-table
-                :data="groupDatas.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+                :data="groupDatas"
                 border
                 style="width: 100%">
                     <el-table-column
@@ -91,7 +96,7 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                          <el-button
+                          <el-button Inquireclick
                             type="primary"
                             size="mini"
                             title="查看费用清单"
@@ -108,7 +113,7 @@
                     :page-sizes="[10,12,15,20]" 
                     :page-size="pageSize" 
                     layout="total, sizes, prev, pager, next" 
-                    :total="groupDatas.length">
+                    :total="count">
                 </el-pagination>
             </div>
         </div>
@@ -120,22 +125,23 @@ export default {
         return {
             options: [
                 {
-                    value: '0',
+                    value: '-1',
                     label: '全部'
                 }, {
-                    value: '1',
+                    value: '0',
                     label: '已完成'
                 }, {
-                    value: '2',
+                    value: '1',
                     label: '未完成'
                 }
             ],
-            value: '0',
+            value: '-1',
             groupDatas:[],
             groupData: [],
             groupDatass:[],
             currentPage: 1, // 当前页码
-            pageSize: 12 ,// 每页的数据条数
+            pageSize: 10 ,// 每页的数据条数
+            count:0,//总数
             input:'',
             token:'',
             fullscreenLoading:false,
@@ -143,14 +149,42 @@ export default {
         }
     },
     methods:{
+        //分页api
+        PostGroupPageList(){
+            var url = "/api/Groups/PostGroupPageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    pageIndex: that.currentPage,
+                    pageSize: that.pageSize,
+                    isSure: that.value,
+                    searchCriteria: that.input,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    that.groupDatas=res.data.data
+                    that.count=res.data.count
+                }
+                console.log(that.count)
+            })
+        },
          //每页条数改变时触发 选择一页显示多少行
          handleSizeChange(val) {
             this.currentPage = 1;
             this.pageSize = val;
+            this.PostGroupPageList();
         },
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
             this.currentPage = val;
+            this.PostGroupPageList();
         },
         //查看费用申请
         handleView(index, row) {
@@ -158,106 +192,8 @@ export default {
         },
         //模糊查询
         Inquireclick(){
-            var newarr=[];
-            if(this.input==""){
-                if(this.value=="0"){
-                    newarr=this.groupData;
-                }else{
-                    newarr=this.groupDatass;
-                }
-            }else{
-                for(var i=0;i<this.groupDatas.length;i++){
-                    if(this.groupDatas[i].clientName.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].clientUnit.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].jietuanOperator.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].salesQuoteNo.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamLev.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamName.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamType.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].tourCode.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }else if(this.groupDatas[i].visitDate.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                }
-            }
             this.currentPage=1;
-            this.groupDatas=newarr;
-        },
-        //获取列表
-        Grouplist(){
-            var url="/api/Groups/GetGroupList"
-            var that=this
-            that.fullscreenLoading = true;
-            this.$axios({
-                method: 'post',
-                url:url,
-                headers:{
-                    Authorization:'Bearer '+this.token
-                },
-                data:{
-                    portType: 1,
-                }
-            }).then(function(res){
-                if(res.data.code==200){
-                    that.groupData=res.data.data
-                    that.groupData.forEach(item=>{
-                        if(item.clientName==null){
-                            item.clientName = ''
-                        } 
-                        if(item.clientUnit==null){
-                            item.clientUnit = ''
-                        } 
-                        if(item.id==null){
-                            item.id = ''
-                        } 
-                        if(item.isSure==null){
-                            item.isSure = ''
-                        } 
-                        if(item.jietuanOperator==null){
-                            item.jietuanOperator = ''
-                        } 
-                        if(item.salesQuoteNo==null){
-                            item.salesQuoteNo = ''
-                        } 
-                        if(item.teamName==null){
-                            item.teamName = ''
-                        } 
-                        if(item.teamType==null){
-                            item.teamType = ''
-                        } 
-                        if(item.tourCode==null){
-                            item.tourCode = ''
-                        } 
-                        if(item.visitDate==null){
-                            item.visitDate = ''
-                        } 
-                        if(item.visitDays==null){
-                            item.visitDays = ''
-                        } 
-                        if(item.visitPNumber==null){
-                            item.visitPNumber = ''
-                        } 
-                    })
-                    that.groupDatas=that.groupData;
-                    console.log(that.groupData)
-                    that.fullscreenLoading = false;
-                }
-            })
+            this.PostGroupPageList()
         },
         //处理时间
         filteryear(val){
@@ -265,54 +201,14 @@ export default {
             return gstime;
         },
         //筛选状态
-        filterStatus(val){
-            var newgroup=[];
-            if(this.input==""){
-                if(val=="0"||val==""){
-                    newgroup=this.groupData;
-                }else if(val=="1"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==1){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }else if(val=="2"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==0){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }
-                this.currentPage=1;
-                this.groupDatas=newgroup
-                this.groupDatass=newgroup 
-            }else{
-                if(val=="0"||val==""){
-                    newgroup=this.groupData
-                }else if(val=="1"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==1){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }else if(val=="2"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==0){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }
-                this.currentPage=1;
-                this.groupDatas=newgroup
-                this.groupDatass=newgroup 
-                this.Inquireclick()
-            }
+        filterStatus(){
+            this.PostGroupPageList();
         },
     },
     mounted(){
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
         this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
-        this.Grouplist();
+        this.PostGroupPageList();
     }
 }
 </script>

src/components/OP/OPgroup.vue

@@ -1,9 +1,8 @@
 <template>
     <div v-loading="fullscreenLoading">
         <div class="group-list">
-            <div class="group-title">
-                <div>团组列表</div>
-                <div class="group-box">
+            <div class="group-box">
+                <div>
                     <el-select v-model="value" clearable placeholder="请选择" @change="filterStatus(value)">
                         <el-option
                         v-for="item in options"
@@ -14,17 +13,22 @@
                     </el-select>
                     <el-input
                     style="width:200px;"
-                    @input="Inquireclick()"
                     placeholder="请输入查询内容"
                     v-model="input"
                     clearable>
                     </el-input>
+                    <el-button @click="Inquireclick()" type="primary">查 询</el-button>
+                </div>
+                <div>
                     <el-button @click="addgroup()" type="primary">新增团组</el-button>
                 </div>
             </div>
+            <div class="group-title">
+                <div>团组列表</div>
+            </div>
             <template>
                 <el-table
-                :data="groupDatas.slice((currentPage-1)*pageSize,currentPage*pageSize)"
+                :data="groupDatas"
                 border
                 style="width: 100%">
                     <el-table-column
@@ -119,7 +123,7 @@
                     :page-sizes="[10,12,15,20]" 
                     :page-size="pageSize" 
                     layout="total, sizes, prev, pager, next" 
-                    :total="groupDatas.length">
+                    :total="count">
                 </el-pagination>
             </div>
         </div>
@@ -131,22 +135,23 @@ export default {
         return {
             options: [
                 {
-                    value: '0',
+                    value: '-1',
                     label: '全部'
                 }, {
-                    value: '1',
+                    value: '0',
                     label: '已完成'
                 }, {
-                    value: '2',
+                    value: '1',
                     label: '未完成'
                 }
             ],
-            value: '0',
+            value: '-1',
             groupDatas:[],
             groupData: [],
             groupDatass:[],
+            count:0,//总条数
             currentPage: 1, // 当前页码
-            pageSize: 12 ,// 每页的数据条数
+            pageSize: 10 ,// 每页的数据条数
             input:'',
             token:'',
             fullscreenLoading:false,
@@ -154,167 +159,58 @@ export default {
         }
     },
     methods:{
+        //分页api
+        PostGroupPageList(){
+            var url = "/api/Groups/PostGroupPageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    pageIndex: that.currentPage,
+                    pageSize: that.pageSize,
+                    isSure: that.value,
+                    searchCriteria: that.input,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    that.groupDatas=res.data.data
+                    that.count=res.data.count
+                }
+                console.log(that.count)
+            })
+        },
          //每页条数改变时触发 选择一页显示多少行
          handleSizeChange(val) {
             this.currentPage = 1;
             this.pageSize = val;
+            this.PostGroupPageList()
         },
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
             this.currentPage = val;
+            this.PostGroupPageList()
         },
         Inquireclick(){
-            var newarr=[];
-            if(this.input==""){
-                if(this.value=="0"){
-                    newarr=this.groupData;
-                }else{
-                    newarr=this.groupDatass;
-                }
-            }else{
-                for(var i=0;i<this.groupDatas.length;i++){
-                    if(this.groupDatas[i].clientName.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].clientUnit.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].jietuanOperator.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].salesQuoteNo.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamLev.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamName.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].teamType.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                    else if(this.groupDatas[i].tourCode.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }else if(this.groupDatas[i].visitDate.indexOf(this.input)!=-1){
-                        newarr.push(this.groupDatas[i]);
-                    }
-                }
-            }
             this.currentPage=1;
-            this.groupDatas=newarr;
+            this.PostGroupPageList()
         },
         addgroup(){
             this.$router.push({path: '/home/Groupedit'});
         },
-        //
-        Grouplist(){
-            var url="/api/Groups/GetGroupList"
-            var that=this
-            that.fullscreenLoading = true;
-            this.$axios({
-                method: 'post',
-                url:url,
-                headers:{
-                    Authorization:'Bearer '+this.token
-                },
-                data:{
-                    portType: 1,
-                }
-            }).then(function(res){
-                if(res.data.code==200){
-                    that.groupData=res.data.data
-                    that.groupData.forEach(item=>{
-                        if(item.clientName==null){
-                            item.clientName = ''
-                        } 
-                        if(item.clientUnit==null){
-                            item.clientUnit = ''
-                        } 
-                        if(item.id==null){
-                            item.id = ''
-                        } 
-                        if(item.isSure==null){
-                            item.isSure = ''
-                        } 
-                        if(item.jietuanOperator==null){
-                            item.jietuanOperator = ''
-                        } 
-                        if(item.salesQuoteNo==null){
-                            item.salesQuoteNo = ''
-                        } 
-                        if(item.teamName==null){
-                            item.teamName = ''
-                        } 
-                        if(item.teamType==null){
-                            item.teamType = ''
-                        } 
-                        if(item.tourCode==null){
-                            item.tourCode = ''
-                        } 
-                        if(item.visitDate==null){
-                            item.visitDate = ''
-                        } 
-                        if(item.visitDays==null){
-                            item.visitDays = ''
-                        } 
-                        if(item.visitPNumber==null){
-                            item.visitPNumber = ''
-                        } 
-                    })
-                    that.groupDatas=that.groupData;
-                    console.log(that.groupData)
-                    that.fullscreenLoading = false;
-                }
-            })
-        },
         filteryear(val){
             let gstime=val.visitDate.split(' ')[0]
             return gstime;
         },
         //筛选状态
-        filterStatus(val){
-            var newgroup=[];
-            if(this.input==""){
-                if(val=="0"||val==""){
-                    newgroup=this.groupData;
-                }else if(val=="1"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==1){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }else if(val=="2"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==0){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }
-                this.currentPage=1;
-                this.groupDatas=newgroup
-                this.groupDatass=newgroup 
-            }else{
-                if(val=="0"||val==""){
-                    newgroup=this.groupData
-                }else if(val=="1"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==1){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }else if(val=="2"){
-                    for(var j=0;j<this.groupData.length;j++){
-                        if(this.groupData[j].isSure==0){
-                            newgroup.push(this.groupData[j])
-                        }
-                    }
-                }
-                this.currentPage=1;
-                this.groupDatas=newgroup
-                this.groupDatass=newgroup 
-                this.Inquireclick()
-            }
+        filterStatus(){
+            this.currentPage=1;
+            this.PostGroupPageList()
         },
         //编辑
         handleEdit(index, row,rows) {
@@ -414,7 +310,7 @@ export default {
     mounted(){
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
         this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
-        this.Grouplist();
+        this.PostGroupPageList();
     }
 }
 </script>
@@ -437,6 +333,7 @@ export default {
     }
     .group-box{
         display: flex;
+        justify-content: space-between;
     }
     .group-box>button{
         margin-left: 10px;

src/components/system/Payroll.vue

@@ -228,7 +228,7 @@
                 </div>
             </el-dialog>
             <!-- 修改新增 -->
-            <el-dialog :close-on-click-modal="false" width="960px" class="pan" top="3.5vh" title="薪资详细信息" :visible.sync="dialogFormVisible">
+            <el-dialog :close-on-click-modal="false" width="960px" class="pan" top="2.5vh" title="薪资详细信息" :visible.sync="dialogFormVisible">
                 <el-form :model="salaryinif" ref="salaryinif" :rules="rules">
                     <div class="payroll-inif">
                         <el-form-item label="员工" prop="userId" :label-width="formLabelWidth">
@@ -305,6 +305,12 @@
                                 </el-input-number>
                             </el-popover>
                         </el-form-item>
+                        <el-form-item label="其他应付" prop="otherHandle" :label-width="formLabelWidth">
+                            <el-input-number :precision="2" size="medium" :controls="false" v-model="salaryinif.otherHandle"></el-input-number>
+                        </el-form-item>
+                        
+                    </div>
+                    <div class="payroll-inif">
                         <el-form-item label="代扣保险" prop="withholdingInsurance" :label-width="formLabelWidth">
                             <el-input-number :precision="2" size="medium" :controls="false" v-model="salaryinif.withholdingInsurance"></el-input-number>
                         </el-form-item>
@@ -557,6 +563,7 @@ export default {
             withholdingInsurance:0,// 代扣保险
             mealsupplement:0,// 餐补
             reservedFunds:0,// 代扣公积金
+            otherHandle:0,//其他应付
             //groupCost:0,// 部门集体团建费
             sickLeave:0,// 病假
             somethingFalse:0,//  事假
@@ -610,6 +617,9 @@ export default {
             otherSubsidies: [
                 { required: true, trigger: 'blur' },
             ],
+            otherHandle:[
+                {required:true,trigger:'blur'}
+            ],
             informationSecurityFee: [
                 { required: true, trigger: 'blur' },
             ],
@@ -920,6 +930,7 @@ export default {
                     // garmentWashSubsidies:that.salaryinif.garmentWashSubsidies,
                     // communicationSubsidies:that.salaryinif.communicationSubsidies,
                     otherSubsidies:that.salaryinif.otherSubsidies,
+                    otherHandle:that.salaryinif.otherHandle,
                     informationSecurityFee:that.salaryinif.informationSecurityFee,
                     // operationBonus:that.salaryinif.operationBonus,
                     // specialAllowance:that.salaryinif.specialAllowance,
@@ -1030,6 +1041,7 @@ export default {
                 // garmentWashSubsidies:0,//服装洗理补贴
                 // communicationSubsidies:0,// 通讯补贴
                 otherSubsidies:0,// 月度补贴
+                otherHandle:0,//其他应付
                 informationSecurityFee:0,// 保密费
                 // operationBonus:0,// 操作奖金
                 // specialAllowance:0,// 特殊津贴
@@ -1192,6 +1204,7 @@ export default {
                     // operationBonus:that.salaryinif.operationBonus,
                     // specialAllowance:that.salaryinif.specialAllowance,
                     // otherSubsidies:that.salaryinif.otherSubsidies,
+                    otherHandle:that.salaryinif.otherHandle,
                     withholdingInsurance:that.salaryinif.withholdingInsurance,
                     mealsupplement:that.salaryinif.mealsupplement,
                     withholdingTax:that.salaryinif.withholdingTax,
@@ -1597,4 +1610,7 @@ export default {
 .biaoji .el-input--medium .el-input__inner{
     text-align: left;
 }
+.payroll-all .el-dialog{
+    margin: 0 auto 23px;
+}
 </style>