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

src/components/Finance/Overspend.vue

@@ -12,7 +12,7 @@
                         </el-select>
                     </div>
                     <div class="preserve-btn">
-                        <el-button class="preserve" type="primary">导出超支明细</el-button>
+                        <el-button class="preserve" @click="PostGroupExtraCost_OutputExcel" type="primary">导出超支明细</el-button>
                         <el-button class="preserve" @click="addlist()" type="primary">新增数据</el-button>
                     </div>
                 </div>
@@ -254,6 +254,32 @@ export default {
             
             // rows.splice(index, 1);
         },
+        //生成
+        PostGroupExtraCost_OutputExcel(){
+            var url = "/api/Financial/PostGroupExtraCost_OutputExcel"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data:{
+                    portType: 1,
+                    diId:this.diId
+                }
+            }).then(function (res) {
+                console.log(res)
+                if(res.data.code==200){
+                   window.open(res.data.data.url)
+                }else{
+                    that.$message({
+                        message:res.data.msg ,
+                        type: 'warning',
+                    });
+                }
+            })
+        },
         //超支费用api
         PostGroupExtraCost_Operator(id){
             var url = "/api/Financial/PostGroupExtraCost_Operator"

src/components/Finance/PayReceived.vue

@@ -54,7 +54,7 @@
                 >
                     <el-table-column
                     label="付款时间"
-                    width="160">
+                    width="165">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"
@@ -88,7 +88,7 @@
                     </el-table-column>
                     <el-table-column
                         label="到款时间"
-                        width="160">
+                        width="165">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -3,7 +3,7 @@
         <div class="mcr-box">
             <div class="mcr-head">
                 <!-- 预计出团量 -->
-                <div style="display: flex;margin-bottom: 10px;">
+                <!-- <div style="display: flex;margin-bottom: 10px;">
                     <div style="width:24%">
                         预计出团:<span>{{ preDele }}</span>
                     </div>
@@ -16,7 +16,7 @@
                     <div style="width:24%">
                         已出团总量:<span>{{ groupNumber.finlishedDeleAll }}</span>
                     </div>
-                </div>
+                </div> -->
 
 
                 <div>
@@ -76,28 +76,29 @@
             </div>
             <div class="mcr-table">
                 <el-table :data="PageList" border @select="handleSelect" style="width: 100%">
-                    <el-table-column prop="client" label="单位" width="140">
+                    <el-table-column prop="weight" label="权重"  width="50">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.weight == '393'">A</span>
+                            <span v-else-if="scope.row.weight == '392'">B</span>
+                            <span v-else-if="scope.row.weight == '391'">C</span>
+                        </template>
                     </el-table-column>
-                    <el-table-column prop="contact" label="联系人">
+                    <el-table-column prop="client" label="单位" width="230">
                     </el-table-column>
-                    <el-table-column prop="job" label="职位">
+                    <el-table-column prop="contact" label="联系人" width="90">
                     </el-table-column>
-                    <el-table-column prop="telephone" label="手机号">
+                    <el-table-column prop="job" label="职位" width="110">
                     </el-table-column>
-                    <el-table-column prop="phone" label="座机号">
+                    <el-table-column prop="telephone" label="手机号" width="120">
                     </el-table-column>
-                    <el-table-column prop="location" label="所在区域">
+                    <el-table-column prop="phone" label="座机号" width="120">
                     </el-table-column>
-                    <el-table-column prop="birthday" label="生日">
+                    <el-table-column prop="location" label="所在区域" width="130">
                     </el-table-column>
-                    <el-table-column prop="weight" label="权重">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.weight == '393'">A</span>
-                            <span v-else-if="scope.row.weight == '392'">B</span>
-                            <span v-else-if="scope.row.weight == '391'">C</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="ascribedDepartment" label="业务归属">
+                    <!-- <el-table-column prop="birthday" label="生日">
+                    </el-table-column> -->
+                    
+                    <el-table-column prop="ascribedDepartment" label="业务归属" width="80">
                         <template slot-scope="scope">
                             <el-tooltip class="item" effect="dark" placement="top">
                                 <span style="color:royalblue">查看</span>
@@ -110,7 +111,7 @@
                             </el-tooltip>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="ascribedUser" label="负责人">
+                    <el-table-column prop="ascribedUser" label="负责人" width="85">
                         <template slot-scope="scope">
                             <!-- <el-tooltip class="item" effect="dark" placement="top">
                                 <span style="color:royalblue">查看</span>
@@ -143,16 +144,15 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="preDele" label="预计出团">
+                    <!-- <el-table-column prop="preDele" label="预计出团">
                     </el-table-column>
                     <el-table-column prop="finlishedDele" label="已出团">
-                    </el-table-column>
-                    <el-table-column label="操作">
+                    </el-table-column> -->
+                    <el-table-column label="操作" width="200">
                         <template slot-scope="scope">
                             <el-button type="primary" size="mini" @click="Edit(scope.row)">编
                                 辑</el-button>
-                            <br>
-                            <br>
+                           
                             <el-button type="danger" size="mini" @click="Del(scope.row)">删
                                 除</el-button>
                         </template>

src/components/OP/CarTouristGuideGrounContent.vue

@@ -1,10 +1,62 @@
 <template>
-    <div class="car_add">
+    <div class="car_add opcar_add">
         <div>
             <div class="communal-title">
                 <div>OP费用填写明细</div>
             </div>
         </div>
+        <el-popover class="oprompts" placement="right" trigger="hover">
+            <el-table :data="budgeting" border>
+                <el-table-column width="100" property="date" label="日期"></el-table-column>
+                <el-table-column width="100" label="车费用">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.carFee)+' '+bizhong  }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="导游费用">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.guideFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="餐食费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.mealFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="门票费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.ticketFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="小费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.tipFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="110" label="饮料零食水果">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.drinksSnacksFruitFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="出行物资">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.travelSupplies)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column property="carType" width="100" label="车型"></el-table-column>
+                <el-table-column width="100" label="领队费">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.leadersFee)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+                <el-table-column width="100" label="零用金">
+                    <template slot-scope="scope">
+                        {{ townum(scope.row.spentCash)+' '+bizhong }}
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-button type="primary" class="oprompt" slot="reference">移上提示成本</el-button>
+        </el-popover>
         <el-skeleton :rows="28" animated :loading="loading">
             <div style="display: flex;justify-content: space-between;">
                 <div style="width: 80%;display: flex;">
