临时员工

src/components/LeaderManagement/leaderManagement.vue

@@ -536,6 +536,9 @@
         <el-form-item :label="$t('hotel.hotel_remark')" v-if="addMsg.LeaderGuidClass==0">
           <el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input>
         </el-form-item>
+        <el-form-item v-if="addMsg.LeaderGuidClass==1" label="密码">
+          <el-input type="password" v-model="addMsg.EmPassword" class="w210"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
@@ -1110,6 +1113,7 @@ export default {
     },
     //修改
     updateData(ID) {
+      console.log("updateData")
       this.LanguageIdS = [];
       this.apipost(
         "leader_post_Get",
@@ -1119,6 +1123,7 @@ export default {
         res => {
           let LanguageIdArr = [];
           this.addMsg = res.data.data;
+          
           this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
           this.addMsg.Type = this.addMsg.Type.toString();
           this.addMsg.Sex = this.addMsg.Sex.toString();
@@ -1138,7 +1143,9 @@ export default {
               this.LanguageIdS.push(Number(x));
             });
           }
+          this.addMsg.EmPassword="";
           // this.getCityList();
+          console.log("this.addMsg",this.addMsg)
         },
         err => {}
       );

src/components/activity/FreelineManagement.vue

@@ -700,7 +700,7 @@
           //出团公司集合
           OutBranchIds: [],
           pageIndex: 1,
-          pageSize: 10,
+          pageSize: 5,
           LineId: 0,
           LineIdList: [],
           LineteamId: 0,

src/components/activity/RegimentLabel.vue

@@ -14,23 +14,23 @@
 <template>
 	<div class="flexOne">
             <div style="overflow:auto">
-                <input type="button" class="normalBtn" value="添加" style="float:right"/>
+                <input type="button" class="normalBtn" value="添加" style="float:right" @click="ResetPwdForm(),LabelVisible=true"/>
             </div>
 		<table style="margin-top:10px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<th>排序</th>
-				<th>标签名</th>
+                <th>标签名</th>
+				<th>排序</th>	
 				<th>操作</th>
 			</tr>
-			<tr v-for="item in dataList" :key="item.SNO">
+			<tr v-for="(item,index) in dataList" :key="index+100">
+                <td>{{item.Content}}</td>
 				<td>{{item.SNO}}</td>
-				<td>{{item.Content}}</td>
 				<td>
 					<el-tooltip class="item" effect="dark" content="修改" placement="top">
-						<el-button type="primary" icon="el-icon-edit" circle></el-button>
+						<el-button type="primary" icon="el-icon-edit" circle @click="Edit(item)"></el-button>
 					</el-tooltip>
 					<el-tooltip class="item" effect="dark" content="删除" placement="top">
-						<el-button type="primary" class='zidingyiFz' icon="iconfont icon-bangdingzhagnhuxinxi" circle></el-button>
+						<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle></el-button>
 					</el-tooltip>
 				</td>
 
@@ -38,24 +38,28 @@
 		</table>
 		<!-- <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
 		</el-pagination> -->
-        <el-dialog custom-class='w400' title="团期标签"  :visible.sync="LabelVisible">
-			    	<el-form :model="pwdMsg" label-width="100px" :rules="rulesPwd" ref="pwdMsg">
-			    		 <el-form-item  label="标签类型" prop="EmName">
-			                 <el-input class='w217' type="text" v-model="addMsg.EmName" :placeholder="$t('pub.pleaseImport')" readonly></el-input>
+        <el-dialog custom-class='w400' title="主题标签"  :visible.sync="LabelVisible">
+			    	<el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
+			    		 <!-- <el-form-item  label="标签类型" prop="Name">
+			                 <el-input class='w217' type="text" v-model="pwdMsg.Name" placeholder=""></el-input>
 			             </el-form-item>
-			             <el-form-item  :label="$t('system.table_acc')" prop="EmAccount">
-			                 <el-input class='w217' type="text" v-model="addMsg.EmAccount" :placeholder="$t('pub.pleaseImport')" readonly></el-input>
+			             <el-form-item  label="团期类型" prop="Code">
+			                 <el-select class='w217' v-model="pwdMsg.Code" placeholder="请选择">
+                                    <el-option key="0" label="常规" value="0"></el-option>
+                                    <el-option key="1" label="小包团" value="1"></el-option>
+                                    <el-option key="2" label="一日游" value="2"></el-option>
+                                </el-select>
+			             </el-form-item> -->
+			             <el-form-item  label="排序">
+			                 <el-input class='w217' v-model="pwdMsg.SNO" placeholder=""></el-input>
 			             </el-form-item>
-			             <el-form-item  :label="$t('adm.adm_newPd')" prop="Pwd">
-			                 <el-input class='w217' type="password" v-model="pwdMsg.Pwd" :placeholder="$t('pub.pleaseImport')"></el-input>
-			             </el-form-item>
-			             <el-form-item  :label="$t('adm.adm_Reinput')" prop="Pwd1">
-			                 <el-input class='w217' type="password" v-model="pwdMsg.Pwd1" :placeholder="$t('pub.pleaseImport')"></el-input>
+			             <el-form-item  label="标签名" prop="Content">
+			                 <el-input class='w217' v-model="pwdMsg.Content" placeholder=""></el-input>
 			             </el-form-item>
 			    	</el-form>	
 			    	<div slot="footer" class="dialog-footer">
