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

src/App.vue

@@ -350,5 +350,8 @@
   .c059FF6 {
     color: #059ff6;
   }
+  .c9e {
+    color: #9e9e9e;
+  }
 
 </style>

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -107,8 +107,19 @@
             <!--<p class="_yewudanju">订单号：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
             <p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>
             <p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
+            <div class="rb_top_row _r_mb5" v-if="GetDetail.GroundingSupplierId">
+              <p @click="goUnifyUrl('GroundSupplier',GetDetail.GroundingSupplierId)">
+                    <span>&nbsp;&nbsp;&nbsp; 供应商：</span>
+                    <span class="" style="color: #3980C8;cursor: pointer;"
+                    >{{ GetDetail.GroundingSupplierName }}</span>
+                    <el-tooltip class="item" effect="dark" :content="GetDetail.GSupplierContractUrl?'有合同':'无合同'" placement="top">
+                    <span style="cursor: pointer;font-size: 12px;">{{GetDetail.GSupplierContractUrl?'已签合同':'未签合同'}}</span>
+                    </el-tooltip>
+                  </p>
+            </div>
             <div class="rb_top_row _r_mb5">
                 <p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
+
                 <p v-if="GetDetail.Type==2 || GetDetail.Type==6">{{$t('fnc.fkduixiang')}}：
                   <span class="_r_name" style="margin-right:8px">{{GetDetail.ClientTypeName}}</span>
                   <span class="_r_name">{{GetDetail.AccountHolder}}</span>
@@ -122,6 +133,8 @@
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==10">虚拟结算</span>
                   <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==11">电商结算</span>
+
+
                 </p>
                 <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
             </div>
@@ -154,7 +167,7 @@
                 <div>
                   <span v-if="GetDetail.OtherType!=55">{{$t('hotel.order_Number')}}：<span>{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></span>
                   <span v-if="GetDetail.OtherType==55"> 机票单号：<span>{{GetDetail.ReFinanceId?GetDetail.ReFinanceId:$t('fnc.no')}}</span></span>
-                </div>                
+                </div>
             </div>
             <div class="rb_top_row _r_mb5" v-if="isPrintPage&&OrderSource==4">
               <p>
@@ -358,6 +371,15 @@ export default {
       s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
       this.printTime = y + '' + m + '' + d + ' ' + h + ':' + min + ':' + s;
   },methods:{
+    goUnifyUrl(path,Id){
+        this.$router.push({
+          path: path,
+          query: {
+            Id: Id,
+            blank: 'y',
+          }
+        });
+      },
         jumpPage(path,id,type){
             if(type==1){
                 // let routeData = this.$router.resolve({
@@ -415,14 +437,14 @@ export default {
                            if(item.CostTypeName=="地接费（领取）"){
                              status=true;
                            }
-                       }) 
+                       })
                       if(status){
 
                       }
                     }
                 }
             }, err => {})
-        },        
+        },
     },mounted(){
         const myDate = new Date();
         let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
@@ -430,7 +452,7 @@ export default {
         let dateS = myDate.getDate(); //获取当前日(1-31)
         this.StartDate = yaer + '-' + month + '-' + '01';
         this.EndDate = yaer + '-' + month + '-' + dateS;
-        let userInfo = this.getLocalStorage();   
+        let userInfo = this.getLocalStorage();
         this.EmployeeId = userInfo.EmployeeId;
         this.Financial_post_GetDetail(this.ID);
     },watch: {  // 监听参数变化

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1448,6 +1448,16 @@
         e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
       },
       AddFinancial(z) { //保存
+        if(this.describeList&&this.describeList.length>0){
+          let num = 0
+          this.msg.detailList.forEach(x=>{
+            num+=Number(x.Number)
+          })
+          if(this.describeList.length!=num){
+            this.Error('费用总数量与旅客名单人数不符！')
+            return
+          }
+        }
         for(let i=0;i<this.msg.detailList.length;i++){
           if(!this.msg.detailList[i].CurrencyId){
             this.Error('请完善费用的相关信息')
@@ -2283,13 +2293,15 @@
           if (this.$route.query.id == 245 ||
             this.$route.query.id == 246 ||
             this.$route.query.id == 247 ||
-            this.$route.query.id == 248) {
+            this.$route.query.id == 248 ||
+            this.$route.query.id == 267) {
             this.is_HandFee = true
             this.isHandFee = true
           } else if ((this.msg.TemplateId == 245 ||
               this.msg.TemplateId == 246 ||
               this.msg.TemplateId == 247 ||
-              this.msg.TemplateId == 248) && this.msg.HandFeeFrId == 0 && this.msg.RB_Branch_Id != 1220) {
+              this.msg.TemplateId == 248 ||
+              this.msg.TemplateId == 267) && this.msg.HandFeeFrId == 0 && this.msg.RB_Branch_Id != 1220) {
             this.is_HandFee = true
             this.isHandFee = true
           } else {
@@ -2568,7 +2580,8 @@
       if (this.$route.query.id == 245 ||
         this.$route.query.id == 246 ||
         this.$route.query.id == 247 ||
-        this.$route.query.id == 248) {
+        this.$route.query.id == 248 ||
+        this.$route.query.id == 267) {
           this.is_HandFee = true
           this.isHandFee = true
       } else {

src/components/dmc/manager/GroundSupplier/index.vue

@@ -138,7 +138,7 @@
             <p>{{scope.row.CreateDate}}</p>
           </template>
         </el-table-column>
-        <el-table-column prop="" label="操作">
+        <el-table-column prop="" label="操作" width="125">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="账户管理" placement="top">
               <el-button @click="AccountManage(scope.row)"
@@ -150,6 +150,12 @@
             class="button" type="primary"
             icon="el-icon-edit" circle>
             </el-button>
+            <!-- <el-tooltip class="item" effect="dark" content="详情" placement="top">
+              <el-button @click="Edit(scope.row,1)"
+              class="button" type="info"
+              icon="el-icon-view" circle>
+              </el-button>
+            </el-tooltip> -->
             <el-button @click="Delete(scope.row)"
             class="button" type="danger"
             icon="el-icon-delete" circle></el-button>
@@ -320,7 +326,7 @@
       }
     },
     created() {
-
+      this.msg.Id = this.$route.query.Id?this.$route.query.Id:''
     },
     components: {
 
@@ -341,10 +347,25 @@
         this.titleName = '新增'
         this.showVisible = true
       },
-      Edit(row){
-        this.titleName = '编辑'
-        this.form = JSON.parse(JSON.stringify(row))
-        this.form.LineId = row.LineInfo.split(',').map(x=>{ return Number(x) })
+      Edit(row,type){
+        if(type==1){
+          this.titleName = '查看'
+          this.apipost('travel_get_GetGroundingSupplier', {
+              Id: row.Id
+            }, res => {
+            if (res.data.resultCode == 1) {
+              this.form = res.data.data
+              this.form.LineId = res.data.data.LineInfo.split(',').map(x=>{ return Number(x) })
+            } else {
+              this.Error(res.data.message)
+            }
+          })
+
+        }else{
+          this.titleName = '编辑'
+          this.form = JSON.parse(JSON.stringify(row))
+          this.form.LineId = row.LineInfo.split(',').map(x=>{ return Number(x) })
+        }
         this.showVisible = true
       },
       Delete(row){