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

src/components/OP/CarTouristGuideGrounContent.vue

@@ -372,63 +372,61 @@
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="消费方式:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="收款方" v-model="OPContenData.payee">
+                                <el-form-item label="消费方式:" prop="consumptionPatterns" label-width="160px">
+                                    <el-input placeholder="收款方" v-model="OPContenData.consumptionPatterns">
                                     </el-input>
                                 </el-form-item>
                             </div>
-                            <div v-if="OPContenData.payDId==72" style="width: 390px;">
-                                <el-form-item label="卡类型:" prop="payDId" label-width="160px">
-                                    <el-select v-model="OPContenData.orbitalPrivateTransfer" clearable filterable
-                                        placeholder="费用标识" style="width: 100%;">
-                                        <el-option :key=0 :value="0" label="公转"></el-option>
-                                        <el-option :key=1 :value="1" label="私转"></el-option>
+                            <div v-if="OPContenData.payDId == 72" style="width: 390px;">
+                                <el-form-item label="卡类型:" prop="ctdid" label-width="160px">
+                                    <el-select v-model="OPContenData.ctdid" clearable filterable placeholder="费用标识"
+                                        style="width: 100%;">
+                                        <el-option v-for="item in bankCard" :key="item.id" :label="item.name"
+                                            :value="item.id">
+                                        </el-option>
                                     </el-select>
                                 </el-form-item>
                             </div>
-                            <div v-if="OPContenData.payDId==72" style="width: 390px;">
-                                <el-form-item label="银行卡号:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                            <div v-if="OPContenData.payDId == 72" style="width: 390px;">
+                                <el-form-item label="银行卡号:" prop="bankNo" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.bankNo">
                                     </el-input>
                                 </el-form-item>
                             </div>
-                            <div v-if="OPContenData.payDId==72" style="width: 390px;">
-                                <el-form-item label="持卡人姓名:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                            <div v-if="OPContenData.payDId == 72" style="width: 390px;">
+                                <el-form-item label="持卡人姓名:" prop="cardholderName" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.cardholderName">
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="消费日期:" prop="payDId" label-width="160px">
-                                    <el-date-picker
-                                    style="width: 100%;"
-                                    v-model="OPContenData.payDId"
-                                    type="date"
-                                    placeholder="选择日期">
+                                <el-form-item label="消费日期:" prop="consumptionDate" label-width="160px">
+                                    <el-date-picker style="width: 100%;" value-format="yyyy-MM-dd"
+                                        v-model="OPContenData.consumptionDate" type="date" placeholder="选择日期">
                                     </el-date-picker>
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="公司银行账号:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                                <el-form-item label="公司银行账号:" prop="companyBankNo" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.companyBankNo">
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="对方开户行:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                                <el-form-item label="对方开户行:" prop="otherBankName" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.otherBankName">
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="对方银行卡号:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                                <el-form-item label="对方银行卡号:" prop="otherSideNo" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.otherSideNo">
                                     </el-input>
                                 </el-form-item>
                             </div>
                             <div style="width: 390px;">
-                                <el-form-item label="对方姓名:" prop="payDId" label-width="160px">
-                                    <el-input placeholder="" v-model="OPContenData.payee">
+                                <el-form-item label="对方姓名:" prop="otherSideName" label-width="160px">
+                                    <el-input placeholder="" v-model="OPContenData.otherSideName">
                                     </el-input>
                                 </el-form-item>
                             </div>
@@ -472,7 +470,7 @@ export default {
             diId: '',
             loading: true,
             currency: 0,
-            countCost: 0,
+            countCost: 0, //总金额
             delegationInfo: {},
             delegationInfoList: [],//团组下拉框
             currencyList: [],
@@ -488,7 +486,17 @@ export default {
                 payDId: '',
                 currency: '',
                 OPContentList: [],
-                CreateUserId: 0
+                CreateUserId: 0,
+                consumptionPatterns: '', //消费方式
+                ctdid: 0,//卡类型
+                bankNo: '', //银行卡号
+                cardholderName: '',//持卡人姓名
+                consumptionDate: '',//消费日期
+                companyBankNo: '',//公司银行账号
+                otherBankName: '',//对方开户行
+                otherSideNo: '',//对方银行卡号
+                otherSideName: ''//对方姓名
+
             },
             OPContenDataRules: {
                 payPercentage: [
@@ -502,7 +510,15 @@ export default {
                 ],
                 payDId: [
                     { required: true, message: '请选择付款方式', trigger: ['blur', 'change'] },
-                ]
+                ],
+                //------------------------
+                // ctdId: [
+                //     { required: true, message: '请选择卡类型', trigger: ['blur', 'change'] },
+                // ],
+                // companyBankNo: [{ required: true, message: '公司银行账号', trigger: ['blur', 'change'] },],
+                // otherBankName: [{ required: true, message: '对方开户行', trigger: ['blur', 'change'] },],
+                // otherSideNo: [{ required: true, message: '对方银行卡号', trigger: ['blur', 'change'] },],
+                // otherSideName: [{ required: true, message: '对方姓名', trigger: ['blur', 'change'] },],
             },
             unitsArr: [{ id: 0, name: '请选择', remark: '' }],
             checkItems: ["车费", "导游费", "客户午餐费用", "导游景点费", "导游小费", "接送机费", "其他费用", "司机工资", "司机小费", "司机餐补", "车超时费", "导游餐补", "导游房补", "导游交通", "客户早餐费用", "客户晚餐费用", "景点门票费", "饮料/零食/水果", "住补费用", "翻译费", '导游超时费用'],
@@ -516,7 +532,8 @@ export default {
             rate: {
                 toCurr: 836,
                 rate: 1
-            }
+            },
+            bankCard: [],//卡类型下拉框
         }
     },
     methods: {
@@ -593,6 +610,17 @@ export default {
                         that.countCost = CreditCardPayment.payMoney
                         that.OPContenData.orbitalPrivateTransfer = CreditCardPayment.orbitalPrivateTransfer
                         that.IsAuditGM = CreditCardPayment.isAuditGM;
+
+                        //-------------------------------
+                        that.OPContenData.consumptionPatterns = CreditCardPayment.consumptionPatterns;
+                        that.OPContenData.ctdid = CreditCardPayment.ctdid;
+                        that.OPContenData.bankNo = CreditCardPayment.bankNo;
+                        that.OPContenData.cardholderName = CreditCardPayment.cardholderName;
+                        that.OPContenData.consumptionDate = CreditCardPayment.consumptionDate;
+                        that.OPContenData.companyBankNo = CreditCardPayment.companyBankNo;
+                        that.OPContenData.otherBankName = CreditCardPayment.otherBankName;
+                        that.OPContenData.otherSideNo = CreditCardPayment.otherSideNo;
+                        that.OPContenData.otherSideName = CreditCardPayment.otherSideName;
                     }
 
                     that.unitsArr = that.unitsArr.concat(res.data.data.ssdv);
@@ -617,6 +645,12 @@ export default {
                         that.rate.toCurr = that.nationalTravelFee.currency;
                     }
 
+                    that.bankCard = res.data.data.bankCard;
+
+                    if (!that.OPContenData.ctdid && that.bankCard.length > 0) {
+                        that.OPContenData.ctdid = that.bankCard[0].id;
+                    }
+
                 } else {
                     this.$message.error('初始化失败' + res.data.msg);
                 }