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

src/components/Finance/Cost.vue

@@ -3,19 +3,19 @@
         <div class="cost-box">
             <el-dialog width="500" title="机票行程数据" :visible.sync="dialogTableVisible">
                 <el-table border :data="gridData">
-                  <el-table-column property="day" label="DAY" width="150"></el-table-column>
-                  <el-table-column property="date" label="DATE" width="200"></el-table-column>
-                  <el-table-column property="itin" label="ITIN"></el-table-column>
+                    <el-table-column property="day" label="DAY" width="150"></el-table-column>
+                    <el-table-column property="date" label="DATE" width="200"></el-table-column>
+                    <el-table-column property="itin" label="ITIN"></el-table-column>
                 </el-table>
                 <div class="btn-dialog-cost">
                     <el-button @click="confirmationTP" size="small" type="primary">采用机票同事的行程数据</el-button>
                     &nbsp;&nbsp;&nbsp;
-                    <el-button @click="dialogTableVisible=false" size="small">采用现有的自定义数据</el-button>
+                    <el-button @click="dialogTableVisible = false" size="small">采用现有的自定义数据</el-button>
                 </div>
-              </el-dialog>
+            </el-dialog>
 
-              <el-dialog width="80%" title="酒店询价数据" :visible.sync="dialogTableVisibleXJ">
-                <el-table :data="tableDatas" border
+            <el-dialog width="80%" title="酒店询价数据" :visible.sync="dialogTableVisibleXJ">
+            <el-table :data="tableDatas" border
 						 >
 					<el-table-column type="index" label="选中" width="55">
                         <template slot-scope="scope">
@@ -369,8 +369,9 @@
                                         v-model="scope.row[item.prop]"
                                         @change="dateChange(scope.row[item.prop], scope.$index)">
                                     </el-input> -->
-                                    <el-date-picker @change="TimeUpdateAnewOrderby(scope.$index)" :clearable="false" size="mini" v-model="scope.row[item.prop]"
-                                        type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+                                    <el-date-picker @change="TimeUpdateAnewOrderby(scope.$index)" :clearable="false"
+                                        size="mini" v-model="scope.row[item.prop]" type="date" value-format="yyyy-MM-dd"
+                                        placeholder="选择日期">
                                     </el-date-picker>
                                 </span>
                                 <div style="position: absolute;left: 36%;">
