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

src/components/Finance/Overspendedit.vue

@@ -4,7 +4,7 @@
             <div class="overspendedit-form">
                 <el-form ref="form" :rules="rules" :model="form" label-width="100px">
                     <el-form-item label="团队名称">
-                        <el-select @change="getheadtitle" :disabled="disableds" v-model="DiId" placeholder="请选择活动区域">
+                        <el-select @change="getheadtitle" :disabled="disableds" v-model="DiId" placeholder="请选择团队名称">
                             <el-option v-for="(item,index) in cTablelist" :key="index" :label="item.teamName" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>

src/components/MCR/Marketingamount.vue

@@ -1,11 +1,298 @@
 <template>
     <div class="Marketingamount-box">
-        
+        <!-- 详情弹出框 -->
+        <el-dialog title="详情" :visible.sync="particulars">
+            <el-table :data="gridData">
+                <el-table-column property="date" label="日期" width="150"></el-table-column>
+                <el-table-column property="name" label="姓名" width="200"></el-table-column>
+                <el-table-column property="address" label="地址"></el-table-column>
+            </el-table>
+        </el-dialog>
+        <!-- 详情弹出框 -->
+        <el-dialog title="拜访记录" :visible.sync="visitlog">
+            
+        </el-dialog>
+        <el-form ref="form" label-width="75px">
+            <el-form-item label="人员名称:">
+                <el-select v-model="DiId" placeholder="请选择团队名称">
+                    <el-option v-for="(item,index) in cTablelist" :key="index" :label="item.teamName" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <div class="Marketingamount-head-ul">
+            <div style="background-color: #ff4f4f;" class="Marketingamount-head-li">
+                <div class="head-li-title">全年销售总金额</div>
+                <div class="head-li-info">
+                    <div class="li-info-amount">¥99,999</div>
+                    <div class="li-info-ratio">年同比:5%&nbsp;&nbsp;&nbsp;▲</div>
+                </div>
+            </div>
+            <div style="background-color: #069305;" class="Marketingamount-head-li">
+                <div class="head-li-title">全年销售总金额</div>
+                <div class="head-li-info">
+                    <div class="li-info-amount">¥99,999</div>
+                    <div class="li-info-ratio">年同比:5%&nbsp;&nbsp;&nbsp;▼</div>
+                </div>
+            </div>
+            <div  style="background-color: #ff4f4f;" class="Marketingamount-head-li">
+                <div class="head-li-title">全年销售总金额</div>
+                <div class="head-li-info">
+                    <div class="li-info-amount">¥99,999</div>
+                    <div class="li-info-ratio">年同比:5%&nbsp;&nbsp;&nbsp;▲</div>
+                </div>
+            </div>
+        </div>
+        <div class="Marketingamount-content">
+            <div class="content-chart">
+                <el-table
+                :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+                :data="tableDatas"
+                border
+                style="width: 100%">
+                    <el-table-column
+                    prop=""
+                    label="排名"
+                    width="50">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="名称"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="成单量">
+                    </el-table-column>
+                </el-table>
+                <div style="text-align: center;margin: 5px 0">
+                    <el-pagination
+                    small
+                    layout="prev, pager, next"
+                    :total="50">
+                    </el-pagination>
+                </div>
+                <div id="statisticallyone" style="height:300px;"></div>
+                <div id="statisticallytwo" style="height:300px;"></div>
+            </div>
+            <div class="content-table">
+                <el-table
+                :header-cell-style="{background:'#eef1f6',color:'#606266'}"
+                :data="tableData"
+                border
+                style="width: 100%">
+                    <el-table-column
+                    prop=""
+                    label="序号"
+                    width="50">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="团组名"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="客户单位">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="客户名称">
+                    </el-table-column>
+                    <el-table-column
+                    prop="date"
+                    label="出访日期"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop=""
+                    label="人数"
+                    width="50">
+                    </el-table-column>
+                    <el-table-column
+                    width="150"
+                    label="操作">
+                        <template>
+                            <el-button size="mini" @click="particulars=true" type="primary">查看</el-button>
+                            <el-button size="mini" @click="visitlog=true" type="primary">拜访</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="block">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange"
+                      :current-page="currentPage"
+                      :page-size="pagesize"
+                      layout="total, sizes, prev, pager, next, jumper"
+                      :total="400">
+                    </el-pagination>
+                  </div>
+            </div>
+        </div>
     </div>
 </template>
 <script>
