Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/BasicDocuments.vue

@@ -1282,7 +1282,7 @@
                 <el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
                 <el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
                 <span v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
-                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：</span>&nbsp;&nbsp;
+                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：{{AuditOrRefundMsg.KingdeeInvoiceState=''}}</span>&nbsp;&nbsp;
                   <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="1">有票</el-radio>
                   <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="2">无票</el-radio>
                 </span>
@@ -1590,7 +1590,7 @@
                   <el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
                   <el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
                   <span v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
-                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：</span>&nbsp;&nbsp;
+                    &nbsp;&nbsp;&nbsp;|&nbsp;<span style="font-size: 12px;">金蝶发票：{{AuditOrRefundMsg.KingdeeInvoiceState=''}}</span>&nbsp;&nbsp;
                   <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="1">有票</el-radio>
                   <el-radio v-model="AuditOrRefundMsg.KingdeeInvoice" label="2">无票</el-radio>
                 </span>
@@ -2071,7 +2071,8 @@
           CourseId: null,
           CourseName: '',//收款类型 银行卡/支付宝/微信
           PayReceiptNo: '',
-          KingdeeInvoice: '0'
+          KingdeeInvoice: '0',
+          KingdeeInvoiceState: '1',
         },
         AuditListData: {
           AuditList: []
@@ -3305,6 +3306,9 @@
       AuditOrRefund() { // 保存
         let that = this;
         that.benMoney = Math.round(that.benMoney * 100) / 100;
+        if(this.AuditOrRefundMsg.Status == '5' && that.AuditOrRefundMsg.KingdeeInvoiceState=='' && that.AuditOrRefundMsg.KingdeeInvoice=='0'){
+          return this.$message.error('请选择发票状态')
+        }
 
         if (that.Ststus == 1) {
           if (this.AuditOrRefundMsg.Status == '5') {