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

src/assets/js/common.js

@@ -0,0 +1,24 @@
+export default{
+    install(Vue){
+        //这里是示例方法 getTime是方法名 function()可以携带参数
+        Vue.prototype.getTime = function(val,fun,title){
+            this.$confirm(val, '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                fun
+                this.$message({
+                type: 'success',
+                message: title+'成功!'
+                });
+            }).catch(() => {
+                this.$message({
+                type: 'info',
+                message: '已取消'+title
+                });          
+            });
+        }
+    }
+    
+}

src/components/Finance/ExpenseReview.vue

@@ -340,7 +340,7 @@ export default {
         margin-left: 10px;
         padding: 8px 20px;
     }
-    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+    .group-list .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
         text-align: center;
     }
     .group-box>.el-input{

src/components/Finance/FeesPage.vue

@@ -23,12 +23,12 @@
                     {{ formInline.Days }}天 / {{ formInline.Number }}人
                 </el-form-item>
             </el-form>
-            <el-form :inline="true" :model="formInline" class="demo-form-inline">
+            <el-form v-if="formInline.Status==0" :inline="true" :model="formInline" class="demo-form-inline">
                 <el-form-item>
-                    <el-button type="primary" @click="onSubmit">通 过(多选)</el-button>
+                    <el-button type="primary" @click="PostAuditGrpCreditCardPayment(1)">通 过(多选)</el-button>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="onSubmit">拒 绝(多选)</el-button>
+                    <el-button type="primary" @click="PostAuditGrpCreditCardPayment(2)">拒 绝(多选)</el-button>
                 </el-form-item>
                 <el-form-item label="审核未通过原因:">
                     <el-radio-group @change="onSubmit" v-model="formInline.resource">
@@ -61,7 +61,8 @@
             @selection-change="handleSelectionChange">
                 <el-table-column
                 type="selection"
-                width="40">
+                width="40"
+                v-if="formInline.Status==0">
                 </el-table-column>
                 <el-table-column
                 prop="priceNameContent"
@@ -116,21 +117,29 @@
                 show-overflow-tooltip>
                 </el-table-column>
                 <el-table-column
-                prop="address"
                 label="审核操作"
                 >
                     <template slot-scope="scope">
                         <el-button
                         size="mini"
+                        v-if='scope.row.isAuditGM==0||scope.row.isAuditGM==2'
                         @click="handleEdit(scope.$index, scope.row)">通 过</el-button>
                         <el-button
                         size="mini"
                         type="danger"
-                        @click="handleDelete(scope.$index, scope.row)">拒 绝</el-button>
+                        v-if='scope.row.isAuditGM==0||scope.row.isAuditGM==1'
+                        @click="handleDelete(scope.$index, scope.row)">不通过</el-button>
                     </template>
                 </el-table-column>
             </el-table>
         </div>
+        <div class="payments">
+            <div class="statistics">该申请团组款项费用统计如下:</div>
+            <div class="payable"></div>
+            <div class="payment"></div>
+            <div class="remainder"></div>
+            <div class="reviewed"></div>
+        </div>
     </div>
 </template>
 
@@ -154,7 +163,7 @@ export default {
                 Number:5,
                 Days:10,
                 resource:'',
-                cause:""
+                cause:"",
             },
             AuditStatus:[
                 {
@@ -175,10 +184,14 @@ export default {
                 },
             ],
             tableData: [],
-            multipleSelection: []
+            multipleSelection: [],
+            auditarr:'',
+            userid:'',
+            payable:'',
         }
     },
     methods: {
+        //控制其他原因
         onSubmit() {
             console.log(this.formInline.resource);
             if(this.formInline.resource=='3、其他'){
@@ -187,6 +200,7 @@ export default {
                 this.causetrue=false;
             }
         },
+        //获取详情
         getPostSearchGrpCreditCardPayment(){
             var url="/api/Groups/PostSearchGrpCreditCardPayment"
             var that=this
@@ -211,11 +225,21 @@ export default {
                     that.formInline.Days=res.data.data.visitDays;
                     that.formInline.Number=res.data.data.visitPNumber;
                     that.tableData=res.data.data.detailList;
+                    document.querySelector('.payable').innerHTML=res.data.data.totalStr1;
+                    document.querySelector('.payment').innerHTML=res.data.data.totalStr2;
+                    document.querySelector('.remainder').innerHTML=res.data.data.totalStr3;
+                    document.querySelector('.reviewed').innerHTML=res.data.data.totalStr4;
                 }
             })
         },
         handleSelectionChange(val) {
+            this.auditarr="";
             this.multipleSelection = val;
+            for(var i=0;i<this.multipleSelection.length;i++){
+                this.auditarr+=this.multipleSelection[i].id+','
+            }
+            console.log(this.auditarr.substring(0, this.auditarr.length - 1))
+            this.auditarr=this.auditarr.substring(0, this.auditarr.length - 1)
         },
         handleClick(tab, event) {
             this.activeName=tab.name;
@@ -225,12 +249,13 @@ export default {
             this.getPostSearchGrpCreditCardPayment();
         },
         handleEdit(index, row) {
-            console.log(index, row);
+            this.noPostAuditGrpCreditCardPayment(row.id,1)
         },
         handleDelete(index, row) {
-            console.log(index, row);
+            this.noPostAuditGrpCreditCardPayment(row.id,2)
         },
-        PostAuditGrpCreditCardPayment(){
+        //多选审批
+        PostAuditGrpCreditCardPayment(val){
             var url="/api/Groups/PostAuditGrpCreditCardPayment"
             var that=this
             this.$axios({
@@ -240,22 +265,63 @@ export default {
                     Authorization:'Bearer '+that.token
                 },
                 data:{
-                    creditId: 2270,
-                    auditCode:that.activeName,
-                    user:that.formInline.Status
+                    CreditIdStr: that.auditarr,
+                    auditCode:val,//1审核通过，2审核未通过
+                    user:that.userid//userid
                 }
             }).then(function(res){
                 console.log(res);
                 if(res.data.code==200){
-                    
+                    that.$message({
+                        message:res.data.msg ,
+                        type: 'warning',
+                        offset:50
+                    });
+                    that.getPostSearchGrpCreditCardPayment();
                 }
             })
         },
+        //单独审批
+        noPostAuditGrpCreditCardPayment(val,num){
+            console.log(val,num)
+            var url="/api/Groups/PostAuditGrpCreditCardPayment"
+            var that=this
+            this.$axios({
+                method: 'post',
+                url:url,
+                headers:{
+                    Authorization:'Bearer '+that.token
+                },
+                data:{
+                    CreditIdStr: val+'',
+                    auditCode:num,//1审核通过，2审核未通过
+                    user:that.userid//userid
+                }
+            }).then(function(res){
+                console.log(res);
+                if(res.data.code==200){
+                    that.$message({
+                        message:res.data.msg ,
+                        type: 'warning',
+                        offset:50
+                    });
+                    that.getPostSearchGrpCreditCardPayment();
+                }
+            })
+        },
+        childMethod() {
+            this.$parent.fatherMethod();
+        },
+        ceshi(){
+            console.log("tg")
+        }
     },
     mounted(){
         this.diid=this.$route.query.id;
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
+        this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
         this.getPostSearchGrpCreditCardPayment();
+        // this.getTime('是否通过该条费用？',this.ceshi(),'通过') 
     }
 }
 </script>
