Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue

@@ -389,7 +389,10 @@ export default {
       const bb = []
       row.forEach(element => {
         aa.push(element.sid)
-        bb.push(element.nodeState)
+        bb.push({
+          nodeState: element.nodeState,
+          isLQOrigInvoice: element.isLQOrigInvoice
+        })
       })
       this.sids = aa
       this.nodeState_list = bb
@@ -474,11 +477,11 @@ export default {
     },
     toArrear() {
       if (this.sids.length === 1) {
-        if (this.nodeState_list[0] === '已办结') {
+        if (this.nodeState_list[0].nodeState === '已办结' && this.nodeState_list[0].isLQOrigInvoice === '是') {
           this.viewState = 5
           this.$refs['divArrearScollection'].showAdd(this.sids[0])
         } else {
-          this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结的进行欠款领票操作' })
+          this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结且是否领取发票原件为否的进行欠款领票操作' })
           return
         }
       } else {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@@ -446,11 +446,18 @@ export default {
     doHandover() {
       if (this.sids.length === 1) {
         if (this.nodeState_list[0].billingState === '已开票' && this.nodeState_list[0].transferState === '未移交') {
+          var nowDate = new Date()
+          var date = {
+            year: nowDate.getFullYear(),
+            month: nowDate.getMonth() + 1,
+            day: nowDate.getDate()
+          }
+          var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
           this.formobj = {
             recipient: '',
             recipientSid: '',
             showTransfer: true,
-            transferTime: '',
+            transferTime: dayDate,
             sid: ''
           }
           this.dialogFileVisible = true