-			    		<button class="hollowFixedBtn" @click="innerVisible=false,resetForm('pwdMsg')">{{$t('pub.cancelBtn')}}</button>
-			    		<button class="normalBtn" @click="submitForm1('pwdMsg')">{{$t('pub.sureBtn')}}</button>
+			    		<button class="hollowFixedBtn" @click="LabelVisible=false">取消</button>
+			    		<button class="normalBtn" @click="submitForm1('pwdMsg')">确定</button>
 			    	</div>	
                 </el-dialog>
 	</div>
@@ -71,21 +75,86 @@
                 },
                 dataList:[],
                 LabelVisible:false,
+                pwdMsg:{
+                    ID:0,
+                    Name:'theme',
+                    Code:'1',
+                    SNO:"",
+                    Content:"",
+                },
+                rulesPwd:{
+                    Name: [
+                        { required: true, message: '请输入主题', trigger: 'blur' }
+                    ],
+                    Code: [
+                        { required: true, message: '请选择团期类型', trigger: 'change' }
+                    ],
+                    Content: [
+                        { required: true, message: '请输入标签名称', trigger: 'blur' }
+                    ]
+                }
+
 			}
 		},
 		mounted() {
-			
-
 			this.getList();
           
 		},
 		
 		
 		methods: {
+            Edit(item){
+                this.pwdMsg=Object.assign({},item);
+                this.LabelVisible=true;
+            },
+            Delete(item){
+                this.$confirm('是否删除?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+                        this.apipost('dict_post_Remove',{dictID:item.ID},res=>{
+                            if(res.data.resultCode==1){
+                                this.Success(res.data.message)
+                                this.getList();
+                            }else{
+                                this.Error(res.data.message)
+                            }
+                        },err=>{})
+					}).catch(() => {
+						
+					});
+            },
+            submitForm1(formName) {
+                this.$refs[formName].validate((valid) => {
+                if (valid) {
+                    this.apipost('travel_post_SetTravelPriceTag',this.pwdMsg,res=>{
+                        if(res.data.resultCode==1){
+                           this.Success(res.data.message) 
+                           this.LabelVisible=false;
+                           this.getList();
+
+                        }else{
+                           this.Error(res.data.message) 
+                        }
+                    },err=>{})
+
+                } else {
+                    
+                }
+                });
+            },
+            ResetPwdForm(){
+                this.pwdMsg={
+                    Name:'theme',
+                    Code:'1',
+                    SNO:"",
+                    Content:"",
+                };
+            },
             handleCurrentChange(){},
             getList(){
                 this.apipost('travel_get_GetTravelPriceTag',this.msg,res=>{
-                    console.log("res",res);
 					if(res.data.resultCode==1){
 						this.dataList=res.data.data;
 					}else{}

src/components/activity/Rotationchart.vue

@@ -40,8 +40,8 @@
     display: block;
 }
 .Rotationchart .imgList ul li .img_box .zezhao i{
-    font-size: 28px;
-    margin:0 10px;
+    font-size: 20px;
+    /* margin:0 10px; */
 }
 .Rotationchart .imgList ul li .img_box  .free {
     top: 15px;
@@ -170,8 +170,14 @@
                     <span v-if="item.slideStatus==1" class="free" style="background: #20bf6b;">正常</span> 
                     <span v-if="item.slideStatus==2" class="free" style="background: #E95252;">禁用</span>
                     <div class="zezhao">
-                        <i class="el-icon-edit" title="编辑" @click.stop="EditImg(item)"></i>
-                        <i class="el-icon-printer" slot="reference" title="修改状态" @click.stop="EditStatus(item)"></i>
+                        <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+                            <el-button type="primary" icon="el-icon-edit" circle @click.stop="EditImg(item)"></el-button>
+                        </el-tooltip>
+                        <!-- <i class="el-icon-edit" title="编辑" @click.stop="EditImg(item)"></i> -->
+                         <el-tooltip class="item" effect="dark" content="修改状态" placement="top">
+                            <el-button type="danger" icon="el-icon-printer" circle @click.stop="EditStatus(item)"></el-button>
+                        </el-tooltip>
+                        <!-- <i class="el-icon-printer" slot="reference" title="修改状态" @click.stop="EditStatus(item)"></i> -->
                     </div>
                 </div>
             </li>
@@ -191,7 +197,8 @@
         title="修改状态"
         :visible.sync="changestatus"
         width="400px">
-        <el-select v-model="editForm.slideStatus" placeholder="请选择状态">
+        状态：
+        <el-select style="display:inline-block" v-model="editForm.slideStatus" placeholder="请选择状态">
                                     <el-option label="启用" :value="1"></el-option>
                                     <el-option label="禁用" :value="2"></el-option>
                                     <el-option label="删除" :value="3"></el-option>

src/router/config.js

@@ -258,6 +258,15 @@ export default {
                                 title: '员工管理'
                             },
                         },
+                        {
+                            path: '/Temporarystaff', //员工管理
+                            name: 'Temporarystaff',
+                            component: resolve => require(['@/components/administrative/Temporarystaff'], resolve),
+                            meta: {
+                                title: '临时员工'
+                            },
+                        },
+                        
                         {
                             path: '/empBankAccount', //员工账户管理
                             name: 'empBankAccount',
@@ -290,7 +299,7 @@ export default {
                                 title: '考核管理'
                             },
                         },
-                        {
+                        {    
                             path: '/leaderManagement', //领队导游管理
                             name: 'leaderManagement',
                             component: resolve => require(['@/components/LeaderManagement/leaderManagement'], resolve),