+import * as echarts from 'echarts';
 export default {
-    
+    data() {
+        return {
+            DiId:'',
+            cTablelist:[],
+            currentPage:1,
+            pagesize:10,
+            tableDatas:[
+                {
+                date: '2016-05-02',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1518 弄'
+                }, {
+                date: '2016-05-04',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1517 弄'
+                }, {
+                date: '2016-05-01',
+                name: '王小虎',
+                address: '上海市普陀区金沙江路 1519 弄'
+                }
+            ],
+            tableData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1517 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1519 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1516 弄'
+            }
+            ],
+            particulars:false,
+            visitlog:false,
+        }
+    },
+    methods:{
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+        },
+        statisone(){
+            var myChart = echarts.init(document.getElementById('statisticallyone'));
+            myChart.setOption({
+                title: {
+                    text: '客户类型分布表',
+                    left: 'center'
+                },
+                tooltip: {
+                    trigger: 'item'
+                },
+                // legend: {
+                //     orient: 'vertical',
+                //     left: 'left'
+                // },
+                series: [
+                    {
+                    type: 'pie',
+                    radius: '50%',
+                    data: [
+                        { value: 1048, name: '政府' },
+                        { value: 735, name: '企业' },
+                        { value: 580, name: '散客' },
+                        { value: 484, name: '高校' },
+                        { value: 484, name: '非团组' },
+                        { value: 484, name: '成都会务活动' },
+                        { value: 484, name: '四川会务活动' },
+                        { value: 484, name: '成都赛事' },
+                        { value: 484, name: '四川赛事' },
+                        { value: 300, name: '未知' }
+                    ],
+                    emphasis: {
+                        itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                    }
+                ]
+            });
+            var myCharttwo = echarts.init(document.getElementById('statisticallytwo'));
+            myCharttwo.setOption({
+                title: {
+                    text: '客户等级分布表',
+                    left: 'center'
+                },
+                tooltip: {
+                    trigger: 'item'
+                },
+                series: [
+                    {
+                    type: 'pie',
+                    radius: '50%',
+                    data: [
+                        { value: 1048, name: 'VIP' },
+                        { value: 735, name: 'VVIP' },
+                        { value: 580, name: '暂未定级' },
+                    ],
+                    emphasis: {
+                        itemStyle: {
+                        shadowBlur: 10,
+                        shadowOffsetX: 0,
+                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                        }
+                    }
+                    }
+                ]
+            });
+        }
+    },
+    mounted(){
+        this.statisone()
+    }
 }
 </script>
 <style>
@@ -16,4 +303,42 @@ export default {
     border-radius: 10px;
     min-height: 830px;
 }