@@ -58,9 +110,9 @@
                                 <span style="display: none;">{{ scope.row.sId }}</span>{{ scope.row.sidName }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="datePrice" label="日期" width="160">
+                        <el-table-column prop="datePrice" label="日期" width="170">
                             <template slot-scope="scope">
-                                <el-date-picker style="width: 100%;" v-model="scope.row.datePrice" type="date"
+                                <el-date-picker size="small" style="width: 100%;" v-model="scope.row.datePrice" type="date"
                                     :picker-options="startPickerOptions" value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="选择日期">
                                 </el-date-picker>
@@ -98,7 +150,7 @@
                             <template slot-scope="scope">
                                 <!-- <el-input size="small" style="width: 100%;" placeholder="选择单位" v-model="scope.row.units"
                                     @change="PriceChange"></el-input> -->
-                                <el-select v-model="scope.row.units" filterable placeholder="选择单位">
+                                <el-select size="small" v-model="scope.row.units" filterable placeholder="选择单位">
                                     <el-option v-for="item in unitsArr" :key="item.id" :label="item.name"
                                         :value="item.id">
                                     </el-option>
@@ -190,6 +242,7 @@
 export default {
     data() {
         return {
+            bizhong:'',
             startPickerOptions: {
             },
             pageId: '',
@@ -237,9 +290,41 @@ export default {
             checkList: [],
             sourceList: [],
             ListCount: 1,
+            budgeting:[]
         }
     },
     methods: {
+        //保留两位小数
+        townum(val){
+            return val.toFixed(2)
+        },
+        //获取成本提示
+        getcostbudgeting(){
+            this.budgeting=[];
+            this.bizhong='';
+            var url = "/api/Groups/PostGroupCostModulePrompt"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    userId: that.userId,
+                    diId: that.diId,
+                    cTable:that.cTable,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.budgeting=res.data.data.modulePromptInfos[0].data;
+                    that.bizhong=res.data.data.modulePromptInfos[0].currencyCode;
+                    console.log(that.budgeting)
+                } else {
+                    // that.$message.error(res.data.msg);
+                }
+            })
+        },
         //初始化下拉框
         initializeSelect() {
             //团组下拉框绑定
@@ -319,6 +404,7 @@ export default {
                 if (res.data.code == 200) {
                     that.cTable = res.data.data.cTable
                     that.PostGroupTeamRateByDiIdAndCTableId();
+                    that.getcostbudgeting();
                 }
             })
         },
@@ -585,4 +671,18 @@ export default {
     width: 120px;
     margin: 10px 10px;
 }