@@ -2731,8 +2732,8 @@ export default {
             acconarrs: [],
             isShare: 0,
             blackCodeIsTrue: false,
-            dialogTableVisible:false,
-            gridData:[],
+            dialogTableVisible: false,
+            gridData: [],
             //监听变量
             //count: 0,
             x: 0,
@@ -4178,7 +4179,7 @@ export default {
             let result = {};
             for (let flight of ["经济舱", "公务舱"]) {
                 if (flight === "经济舱") {
-                    this.matchRooms(hotelRooms, flights, ["SGR", "TBR", "JSES", "SUITE"], flight, result);
+                    this.matchRooms(hotelRooms, flights, ["TBR", "SGR", "JSES", "SUITE"], flight, result);
                 } else if (flight === "公务舱") {
                     this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR", "TBR"], flight, result);
                 }
@@ -4295,6 +4296,7 @@ export default {
             var JJCSUITERS = (result.hasOwnProperty("经济舱SUITE") ? result["经济舱SUITE"] : 0)
             var txtGWCSUITERS = (result.hasOwnProperty("公务舱SUITE") ? result["公务舱SUITE"] : 0)
 
+            console.log(txtJJCSGRRS, lblGWCSGRRS, txtJJCTBRRS, txtGWCJSESRS, JJCSUITERS, txtGWCSUITERS, 'test');
 
             if (txtJJCSGRRS > 0) {
                 rightCheckArr.push('经济舱 SGR');
@@ -5568,7 +5570,7 @@ export default {
             }
         },
         importBlackCode() {
-            this.gridData=[];
+            this.gridData = [];
             var url = "/api/Groups/CraeteGroupCostTravel"
             var that = this
             this.$axios({
@@ -5583,11 +5585,11 @@ export default {
             }).then(function (resp) {
                 if (resp.data.code == 200) {
                     //console.log('CraeteGroupCostTravelResponse', resp.data.data);
-                    that.gridData=resp.data.data.groupCost;
+                    that.gridData = resp.data.data.groupCost;
                     that.blackCodeIsTrue = resp.data.data.blackCodeIsTrue;
                     if (that.blackCodeIsTrue) {
-                        that.dialogTableVisible=true;
-                    }else{
+                        that.dialogTableVisible = true;
+                    } else {
                         that.$message.error("机票数据未录入！");
                     }
                     // that.tableData = resp.data.data.groupCost;
@@ -5605,7 +5607,7 @@ export default {
 
         },
         //机票行程确认赋值
-        confirmationTP(){
+        confirmationTP() {
             this.tableData = this.gridData;
             for (var i = 0; i < this.tableData.length; i++) {
                 for (var prop in this.tableData[i]) {
@@ -5614,7 +5616,7 @@ export default {
                     }
                 }
             }
-            this.dialogTableVisible=false;
+            this.dialogTableVisible = false;
         },
         //监听鼠标
         MonitorMouse() {
@@ -5670,16 +5672,16 @@ export default {
                 clearInterval(this.autoSave);
             })
         },
-        TimeUpdateAnewOrderby(index){
-                if(index == 0 && this.tableData.length > 0){
-                    var start = this.tableData[0].date;
-                    for (var i = 0; i < this.tableData.length; i++) {
-                        if(this.tableData[i].date){
-                            this.tableData[i].date = start;
-                            start = this.addOneDay(start,1)
-                        }
+        TimeUpdateAnewOrderby(index) {
+            if (index == 0 && this.tableData.length > 0) {
+                var start = this.tableData[0].date;
+                for (var i = 0; i < this.tableData.length; i++) {
+                    if (this.tableData[i].date) {
+                        this.tableData[i].date = start;
+                        start = this.addOneDay(start, 1)
                     }
                 }
+            }
         },
         //团组询价列表
         PostHotelInquiryPageItem() {
@@ -6123,7 +6125,8 @@ export default {
 .accon-ul:last-child {
     bottom: 15px;
 }
-.btn-dialog-cost{
+
+.btn-dialog-cost {
     margin-top: 20px;
     text-align: right;
 }

src/components/Finance/DailyFeeedit.vue

@@ -147,8 +147,8 @@ export default {
     methods:{
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
-                console.log(valid)
                 if (valid) {
+                    this.SumPrice=0;
                     console.log(this.itemsArr)
                     var issubmit=true;
                     for(var g=0;g<this.itemsArr.length;g++){
@@ -157,6 +157,7 @@ export default {
                                 //for(var k=0;k<this.itemsArr.length;k++){
                                     this.SumPrice+=Number(this.itemsArr[g].itemTotal)
                                 //}
+                                console.log(this.SumPrice);
                             }else{
                                 this.$message({
                                     showClose: true,
@@ -340,6 +341,8 @@ export default {
                         offset:50
                     });
                     that.$router.push({ path: "/home/DailyFeePayment"});
+                }else{
+                    that.$message.error(res.data.msg);
                 }
             })
         },
@@ -417,7 +420,7 @@ export default {
                             that.fullscreenLoading=false;
                             if(that.userid!=res.data.data.createUserId){
                                 that.thesame=true;
-                            }else if(res.data.data.fAudit!=0||res.data.data.mAudit!=0){
+                            }else if(res.data.data.fAudit==1||res.data.data.mAudit==1){
                                 that.thesame=true;
                             }
                             if(that.thesame==true){

src/components/Finance/RvsReport.vue

@@ -12,7 +12,7 @@
                 应收合计：{{total_fr}} 已收合计：{{total_pr}} 余款合计：{{total_balance}}
             </div>
             <div class="rvsreport-table">
-                <el-table :data="tableData" style="width: 100%">
+                <el-table height="720" :data="tableData" style="width: 100%">
                     <el-table-column label="应收报表">
                         <el-table-column prop="no" label="序号" width="50">
                         </el-table-column>

src/components/OP/HotelReservations.vue

@@ -93,7 +93,7 @@
                             <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="价格">
+                            <el-table-column width="115" label="套房(SUITE)">
                                 <template slot-scope="scope">
                                     {{ townum(scope.row.suite) }}
                                 </template>
@@ -104,7 +104,7 @@
                     <div class="form-head-btn">
                         <el-button type="primary" @click="DownloadVOUCHER">VOUCHER</el-button>
                         <el-button type="primary" @click="ConfirmWord">确认单</el-button>
-                        <el-button type="primary">预订成本</el-button>
+                        <el-button type="primary" @click="BookingCost">预订成本</el-button>
                         <el-button type="primary" @click="AddToggle">新增切换</el-button>
                         <el-button type="primary" @click="AddBtn('RequiredParameters')">保存设置</el-button>
                     </div>
@@ -1241,6 +1241,33 @@ export default {
             });
 
         },
+        //预定成本
+        BookingCost(){
+            var url = "/api/Groups/PostHotelReservationsPredictedCostFileDownload"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: { 
+                    portType: 1 ,
+                    userId: that.userId ,
+                    pageId: that.pageId ,
+                    diId: that.OpHotelReservationsData.diId ,
+                }
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    window.location.href = res.data.data
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("接口错误，请联系信息部！");
+            });
+        },
         //删除
         delinif(index,row){
             if(row.isAuditGM!=1){

src/components/OP/OCRIdentify.vue

@@ -142,8 +142,6 @@ export default {
         },
         //身份证人像面
         IDcardR(){
-
-            
             this.fullscreenLoading = true;
             var url="/api/TencentOCR/GetIDCard"
             var that=this

src/components/Resource/OpOfficialActivities.vue

@@ -4,6 +4,7 @@
             <div class="communal-title">
                 <div>{{ title }}</div>
             </div>
+            <div class="ps-title">PS:"请规范录入，未规范录入，造成公司损失或影响提成计算，需承担责任"</div>
         </div>
         <hr style='background-color:#5555; height:1px; border:none;' />
         <div>
@@ -99,8 +100,8 @@
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
-                        <el-form-item label="联系方式:" prop="tel" label-width="160px">
-                            <el-input clearable placeholder="联系方式" v-model="OpOfficialActivitiesDto.tel">
+                        <el-form-item label="电话:" prop="tel" label-width="160px">
+                            <el-input clearable placeholder="电话" v-model="OpOfficialActivitiesDto.tel">
                             </el-input>
                         </el-form-item>
                     </div>
@@ -165,14 +166,9 @@
                 </div>
                 <div style="display: flex; flex-wrap: wrap;">
                     <div style="width: 770px;">
-                        <el-form-item style="position: relative;" label="公务请示范例:" label-width="160px">
-                            <el-input @blur="reqSampleblur" @focus="PostOfficialActivitiesReqReqSampleTips" type="textarea" :rows="3" placeholder="公务请示范例" v-model="OpOfficialActivitiesDto.reqSample">
-                            </el-input>
-                            <div v-show="reqSampleArrpd" class="reqSampleArr-ul">
-                                <div @click="reqSampleArrli(item)" class="reqSampleArr-li" v-for="(item,index) in reqSampleArr" :key="index">
-                                    {{'['+item.teamName+']('+item.client+')   '+item.reqSample}}
-                                </div>
-                            </div>
+                        <el-form-item label="公务地址:" prop="address" label-width="160px">
+                            <el-input type="textarea" :rows="3" placeholder="公务地址"
+                                v-model="OpOfficialActivitiesDto.address"></el-input>
                         </el-form-item>
                     </div>
                     <div style="width: 770px;">
@@ -186,9 +182,14 @@
                         </el-form-item>
                     </div>
                     <div style="width: 770px;">
-                        <el-form-item label="公务地址:" prop="address" label-width="160px">
-                            <el-input type="textarea" :rows="3" placeholder="公务地址"
-                                v-model="OpOfficialActivitiesDto.address"></el-input>
+                        <el-form-item style="position: relative;" label="公务请示范例:" label-width="160px">
+                            <el-input @blur="reqSampleblur" @focus="PostOfficialActivitiesReqReqSampleTips" type="textarea" :rows="3" placeholder="公务请示范例" v-model="OpOfficialActivitiesDto.reqSample">
+                            </el-input>
+                            <div v-show="reqSampleArrpd" class="reqSampleArr-ul">
+                                <div @click="reqSampleArrli(item)" class="reqSampleArr-li" v-for="(item,index) in reqSampleArr" :key="index">
+                                    {{'['+item.teamName+']('+item.client+')   '+item.reqSample}}
+                                </div>
+                            </div>
                         </el-form-item>
                     </div>
                 <!-- </div>
@@ -359,7 +360,14 @@ export default {
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
                 ],
-
+                language: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
+                setting: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
             },
             uploadURL: "http://localhost:5256/api/Resource/UploadOfficialActivities",
             uploadFiles1: [],
@@ -869,6 +877,10 @@ export default {
     padding: 10px;
     cursor: pointer;
 }
+.ps-title{
+    color: red;
+    font-size: 12px;
+}
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;