+.Marketingamount-head-ul{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.Marketingamount-head-li{
+    color: #fff;
+    min-width: 25%;
+    padding: 15px;
+    box-shadow: 0 0 10px #0005;
+    border-radius: 10px;
+}
+.head-li-title{
+    font-size: 17px;
+    font-weight: 600;
+    margin-bottom: 20px;
+}
+.head-li-info{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+.Marketingamount-content{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+}
+.content-chart{
+    padding-top: 25px;
+    min-width: 26.5%;
+}
+.content-table{
+    margin-top: 25px;
+    min-width: 60%;
+}
+.content-table .block{
+    text-align: center;
+}
 </style>

src/components/OP/DecreasePayments.vue

@@ -43,9 +43,9 @@
                     </el-table-column>
                     <el-table-column prop="priceName" label="费用名称" width="260">
                     </el-table-column>
-                    <el-table-column prop="price,currency" label="费用" sortable>
+                    <el-table-column label="费用" sortable>
                         <template slot-scope="scope">
-                            {{ townum(scope.row.price) }}({{ scope.row.currency }})
+                            {{ townum(scope.row.feeTotal) }}({{ scope.row.currency }})
                         </template>
                     </el-table-column>
                     <el-table-column prop="filePath" label="附件">

src/components/OP/EntryDetails.vue

@@ -1661,13 +1661,6 @@ export default {
             }
             var url = "/api/Groups/PostEnterExitCostDownload"
             var that = this
-            var data={
-                    portType: 1,
-                    diId: that.value,
-                    exportType: val,
-                    subTypeId:subTypeId
-                }
-            console.log(JSON.stringify(data))
             this.$axios({
                 method: 'post',
                 url: url,

src/components/OP/OpDecreasePayments.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="car_add">
+    <div class="car_add" v-loading.fullscreen.lock="fullscreenLoading">
         <div>
             <div class="communal-title">
                 <div>{{ title }}</div>
@@ -8,8 +8,8 @@
         <hr style='background-color:#5555; height:1px; border:none;' />
         <div>
             <el-form :model="delegationInfo" label-width="100px" class="demo-ruleForm">
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 394px;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="DiIdSelect" clearable filterable placeholder="团组选择"
                                 @change="DecreasePaymentsChange" :disabled="isShow" style="width: 100%;">
@@ -19,19 +19,19 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 394px;">
                         <el-form-item label="团 号:" prop="tourCode" label-width="160px">
                             <el-input placeholder="团号" v-model="delegationInfo.tourCode" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 394px;">
                         <el-form-item label="客户:" prop="clientName" label-width="160px">
                             <el-input placeholder="客户" v-model="delegationInfo.clientName" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 394px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
@@ -42,29 +42,91 @@
             <el-form :model="DecreasePaymentsData" ref="DecreasePaymentsData" :rules="DecreasePaymentsRules"
                 label-width="100px" class="demo-ruleForm">
                 <div style="display:flex ;flex-wrap: wrap;">
-                    <div style="width: 25%;">
+                    <!-- <div style="width: 394px;">
+                        <el-form-item label="团组类型:" prop="clientName" label-width="160px">
+                            <el-input placeholder="团组类型" v-model="delegationInfo.clientName" :disabled="true">
+                            </el-input>
+                        </el-form-item>
+                    </div> -->
+                    <div style="width: 394px;">
                         <el-form-item label="费用名称:" prop="priceName" label-width="160px">
                             <el-input placeholder="费用名称" v-model="DecreasePaymentsData.priceName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
-                        <el-form-item label="费用金额:" prop="currency" label-width="160px">
-                            <el-input placeholder="费用金额" v-model="DecreasePaymentsData.price" style="width: 56%;">
-                            </el-input>
+                    <div style="width: 394px;">
+                        <el-form-item label="费用单价:" prop="currency" label-width="160px">
+                            <el-input-number @blur="Sumup" style="width:56%" :precision="2" placeholder="费用金额" v-model="DecreasePaymentsData.price" :controls='false'>
+                            </el-input-number>
+                            <!-- <el-input placeholder="费用单价" v-model="DecreasePaymentsData.price" style="width: 56%;">
+                            </el-input> -->
                             <el-select v-model="DecreasePaymentsData.currency" style="width: 40%;">
                                 <el-option v-for="item in rateList" :key="item.currencyId" :label="item.currencyCode"
                                     :value="item.currencyId"></el-option>
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
-                        <el-form-item label="收款方:" prop="payee" label-width="160px">
-                            <el-input placeholder="收款方" v-model="DecreasePaymentsData.payee">
+                    <div style="width: 394px;">
+                        <el-form-item label="数量:" prop="quantity" label-width="160px">
+                            <el-input-number @blur="Sumup" style="width:100%" :precision="2" placeholder="数量" v-model="DecreasePaymentsData.quantity" :controls='false'>
+                            </el-input-number>
+                            <!-- <el-input placeholder="数量" v-model="DecreasePaymentsData.payee">
+                            </el-input> -->
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="供应商全称:" prop="supplierName" label-width="160px">
+                            <el-input placeholder="供应商全称" v-model="DecreasePaymentsData.supplierName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div v-if="eventspd" style="width: 394px;">
+                        <el-form-item label="供应商类型:" prop="supplierTypeId" label-width="160px">
+                            <el-select v-model="DecreasePaymentsData.supplierTypeId" placeholder="供应商类型"
+                                style="width: 100%;">
+                                <el-option v-for="(item,index) in suppliertype" :key="index" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="供应商地区:" prop="supplierArea" label-width="160px">
+                            <el-select v-model="DecreasePaymentsData.supplierArea" placeholder="供应商地区"
+                                style="width: 100%;">
+                                <el-option v-for="(item,index) in supplierRegion" :key="index" :label="item.name" :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="社交账号:" prop="supplierSocialAccount" label-width="160px">
+                            <el-input placeholder="社交账号" v-model="DecreasePaymentsData.supplierSocialAccount">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="供应商地址:" prop="supplierAddress" label-width="160px">
+                            <el-input placeholder="供应商地址" v-model="DecreasePaymentsData.supplierAddress">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="邮箱:" prop="supplierEmail" label-width="160px">
+                            <el-input placeholder="邮箱" v-model="DecreasePaymentsData.supplierEmail">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="联系人:" prop="supplierContact" label-width="160px">
+                            <el-input placeholder="联系人" v-model="DecreasePaymentsData.supplierContact">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="联系电话:" prop="supplierContactNumber" label-width="160px">
+                            <el-input placeholder="联系电话" v-model="DecreasePaymentsData.supplierContactNumber">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="DecreasePaymentsData.orbitalPrivateTransfer" placeholder="费用标识"
                                 style="width: 100%;">
@@ -75,7 +137,17 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 394px;">
+                        <el-form-item label="费用总价:" label-width="160px">
+                            <el-input-number disabled style="width:56%" :precision="2" placeholder="费用总价" v-model="DecreasePaymentsData.feeTotal" :controls='false'>
+                            </el-input-number>
+                            <el-select disabled v-model="DecreasePaymentsData.currency" style="width: 40%;">
+                                <el-option v-for="item in rateList" :key="item.currencyId" :label="item.currencyCode"
+                                :value="item.currencyId"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
                         <el-form-item label="支付方式:" prop="payDId" label-width="160px">
                             <el-select v-model="DecreasePaymentsData.payDId" placeholder="支付方式" style="width: 100%;">
                                 <el-option v-for="item in payment" :key="item.id" :label="item.name" :value="item.id">
@@ -83,6 +155,26 @@
                             </el-select>
                         </el-form-item>
                     </div>
+                    
+                    <div style="width: 394px;">
+                        <el-form-item label="开户行:" label-width="160px">
+                            <el-input placeholder="开户行" v-model="DecreasePaymentsData.otherBankName">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="银行卡号:"  label-width="160px">
+                            <el-input placeholder="银行卡号" v-model="DecreasePaymentsData.otherSideNo">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 394px;">
+                        <el-form-item label="对方姓名:"  label-width="160px">
+                            <el-input placeholder="对方姓名" v-model="DecreasePaymentsData.otherSideName">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    
                 </div>
                 <div style="display: flex;">
                     <div>
@@ -121,6 +213,8 @@
     </div>
 </template>
 <script>
+import { Decimal } from 'decimal.js'
+import {debounce} from '../../store/statice'
 export default {
     data() {
         return {
@@ -139,18 +233,30 @@ export default {
             delegationInfoList: [],//团组下拉框
             payment: [],//支付方式下拉框
             DecreasePaymentsData: {
-                status: 0,
-                payDId: 72,
-                orbitalPrivateTransfer: 0,
-                payee: "",
-                id: 0,
-                diId: 0,
-                priceName: "",
-                price: 0,
-                currency: '',
-                filePath: "",
-                createUserId: 0,
-                remark: ""
+                status: 0,//操作状态 1 添加 2 修改
+                payDId: 72,//支付方式
+                orbitalPrivateTransfer: 0,//费用表示
+                supplierName: "",//收款方
+                id: 0,//编号
+                diId: 0,//团组外键编号
+                priceName: "",//费用名称
+                price: 0,//费用金额
+                supplierContact:"",//联系人
+                supplierContactNumber:"",//联系电话
+                currency: '',//费用币种
+                filePath: "",//附件地址
+                createUserId: 0,//创建者Id
+                remark: "",//备注
+                supplierArea:1,//供应商地区
+                supplierTypeId:'',//供应商类型
+                quantity:0,//数量
+                feeTotal:0,//总计
+                supplierSocialAccount:'',//社交账号
+                supplierAddress:'',//供应商地址
+                supplierEmail:'',//邮箱
+                otherBankName:'',//开户行
+                otherSideNo:'',//银行卡号
+                otherSideName:'',//对方姓名
             },
             IsAuditGM: 0,
             Decrease: {},
@@ -166,8 +272,8 @@ export default {
                 priceName: [
                     { required: true, message: '请输入费用名称', trigger: 'change' },
                 ],
-                payee: [
-                    { required: true, message: '请输入收款方姓名', trigger: 'change' },
+                supplierName: [
+                    { required: true, message: '请输入供应商全称', trigger: 'change' },
                 ],
                 orbitalPrivateTransfer: [
                     { required: true, message: '请选择费用标识', trigger: 'change' },
@@ -175,9 +281,38 @@ export default {
                 payDId: [
                     { required: true, message: '请选择支付方式', trigger: 'change' }
                 ],
+                quantity: [
+                    { required: true, message: '请输入数量', trigger: 'blur' }
+                ],
+                supplierContact: [
+                    { required: true, message: '请输入联系人', trigger: 'blur' }
+                ],
+                supplierContactNumber: [
+                    { required: true, message: '请输入联系人电话', trigger: 'blur' }
+                ],
+                supplierTypeId: [
+                    { required: true, message: '请选择供应商类型', trigger: 'change' }
+                ],
+                supplierArea: [
+                    { required: true, message: '请选择供应商地区', trigger: 'change' }
+                ],
+                supplierSocialAccount: [
+                    { required: true, message: '请输入联系人', trigger: 'blur' }
+                ],
+                supplierAddress: [
+                    { required: true, message: '请输入联系人', trigger: 'blur' }
+                ],
+                supplierEmail: [
+                    { required: true, message: '请输入联系人', trigger: 'blur' }
+                ],
+
             },
             rateList: [],
-        }
+            suppliertype:[],
+            supplierRegion:[],
+            eventspd:true,
+            fullscreenLoading:false,
+        }   
     },
 
     methods: {
@@ -202,10 +337,18 @@ export default {
                     for (let index = 0; index < that.delegationInfoList.length; index++) {
                         if (that.delegationInfoList[index].id == that.DiIdSelect) {
                             that.delegationInfo = that.delegationInfoList[index];
+                            if(res.data.data.groupName[index].teamDid==302||res.data.data.groupName[index].teamDid==691||res.data.data.groupName[index].teamDid==762||res.data.data.groupName[index].teamDid==1047){
+                                that.eventspd=true
+                            }else{
+                                that.eventspd=false
+                            }
+                            console.log(that.eventspd);
                             break;
                         }
                     }
-                    that.payment = res.data.data.payment
+                    that.payment = res.data.data.payment;
+                    that.suppliertype = res.data.data.supplier;
+                    that.supplierRegion = res.data.data.supplierArea;
                 }
             })
 
@@ -225,13 +368,17 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-
-                    that.Decrease = res.data.data._Decrease
-                    that.CreditCard = res.data.data._CreditCard
-                    that.DecreasePaymentsData.payDId = that.CreditCard.payDId
-                    that.DecreasePaymentsData.orbitalPrivateTransfer = that.CreditCard.orbitalPrivateTransfer
-                    that.DecreasePaymentsData.payee = that.CreditCard.payee
+                    that.Decrease = res.data.data
+                    that.DecreasePaymentsData.payDId = that.Decrease.payDId
+                    that.DecreasePaymentsData.orbitalPrivateTransfer = that.Decrease.orbitalPrivateTransfer
+                    that.DecreasePaymentsData.supplierName = that.Decrease.supplierName
                     that.DecreasePaymentsData.id = that.Decrease.id
+                    that.DecreasePaymentsData.supplierArea = that.Decrease.supplierArea
+                    that.DecreasePaymentsData.supplierTypeId = that.Decrease.supplierTypeId
+                    that.DecreasePaymentsData.supplierContact = that.Decrease.supplierContact
+                    that.DecreasePaymentsData.supplierContactNumber = that.Decrease.supplierContactNumber
+                    that.DecreasePaymentsData.quantity = that.Decrease.quantity
+                    that.DecreasePaymentsData.feeTotal = that.Decrease.feeTotal
                     that.DecreasePaymentsData.diId = that.Decrease.diId
                     that.DecreasePaymentsData.priceName = that.Decrease.priceName
                     that.DecreasePaymentsData.price = that.Decrease.price
@@ -239,25 +386,33 @@ export default {
                     that.DecreasePaymentsData.filePath = that.Decrease.filePath
                     that.projectName = that.Decrease.filePath
                     that.DecreasePaymentsData.remark = that.Decrease.remark
-                    that.IsAuditGM = that.CreditCard.isAuditGM
+                    that.DecreasePaymentsData.supplierSocialAccount = that.Decrease.supplierSocialAccount
+                    that.DecreasePaymentsData.supplierAddress = that.Decrease.supplierAddress
+                    that.DecreasePaymentsData.supplierEmail = that.Decrease.supplierEmail
+                    that.DecreasePaymentsData.otherBankName = that.Decrease.otherBankName
+                    that.DecreasePaymentsData.otherSideNo = that.Decrease.otherSideNo
+                    that.DecreasePaymentsData.otherSideName = that.Decrease.otherSideName
+                    that.IsAuditGM = that.Decrease.isAuditGM
                     if (that.Decrease.filePath != null && that.Decrease.filePath != undefined && that.Decrease.filePath != "") {
                         that.uploadFiles.push({
                             name: that.Decrease.filePath,
                             url: 'http://132.232.92.186:24/Office/GrpFile/团组增减款项相关文件/',
                         })
                     }
-
                 }
-
             })
         },
-
         //点击保存事件
-        addBtn() {
+        addBtn:debounce(function() {
+            console.log(this.IsAuditGM);
+            this.DecreasePaymentsData.supplierTypeId=this.eventspd?this.DecreasePaymentsData.supplierTypeId:0;
+            this.fullscreenLoading=true;
             if (this.IsAuditGM == 1) {
+                this.fullscreenLoading=false;
                 this.$message.error('已通过审核，不可修改！');
             } else {
                 if (this.DiId == null && this.DiId == undefined && this.DiId == "") {
+                    this.fullscreenLoading=false;
                     this.$message.error("请选择团组名称");
                     return;
                 }
@@ -299,11 +454,12 @@ export default {
                                         message: res.data.msg,
                                         type: 'success'
                                     });
-                                    that.loading = true;
                                     setTimeout(() => {
+                                        that.fullscreenLoading=false;
                                         that.quxiao()
                                     }, 1000);
                                 } else {
+                                    that.fullscreenLoading=false;
                                     that.$message.error(res.data.msg);
                                 }
                             })
@@ -348,9 +504,11 @@ export default {
                                         });
                                         that.loading = true;
                                         setTimeout(() => {
+                                            that.fullscreenLoading=false;
                                             that.$router.push('/home/DecreasePayments')
-                                        }, 3000);
+                                        }, 1000);
                                     } else {
+                                        that.fullscreenLoading=false;
                                         that.$message.error(res.data.msg);
                                     }
                                 })
