Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/guestManagement/Agreement.vue

@@ -70,6 +70,7 @@
     
     .Credentials {
         color: #2961FE;
+        cursor: pointer;
     }
     .agreement-IncomeMoney-box{
         /* position: relative; */
@@ -115,6 +116,37 @@
     /deep/.el-table .cell.el-tooltip{
         overflow: hidden !important;
     }
+    .OrderType-text{
+        font-size: 11px;
+        font-weight: 100;
+        margin-left: 5px;
+        border-radius: 3px;
+        display: inline-block;
+        padding: 0 1px;
+    }
+    .OrderType-text-box .OrderType-text:nth-child(2){
+        margin-left: 0;
+    }
+    .OrderType-text.one{
+        color: rgb(41, 97, 254);
+        background-color: rgba(41, 97, 254,.2);
+    }
+    .OrderType-text.two{
+        color: rgb(242, 140, 29);
+        background-color: rgba(242, 140, 29,.2);
+    }
+    .OrderType-text.three{
+        color: rgb(63, 196, 255);
+        background-color: rgba(63, 196, 255,.2);
+    }
+    .OrderType-text.four{
+        color: rgb(255,111,0);
+        background-color: rgba(255,111,0,.2);
+    }
+    .OrderType-text.five{
+        color: rgb(197,225,165);
+        background-color: rgba(97,225,165,.2);
+    }
 </style>
 <template>
     <div class="Business">
@@ -158,11 +190,15 @@
         row-class-name="font-size-12">
         <el-table-column
             fixed
-            label="订单号"
-            show-overflow-tooltip>
+            label="订单号" width="110">
             <template slot-scope="scope">
-              {{scope.row.OrderId}}
-              <!-- <p v-for="(item,index) in scope.row.MultipleChoiceList">{{item.Name}}</p> -->
+                <div class="OrderType-text-box">
+                    <p>{{scope.row.OrderId}}</p>
+                    <span class="OrderType-text"
+                        :class="items.Id==1?'one':(items.Id==2?'two':(items.Id==3?'three':(items.Id==4?'four':(items.Id==5?'five':''))))"
+                        v-for="(items,index) in scope.row.MultipleChoiceList">{{items.Name}}</span>
+                </div>
+              
             </template>
           </el-table-column>
           <el-table-column fixed label="业务员" show-overflow-tooltip :width="120">

src/components/guestManagement/ticketOrder.vue

@@ -1379,23 +1379,23 @@
             }, 50);
             this.form.GuestId = this.GuestId
             if (this.name == "编辑机票订单") {
-                this.checkList = this.obj.OrderType.split(',')
-                if (this.obj.OrderType.indexOf(1) != -1) {
+                this.checkList = this.obj.OrderType!=null&&this.obj.OrderType.split(',')
+                if (this.obj.OrderType&&this.obj.OrderType.indexOf(1) != -1) {
                     this.AirTicketsShow = false
                 } else {
                     this.AirTicketsShow = true
                 }
-                if (this.obj.OrderType.indexOf(2) != -1) {
+                if (this.obj.OrderType&&this.obj.OrderType.indexOf(2) != -1) {
                     this.visaShow = false
                 } else {
                     this.visaShow = true
                 }
-                if (this.obj.OrderType.indexOf(3) != -1) {
+                if (this.obj.OrderType&&this.obj.OrderType.indexOf(3) != -1) {
                     this.groundShow = false
                 } else {
                     this.groundShow = true
                 }
-                if (this.obj.OrderType.indexOf(4) != -1) {
+                if (this.obj.OrderType&&this.obj.OrderType.indexOf(4) != -1) {
                     this.comboShow = false
                 } else {
                     this.comboShow = true
@@ -1786,7 +1786,8 @@
                 this.BillMaking.vorcherInos=[]
                 this.form.Voucher.forEach(item=>{
                     let Content ={
-                        Content:item
+                        Content:item,
+                        type: 3
                     }
                     this.BillMaking.vorcherInos.push(Content)
                 })
@@ -1806,7 +1807,8 @@
                         // });
                     this.Voucher.push(data)
                     let Content ={
-                        Content:data
+                        Content:data,
+                        type:3
                     }
                     this.BillMaking.vorcherInos.push(Content)
                     this.form.Voucher.push(url);
@@ -2044,7 +2046,7 @@
                     this.$message.warning('请选择汇款时间');
                     return
                 }
-                if(!this.BillMaking.TradeDate){
+                if(!this.BillMaking.AccountNumber){
                     this.$message.warning('请输入流水号');
                     return
                 }