草稿功能

README.md

@@ -53,4 +53,27 @@ pl-10
 
 
 外勤（不调整）/master/attendance/sign
-外出登记（不调整）EgressWork
+外出登记（不调整）EgressWork
+
+/mobile/requestForLeave/leaveSubmit
+请假
+
+/mobile/businessOutApiController/submitBusiness
+（出差）
+
+/mobile/workAttendance/supplementWorkSubmit
+补卡
+/mobile/workAttendance/supplementWorkBatchSubmit
+批量补卡
+
+/mobile/workOver/workOverPathSubmit
+加班，批量加班
+
+/mobile/carryThingsOutFactoryApi/submitCarryThings
+携物出厂
+
+/mobile/customerDiningApi/customerDiningSubmit
+接待申请
+
+/mobile/adjustShiftApi/adjustShiftSubmit
+调班申请

src/projects/business/apis-xsy/applyclass.js

@@ -196,7 +196,7 @@ export function CarryThingsList(params) {
 	})
 }
 
-//提交
+//携物出厂 提交
 export function submitCarryThings(params) {
  
 	return request({

src/projects/business/apis-xsy/treat.js

@@ -25,7 +25,7 @@ export function customerDiningDetail(id) {
 		method: 'post',
 	})
 }
-
+// 接待申请
 export function customerDiningSubmit(params) {
  
 	return request({

src/projects/business/views-xsy/ApplyClass/Add.vue

@@ -3,7 +3,7 @@
 	
 	 
 		<top-header :pageTitle="pageTitle" v-show="!stepSelectClass"></top-header>
-		<select-class  v-if="initSelectClass"  v-show="stepSelectClass"  @confirm="confirm"></select-class>
+		<select-class  v-if="initSelectClass" :setids="subForm.shiftIds"  v-show="stepSelectClass"  @confirm="confirm"></select-class>
 			<div class="mui-content vongi-fx  vongi-qingjiadt" v-show="!stepSelectClass">
 				<form class="mui-input-group vongi-editme margin10 mt-10">
 					<div class="mui-input-row  ">
@@ -47,9 +47,13 @@
 				</form>
 			</div>
 			<div class="fyy-footer" v-show="!stepSelectClass">
-				<div class="bindfyy-btn" @click="submit" >
-					<button type="button" class="mui-btn mui-btn-primary "  v-if="examinePerson.name">提交</button>
-					<button type="button" class="mui-btn mui-btn-grey " v-if="!examinePerson.name">提交</button>
+				<div class="bindfyy-btn"  >
+					<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+											<i icon="mui-icon mui-icon-compose"></i>保存草稿
+					</button>
+					<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+											提交
+					</button>
 				</div>
 			</div>	<loading :visible="isLoading"></loading>
 		</div>
@@ -88,7 +92,8 @@
 				initSelectClass:false,
 				stepSelectClass:false,
 				isLoading: false,
-				ownerShift:{},
+				ownerShift:{},
+				id:"",
 				seletName:"",
 				examinePerson:{},
 				subForm: {
@@ -101,9 +106,33 @@
 		},
 		created() {
 			this.subForm.date = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			this.id = this.$route.query.id;
 
 		},
-		methods: {
+		methods: {
+			getAdjustShiftDetail() {
+				if(!this.id){
+					return
+				}
+				this.isLoading = true;
+			
+				API.adjustShiftDetail(this.id).then(response => {
+				 this.subForm ={
+					... this.subForm,
+					 ...response
+				 } 
+				 this.subForm.date=response.adjustDate.split(" ")[0]
+				 this.subForm.ids=this.id;
+				 
+				 this.seletName=response.newShift;
+				 this.subForm.shiftIds=response.newShiftIds;
+				 
+				 this.getOwnerShift();
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			confirm(temp){
 				this.stepSelectClass=false;
 				console.log(temp)
@@ -120,7 +149,8 @@
 			},
 			selectClassBtn(){
 				this.initSelectClass=true;
-				this.stepSelectClass=true;
+				this.stepSelectClass=true;
+				
 			},
 			//选择日期
 			selectData() {
@@ -148,7 +178,11 @@
 		
 			//表单检测
 			checkFrom() {
-				
+				
+				
+				if(!this.examinePerson.name){
+					return;
+				}
 				if (!this.ownerShift.id) {
 					mui.toast('调班当天没有班次，请选择其他日期');
 					return false;
@@ -160,7 +194,8 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
 				
 				if (this.checkFrom()) {
 					this.isLoading = true;
@@ -171,13 +206,18 @@
 					API.adjustShiftSubmit(this.subForm).then(response => {
 						this.subForm.date=obj;
 						this.isLoading = false;
-						
-						mui.toast('提交成功');
-						this.$router.replace({
-						    
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'exchangeWork'}
-						})
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+								
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'exchangeWork'}
+							})
+						}else{
+							mui.toast('保存成功');
+							this.subForm.ids=response.id;
+							this.id=response.id
+						}
 					}).catch(error => {
 						this.subForm.date=obj;
 						this.isLoading = false;
@@ -217,9 +257,13 @@
 			},
 		
 		},
-		mounted() {
-			this.getOwnerShift();
-			this.getExaminePerson();
+		mounted() {
+			if(!this.id){
+				this.getOwnerShift();
+			}
+			
+			this.getExaminePerson();
+			this.getAdjustShiftDetail();
 		},
 		destroyed() {},
 	

src/projects/business/views-xsy/ApplyClass/Class.vue

@@ -8,9 +8,10 @@
 		<div class="mui-content">
 			<form class="mui-input-group mt-10">
 				
-				<div class="mui-input-row mui-checkbox" v-for="item,i in recordList" :key="i" >
+				<div class="mui-input-row mui-checkbox" v-for="item,i in recordList" :key="i"   >
 					<label>{{item.name}}</label>
-					<input name="checkbox1" v-model="ids" :value="item.id" type="checkbox">
+					 
+					<input name="checkbox1" v-model="ids" :value="item.id" type="checkbox"> 
 				</div>
 			 
 			</form>
@@ -50,8 +51,15 @@
 		created() {
 			
 
+		},
+		props:{
+			setids:{
+				default:'',
+				required:false,
+			}
 		},
-		methods: {
+		methods: {
+			 
 			back(){
 					this.ids=this.old;
 				this.$emit("confirm",{status:0})
@@ -109,7 +117,10 @@
 			},
 		
 		},
-		mounted() {
+		mounted() {
+			if(this.setids){
+				this.ids=this.setids.split(",")
+			}
 			this.getOwnerCompanyShift();
 			//console.log("mounted")
 			var _this = this;

src/projects/business/views-xsy/ApplyClass/List.vue

@@ -84,10 +84,18 @@
 		},
 		methods: {
 			gotoItem(item){
-				this.$router.push({
-				    name: "XsyApprovalInfo",
-					query:{id:item.id,formId:'exchangeWork'}
-				})
+				if(item.status==-99){
+					this.$router.push({
+					    name: "XsyApplyClassAdd",
+						query:{id:item.id}
+					})
+				}else{
+					this.$router.push({
+					    name: "XsyApprovalInfo",
+						query:{id:item.id,formId:'exchangeWork'}
+					})
+				}
+				
 			},
 			gotoUrl(){
 				 this.$router.push({

src/projects/business/views-xsy/CardReplacement/Add.vue

@@ -1,7 +1,7 @@
 <template>
 <div id="app">
 			<top-header :pageTitle="pageTitle" v-show="!stepSelect"></top-header>
- 			<select-person  v-if="initSelectPerson"  v-show="stepSelectPerson"  @confirm="confirm2"></select-person>
+ 			<select-person  v-if="initSelectPerson"  v-show="stepSelectPerson"   :setids="subForm.personIds"  :setnames="seletPerson"  @confirm="confirm2"></select-person>
 			
 			
 			<div class="mui-content vongi-fx vongi-qingjiadt margin60"  v-show="!stepSelect" >
@@ -50,8 +50,16 @@
 			</div>
 			<div class="fyy-footer"  v-show="!stepSelect" >
 				<div class="bindfyy-btn">
-					<button    class="mui-btn " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">提交</button>
-					<!--<button type="button" class="mui-btn mui-btn-grey ">确认调班</button>-->
+<!-- 					<button    class="mui-btn " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">提交</button>
+ -->					<!--<button type="button" class="mui-btn mui-btn-grey ">确认调班</button>-->
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+					提交
+				</button>
+				
+				
 				</div>
 			</div>
 		</div>
@@ -99,7 +107,8 @@
 				seletName:"",
 				seletPerson:"请选择",
 				showselect1:"",
-				showselect2:"",
+				showselect2:"",
+					id:"",
 				subForm: {
 					date: '',
 					imageUrl:"",
@@ -113,9 +122,37 @@
 		},
 		created() {
 			//this.subForm.date = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			this.id = this.$route.query.id;
 
 		},
-		methods: {
+		methods: {
+			getSupplementWorkBatchDetail() {
+				if(!this.id){
+					return;
+				}
+				this.isLoading = true;
+			
+				API.supplementWorkBatchDetail(this.id).then(response => {
+					 
+					 this.isLoading = false;
+					this.subForm.ids=this.id;
+					
+					this.subForm = {
+						... this.subForm ,
+						...response
+					};
+					this.subForm.personIds=response.nameId;
+					this.seletPerson=response.name
+					this.subForm.date=response.attendanceDate
+					if(response.imageUrl){
+						this.picList=response.imageUrl.split(",")
+					}
+					
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			 //微信选择图片
 			 chooseImage() {
 			 	WxJsApi.chooseImage().then(res => {
@@ -257,7 +294,8 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
 				if(!this.examinePerson.name){
 					return;
 				}
@@ -272,15 +310,22 @@
 					API.supplementWorkBatchSubmit(this.subForm).then(response => {
 						this.isLoading = false;
 						
-						mui.toast('提交成功');
-						this.$router.replace({
-						    name: "XsyApprovalInfo",
-							
-						    query: {
-								formId:"batchApplyWork",
-								id:response.id
-							}
-						})
+						
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+							    name: "XsyApprovalInfo",
+							    query: {
+									formId:"batchApplyWork",
+									id:response.id
+								}
+							})
+							
+						}else{
+							mui.toast('保存成功');
+							this.subForm.ids=response.id;
+							this.id=response.id
+						}
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -295,25 +340,7 @@
 					mui.toast(error);
 				})
 			},
-			getOwnerShift(){
-					this.isLoading = true;
-					var obj={
-						date:this.subForm.date+" 00:00:00"
-					}
-				API.ownerShift(obj).then(response => {
-					this.ownerShift=response;
-					 
-					if(this.ownerShift.id){
-						
-					}else{
-							mui.toast('调班当天没有班次，请选择其他日期');
-					}
-					this.isLoading = false;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
+			 
 			asynCallBack() {
 
 			},
@@ -334,7 +361,8 @@
 			//获取微信配置
 			WxJsApi.getWxConfig();
 			mui.alert("请于补卡班次结束24小时后，<br/>再进行补卡")
-			//this.getOwnerShift();
+			
+			this.getSupplementWorkBatchDetail();
 			this.getExaminePerson();
 		},
 		destroyed() {},

src/projects/business/views-xsy/CardReplacement/List.vue

@@ -85,10 +85,23 @@
 		},
 		methods: {
 			gotoItem(item){
-				this.$router.push({
-				    name: "XsyApprovalInfo",
-					query:{id:item.id,formId:'batchApplyWork'}
-				})
+				
+				if(item.status==-99){
+					this.$router.push({
+						name: 'XsyCardReplacementAdd',
+						query: {
+							id:item.id
+						}
+					})
+				}else{
+					this.$router.push({
+					    name: "XsyApprovalInfo",
+						query:{id:item.id,formId:'batchApplyWork'}
+					})
+				}
+				
+				
+				
 			},
 			gotoUrl(){
 				 this.$router.push({

src/projects/business/views-xsy/Commerce/Add.vue

@@ -47,9 +47,15 @@
 			</div>
 			<div class="fyy-footer">
 				<div class="bindfyy-btn">
-					<button   class="mui-btn   " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">提交</button>
-					<!--<button type="button" class="mui-btn mui-btn-grey ">提交信息</button>-->
-				</div>
+					
+					 <button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+						<i icon="mui-icon mui-icon-compose"></i>保存草稿
+					 </button>
+					 <button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+						提交
+					 </button>
+				 
+				 </div>
 			</div>
 		</div>
 </template>
@@ -87,7 +93,7 @@
 				
 				pageTitle: '携物出厂申请',
 				
-				
+				id:"",
 				isLoading: false,
 				 
 				subForm: {
@@ -103,9 +109,37 @@
 		},
 		created() {
 			this.subForm.date = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
+			this.id = this.$route.query.id;
 
 		},
-		methods: {
+		methods: {
+			carryThingsDetail() {
+			if(!this.id){
+				return;
+			}
+				this.isLoading = true;
+				
+				API.carryThingsDetail(this.id).then(response => {
+					// this.adjustShiftDetail = response;
+					// this.subForm.ids=this.id;
+					this.isLoading = false;
+					
+					this.subForm.ids=this.id;
+					this.subForm = {
+						... this.subForm ,
+						...response
+					};
+					
+					if(response.imageUrl){
+						this.picList=response.imageUrl.split(",")
+					}
+				 
+ 					
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			 //微信选择图片
 			 chooseImage() {
 			 	WxJsApi.chooseImage().then(res => {
@@ -186,7 +220,9 @@
 				
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
+				
 				if(!this.examinePerson.name){
 					return;
 				}
@@ -201,15 +237,26 @@
 					API.submitCarryThings(this.subForm).then(response => {
 						this.isLoading = false;
 						
-						mui.toast('提交成功');
-						this.$router.replace({
-						    name: "XsyApprovalInfo",
-							
-						    query: {
-								formId:"commerceWork",
-								id:response.id
-							}
-						})
+						
+						
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+							    name: "XsyApprovalInfo",
+								
+							    query: {
+									formId:"commerceWork",
+									id:response.id
+								}
+							})
+							
+						}else{
+							mui.toast('保存成功');
+							this.subForm.ids=response.id;
+							this.id=response.id
+						}
+						
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -234,7 +281,7 @@
 			  
 			//获取微信配置
 			WxJsApi.getWxConfig();
-			
+			this.carryThingsDetail();
 			this.getExaminePerson();
 		},
 		destroyed() {},

src/projects/business/views-xsy/Commerce/List.vue

@@ -86,10 +86,24 @@
 		},
 		methods: {
 			gotoItem(item){
-				this.$router.push({
-				    name: "XsyCommerceInfo",
-					query:{id:item.id,formId:'commerceWork'}
-				})
+				
+				
+				if(item.auditStatus==-99){
+					this.$router.push({
+						name: 'XsyCommerceAdd',
+						query: {
+							id:item.id
+						}
+					})
+				}else{
+				
+					this.$router.push({
+						name: "XsyCommerceInfo",
+						query:{id:item.id,formId:'commerceWork'}
+					})
+				}
+				
+				
 			},
 			gotoUrl(){
 				 this.$router.push({

src/projects/business/views-xsy/PlanClass/Person.vue

@@ -30,9 +30,10 @@
 				</div>
 				<form class="mui-input-group">
 					
-					<div class="mui-input-row mui-checkbox" v-for="(item,index) in arrangeShiftCompanyList"  v-if="item.type==2">
+					<div class="mui-input-row "  v-for="(item,index) in arrangeShiftCompanyList" @click="checkboxBtn(item),selectId.push(item.id)"   v-if="item.type==2">
 						<label>{{item.name}}</label>
-						<input name="checkbox1" :value="item.id" v-model="selectId" @click="checkboxBtn(item)" type="checkbox">
+						<!-- mui-checkbox
+						<input name="checkbox1" :value="item.id" v-model="selectId" type="checkbox"> -->
 					</div> 
 				</form>
 				<div class="fyy-footer vongi-footer box-show" id="fyy-footer"  > 
@@ -84,6 +85,16 @@
 		created() {
 			
 
+		},
+		props:{
+			setids:{
+				default:"",
+				required:false
+			},
+			setnames:{
+				default:"",
+				required:false
+			},
 		},
 		methods: {
 			checkboxBtn(obj,bl,i){
@@ -218,7 +229,17 @@
 			},
 		
 		},
-		mounted() {
+		mounted() {
+			if(this.setids){
+				this.selectId=this.setids.split(",");
+				this.selectPerson=this.setnames.split(",").map((item,i)=>{
+					//console.log(i)
+					return {
+						id:this.selectId[i],
+						name:item
+					}
+				});
+			}
 			this.getArrangeShiftCompanyList();
 			//console.log("mounted")
 			//var _this = this;

src/projects/business/views-xsy/Treat/Add.vue

@@ -4,6 +4,8 @@
 				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 				<h1 class="mui-title">申请接待</h1>
 			</header>
+			<loading :visible="isLoading"></loading>
+			
 			<div class="mui-content vongi-fx vongi-qingjiadt margin60">
 				<form class="mui-input-group vongi-editme mt-10">
 					<div class="mui-input-row">
@@ -60,7 +62,13 @@
 			</div>
 			<div class="fyy-footer">
 				<div class="bindfyy-btn">
-					<button  class="mui-btn   " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">提交</button>
+					<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+											<i icon="mui-icon mui-icon-compose"></i>保存草稿
+					</button>
+					<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+											提交
+					</button>
+				
 				</div>
 			</div>
 	</div>
@@ -101,7 +109,7 @@
 				
 				
 				isLoading: false,
-				 
+				 id:"",
 				subForm: {
 					customerCompany:"",
 					reason:"",
@@ -120,9 +128,30 @@
 		},
 		created() {
 			this.subForm.diningTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
-
+			this.id = this.$route.query.id;
+			
 		},
-		methods: {
+		methods: {
+			getAdjustShiftDetail() {
+				if(!this.id){
+					return;
+				}
+				this.isLoading = true;
+			
+				API.customerDiningDetail(this.id).then(response => {
+					 
+					this.isLoading = false;
+					 this.subForm.ids=this.id;
+					 this.subForm = {
+					 	... this.subForm ,
+					 	...response
+					 };
+					 
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			 //微信选择图片
 			 chooseImage() {
 			 	WxJsApi.chooseImage().then(res => {
@@ -243,7 +272,9 @@
 				
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
+				
 				if(!this.examinePerson.name){
 					return;
 				}
@@ -258,15 +289,24 @@
 					API.customerDiningSubmit(this.subForm).then(response => {
 						this.isLoading = false;
 						
-						mui.toast('提交成功');
-						this.$router.replace({
-						    name: "XsyApprovalInfo",
-							
-						    query: {
-								formId:"treatWork",
-								id:response.id
-							}
-						})
+						 
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+							    name: "XsyApprovalInfo",
+								
+							    query: {
+									formId:"treatWork",
+									id:response.id
+								}
+							})
+							
+						}else{
+							mui.toast('保存成功');
+							this.subForm.ids=response.id;
+							this.id=response.id
+						}
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -289,7 +329,7 @@
 		},
 		mounted() {
 			  
-		
+		this.getAdjustShiftDetail()
 			
 			this.getExaminePerson();
 		},

src/projects/business/views-xsy/Treat/List.vue

@@ -4,9 +4,11 @@
 			<h1 class="mui-title">来客接待进餐申请</h1>
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 		</header>
+		<loading :visible="isLoading"></loading>
+		
 		<div class="mui-content margin60">
 			<div class="mui-content-padded">
-				<ul class="mui-table-view fyy-view" v-for="item,i in recordList" @click="gotoItem(item.id)" style="  margin-bottom: 10px;" >
+				<ul class="mui-table-view fyy-view" v-for="item,i in recordList" @click="gotoItem(item)" style="  margin-bottom: 10px;" >
 					<li class="mui-table-view-cell">
 						<label>接待部门：</label>
 						<span>{{item.companyName}}
@@ -84,15 +86,27 @@
 		methods: {
 		
 		
-			gotoItem(id){
-							  this.$router.push({
-							   name: "XsyApprovalInfo",
-							   
-							   query: {
-							   	formId:"treatWork",
-							   	id:id
-							   }
-							  })
+			gotoItem(item){
+				
+				if(item.status==-99){
+					this.$router.push({
+						name: 'XsyTreatAdd',
+						query: {
+							id:item.id
+						}
+					})
+				}else{
+				
+				this.$router.push({
+				 name: "XsyApprovalInfo",
+				 
+				 query: {
+				 	formId:"treatWork",
+				 	id:id
+				 }
+				})
+				}
+							
 			},
 			gotoUrl(){
 				 this.$router.push({

src/projects/business/views-xsy/WorkOvertime/Add.vue

@@ -2,7 +2,7 @@
 <div>
 			<top-header :pageTitle="pageTitle" v-show="!stepSelect"></top-header>
 			
-			<select-person  v-if="initSelectPerson"  v-show="stepSelectPerson"  @confirm="confirm2"></select-person>
+			<select-person  v-if="initSelectPerson"  v-show="stepSelectPerson"  :setids="subForm.personIds"  :setnames="seletPerson"  @confirm="confirm2"></select-person>
 			
 			<div class="mui-content vongi-fx  vongi-qingjiadt margin60"  v-show="!stepSelect">
 				<form class="mui-input-group vongi-editme margin10 mt-10">
@@ -52,8 +52,12 @@
 			</div>
 			<div class="fyy-footer"  v-show="!stepSelect">
 				<div class="bindfyy-btn">
-					<button  :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit" class="mui-btn  ">提交</button>
-					<!--<button type="button" class="mui-btn mui-btn-grey ">确认调班</button>-->
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+					提交
+				</button>
 				</div>
 			</div>
 		</div>
@@ -92,7 +96,7 @@
 
 				isLoading: false,
 				stepSelect:false,
-			 
+				id:"",
 				initSelectPerson:false,
 				stepSelectPerson:false,
 				seletPerson:"请选择",
@@ -115,9 +119,33 @@
 			}
 		},
 		created() {
+			this.id = this.$route.query.id;
+			
 			this.subForm.startTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
 		},
 		methods: {
+			//获取详情
+			getInfo() {
+				if(!this.id){
+					return
+				}
+				this.isLoading = true;
+				API_ExtraWork.workOverBatchDetail(this.id).then(response => {
+					this.isLoading = false;
+					this.subForm.ids=this.id
+					//this.subForm = response;
+					
+					this.subForm = {
+						... this.subForm ,
+						...response
+					};
+					this.subForm.personIds=response.nameId;
+					this.seletPerson=response.name
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			confirm2(temp){
 				this.stepSelect=false;
 				this.stepSelectPerson=false;
@@ -179,6 +207,7 @@
 			selectData(field,vdate,edate) {
 				var _this = this;
 				if(vdate){
+					
                     vdate=new Date(vdate)
 				}
                 if(edate){
@@ -203,6 +232,7 @@
 				if(!this.examinePerson.name){
 					return
 				}
+				
 				if (!this.subForm.personIds) {
 					mui.toast('请选择人员');
 					return false;
@@ -223,17 +253,25 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
 				if (this.checkForm()) {
 					this.isLoading = true;
 					API_ExtraWork.workOverPathSubmit(this.subForm).then(response => {
 						this.isLoading = false;
-
-						mui.toast('提交成功');
-						this.$router.replace({
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'extraWork'}
-						})
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'extraWork'}
+							})
+						
+						}else{
+							mui.toast('保存成功');
+							this.subForm.ids=response.id;
+							this.id=response.id
+						}
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -261,6 +299,7 @@
 			//获取审核人列表
 			//this.getBusinessOutApprovalPerson();
 			this.getExaminePerson();
+			this.getInfo();
 		},
 		destroyed() {},
 		computed: {

src/projects/business/views-xsy/WorkOvertime/Add3.vue

@@ -98,7 +98,7 @@
 					endTime: '',
 					hours: 0,
 					type: '3',
-					
+					draft:1,
 					formId: 'batchExtraWork',
 				},
 

src/projects/business/views-xsy/WorkOvertime/List.vue

@@ -91,10 +91,18 @@
 		},
 		methods: {
 			gotoItem(item){
-				this.$router.push({
-				    name: "XsyApprovalInfo",
-					query:{id:item.id,formId:'batchExtraWork'}
-				})
+				if(item.status=="-99"){
+					this.$router.push({
+					    name: "XsyWorkOvertimeAdd",
+						query:{id:item.id}
+					})
+				}else{
+					this.$router.push({
+					    name: "XsyApprovalInfo",
+						query:{id:item.id,formId:'batchExtraWork'}
+					})
+				}
+				
 			},
 			gotoUrl(){
 				 this.$router.push({

src/projects/business/views/Master/Attendance/Apply.vue

@@ -45,7 +45,12 @@
 			
 			
 			<div class="vongi-btn">
-				<button class="mui-btn " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">
+			 
+				
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
 					提交
 				</button>
 				 
@@ -80,7 +85,7 @@
 		data() {
 			return {
 				pageTitle: '补卡申请',
-
+				id:"",
 				isLoading: false,
 				examinePerson:{},
 				subForm: {
@@ -105,9 +110,35 @@
 			}
 		},
 		created() {
-
+			this.id=this.$route.query.sid
+			
 		},
 		methods: {
+			//获取详情
+			getDetail() {
+				if(!this.id){
+					return 
+				}
+				this.isLoading = true;
+				API_Attendance.supplementWorkDetail( {
+					id: this.id
+				},).then(response => {
+					this.tjForm.ids=this.id;
+					this.tjForm = {
+						... this.tjForm ,
+						...response
+						
+					};
+					if(response.imageUrl){
+						this.picList=response.imageUrl.split(",")
+					}
+			
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			//获取详情
 			getTime() {
 				this.isLoading = true;
@@ -232,7 +263,9 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+								this.tjForm.draft=status;
+
 				if(!this.examinePerson.name){
 					return;
 				}
@@ -241,12 +274,21 @@
 					this.isLoading = true;
 					API_Attendance.supplementWorkSubmit(this.tjForm).then(response => {
 						this.isLoading = false;
-
-						mui.toast('提交成功');
-						this.$router.replace({
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'applyWork'}
-						})
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'applyWork'}
+							})
+						}else{
+							mui.toast('保存成功');
+							this.tjForm.ids=response.id;
+							this.id=response.id
+						}
+					
+						
+						
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -282,6 +324,7 @@
 			WxJsApi.getWxConfig();
 			//this.getTime();
 			this.getExaminePerson();
+			this.getDetail();
 		},
 		destroyed() {},
 		computed: {

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -69,7 +69,10 @@
 
 			<div class="mui-content-padded mui-h6">注：1、病假须上传医院证明。2、请假事由中须写明请假去向。</div>
 			<div class="vongi-btn">
-				<button class="mui-btn "  :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit()">
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
 					提交
 				</button>
 			</div>
@@ -115,7 +118,7 @@
                 workOverTime:0,
 				typeName: '请选择',
 				approvalPersonName: '请选择',
- 
+				id:"",
 				tjForm: {
 					startTime: '请选择',
 					endTime: '请选择',
@@ -125,7 +128,7 @@
 					imageUrl: '',
 					reason: '',
 					personId: '',
-				
+					draft:0,
                     approvedPersonPopedomId: '',
 					remark: '',
 					formId: "leaveWork",
@@ -135,9 +138,38 @@
 			}
 		},
 		created() {
-
+			this.id=this.$route.query.id
+			
 		},
 		methods: {
+			//info
+			getDetail() {
+				if(!this.id){
+					return
+				}
+			    this.isLoading = true;
+			    API_Leave.detail({
+			        id: this.id
+			    }).then(response => {
+			        this.tjForm = {
+						... this.tjForm ,
+						...response
+						
+					};
+					
+					this.tjForm.id=this.id
+					this.tjForm.leaveType=response.type;
+					this.typeName=response.typeName;
+					this.daytime=response.days;
+					if(response.imageUrl){
+						this.picList=response.imageUrl.split(",")
+					}
+			        this.isLoading = false;
+			    }).catch(error => {
+			        this.isLoading = false;
+			        mui.toast(error);
+			    })
+			},
 			getExaminePerson(){
 				API_sp.examinePersonObj({
 					formId:this.tjForm.formId,
@@ -338,10 +370,12 @@
 				this.picList = picList;
 			},
 			//提交
-			submit() {
+			submit(status) {
+				
 				if(!this.examinePerson.name){
 					return;
 				}
+				this.tjForm.draft=status;
 				this.tjForm.reason = this.tjForm.reason ? this.tjForm.reason : this.reasonDefault;
 				if (this.checkFrom()) {
 					this.tjForm.imageUrl = this.picList.join(',');
@@ -357,12 +391,23 @@
 					this.tjForm.activityId=this.examinePerson.processActivityId
 					API_Leave.save(this.tjForm).then(response => {
 						this.isLoading = false;
-						mui.toast("提交成功");
-										 
-						this.$router.replace({
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'leaveWork'}
-						})
+						
+						
+						if(this.tjForm.draft){
+							mui.toast("提交成功");
+							this.$router.replace({
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'leaveWork'}
+							})
+						}else{
+							this.tjForm.startTime=startTime;
+							this.tjForm.endTime=endTime;
+							mui.toast("保存成功");
+							this.id=response.id
+							this.tjForm.id=response.id;
+							//this.getDetail();
+						}			 
+						
 					}).catch(error => {
 						this.tjForm.startTime=startTime;
 						this.tjForm.endTime=endTime;
@@ -383,7 +428,7 @@
 			//获取微信配置
 			WxJsApi.getWxConfig();
             this.getExaminePerson();
-
+			this.getDetail();
 			this.getLeaveTypeList();
 
 

src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -7,7 +7,7 @@
 		<div class="mui-content">
 			<div class="mui-content-padded vongi-work">
 				<ul class="mui-table-view vongi-qingjia">
-					<li class="mui-table-view-cell" v-for="mod in recordList" @click="detail(mod.id,mod.enableCancel)">
+					<li class="mui-table-view-cell" v-for="mod in recordList" @click="detail(mod.id,mod.enableCancel,mod.status)">
 						<h4>
 							{{mod.title}}
 							<span v-text="mod.createTime">12:00</span>
@@ -77,17 +77,27 @@
 		},
 		methods: {
 			//info
-			detail(id,bl) {
-				var routeName="XsyApprovalInfo";
+			detail(id,bl,stauts) {
+				if(stauts==-99){
+					this.$router.push({
+						name: 'MasterAttendanceLeaveForm',
+						query: {
+							id:id
+						}
+					})
+				}else{
+					var routeName="XsyApprovalInfo";
+					
+					this.$router.push({
+						name: routeName,
+						query: {
+							id: id,
+							formId:'leaveWork',
+							opAction:bl
+						}
+					})
+				}
 				
-				this.$router.push({
-					name: routeName,
-					query: {
-						id: id,
-						formId:'leaveWork',
-						opAction:bl
-					}
-				})
 			},
 			save() {
 				this.$router.push({

src/projects/business/views/Master/Attendance/List.vue

@@ -15,6 +15,7 @@
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='0'" @click="goToInfo(item.supplementWorkId)">审核中</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status===null" @click="applybk(item.id,item.recordTime)">申请补卡</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status==='6'" @click="applybk(item.id,item.recordTime)">申请补卡</button>
+							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status==='-99'" @click="applybk2(item.id,item.recordTime,item.supplementWorkId)">草稿中</button>
 							
 							<span :style="'color:'+statusColor[item.result]" v-text="status[item.result]">缺卡</span>
 						</div>
@@ -83,7 +84,19 @@
 					name: 'MasterAttendanceApply',
 					query: {
 						id: id,
-						time:time
+						time:time,
+					
+					}
+				})
+			},
+			//申请补卡
+			applybk2(id,time,sid) {
+				this.$router.push({
+					name: 'MasterAttendanceApply',
+					query: {
+						id: id,
+						time:time,
+						sid:sid
 					}
 				})
 			},

src/projects/business/views/Master/BusinessTravel/Form.vue

@@ -51,7 +51,14 @@
 		</div>
 		<div class="fyy-footer">
 			<div class="bindfyy-btn">
-				<button @click="submit" type="submit" class="mui-btn   "  :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'">保 存</button></div>
+			
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
+					提交
+				</button>
+			</div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -86,7 +93,7 @@
 				pageTitle: '出差申请单',
 				examinePerson:{},
 				isLoading: false,
-
+				id:"",
 				subForm: {
 					type: '3',
 					destination: '',
@@ -112,8 +119,48 @@
 		},
 		created() {
 			//this.subForm.startTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
+		  this.id=this.$route.query.id
 		},
 		methods: {
+			//获取详情
+			getInfo() {
+								if(!this.id){
+									return
+								}
+
+
+				this.isLoading = true;
+				API_BusinessTravel.businessOutDetail(this.id).then(response => {
+					this.isLoading = false;
+					this.subForm.ids=this.id
+					this.subForm = {...this.subForm,...response};
+					// this.detail.sp=true
+					// this.detail.statusName=this.detail.statusN
+					// this.detail.name=this.detail.personName
+					// this.detail.text=this.detail.typeN+"申请"
+					
+					// this.$emit('getInfo',this.detail);
+					this.subForm.startTimeShow=this.subForm.startTime.split(" ")[0];
+					this.subForm.endTimeShow=this.subForm.endTime.split(" ")[0];
+					
+					
+					if(this.subForm.startTime.indexOf(" 00:00")>-1){
+						this.subForm.startTimeQuantum="0"
+					}else{
+						this.subForm.startTimeQuantum="1"
+					}
+					
+					if(this.subForm.endTime.indexOf(" 11:59")>-1){
+						this.subForm.endTimeQuantum="0"
+					}else{
+						this.subForm.endTimeQuantum="1"
+					}
+					this.updatePersonByTime()
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			getExaminePerson(){
 				API_sp.examinePerson(this.subForm.formId).then(response => {
 					this.examinePerson=response
@@ -248,7 +295,9 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+				
+				this.subForm.draft=status;
 				if(!this.examinePerson.name){
 					return;
 				}
@@ -261,13 +310,19 @@
 					this.isLoading = true;
 					API_BusinessTravel.submitBusiness(this.subForm).then(response => {
 						this.isLoading = false;
-
-						mui.toast('提交成功');
-						 
-						this.$router.replace({
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'travelWork'}
-						})
+						if(this.subForm.draft){
+							mui.toast('提交成功');
+							 
+							this.$router.replace({
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'travelWork'}
+							})
+						}else{
+							mui.toast('保存成功');
+							 this.subForm.ids=response.id;
+							 this.id=response.id
+						}
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -279,6 +334,7 @@
 			},
 		},
 		mounted() {
+			this.getInfo();
 			//获取审核人列表
 			this.getExaminePerson();
 		},

src/projects/business/views/Master/BusinessTravel/List.vue

@@ -8,7 +8,7 @@
 			<div class="mui-slider-group">
 				<ul class="mui-table-view">
 					<li v-for="(item,index) in recordList" class="mui-table-view-cell">
-						<router-link :to="{name:'XsyApprovalInfo',query:{id:item.id,formId:'travelWork'}}">
+						<router-link :to="{name:item.status=='-99'?'MasterBusinessTravelForm':'XsyApprovalInfo',query:{id:item.id,formId:'travelWork'}}">
 							<div class="mui-media-body flew-sp">
 								出差地点:{{item.destination}}
 								<span class='mui-ellipsis mui-h6' v-text="item.startTime.substr(5)"></span>

src/projects/business/views/Master/ExtraWork/Form.vue

@@ -39,7 +39,10 @@
 		</div>
 		<div class="fyy-footer">
 			<div class="bindfyy-btn" >
-				<button class="mui-btn " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-success':'mui-btn-grey'"  type="submit" @click="submit(0)">
+					<i icon="mui-icon mui-icon-compose"></i>保存草稿
+				</button>
+				<button class="mui-btn "  style="width: 50%;" :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'"  type="submit" @click="submit(1)">
 					提交
 				</button>
 				</div>
@@ -78,7 +81,7 @@
 				pageTitle: '加班申请',
 
 				isLoading: false,
-
+id:"",
 				subForm: {
 					reason: '',
 					startTime: '',
@@ -97,8 +100,31 @@
 		},
 		created() {
 			this.subForm.startTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
+		  this.id=this.$route.query.id
+		
 		},
 		methods: {
+			//获取详情
+			getInfo() {
+				if(!this.id){
+					return
+				}
+				this.isLoading = true;
+				API_ExtraWork.workOverBatchDetail(this.id).then(response => {
+					this.isLoading = false;
+					this.subForm.ids=this.id
+					//this.subForm = response;
+					
+					this.subForm = {
+						... this.subForm ,
+						...response
+					};
+					
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
 			//获取审核人列表
 			getBusinessOutApprovalPerson() {
 				this.isLoading = true;
@@ -138,6 +164,8 @@
 			selectData(field,vdate,edate) {
 				var _this = this;
 				if(vdate){
+					
+					vdate="2021-10-28 12:55";
                     vdate=new Date(vdate)
 				}
                 if(edate){
@@ -176,7 +204,9 @@
 				}
 			},
 			//提交
-			submit() {
+			submit(status) {
+				this.subForm.draft=status;
+				
 				if(!this.examinePerson.name){
 					return
 				}
@@ -184,12 +214,18 @@
 					this.isLoading = true;
 					API_ExtraWork.workOverPathSubmit(this.subForm).then(response => {
 						this.isLoading = false;
-
-						mui.toast('提交成功');
-						this.$router.replace({
-							name: "XsyApprovalInfo",
-							query:{id:response.id,formId:'extraWork'}
-						})
+						if(status){
+							mui.toast('提交成功');
+							this.$router.replace({
+								name: "XsyApprovalInfo",
+								query:{id:response.id,formId:'extraWork'}
+							})
+						}else{
+							mui.toast('保存成功');
+							 this.subForm.ids=response.id;
+							 this.id=response.id
+						}
+						
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
@@ -216,6 +252,7 @@
 			//获取审核人列表
 			//this.getBusinessOutApprovalPerson();
 			this.getExaminePerson();
+			this.getInfo()
 		},
 		destroyed() {},
 		computed: {

src/projects/business/views/Master/ExtraWork/List.vue

@@ -6,7 +6,7 @@
 		<div class="mui-content">
 			<div class="mui-content-padded vongi-work">
 				<ul class="mui-table-view vongi-qingjia">
-					<li v-for="(item,index) in recordList" class="mui-table-view-cell" @click="goToInfo(item.id)">
+					<li v-for="(item,index) in recordList" class="mui-table-view-cell" @click="goToInfo(item)">
 						<h4>{{item.personName}}的加班申请<span v-text="item.dateTime"></span></h4>
 						<button type="button" class="mui-btn mui-btn-outlined" :style="getColor(item.status)" v-text="item.statusN"></button>
 					</li>
@@ -112,14 +112,24 @@
 				})
 			},
 			//详情
-			goToInfo(id) {
-				this.$router.push({
-					name: 'XsyApprovalInfo',
-					query: {
-						id: id,
-						formId:'extraWork'
-					}
-				})
+			goToInfo(row) {
+				if(row.status=='-99'){
+					this.$router.push({
+						name: 'MasterExtraWorkForm',
+						query: {
+							id: row.id
+						}
+					})
+				}else{
+					this.$router.push({
+						name: 'XsyApprovalInfo',
+						query: {
+							id: row.id,
+							formId:'extraWork'
+						}
+					})
+				}
+				
 			},
 			asynCallBack() {