@@ -359,6 +517,7 @@ export default {
                         }
 
                     } else {
+                        this.fullscreenLoading=false;
                         this.$message.error('请完善信息在保存！');
                         return false;
                     }
@@ -366,7 +525,7 @@ export default {
 
             }
             // 此时必填完成，做保存后的业务操作
-        },
+        },1000,true),
         //取消
         quxiao(){
             this.$router.push({
@@ -376,16 +535,24 @@ export default {
                 }
             })
         },
+        //计算总价
+        Sumup(){
+            this.DecreasePaymentsData.feeTotal=new Decimal(this.DecreasePaymentsData.price*this.DecreasePaymentsData.quantity).toFixed(2);
+        },
         DecreasePaymentsChange() {
             this.QueryRate();
             for (let index = 0; index < this.delegationInfoList.length; index++) {
                 if (this.delegationInfoList[index].id == parseInt(this.DiIdSelect)) {
                     this.delegationInfo = this.delegationInfoList[index];
+                    if(this.delegationInfo.teamDid==302||this.delegationInfo.teamDid==691||this.delegationInfo.teamDid==762||this.delegationInfo.teamDid==1047){
+                        this.eventspd=true
+                    }else{
+                        this.eventspd=false
+                    }
                     break;
                 }
             }
         },
