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

src/components/Finance/FeesPage.vue

@@ -198,7 +198,7 @@ export default {
                 if (res.data.code == 200) {
                     that.tableData = res.data.data.data.detailList;
                     document.querySelector('.payable').innerHTML = res.data.data.data.totalStr1;
-                    document.querySelector('.payment').innerHTML = res.data.data.data.totalStr2;
+                    document.querySelector('.payment').innerHTML =that.activeName==79?res.data.data.data.totalStr2:'';
                     document.querySelector('.remainder').innerHTML = res.data.data.data.totalStr3;
                     document.querySelector('.reviewed').innerHTML = res.data.data.data.totalStr4;
                 }

src/components/Finance/GroupUnreviewed.vue

@@ -1,18 +1,171 @@
 <template>
     <div class="groupunreviewed-all">
-        <div>团组未审核数据</div>
-        <div class="rvsreport-haed">
-            <el-date-picker @change="datechange" style="width:350px" v-model="value2" type="daterange" align="left"
+        <div class="groupunreviewed-title">团组未审核数据</div>
+        <div class="groupunreviewed-haed">
+            <el-date-picker @change="datechange" style="width:350px" v-model="value" type="daterange" align="left"
                 unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                 :picker-options="pickerOptions">
             </el-date-picker>
-            <el-button @click="Skeclick" type="primary">生 成</el-button>
+            <div>
+                <el-button type="primary">审核通过</el-button>
+                <el-button type="danger">审核不通过</el-button>
+            </div>
+        </div>
+        <div class="tree-box">
+            <el-tree 
+            @check="handleSelectionChange" 
+            :data="groupstableData" 
+            ref="tree"
+            show-checkbox 
+            :default-expand-all="false" 
+            :default-checked-keys="defaultarr"
+            node-key="id" 
+            :props="defaultProps"
+            highlight-current>
+                <span class="custom-tree-node" slot-scope="{ data }">
+                    <span>{{data.groupName?'（团组：'+data.groupName+'）':'' }}</span>
+                    <span>
+                        {{ data.applicant?'申请人：'+data.applicant:''}}
+                    </span>
+                    <span>
+                        {{ data.payType?'【'+data.payType+'】':''}}
+                    </span>
+                    <span>
+                        {{ data.moduleName?'['+data.moduleName+']':''}}
+                    </span>
+                    <span>
+                        {{ data.priceName?data.priceName:''}}
+                    </span>
+                    <span>
+                        {{ data.payee?'（收款方：'+data.payee+'）':'' }}
+                    </span>
+                    <span>
+                        {{ data.payCurrCode?'  : '+data.payCurrCode+' ':'' }}
+                    </span>
+                    <span>
+                        {{ data.paymentAmount!=undefined?'  '+twonumder(data.paymentAmount):'' }}
+                    </span>
+                    <span>
+                        {{ data.cnyTotalAmount!=undefined?'&nbsp;&nbsp;&nbsp;付款金额&nbsp;&nbsp;&nbsp;CNY  '+twonumder(data.cnyTotalAmount):'' }}
+                    </span>
+                    <span>
+                        {{ data.cnySubTotalAmount!=undefined?'  、 CNY  '+twonumder(data.cnySubTotalAmount=data.paymentAmount*data.payRate)+'&nbsp;&nbsp;&nbsp;汇率：':'' }}
+                    </span>
+                    <!-- <span>
+                        {{data.groupName?'（团组：'+data.groupName+'）':'' }}
+                    </span>
+                    
+                    
+                    
+                    
+                    
+                    
+                    
+                    <el-input-number v-if="data.payRate!=undefined" style="width:100px" @blur="inputblur(data.id,data.payRate,data.hotelSubId)" :precision="4" placeholder="公务翻译费" v-model="data.payRate" :controls='false'>
+                    </el-input-number> -->
+                </span>
+            </el-tree>
         </div>
     </div>
 </template>
 <script>
 export default {
-    
+    data () {
+        return {
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一个月',
+                    onClick(picker) {
+                    const end = new Date();
+                    const start = new Date();
+                    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                    picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近六个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 180);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一年',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 365);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            value:[],
+            defaultarr:[],//团组勾选中
+            groupstableData:[],//团组付款申请
+            defaultProps: {
+                children: 'childList',
+                label: 'groupName'
+            },
+        }
+    },
+    methods:{
+        //两位小数
+        twonumder(val){
+            return val.toFixed(2)
+        },
+        //处理日期
+        datetime(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1).toString();
+            var d=date.getDate()>=10?date.getDate():'0'+(date.getDate()).toString();
+            return y+'-'+m+'-'+d
+        },
+        //切换时间
+        datechange(){
+            if(this.value==null){
+                return
+            }
+            this.GroupUnAuditFeeList(this.datetime(this.value[0]),this.datetime(this.value[1]))
+        },
+        //获取团组未审核数据
+        GroupUnAuditFeeList(beginDt,endDt){
+            var that = this;
+            var url = "/api/Financial/GroupUnAuditFeeList?beginDt="+beginDt+"&endDt="+endDt
+            this.$axios({
+                method: 'get',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.groupstableData=res.data.data.dataList
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //勾选
+        handleSelectionChange(data,node) {
+            for(let i=0;i<node.checkedNodes.length;i++){
+                for(let j=0;j<node.checkedKeys.length;j++){
+                    if(node.checkedNodes[i].id==node.checkedKeys[j]){
+                        this.hotelSubIdarr.push(node.checkedNodes[i].hotelSubId)
+                    }
+                }
+            }
+            this.defaultarr=node.checkedKeys
+        },
+    }
 }
 </script>
 <style>
@@ -25,4 +178,18 @@ export default {
     min-height: 840px;
     min-width: 1400px;
 }
-</style>
+.groupunreviewed-title{
+    color: #555;
+    margin-bottom: 5px;
+}
+.groupunreviewed-haed{
+    display: flex;
+    justify-content: space-between;
+}
+.tree-box{
+    margin-top: 10px;
+    border: 1px solid #EBEEF5;
+    padding: 10px;
+}
+</style>
+

src/components/OP/PickupList.vue

@@ -170,80 +170,82 @@
                     <label>PS:自动填写补全功能可能有误差请仔细核实，补全或修改(没有可用‘-’或‘暂无’代替)</label>
                     <el-button @click="manysave" size="mini" type="primary">保 存</el-button>
                 </div>
-                <el-table :border="true" :data="tourClientListInfos">
-                    <el-table-column type="index" label="序号" width="50"></el-table-column>
-                    <el-table-column property="date" label="姓" width="100">
-                        <template slot-scope="scope">
-                            <el-autocomplete popper-class="el-autocomplete-suggestion" :popper-append-to-body="false"
-                                class="inline-input" size="mini" v-model.trim="scope.row.lastName"
-                                :fetch-suggestions="querySearch" @select="DTPromptChecked(scope.row)"></el-autocomplete>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="名" width="100">
-                        <template slot-scope="scope">
-                            <el-input size="mini" type="text" v-model.trim="scope.row.firstName">
-                            </el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="单位" width="150">
-                        <template slot-scope="scope">
-                            <el-autocomplete style="width:100% ;" popper-class="el-autocomplete-suggestion"
-                                :popper-append-to-body="false" class="inline-input" size="mini"
-                                v-model.trim="scope.row.companyFullName"
-                                :fetch-suggestions="querySearchdw"></el-autocomplete>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="职务" width="150">
-                        <template slot-scope="scope">
-                            <el-input size="mini" type="text" v-model.trim="scope.row.job">
-                            </el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="身份证" width="170">
-                        <template slot-scope="scope">
-                            <el-input size="mini" type="text" v-model.trim="scope.row.idCardNo">
-                            </el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="手机号码" width="115">
-                        <template slot-scope="scope">
-                            <el-input size="mini" type="text" v-model.trim="scope.row.phone">
-                            </el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="性别" width="150">
-                        <template slot-scope="scope">
-                            <el-radio-group size="mini" v-model="scope.row.sex">
-                                <el-radio label="男"></el-radio>
-                                <el-radio label="女"></el-radio>
-                            </el-radio-group>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="是否陪同" width="150">
-                        <template slot-scope="scope">
-                            <el-radio-group size="mini" v-model="scope.row.isAccompany">
-                                <el-radio label="是"></el-radio>
-                                <el-radio label="否"></el-radio>
-                            </el-radio-group>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="出生日期" width="100">
-                        <template slot-scope="scope">
-                            <el-date-picker :clearable="false" size="mini" type="date" placeholder="出生日期"
-                                v-model.trim="scope.row.birthDay" style="width: 100%;">
-                            </el-date-picker>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="舱位类型" width="115">
-                        <template slot-scope="scope">
-                            <el-select size="mini" style="width:100%" v-model="scope.row.shippingSpaceTypeId" clearable
-                                filterable placeholder="请选择">
-                                <el-option v-for="item in cangweiType" :key="item.id" :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </template>
-                    </el-table-column>
-                </el-table>
+                <div class="yanzheng">
+                    <el-table :border="true" :data="tourClientListInfos">
+                        <el-table-column type="index" label="序号" width="50"></el-table-column>
+                        <el-table-column property="date" label="姓" width="100">
+                            <template slot-scope="scope">
+                                <el-autocomplete popper-class="el-autocomplete-suggestion" :popper-append-to-body="false"
+                                    class="inline-input" size="mini" v-model.trim="scope.row.lastName"
+                                    :fetch-suggestions="querySearch" @select="DTPromptChecked(scope.row)"></el-autocomplete>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="名" width="100">
+                            <template slot-scope="scope">
+                                <el-input size="mini" type="text" v-model.trim="scope.row.firstName">
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="单位" width="150">
+                            <template slot-scope="scope">
+                                <el-autocomplete style="width:100% ;" popper-class="el-autocomplete-suggestion"
+                                    :popper-append-to-body="false" class="inline-input" size="mini"
+                                    v-model.trim="scope.row.companyFullName"
+                                    :fetch-suggestions="querySearchdw"></el-autocomplete>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="职务" width="150">
+                            <template slot-scope="scope">
+                                <el-input size="mini" type="text" v-model.trim="scope.row.job">
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="身份证" width="170">
+                            <template slot-scope="scope">
+                                <el-input size="mini" type="text" v-model.trim="scope.row.idCardNo">
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="手机号码" width="115">
+                            <template slot-scope="scope">
+                                <el-input size="mini" type="text" v-model.trim="scope.row.phone">
+                                </el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="性别" width="150">
+                            <template slot-scope="scope">
+                                <el-radio-group size="mini" v-model="scope.row.sex">
+                                    <el-radio label="男"></el-radio>
+                                    <el-radio label="女"></el-radio>
+                                </el-radio-group>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="是否陪同" width="150">
+                            <template slot-scope="scope">
+                                <el-radio-group size="mini" v-model="scope.row.isAccompany">
+                                    <el-radio label="是"></el-radio>
+                                    <el-radio label="否"></el-radio>
+                                </el-radio-group>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="出生日期" width="100">
+                            <template slot-scope="scope">
+                                <el-date-picker :clearable="false" size="mini" type="date" placeholder="出生日期"
+                                    v-model.trim="scope.row.birthDay" style="width: 100%;padding-left: 0px;padding-right: 0px;">
+                                </el-date-picker>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="舱位类型" width="115">
+                            <template slot-scope="scope">
+                                <el-select size="mini" style="width:100%" v-model="scope.row.shippingSpaceTypeId" clearable
+                                    filterable placeholder="请选择">
+                                    <el-option v-for="item in cangweiType" :key="item.id" :label="item.name" :value="item.id">
+                                    </el-option>
+                                </el-select>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
             </el-dialog>
         </div>
     </div>
@@ -956,7 +958,8 @@ export default {
                     pdarr.push(this.tableData[k])
                 }
             }
-            if(pdarr.length>=this.GroupInfo.visitPNumber&&this.id==0){
+            console.log(this.pickupinif.isAccompany);
+            if(pdarr.length>=this.GroupInfo.visitPNumber&&this.id==0&&this.pickupinif.isAccompany!="是"){
                 this.$message.error("保存失败！录入的客户名单超过本团组的出访人数，请检查仔细删除多余人！");
                 return
             }
@@ -1431,7 +1434,10 @@ export default {
 .pickuplist-all .el-autocomplete-suggestion {
     width: auto !important;
 }
-
+.pickuplist-all .yanzheng .el-input--prefix .el-input__inner{
+    padding-left: 0px;
+    padding-right: 0px;
+}
 .dutzl .el-input__inner {
     padding: 0 5px;
 }