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

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -87,6 +87,7 @@
         showTab:0,
         templateID: null,
         DepartID: null,
+        EmployeeId: null,
       }
     },methods:{
       goUrl(path,id,Name,Type,IsUploadPic) {
@@ -162,11 +163,19 @@
                 }
                 //    5-5       仅茈、而巳。  14:32:06
                 // 部门id  =  242 或者  240   就展示出  templeteId=33 的流程，  流程名字叫做  公司佣金收款
-                if (x.Id === 33) {
-                  if (this.DepartID === 242 || this.DepartID === 240) {
-                    x.bigShow = true
-                  } else {
-                    x.bigShow = false
+                if (x.Id === 33 || x.Id === 48) {
+                  if (x.Id === 33) {
+                    if (this.DepartID === 242 || this.DepartID === 240) {
+                      x.bigShow = true
+                    } else {
+                      x.bigShow = false
+                    }
+                  } else if (x.Id === 48) {
+                    if (this.EmployeeId === 1725) {
+                      x.bigShow = true
+                    } else {
+                      x.bigShow = false
+                    }
                   }
                 } else {
                   x.bigShow = true
@@ -188,6 +197,7 @@
     },mounted(){
       let userInfo = this.getLocalStorage();
       this.DepartID = userInfo.RB_Department_Id;
+      this.EmployeeId = userInfo.EmployeeId;
       this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
       this.Financial_post_GetList();
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;

src/components/administrative/Announcement.vue

@@ -57,7 +57,7 @@
              	<td>
 					 <el-button-group>
 					 	<el-tooltip v-if="item.Status!='0'" class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top-start">
-						   <el-button @click='getDetails(item.Id)' type="primary" icon="el-icon-tickets" ></el-button>
+						   <el-button @click='getDetails(item.Id, item.Title)' type="primary" icon="el-icon-tickets" ></el-button>
 						</el-tooltip>
 						<el-tooltip v-if="item.Status=='0'" class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
 						   <el-button @click='updateNotice(item.Id)' type="primary" icon="el-icon-edit" ></el-button>
@@ -88,12 +88,11 @@
 		</el-pagination>
 		<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
 			            <div v-if='layerType==1'>
-			            	<p class="ann_detail_title">{{detailMessage.Title}}</p>
 			            	<p style="text-align: right; padding: 5px 0;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
 			            	<pre style="letter-spacing: 1px; font-size: 14px; color: #333;">{{detailMessage.Content}}</pre>
 			            	<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
 			            	<p style="height: 28px; padding: 0 10px; line-height: 28px;" v-for="item in downLoadList" class="AnnFileListPMeta">
-			            		<span @click="downloadSingle(item)">{{item.Name}}--{{$t('adm.adm_download')}}</span>
+			            		<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
 			            	</p>
 			            </div>
 			 
@@ -357,10 +356,10 @@
 					}
 				},err=>{})
 			},
-			getDetails(id){
+			getDetails(id, tit){
 				this.outerVisible=true;
 				this.layerType=1;
-				this.dialogTitle=this.$t('tips.adm_noticexiangqing');
+				this.dialogTitle=tit;
 				this.apipost('User_get_NoticeGet',{noticeId:id},res=>{
 					if(res.data.resultCode == 1) {
 						this.detailMessage=res.data.data
@@ -434,5 +433,11 @@
 	.AnnfileList li{height: 30px; line-height: 30px; padding: 0 10px;}
 	.AnnfileList li:hover{background: #f1f1f1;}
 	.AnnfileList li>i{float: right; margin-top:8px;}
-	.AnnfileList li>span:hover,.AnnFileListPMeta>span:hover{text-decoration: underline; color: #E95252; cursor: pointer;}
+	.AnnfileList li:hover,.AnnFileListPMeta:hover{text-decoration: underline; color: #E95252; cursor: pointer;}
+	.AnnFileListPMeta{
+		color: blue
+	}
+	.AnnFileListPMeta .iconfon{
+		font-size: 12px;
+	}
 </style>
\ No newline at end of file

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -694,7 +694,7 @@
                 <div class="TPright" style="float:left;">
                     <span>团期标签</span>
                     <span>
-                       <el-checkbox-group v-model="priceData.PriceTagList">
+                       <el-checkbox-group v-model="priceData.PriceTagIds">
                         <el-checkbox v-for="team in teamTips" :label="team.ID"
                           :key="team.Content">{{team.Content}}</el-checkbox>
                       </el-checkbox-group>
@@ -811,7 +811,6 @@
       },
       //点击选中日历日期
       clickedDay(item) {
-        console.log(item,'item');
         this.chooseDay = this.getDayStr(item.day);
         switch (item.checkState) {
           case this.$calendarUtils.checkState.hasValue:
@@ -884,7 +883,7 @@
                 LowNum: 2,
                 TeamType:1,
                 //选中团期标签
-                PriceTagList:[],
+                PriceTagIds:[],
                 PriceFlight: JSON.parse(
                   JSON.stringify(this.PostConfig.FlightList)
                 )
@@ -1418,9 +1417,6 @@
           },err => {}
         );
       },
-      getCkedTips(item){
-        console.log(item,'itemmmmmmm');
-      },
     },created(){
       localStorage.removeItem('queryFlightAirMsg');
       if(this.TeamType==1){