+.opcar_add{
+    position: relative;
+}
+.oprompt{
+    position: fixed;
+    top: 150px;
+    right: 70px;
+    z-index: 2014;
+}
+.oprompts .el-button--primary {
+    color: #FFF;
+    background-color: #007dff;
+    border-color: #007dff;
+}
 </style>

src/components/OP/CarTouristGuideGroundId.vue

@@ -96,12 +96,12 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button-group>
+                            <!-- <el-button-group> -->
                                 <el-button type="primary" size="mini" icon="el-icon-edit"
                                     @click="upDate(scope.$index, scope.row)"></el-button>
-                                <el-button type="danger" size="mini" icon="el-icon-delete"
+                                <el-button style="margin-left: 0px;" type="danger" size="mini" icon="el-icon-delete"
                                     @click="del(scope.$index, scope.row)"></el-button>
-                            </el-button-group>
+                            <!-- </el-button-group> -->
                         </template>
                     </el-table-column>
                 </el-table>

src/components/OP/EntryDetails.vue

@@ -1350,9 +1350,8 @@ export default {
     -khtml-user-select: none;
     -webkit-user-select: none;
     -moz-user-select: none;
-    font-size: 14px;
+    font-size: 12px;
     user-select: none;
-    font-family: cursive;
     background-color: #FFF;
     background-image: none;
     border-radius: 4px;

src/components/OP/HotelReservations.vue

@@ -84,10 +84,20 @@
             <div class="hotelr-form">
                 <div class="form-head">
                     <el-popover placement="right" trigger="hover">
-                        <el-table :data="gridData" border>
-                            <el-table-column width="150" property="date" label="日期"></el-table-column>
-                            <el-table-column width="100" property="name" label="姓名"></el-table-column>
-                            <el-table-column width="300" property="address" label="地址"></el-table-column>
+                        <div>币种：{{bizhong}}&nbsp;&nbsp;&nbsp;汇率：{{fournum(huilv)}}</div>
+                        <el-table :data="budgeting" border>
+                            <el-table-column width="50" property="day" label="天数"></el-table-column>
+                            <el-table-column width="100" property="date" label="日期"></el-table-column>
+                            <el-table-column width="300" property="accon" label="酒店名称"></el-table-column>
+                            <el-table-column width="300" property="itin" label="行程描述"></el-table-column>
+                            <el-table-column width="110" property="sgr" label="单人间(SGR)"></el-table-column>
+                            <el-table-column width="100" property="tbr" label="双人(TBR)"></el-table-column>
+                            <el-table-column width="100" property="jS_ES" label="套间(JS_ES)"></el-table-column>
+                            <el-table-column width="100" label="价格">
+                                <template slot-scope="scope">
+                                    {{ townum(scope.row.suite) }}
+                                </template>
+                            </el-table-column>
                         </el-table>
                         <el-button slot="reference">移上提示每天详细房价</el-button>
                     </el-popover>
@@ -627,10 +637,47 @@ export default {
                     { required: true, message: '请输入备注', trigger: ['blur', 'change'] }
                 ],
             },
