0426整合

src/components/Finance/DailyFeePayment.vue

@@ -46,10 +46,10 @@
                         </el-option>
                     </el-select>
                 </div>
-                <!-- <div class="feeType-box">
-                    <label>申请说明:</label>
-                    <el-input v-model="formInline.feeDesc" placeholder="申请说明"></el-input>
-                </div> -->
+                <div class="feeType-box">
+                    <label>费用描述:</label>
+                    <el-input @input="downtrigger()" v-model="formInline.feeDesc" placeholder="费用描述"></el-input>
+                </div>
                 <div class="feeType-box">
                     <label>申请人: </label>
                     <el-select :disabled="sqrpd" @change="downtrigger()" v-model="userNameValue" filterable placeholder="请选择申请人">
@@ -287,7 +287,7 @@ export default {
                     managerAuditStatus: that.GMValue,  //总经理审核
                     feeTypeId: that.feeTypValue,           //费用类型
                     feeSubTypeId: that.feeSubTypeValue,       //费用子类型
-                    feeDesc: '',    //描述
+                    feeDesc: that.formInline.feeDesc,    //描述
                     createUserId: that.userNameValue //申请人
                 }
             }).then(function (res) {
@@ -563,9 +563,14 @@ export default {
         margin: 0 8px;
     }
     .visasearch-li .feeType-box{
+        width: 200px;
         margin-right: 0;
     }
     .feeType-box .el-select{
-        width: 180px;
+        width: 100%;
+    }
+    .feeType-box label{
+        font-size: 14px;
+        color: #606266;
     }
 </style>y

src/components/Finance/DailyFeeedit.vue

@@ -395,7 +395,6 @@ export default {
                     }
                 }).then(function (res) {
                     console.log(res)
-                    console.log(that.feeMarkSubTypeData)
                     if (res.data.code == 200) {
                         that.itemsArr=res.data.data.feeContents;
                         that.ruleForm.desc=res.data.data.instructions;

src/components/OP/OpAirTicketRes.vue

@@ -264,12 +264,12 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <!-- <div style="width: 25%;">
                         <el-form-item label="消费方式:" prop="consumptionPatterns">
                             <el-input placeholder="消费方式" v-model="cardPaymentOpData.consumptionPatterns">
                             </el-input>
                         </el-form-item>
-                    </div>
+                    </div> -->
                     <div style="width: 25%;">
                         <el-form-item label="消费日期:" prop="visitCountry">
                             <el-date-picker v-model="cardPaymentOpData.consumptionDate" placeholder="消费日期" type="date">
@@ -517,7 +517,7 @@ export default {
             cardPaymentOpData: {
                 id: 0,
                 payDId: 72,
-                consumptionPatterns: '',
+                consumptionPatterns: '暂无',
                 consumptionDate: this.transformDateFormat(new Date()),
                 ctdId: '',
                 bankNo: '',
@@ -816,7 +816,7 @@ export default {
                     var creData = res.data.data.creditCard;
                     that.cardPaymentOpData.id = creData.id
                     that.cardPaymentOpData.payDId = creData.payDId
-                    that.cardPaymentOpData.consumptionPatterns = creData.consumptionPatterns
+                    // that.cardPaymentOpData.consumptionPatterns = creData.consumptionPatterns
                     that.cardPaymentOpData.consumptionDate = creData.consumptionDate
                     that.cardPaymentOpData.bankNo = creData.bankNo
                     that.cardPaymentOpData.cardholderName = creData.cardholderName

src/components/OP/OpInvitationOfficialActivities.vue

@@ -9,7 +9,7 @@
         <div>
             <el-form :model="delegationInfo" class="demo-ruleForm">
                 <div style="display: flex;flex-wrap: wrap;">
-                    <div style="width: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
@@ -42,26 +42,26 @@
             <el-form :model="InvitationOfficialActivities" ref="InvitationOfficialActivities"
                 :rules="InvitationOfficialActivitiesRules" label-width="160px" class="demo-ruleForm">
                 <div style="display:flex ; flex-wrap: wrap;">
-                    <div style="width: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <el-form-item label="是否到场:" prop="isGoOfficaiaBussiness" label-width="160px">
                             <el-radio-group v-model="InvitationOfficialActivities.isGoOfficaiaBussiness">
                                 <el-radio :label=1>是</el-radio>
@@ -71,25 +71,25 @@
                     </div>
                 </div>
                 <div style="display:flex ; flex-wrap: wrap;">
-                    <div style="width: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <el-form-item label="传真号码:" prop="fax" label-width="160px">
                             <el-input placeholder="传真号码" v-model="InvitationOfficialActivities.fax">
                             </el-input>
@@ -97,13 +97,13 @@
                     </div>
                 </div>
                 <div style="display: flex; flex-wrap: wrap;">
-                    <div style="width: 780px;">
+                    <div style="width: 775px;">
                         <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: 780px;">
+                    <div style="width: 775px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div style="width: 385px;">
                         <el-form-item label="消费方式:" prop="consumptionPatterns">
                             <el-input placeholder="消费方式" v-model="InvitationOfficialActivities.consumptionPatterns">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 390px;">
+                    <div style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==72" style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 385px;">
                               <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 385px;">
                         <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: 390px;">
+                    <div v-if="InvitationOfficialActivities.payDId==73||InvitationOfficialActivities.payDId==83" style="width: 385px;">
                         <el-form-item label="对方姓名:" prop="otherSideName">
                             <el-input placeholder="对方姓名" v-model="InvitationOfficialActivities.otherSideName">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 390px;">
+                    <div style="width: 385px;">
                         <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/OpVisaPriec.vue

@@ -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: 385px;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="OpVisaPriceData.diId" clearable filterable placeholder="团组选择"
                                 :disabled="isShow" style="width: 100%;" @change="DiIdSelectChange">
@@ -19,39 +19,39 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <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: 385px;">
                         <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: 385px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
                         <el-form-item label="出访时间:" label-width="160px">
                             <el-input placeholder="出访时间" v-model="VisitDate" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="出访人数:" label-width="160px">
                             <el-input placeholder="出访人数" v-model="delegationInfo.visitPNumber" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="出访天数:" label-width="160px">
                             <el-input placeholder="出访天数" v-model="delegationInfo.visitDays" :disabled="true">
                             </el-input>
@@ -61,7 +61,19 @@
             </el-form>
             <el-form :model="OpVisaPriceData" ref="OpVisaPriceData" :rules="OpVisaPriceDataRules" label-width="100px"
                 class="demo-ruleForm">
-                <div style="width: 100%;">
+                <div style="width: 98.5%;">
+                    <el-form-item label="签证描述:" prop="visaClient" label-width="160px">
+                        <!-- <el-select @change="clientNamechange" style="width: 100%;" v-model="OpVisaPriceData.visaClient"
+                            placeholder="签证客户" multiple clearable filterable>
+                            <el-option v-for="item in fliterClient" :key="item.id"
+                                :label="item.lastName + item.firstName" :value="item.id">
+                            </el-option>
+                        </el-select> -->
+                        <el-input placeholder="签证描述" v-model="OpVisaPriceData.visaDescription">
+                        </el-input>
+                    </el-form-item>
+                </div>
+                <div style="width: 98.5%;">
                     <el-form-item label="签证客户:" prop="visaClient" label-width="160px">
                         <el-select @change="clientNamechange" style="width: 100%;" v-model="OpVisaPriceData.visaClient"
                             placeholder="签证客户" multiple clearable filterable>
@@ -72,13 +84,13 @@
                     </el-form-item>
                 </div>
                 <div style="display: flex;flex-wrap: wrap;">
-                    <!-- <div style="width: 25%;">
+                    <!-- <div style="width: 385px;">
                         <el-form-item label="签证客户:" prop="visaClient" label-width="160px">
                             <el-input placeholder="签证客户" v-model="OpVisaPriceData.visaClient">
                             </el-input>
                         </el-form-item>
                     </div> -->
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="签证费用:"  prop="visaCurrency" label-width="160px">
                             <el-input-number style="width:52%" :precision="2" placeholder="付款金额" v-model="OpVisaPriceData.visaPrice" :controls='false'>
                             </el-input-number>
@@ -91,7 +103,7 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="是否第三方代办:" prop="isThird" label-width="160px">
                             <el-radio-group v-model="OpVisaPriceData.isThird">
                                 <el-radio :label=1>是</el-radio>
@@ -99,7 +111,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="客户类型:" prop="passengerType" label-width="160px">
                             <el-select v-model="OpVisaPriceData.passengerType" clearable filterable placeholder="客户类型">
                                 <el-option v-for="item in passengerTypeSelect" :key="item.id" :label="item.name"
@@ -108,20 +120,20 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="签证办理人数:" prop="visaNumber" label-width="160px">
                             <el-input placeholder="签证办理人数" v-model="OpVisaPriceData.visaNumber" style="width: 100%;">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="免签人数:" prop="visaFreeNumber" label-width="160px">
                             <el-input placeholder="免签人数" v-model="OpVisaPriceData.visaFreeNumber" style="width: 100%;">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;flex-wrap: wrap;">
                     <div style="width: 100%;">
                         <el-form-item label="备 注:" prop="Remark" label-width="160px">
                             <el-input type="textarea" :rows="5" placeholder="备注"
@@ -130,8 +142,8 @@
                     </div>
                 </div>
                 <hr style='background-color:#5555; height:1px; border:none;margin-top: 10px;' />
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
                         <el-form-item label="支付方式:" prop="payDId" label-width="160px">
                             <el-select v-model="OpVisaPriceData.payDId" placeholder="支付方式" style="width: 100%;"
                                 @change="payChange">
@@ -140,13 +152,13 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <!-- <div style="width: 385px;">
                         <el-form-item label="消费方式:" prop="consumptionPatterns" label-width="160px">
                             <el-input placeholder="消费方式" v-model="OpVisaPriceData.consumptionPatterns">
                             </el-input>
                         </el-form-item>
-                    </div>
-                    <div style="width: 25%;">
+                    </div> -->
+                    <div style="width: 385px;">
                         <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
                             <el-date-picker style="width:100%" v-model="OpVisaPriceData.consumptionDate"
                                 placeholder="消费日期" type="date">
@@ -154,7 +166,7 @@
 
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="付款金额:" label-width="160px">
                             <el-input placeholder="付款金额" v-model="OpVisaPriceData.visaPrice" style="width: 52%;"
                                 :disabled="true">
@@ -167,8 +179,8 @@
                     </div>
                 </div>
                 <div v-if="OpVisaPriceData.payDId == 72">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 385px;">
                             <el-form-item label="卡类型:" prop="ctdId" label-width="160px">
                                 <el-select v-model="OpVisaPriceData.ctdId" placeholder="卡类型" style="width: 100%;"
                                     @change="ctdChange">
@@ -178,13 +190,13 @@
                                 </el-select>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="银行卡号:" prop="bankNo" label-width="160px">
                                 <el-input placeholder="银行卡号" v-model="OpVisaPriceData.bankNo" :disabled="true">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="持卡人姓名:" prop="cardholderName" label-width="160px">
                                 <el-input placeholder="持卡人姓名" v-model="OpVisaPriceData.cardholderName" :disabled="true">
                                 </el-input>
@@ -193,27 +205,27 @@
                     </div>
                 </div>
                 <div v-else-if="OpVisaPriceData.payDId == 73">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 385px;">
                             <el-form-item label="公司银行账号:" label-width="160px" prop="companyBankNo">
                                 <el-input placeholder="公司银行账号" v-model="OpVisaPriceData.companyBankNo">
                                 </el-input>
 
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方开户行:" prop="otherBankName" label-width="160px">
                                 <el-input placeholder="对方开户行:" v-model="OpVisaPriceData.otherBankName">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方银行卡号:" prop="otherSideNo" label-width="160px">
                                 <el-input placeholder="对方银行卡号" v-model="OpVisaPriceData.otherSideNo">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方姓名:" prop="otherSideName" label-width="160px">
                                 <el-input placeholder="对方姓名" v-model="OpVisaPriceData.otherSideName">
                                 </el-input>
@@ -222,20 +234,20 @@
                     </div>
                 </div>
                 <div v-else-if="OpVisaPriceData.payDId == 83">
-                    <div style="display: flex;">
-                        <div style="width: 25%;">
+                    <div style="display: flex;flex-wrap: wrap;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方开户行:" prop="otherBankName" label-width="160px">
                                 <el-input placeholder="对方开户行" v-model="OpVisaPriceData.otherBankName">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方银行卡号:" prop="otherSideNo" label-width="160px">
                                 <el-input placeholder="对方银行卡号" v-model="OpVisaPriceData.otherSideNo">
                                 </el-input>
                             </el-form-item>
                         </div>
-                        <div style="width: 25%;">
+                        <div style="width: 385px;">
                             <el-form-item label="对方姓名:" prop="otherSideName" label-width="160px">
                                 <el-input placeholder="对方姓名" v-model="OpVisaPriceData.otherSideName">
                                 </el-input>
@@ -244,14 +256,14 @@
                     </div>
                 </div>
                 <div v-else></div>
-                <div style="display:flex;">
-                    <div style="width: 25%;">
+                <div style="display:flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
                         <el-form-item label="收款方:" label-width="160px">
                             <el-input placeholder="对方姓名:" v-model="OpVisaPriceData.payee">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="费用标识:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="OpVisaPriceData.orbitalPrivateTransfer" placeholder="费用标识"
                                 style="width: 100%;">
@@ -263,7 +275,7 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;flex-wrap: wrap;">
                     <div style="width: 100%;">
                         <el-form-item label="备 注:" prop="Remark" label-width="160px">
                             <el-input type="textarea" :rows="5" placeholder="备注"
@@ -298,6 +310,7 @@ export default {
             bankCard: [],//卡类型下拉框
             payment: [],//支付方式下拉框
             OpVisaPriceData: {
+                visaDescription:'',
                 status: 0,
                 id: 0,
                 diId: '',
@@ -311,7 +324,7 @@ export default {
                 createUserId: 0,
                 remark: '',
                 payDId: 72,
-                consumptionPatterns: '',
+                consumptionPatterns: '暂无',
                 consumptionDate: '',
                 ctdId: '',
                 companyBankNo: '',
@@ -565,7 +578,8 @@ export default {
                     that.OpVisaPriceData.createUserId = VisaInfo.createUserId;
                     that.OpVisaPriceData.remark = VisaInfo.remark;
                     that.OpVisaPriceData.payDId = CreditCardPayment.payDId;
-                    that.OpVisaPriceData.consumptionPatterns = CreditCardPayment.consumptionPatterns;
+                    that.OpVisaPriceData.visaDescription = VisaInfo.visaDescription;
+                    // that.OpVisaPriceData.consumptionPatterns = CreditCardPayment.consumptionPatterns;
                     that.OpVisaPriceData.consumptionDate = CreditCardPayment.consumptionDate;
                     that.OpVisaPriceData.ctdId = CreditCardPayment.ctdId;
                     that.OpVisaPriceData.bankNo = CreditCardPayment.bankNo;
@@ -634,6 +648,7 @@ export default {
                                     otherBankName:that.OpVisaPriceData.otherBankName,
                                     otherSideNo:that.OpVisaPriceData.otherSideNo,
                                     otherSideName:that.OpVisaPriceData.otherSideName,
+                                    visaDescription:that.OpVisaPriceData.visaDescription,
                                     bankNo:that.OpVisaPriceData.bankNo,
                                     cardholderName:that.OpVisaPriceData.cardholderName,
                                     payee:that.OpVisaPriceData.payee,

src/components/OP/VisaPriec.vue

@@ -8,7 +8,7 @@
                 <div style="display: flex;justify-content: space-between;">
                     <div style="width: 80%;display: flex;">
                         <div style="width: 25%;">
-                            <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="visaSelect"
+                            <el-select v-model="DiId" placeholder="团组选择" c  learable filterable @change="visaSelect"
                                 style="width: 100%;">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
@@ -49,6 +49,8 @@
                             {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
                         </template>
                     </el-table-column>
+                    <el-table-column prop="visaDescription" label="签证描述">
+                    </el-table-column>
                     <el-table-column prop="visaClient" label="签证客户">
                     </el-table-column>
                     <el-table-column prop="visaPrice,visaCurrencyStr" label="签证费用">

src/components/Resource/OpOfficialActivities.vue

@@ -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: 385px;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="DiId" clearable filterable placeholder="团组选择" @change="DiIdChang"
                                 :disabled="isShow">
@@ -19,42 +19,43 @@
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <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: 385px;">
                         <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: 385px;">
                         <el-form-item label="出访国家:" prop="visitCountry" label-width="160px">
                             <el-input placeholder="出访国家" v-model="delegationInfo.visitCountry" :disabled="true">
                             </el-input>
                         </el-form-item>
                     </div>
                 </div>
+
             </el-form>
             <el-form :model="OpOfficialActivitiesDto" ref="OpOfficialActivitiesDto" :rules="OpOfficialActivitiesRules"
                 label-width="100px" class="demo-ruleForm">
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务单位:" prop="client" label-width="160px">
                             <el-input clearable placeholder="公务单位" v-model="OpOfficialActivitiesDto.client">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务日期:" prop="date" label-width="160px">
                             <el-date-picker v-model="OpOfficialActivitiesDto.date" type="date" placeholder="选择公务日期">
                             </el-date-picker>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务时刻:" prop="time" label-width="160px">
                             <el-time-picker v-model="OpOfficialActivitiesDto.time" format='HH:mm' value-format="HH:mm"
                                 placeholder="公务时刻">
@@ -62,7 +63,7 @@
 
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="邀请方:" prop="type" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.type">
                                 <el-radio :label=1>是</el-radio>
@@ -71,27 +72,27 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;flex-wrap: wrap;">
 
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务方联系人职务:" prop="job" label-width="160px">
                             <el-input clearable placeholder="公务方联系人职务" v-model="OpOfficialActivitiesDto.job">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务方联系人:" prop="contact" label-width="160px">
                             <el-input clearable placeholder="公务方联系人" v-model="OpOfficialActivitiesDto.contact">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="联系方式:" prop="tel" label-width="160px">
                             <el-input clearable placeholder="联系方式" v-model="OpOfficialActivitiesDto.tel">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="公务形式:" prop="officialForm" label-width="160px">
                             <el-select v-model="OpOfficialActivitiesDto.officialForm" clearable filterable placeholder="公务形式">
                                 <el-option v-for="item in OfficialFormList" :key="item.id" :label="item.name" :value="item.id">
@@ -100,14 +101,14 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
-                    <div style="width: 25%;">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div style="width: 385px;">
                         <el-form-item label="着装要求:" prop="dresscode" label-width="160px">
                             <el-input clearable placeholder="着装要求" v-model="OpOfficialActivitiesDto.dresscode">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="需要翻译:" prop="isNeedTrans" label-width="160px">
                             <el-radio-group v-model="OpOfficialActivitiesDto.isNeedTrans">
                                 <el-radio :label=1>是</el-radio>
@@ -115,19 +116,34 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="翻译人员:" prop="translators" label-width="160px">
                             <el-input clearable placeholder="翻译人员" v-model="OpOfficialActivitiesDto.translators">
                             </el-input>
                         </el-form-item>
                     </div>
-                    <div style="width: 25%;">
+                    <div style="width: 385px;">
                         <el-form-item label="翻译语种:" prop="language" label-width="160px">
                             <el-input clearable placeholder="翻译语种" v-model="OpOfficialActivitiesDto.language">
                             </el-input>
                         </el-form-item>
                     </div>
-
+                    <div style="width: 385px;">
+                        <el-form-item label="是否付费:" prop="type" label-width="160px">
+                            <el-radio-group v-model="OpOfficialActivitiesDto.isPay">
+                                <el-radio :label=1>是</el-radio>
+                                <el-radio :label=0>否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 385px;">
+                        <el-form-item label="是否报批:" prop="type" label-width="160px">
+                            <el-radio-group v-model="OpOfficialActivitiesDto.isSubmitApproval">
+                                <el-radio :label=1>是</el-radio>
+                                <el-radio :label=0>否</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </div>
                 </div>
                 <div style="display: flex;">
                     <div style="width: 50%;">
@@ -250,10 +266,15 @@ export default {
                 language: "",
                 trip: "",
                 createUserId: 0,
+                isPay:0,
+                isSubmitApproval:0,
                 remark: ""
             },
             OpOfficialActivitiesRules: {
-
+                officialForm: [
+                    { required: true, message: '该信息为必填信息', trigger: 'blur' },
+                    { required: true, message: '该信息为必填信息', trigger: 'change' },
+                ],
                 inviteCosts: [
                     { required: true, message: '该信息为必填信息', trigger: 'blur' },
                     { required: true, message: '该信息为必填信息', trigger: 'change' },
@@ -428,6 +449,8 @@ export default {
                     that.OpOfficialActivitiesDto.trip = dataList.trip
                     that.OpOfficialActivitiesDto.createUserId = dataList.createUserId
                     that.OpOfficialActivitiesDto.remark = dataList.remark
+                    that.OpOfficialActivitiesDto.isSubmitApproval = dataList.isSubmitApproval
+                    that.OpOfficialActivitiesDto.isPay = dataList.isPay
                 }
 
             })