-
         //上传
         // 文件超出限制
         exceed(files, fileList) {
@@ -394,7 +561,6 @@ export default {
                 } 个文件,请取消要替换的文件`
             );
         },
-
         //文件上传成功时的钩子
         upLoadSuccess(response, file, fileList) {
             if (response.code == 200) {
@@ -441,9 +607,8 @@ export default {
                         that.$message.error(res.data.msg);
                     }
                 })
-                console.log("上传成功");
             } else {
-                console.log("保存失败");
+                that.$message.error(res.data.msg);
             }
 
         },
@@ -558,6 +723,7 @@ export default {
     padding: 20px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    min-height: 810px;
 }
 
 @media screen and (max-width: 1700px) {

src/components/OP/downloadpage.vue

@@ -0,0 +1,354 @@
+<template>
+    <div class="downloadpage-all">
+        <div class="downloadpage-Groups">
+            <el-select v-model="diIdselect" clearable filterable placeholder="团组选择" style="width: 100%;">
+                <el-option v-for="item in delegationInfoList" :key="item.rowNumber" :label="item.groupName"
+                    :value="item.id">
+                </el-option>
+            </el-select>
+        </div>
+        <div class="downloadpage-ps">PS:请先选择团组再下载！</div>
+        <div class="downloadpage-table">
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">OP行程单</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="dcwzxc" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">OP行程单</div> 
+                <div class="downloadpage-table-tb tb-type">PDF</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">团组名单</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="Exportlist(0)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">团组名单</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">英文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small"  @click="Exportlist(1)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">导出倒推表</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="PostInvertedListFileDownload" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">出国出境经费审核计算明细</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(1,1005)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">因公出国(境)经费测算明细表</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(1,1006)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">四川省商务厅出国经费财政先行审核表</div> 
+                <div class="downloadpage-table-tb tb-type">EXCEL</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(1,1007)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">成都市因公临时出国任务和预算审批意见表（外专培训团专用）</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(1,1066)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">派员单位出(境)任务和预算审批意见表</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(2,1008)" type="primary">下载</el-button>
+                </div> 
+            </div>
+            <div class="downloadpage-table-tr">
+                <div class="downloadpage-table-tb tb-name">省级单位出(境)经费报销单</div> 
+                <div class="downloadpage-table-tb tb-type">WORD</div> 
+                <div class="downloadpage-table-tb tb-Language">中文</div> 
+                <div class="downloadpage-table-tb tb-download">
+                    <el-button size="small" @click="eptschedule(2,1009)" type="primary">下载</el-button>
+                </div> 
+            </div>
+        </div>
+        <div class="downloadpage-btn-box">
+            <!-- <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button>
+            <el-button class="downloadpage-btn" type="primary">主要按钮</el-button> -->
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            diIdselect:'',
+            delegationInfoList:[],
+            pageloadData: {
+                "portType": 1,
+                "pageIndex": 1,
+                "pageSize": 10,
+                "contact": "",
+                "location": "",
+                "client": "",
+                "userid": "",
+                "lvlid": 0,
+                "business": "",
+                "Range": 0,
+                "Category": 0,
+                "operationUserId": 0
+            },
+            token:'',
+            pageId:'',
+            userId:''
+        }
+    },
+    methods:{
+        //页面加载
+        padeload(){
+            var url = "/api/Business/PostGroupNameScreen"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    pageIndex:1,
+                    pageSize: 9000,
+                    groupName:'',
+                    userId:that.userId==21?-1:that.userId,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                    that.delegationInfoList=res.data.data;
+                    that.diIdselect=that.delegationInfoList[0].id;
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        //导出完整行程
+        dcwzxc(){
+            var url = "/api/Groups/ExportTravel"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    diid: that.diIdselect,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success',
+                        offset: 50
+                    });
+                    window.open(res.data.data.replace('C:/Server/File/OA2023/','http://132.232.92.186:24/'));
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+        },
+        //团组名单
+        Exportlist(val) {
+            var url = "/api/Groups/PostTourClientListDownloadFile"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    portType: 1,
+                    userId: that.userId,
+                    pageId: that.pageId,
+                    diId: that.diIdselect,
+                    language: val
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    window.location.href = res.data.data
+                    that.$message({
+                        type: 'success',
+                        message: res.data.msg
+                    });
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("下载失败！");
+            });
+        },
+        //导出倒推表
+        PostInvertedListFileDownload() {
+            var url = "/api/Groups/PostInvertedListFileDownload"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    portType: 1,
+                    diId: that.diIdselect
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.$message({
+                        message:res.data.msg ,
+                        type: 'success',
+                        offset:50
+                    });
+                    window.open(res.data.data);
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+        },
+        //三公导出
+        eptschedule(val1,val2){
+            var url = "/api/Groups/PostEnterExitCostDownload"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data:{
+                    portType: 1,
+                    diId: that.diIdselect,
+                    exportType: val1,
+                    subTypeId:val2
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                    that.$message({
+                        type: 'success',
+                        message: res.data.msg
+                    });
+                    window.open(res.data.data.url);
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+    },
+    created(){
+        this.token = JSON.parse(localStorage.getItem('userinif')).token;
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
+        this.pageId = Number(localStorage.getItem('indexs').split('-')[1]);//页面id
+        this.padeload()
+    }
+}
+</script>
+<style>
+.downloadpage-all {
+    background-color: #fff;
+    padding: 20px;
+    box-shadow: 0 0 5px #0005;
+    border-radius: 10px;
+    min-height: 810px;
+}
+.downloadpage-Groups{
+    width: 394px;
+}
+.downloadpage-btn{
+    width: 200px;
+}
+.downloadpage-table-tr{
+    display: flex;
+    
+}
+.downloadpage-ps{
+    margin-top:20px ;
+    font-size: 14px;
+}
+.downloadpage-table{
+    max-height: 700px;
+    border-bottom: 1px solid #DCDFE6;
+    overflow: hidden;
+    overflow: auto;
+}
+.downloadpage-table-tr{
+    border-top: 1px solid #DCDFE6;
+}
+.downloadpage-table-tb{
+    padding: 10px;
+    text-align: center;
+    border-left: 1px solid #DCDFE6;
+    font-size: 14px;
+    color: #555;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.downloadpage-table-tb:last-child{
+    border-right: 1px solid #DCDFE6;
+}
+.tb-name{
+    width: 40%;
+}
+.tb-type{
+    width: 25%;
+}
+.tb-Language{
+    width: 25%;
+}
+.tb-download{
+    width: 10%;
+}
+</style>

src/router/index.js

@@ -107,6 +107,7 @@ import royaltypg from '@/components/Finance/royaltypg';
 import visaAgencyfee from '@/components/OP/visaAgencyfee'
 import Hotelenquiry from '@/components/OP/Hotelenquiry'
 import Marketingamount from '@/components/MCR/Marketingamount';
+import downloadpage from '@/components/OP/downloadpage';
 
 Vue.use(Router)
 
@@ -659,6 +660,11 @@ export default new Router({
           name: 'Marketingamount',
           component: Marketingamount
         },
+        {
+          path: '/home/downloadpage',
+          name: 'downloadpage',
+          component: downloadpage
+        },
       ]
     },
     {