-
+            budgeting:[],
+            bizhong:'',
+            huilv:0,
         }
     },
     methods: {
+        //保留两位小数
+        townum(val){
+            return val.toFixed(2)
+        },
+        //保留4位小数
+        fournum(val){
+            return val.toFixed(4)
+        },
+        //获取成本提示
+        getcostbudgeting(){
+            this.budgeting=[];
+            var url = "/api/Groups/PostGroupCostModulePrompt"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    userId: that.userId,
+                    diId: that.OpHotelReservationsData.diId,
+                    cTable:that.cTable,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.budgeting=res.data.data.modulePromptInfos[0].data;
+                    that.bizhong=res.data.data.modulePromptInfos[0].currencyCode;
+                    that.huilv=res.data.data.modulePromptInfos[0].rate;
+                    console.log(that.budgeting)
+                } else {
+                    // that.$message.error(res.data.msg);
+                }
+            })
+        },
         //每页条数改变时触发 选择一页显示多少行
         handleSizeChange(val) {
             this.currentPage = 1;
@@ -658,7 +705,8 @@ export default {
                 console.log(res)
                 if (res.data.code == 200) {
                     that.cTable=res.data.data.cTable;
-                    that.PostGroupListByCTableAndUserId()
+                    that.PostGroupListByCTableAndUserId();
+                    that.getcostbudgeting()
                 }else{
                     that.$message({
                         message:"获取cTable失败",
@@ -1396,7 +1444,8 @@ export default {
         delegationSelectChange() {
             this.delegationInfo=[];
             this.PostGroupListByCTableAndUserId();
-            this.AddToggle()
+            this.AddToggle();
+            this.getcostbudgeting();
         },
         
        

src/components/OP/OPgroup.vue

@@ -42,13 +42,18 @@
                     <el-table-column
                         prop="tourCode"
                         width="100"
-                        label="团 号">
+                        label="所属部门">
                     </el-table-column>
                     <el-table-column
+                        prop="tourCode"
+                        width="100"
+                        label="团 号">
+                    </el-table-column>
+                    <!-- <el-table-column
                         width="100" 
                         prop="salesQuoteNo"
                         label="销售报价号">
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column
                         prop="teamType"
                         label="团组类型"

src/components/OP/OpDecreasePayments.vue

@@ -50,7 +50,7 @@
                     </div>
                     <div style="width: 25%;">
                         <el-form-item label="费用金额:" prop="price" label-width="160px">
-                            <el-input placeholder="费用金额" v-model="DecreasePaymentsData.price" style="width: 58%;">
+                            <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"
@@ -128,7 +128,7 @@ export default {
             uploadURL: "http://132.232.92.186:8888/api/Groups/UploadProject",
             uploadFiles: [],//上传的文件列表
             DelfileName: "",
-            title: "新增团组增减款项费用",
+            title: "新增其他款项",
             token: '',
             userId: 0,
             id: '',
@@ -496,12 +496,12 @@ export default {
         this.id = this.$route.query.id
         if (this.id != null && this.id != undefined && this.id != 0) {
             this.QueryDecreasePaymentsById();
-            this.title = "修改团组增减款项费用";
+            this.title = "修改其他款项";
             this.DecreasePaymentsData.status = 2
             this.isShow = true
         } else {
             this.DecreasePaymentsData.status = 1
-            this.title = "新增团组增减款项费用"
+            this.title = "新增其他款项"
             this.isShow = false
         }
 

src/components/OP/PickupList.vue

@@ -35,6 +35,7 @@
                 </div>
             </div>
             <div class="pickuplist-Upload-box"> 
+                <div slot="tip" class="el-upload__tip">只能识别jpg/png文件&nbsp;&nbsp;&nbsp;</div>
                 <el-upload 
                 class="upload-demo" 
                 ref="upload" 
@@ -47,7 +48,6 @@
                 :auto-upload="false">
                     <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                     <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">识别图片</el-button>
-                    <div slot="tip" class="el-upload__tip">只能识别jpg/png文件</div>
                 </el-upload>
             </div>
             <div class="pickuplist-table">

src/components/OP/VisaPriec.vue

@@ -68,12 +68,10 @@
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button-group>
-                                <el-button type="primary" size="mini" icon="el-icon-edit"
-                                    @click="upDate(scope.$index, scope.row)"></el-button>
-                                <el-button type="danger" size="mini" icon="el-icon-delete"
-                                    @click="del(scope.$index, scope.row)"></el-button>
-                            </el-button-group>
+                            <el-button type="primary" size="mini" icon="el-icon-edit"
+                                @click="upDate(scope.$index, scope.row)"></el-button>
+                            <el-button type="danger" size="mini" icon="el-icon-delete"
+                                @click="del(scope.$index, scope.row)"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>

src/components/Resource/InvitationOfficialActivityData.vue

@@ -36,9 +36,9 @@
                         :picker-options="pickerOptions">
                     </el-date-picker>
                     <el-button type="primary" @click="QueryCount" style="margin-left: 10px;">查询录入数量</el-button>
-                    <div style="display: flex;align-items: center;justify-content: center">
+                    <!-- <div style="display: flex;align-items: center;justify-content: center">
                         查询结果：该人员在以上条件共录入<span style="color: red;">{{ dataCount }}</span>条数据
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <template>

src/components/Resource/OpOfficialActivities.vue

@@ -158,7 +158,7 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div>
+                <!-- <div>
                     <div>
                         <div class="communal-title">
                             <div>公务文件</div>
@@ -199,7 +199,7 @@
                             </el-upload>
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <el-form-item>
                     <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>

src/components/system/Company.vue

@@ -7,7 +7,7 @@
                 <div class="communal-box">
                     <el-input @input="Inquireclick()" placeholder="请输入内容" v-model="input" clearable>
                     </el-input>
-                    <el-button @click="Inquireclick()" type="primary"><i class="icon-sousuo"></i></el-button>
+                    <el-button @click="Inquireclick()" type="primary"><i class="iconfont icon-sousuo"></i></el-button>
                     <el-button @click="addcompany()" type="primary">新增</el-button>
                 </div>
             </div>