0426lhj1736

src/components/OP/OpAirTicketRes.vue

@@ -90,8 +90,10 @@
                     <div style="width: 25%;display: flex;">
                         <div style="width: 72%;">
                             <el-form-item label="机票单价:" prop="prePrice" label-width="160px">
-                                <el-input placeholder="机票单价" v-model="airTicketResOpData.prePrice" @input="peiceinput">
-                                </el-input>
+                                <el-input-number style="width:100%" :precision="2" placeholder="费用金额" @input="peiceinput" v-model="airTicketResOpData.prePrice" :controls='false'>
+                                </el-input-number>
+                                <!-- <el-input placeholder="机票单价" v-model="airTicketResOpData.prePrice" @input="peiceinput">
+                                </el-input> -->
                             </el-form-item>
                         </div>
                         <div style="width: 28%;">
@@ -423,7 +425,6 @@ export default {
                 ],
                 prePrice: [
                     { required: true, message: '请输入机票单价', trigger: ['blur', 'change'] },
-                    { pattern: /^(([1-9]?\d{0,8}(\.\d{1,2})?)|999999999|999999999\.(0){1,2})$/, message: '请输入正确的金额(最多2位小数)' }
                 ],
                 clientNum: [
                     { required: true, message: '请输入舱位人数', trigger: ['blur', 'change'] },
@@ -492,9 +493,9 @@ export default {
                 diId: 0,
                 cType: 460,
                 prePrice: 0,
-                preCurrency: '',
+                preCurrency: 836,
                 price: 0,
-                currency: '',
+                currency: 836,
                 clientNum: 0,
                 clientName: [],
                 isCheckIn: 0,
@@ -522,7 +523,7 @@ export default {
                 bankNo: '',
                 cardholderName: 'Zhang Hailin',
                 payMoney: 0,
-                paymentCurrency: '',
+                paymentCurrency: 836,
                 companyBankNo: '',
                 otherBankName: '',
                 otherSideNo: '',
@@ -633,7 +634,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-
                     that.delegationInfo = res.data.data.delegationInfo;
                     that.airGroupCostParameter = res.data.data.airGroupCostParameter;
                     that.fullscreenLoading=false;
@@ -799,9 +799,16 @@ export default {
 
 
                     var ss = airData.clientName.split(',')
+                    
                     that.airTicketResOpData.clientName = [];
                     ss.forEach(function (item) {
-                        that.airTicketResOpData.clientName.push(parseInt(item))
+                        console.log()
+                        console.log(item)
+                        if(!item.includes('.')){
+                            that.airTicketResOpData.clientName.push(parseInt(item))
+                        }else{
+                            that.airTicketResOpData.clientName=[]
+                        }
                     });
                     that.prePrice = res.data.data.airTicket.prePrice
                     that.currencyId = res.data.data.airTicket.preCurrency

src/components/OP/OpInvitationOfficialActivities.vue

@@ -8,8 +8,8 @@
         <hr style='background-color:#5555; height:1px; border:none;' />
         <div>
             <el-form :model="delegationInfo" class="demo-ruleForm">
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <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: 390px;">
                         <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: 390px;">
                         <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: 390px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
@@ -41,27 +41,27 @@
             </el-form>
             <el-form :model="InvitationOfficialActivities" ref="InvitationOfficialActivities"
                 :rules="InvitationOfficialActivitiesRules" label-width="160px" class="demo-ruleForm">
-                <div style="display:flex ;">
-                    <div style="width: 25%;">
+                <div style="display:flex ; flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="邀请方地区:" prop="inviterArea" label-width="160px">
                             <el-input placeholder="邀请方地区" v-model="InvitationOfficialActivities.inviterArea">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="邀请方:" prop="inviter" label-width="160px">
                             <el-input placeholder="邀请方" v-model="InvitationOfficialActivities.inviter">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="邀请时间:" prop="inviteTime" label-width="160px">
                             <el-date-picker value-format="yyyy-MM-dd" v-model="InvitationOfficialActivities.inviteTime"
                                 type="date" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="是否到场:" prop="isGoOfficaiaBussiness" label-width="160px">
                             <el-radio-group v-model="InvitationOfficialActivities.isGoOfficaiaBussiness">
                                 <el-radio :label=1>是</el-radio>
@@ -70,40 +70,40 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display:flex ;">
-                    <div style="width: 25%;">
+                <div style="display:flex ; flex-wrap: wrap;">
+                    <div style="width: 390px;">
                         <el-form-item label="联系人:" prop="contact" label-width="160px">
                             <el-input placeholder="联系人" v-model="InvitationOfficialActivities.contact">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="联系电话:" prop="tel" label-width="160px">
                             <el-input placeholder="联系电话" v-model="InvitationOfficialActivities.tel">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="电子邮箱:" prop="email" label-width="160px">
                             <el-input placeholder="电子邮箱" v-model="InvitationOfficialActivities.email">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="传真号码:" prop="fax" label-width="160px">
                             <el-input placeholder="传真号码" v-model="InvitationOfficialActivities.fax">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
-                    <div style="width: 50%;">
+                <div style="display: flex; flex-wrap: wrap;">
+                    <div style="width: 780px;">
                         <el-form-item label="邀请方地址:" prop="address" label-width="160px">
                             <el-input type="textarea" :rows="5" placeholder="邀请方地址"
                                 v-model="InvitationOfficialActivities.address"></el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 50%;">
+                    <div style="width: 780px;">
                         <el-form-item label="其他信息:" prop="otherInformation" label-width="160px">
                             <el-input type="textarea" :rows="5" placeholder="其他信息"
                                 v-model="InvitationOfficialActivities.otherInformation"></el-input>
@@ -111,7 +111,7 @@
                     </div>
                 </div>
                 <div style="display:flex ;flex-wrap: wrap;">
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="公务活动费:" prop="eventsCost" label-width="160px">
@@ -129,7 +129,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="公务翻译费:" prop="translateCost" label-width="160px">
@@ -147,7 +147,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="快递费:" prop="sendCost" label-width="160px">
@@ -165,7 +165,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="邀请费用:" prop="inviteCost" label-width="160px">
@@ -183,7 +183,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <div style="display: flex;">
                             <div style="width: 72%;">
                                 <el-form-item label="支付总费用:" prop="payMoney" label-width="160px">
@@ -201,13 +201,13 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="收款方:" prop="payee" label-width="160px">
                             <el-input placeholder="收款方" v-model="InvitationOfficialActivities.payee">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer">
                             <el-select v-model="InvitationOfficialActivities.orbitalPrivateTransfer" placeholder="费用标识"
                                 style="width: 100%;">
@@ -216,20 +216,20 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="消费日期:" prop="consumptionDate">
                             <el-date-picker value-format="yyyy-MM-dd" v-model="InvitationOfficialActivities.consumptionDate"
                                 type="date" placeholder="选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="消费方式:" prop="consumptionPatterns">
                             <el-input placeholder="消费方式" v-model="InvitationOfficialActivities.consumptionPatterns">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="支付方式:" prop="payDId">
                             <el-select v-model="InvitationOfficialActivities.payDId" placeholder="支付方式">
                                 <el-option v-for="item in payment" :key="item.id" :label="item.name" :value="item.id">
@@ -237,7 +237,7 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 390px;">
                         <el-form-item label="卡类型:" prop="ctdId">
                             <el-select @change="cardhandoff" v-model="InvitationOfficialActivities.ctdId" placeholder="卡类型">
                                 <el-option v-for="item in cardTypeData" :key="item.id" :label="item.name" :value="item.id">
@@ -245,43 +245,43 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 390px;">
                         <el-form-item label="银行卡号:" prop="bankNo">
                             <el-input :disabled="true" placeholder="银行卡号" v-model="InvitationOfficialActivities.bankNo">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 390px;">
                         <el-form-item label="持卡人姓名:" prop="cardholderName">
                             <el-input :disabled="true" placeholder="持卡人姓名" v-model="InvitationOfficialActivities.cardholderName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 390px;">
                               <el-form-item label="公司银行卡号:" prop="companyBankNo">
                             <el-input placeholder="公司银行卡号" v-model="InvitationOfficialActivities.companyBankNo">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 390px;">
                         <el-form-item label="对方开户行:" prop="otherBankName">
                             <el-input placeholder="对方开户行" v-model="InvitationOfficialActivities.otherBankName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 390px;">
                         <el-form-item label="对方银行账号:" prop="otherSideNo">
                             <el-input placeholder="对方银行账号" v-model="InvitationOfficialActivities.otherSideNo">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 25%;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 390px;">
                         <el-form-item label="对方姓名:" prop="otherSideName">
                             <el-input placeholder="对方姓名" v-model="InvitationOfficialActivities.otherSideName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 390px;">
                         <el-form-item label="附件:" prop="fileUrl" label-width="160px">
                             <el-upload :file-list="uploadFiles" ref="upload" :on-success="upLoadSuccess"
                                 :on-error="upLoadError" :before-remove="beforeRemove" :on-change="onChange" :limit="1"

src/components/OP/PickupList.vue

@@ -114,13 +114,13 @@
                     <el-form-item style="width:395px ;" label="职务" prop="office">
                         <el-input size="medium" type="text" v-model.trim="pickupinif.office"></el-input>
                     </el-form-item>
-                    <el-form-item style="width:395px ;" label="性别" prop="gender">
+                    <el-form-item style="width:395px ;" label="性别">
                         <el-radio-group v-model="pickupinif.gender">
                             <el-radio label="男"></el-radio>
                             <el-radio label="女"></el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item style="width:395px ;" label="出生日期" prop="birth">
+                    <el-form-item style="width:395px ;" label="出生日期">
                         <el-date-picker size="medium" type="date" placeholder="选择出生日期" v-model.trim="pickupinif.birth"
                             style="width: 100%;">
                         </el-date-picker>

src/components/Resource/LocalGuide.vue

@@ -31,7 +31,7 @@
                     </el-table-column>
                     <el-table-column prop="score" label="评分" width="55">
                     </el-table-column>
-                    <el-table-column prop="createTime" label="更新时间" width="180">
+                    <el-table-column prop="lastUpdate" label="更新时间" width="180">
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">