05231650lhj

src/components/Finance/DailyFeeedit.vue

@@ -417,7 +417,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,34 @@ export default {
             });
 
         },
+        //预定成本
+        BookingCost(){
+            var url = "/api/Groups/PostHotelReservationsCreateVoucher"
+            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 ,
+                    id: 0
+                }
+            }).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%;