0506lhj1801

src/components/OP/HotelReservations.vue

@@ -567,7 +567,7 @@ export default {
                 paymentAmount:0,//付款金额
                 paymentCurrency:0,//付款币种
                 beneficiary:'',//收款方
-                expenseid:-1,//费用标识
+                expenseid:0,//费用标识
                 remarks:'',//备 注
                 //刷卡
                 cardtype:'',//卡类型:

src/components/OP/InvitationOfficialActivities.vue

@@ -93,14 +93,21 @@
                             <span v-else>自动审核通过</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="attachment" label="附件" width="200">
+                    <el-table-column prop="isPay" label="是否付款" width="78">
+                        <template slot-scope="isPay">
+                            <span v-if="isPay.row.isPay == 1">已付款</span>
+                            <span v-else-if="isPay.row.isPay == 0">未付款</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="attachment" label="附件" width="122">
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
-                            <el-button size="mini" @click="download(scope.$index, scope.row)"
+                            <el-button style="margin-left: 0px;" size="mini" @click="download(scope.$index, scope.row)"
                                 v-show="scope.row.attachment">下载附件</el-button>
-                            <el-button size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
-                            <el-button size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>
+
+                            <el-button style="margin-left: 0px;" size="mini" @click="upDate(scope.$index, scope.row)">编辑</el-button>
+                            <el-button style="margin-left: 0px;" size="mini" type="danger" @click="del(scope.$index, scope.row)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>

src/components/OP/OpInvitationOfficialActivities.vue

@@ -121,7 +121,7 @@
                             </div>
                             <div style="width: 28%;">
                                 <el-form-item prop="eventsCurrency" label-width="5px">
-                                    <el-select @change="computerenminbi" v-model="InvitationOfficialActivities.eventsCurrency" placeholder="币种">
+                                    <el-select @change="computerenminbi(1)" v-model="InvitationOfficialActivities.eventsCurrency" placeholder="币种">
                                         <el-option v-for="item in rateList" :key="item.currencyId"
                                             :label="item.currencyCode" :value="item.currencyId"></el-option>
                                     </el-select>
@@ -616,11 +616,13 @@ export default {
             })
         },
         //币种不同计算为人民币
-        computerenminbi(){
-            if(this.InvitationOfficialActivities.inviteCurrency==''||this.InvitationOfficialActivities.translateCurrency==''||this.InvitationOfficialActivities.sendCurrency==''){
-                this.InvitationOfficialActivities.inviteCurrency=this.InvitationOfficialActivities.eventsCurrency;
-                this.InvitationOfficialActivities.translateCurrency=this.InvitationOfficialActivities.eventsCurrency;
-                this.InvitationOfficialActivities.sendCurrency=this.InvitationOfficialActivities.eventsCurrency;
+        computerenminbi(val){
+            if(val==1){
+                if(this.InvitationOfficialActivities.inviteCurrency==''||this.InvitationOfficialActivities.translateCurrency==''||this.InvitationOfficialActivities.sendCurrency==''){
+                    this.InvitationOfficialActivities.inviteCurrency=this.InvitationOfficialActivities.eventsCurrency;
+                    this.InvitationOfficialActivities.translateCurrency=this.InvitationOfficialActivities.eventsCurrency;
+                    this.InvitationOfficialActivities.sendCurrency=this.InvitationOfficialActivities.eventsCurrency;
+                }
             }
             var eventsRate=0;
             var inviteRate=0;