no message

src/components/guestManagement/Agreement.vue

@@ -392,9 +392,16 @@
             this.getList();
             this.GetTicketStatusEnumList()
             let $this = this
-            this.MsgBus.$on("closeGetList", function() {
+            $this.MsgBus.$on("closeGetList", function() {
                 $this.getList()
             });
+            $this.MsgBus.$on("closeBillMaking", function() {
+                for(let i=0;i<$this.dataList.length;i++){
+                    $this.dataList[i].checkList = []
+                    $this.dataList[i].MultipleChoiceList = []
+                    $this.dataList[i].selectedType = ""
+                }
+            });
         },
         methods: {
             // 取消
@@ -405,11 +412,18 @@
                 if(num==3){
                     this.dataList[index].cost =false
                 }
-                this.dataList[index].MultipleChoiceList = []
-                this.dataList[index].selectedType = ''
+                this.dataList.forEach(item=>{
+                    item.checkList = []
+                    item.MultipleChoiceList = []
+                    item.selectedType = ''
+                })
             },
-            // 关闭弹窗
+            // 确定弹窗
             popClick(row, index, num){
+                if(!row.selectedType){
+                    this.$message.warning('请选择类型!');
+                    return
+                }
                 this.makeAdocumentFun(row, index, num)
                 if(num==1){
                     this.dataList[index].actuallyReceived =false
@@ -532,35 +546,44 @@
                 }
             },
             makeAdocumentFun(row, index, num){
+                let list = row.OrderType&&row.OrderType.split(',')
                 if (this.userInfo.EmName != row.EnterName) {
                     this.ValidateOperator()
                 } else {
                     if (row.OrderStatus != '2') {
-                        let type
-                        type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
-                        let href
-                        let url
-                        if (this.isOnline()) {
-                            url = 'http://yx.oytour.com/#/'
-                        } else {
-                            url = 'http://www.test.com:8081/#/'
+                        if(num=='2'){
+                            let type
+                            type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
+                            let href
+                            let url
+                            if (this.isOnline()) {
+                                url = 'http://yx.oytour.com/#/'
+                            } else {
+                                url = 'http://www.test.com:8081/#/'
+                            }
+                            let data = [{
+                                path: 'ChoiceAddFinancialDocuments',
+                                type: type,
+                                OtherType: 55,
+                                ReFinanceId: row.OrderId,
+                                ReFinanceId2: num,
+                                GuestId: row.GuestId,
+                                RelevanceFrId: row.selectedType?row.selectedType:row.OrderType // 单据类型
+                            }]
+                            href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
+                            window.open(href);
+                        }if(num=='1'&&list&&list.length>1){
+                            let type
+                            type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
+                            let $this = this;
+                            this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
+                        }else{
+                            
+                            this.apipost2("Financial_post_SetFinanceInfoForCRMIn",{},(res)=>{
+
+                            }) 
                         }
-                        let data = [{
-                            path: 'ChoiceAddFinancialDocuments',
-                            type: type,
-                            OtherType: 55,
-                            ReFinanceId: row.OrderId,
-                            ReFinanceId2: num,
-                            GuestId: row.GuestId,
-                            RelevanceFrId: row.selectedType?row.selectedType:row.OrderType // 单据类型
-                        }]
-                        this.dataList.forEach(item=>{
-                            item.checkList = []
-                            item.MultipleChoiceList = []
-                            item.selectedType = ''
-                        })
-                        href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
-                        window.open(href);
+                        
                     }
 
                 }

src/views/index.vue

@@ -351,6 +351,12 @@
         $this.obj = obj;
         $this.dialogTicketOrderVisible = true;
       });
+      this.MsgBus.$on("BillMakingOrderBoxOpen", function (GuestId, obj) {
+        $this.dialogTicketOrderVisibleName = "制单";
+        $this.GuestId = GuestId;
+        $this.obj = obj;
+        $this.dialogTicketOrderVisible = true;
+      });
       this.MsgBus.$on("closeTicketOrderDialogBox", function () {
         $this.dialogTicketOrderVisible = false;
         this.$emit("getList");