@@ -275,4 +341,24 @@ export default {
     .fesspage-head .el-form-item{
         margin-bottom: 10px;
     }
+    .payments{
+        margin-top: 10px;
+    }
+    .payments>div{
+        margin: 2px 0;
+        font-size: 14px;
+    }
+    .payments .statistics{
+        font-size: 17px;
+        font-weight:600 ;
+    }
+    .payment{
+        color: #008000;
+    }
+    .remainder{
+        color: #ff0000;
+    }
+    .reviewed{
+        color: #1D5DA4;
+    }
 </style>

src/components/OP/OCRIdentify.vue

@@ -64,6 +64,7 @@
             <el-button type="primary">房产证(英文)</el-button>
             <el-button type="primary">结婚证(英文)</el-button>
             <el-button type="primary">大陆护照(英文)</el-button>
+            <el-button type="primary">通用印刷体(英文)</el-button>
         </el-row>
     </div>
 </template>
@@ -485,7 +486,7 @@ export default {
             }else{
                 this.$message.error('请检查图片是否为此类型!');
             }
-        }
+        },
     },
     mounted(){
         this.token=JSON.parse(localStorage.getItem('userinif')).token;
@@ -510,13 +511,21 @@ export default {
     }
     .ocr-all .el-button--primary{
         width: 160px;
-        margin: 0px 5px;
-        margin-bottom: 10px;
+        margin: 10px 0px;
+    }
+    .ocr-all .el-button+.el-button{
+        margin-left: 0px;
     }
     .ocr-all .el-row{
         width: 44%;
         margin: 0 auto;
         margin-top: 30px;
         margin-bottom: 180px;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+    }
+    .ocr-all .el-row::after, .ocr-all .el-row::before{
+        content: none;
     }
 </style>

src/components/home.vue

@@ -194,6 +194,7 @@
   </div>
 </template>
   <script>
+    // import child from '~/components/Finance/FeesPage';
     export default {
       data() {
         return {
@@ -206,6 +207,9 @@
           userinif:'',
         };
       },
+      // components: {
+      //   child
+      // },
       methods: {
         handleOpen(key, keyPath) {
           console.log(key, keyPath);
@@ -303,6 +307,9 @@
           });
           // this.$router.push({name:'Login'})
           // localStorage.clear();
+        },
+        fatherMethod() {
+          console.log('测试');
         }
       },
       mounted() {

src/main.js

@@ -10,9 +10,11 @@ import store from './store/index.js';
 import VueTypedJs from 'vue-typed-js'
 Vue.use(VueTypedJs)
 import axios from 'axios';
-//axios.defaults.baseURL = 'http://132.232.92.186:8888';
-axios.defaults.baseURL = 'http://localhost:5256/';
+axios.defaults.baseURL = 'http://132.232.92.186:8888';
+//  axios.defaults.baseURL = 'http://localhost:5256/';
 import { Message } from "element-ui";
+import common from './assets/js/common'
+Vue.use(common);
 Vue.prototype.$message = Message
 Vue.prototype.$axios = axios;