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

src/components/FinancialModule/addFinancialProcess.vue

@@ -278,7 +278,7 @@
 							</el-option>
 						</el-select>
 					</div> -->
-					<div class="approval_layer_info" v-if="approvalType==5||approvalType==6||approvalType==7||approvalType==8 || approvalType==9">
+					<div class="approval_layer_info" v-if="approvalType==5||approvalType==6||approvalType==7||approvalType==8 || approvalType==9||approvalType==10">
 						<div style="margin: 10px 0;">
 							<el-radio-group v-model="AuditWay">
 								<el-radio :label="2">{{$t('fnc.huiquandetail')}}</el-radio>
@@ -561,6 +561,10 @@ export default {
 				id:9,
 				name:this.$t('fnc.skchuna')
 				},
+				{
+				id:10,
+				name:"分公司OP"
+				},
 			],
       accListMsg:[],
 			SpecialNodeSelectType:'',
@@ -1129,6 +1133,20 @@ export default {
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList[this.updateItemIndex]=AuditList;
 			}
+			if(type==10){//分公司op（当团OP所在部门的负责人）
+// if(!this.WindowID){
+				// 	this.$message.error("请选择窗口！")
+				// 	return
+				// }
+				AuditList.AuditType = 10;
+				AuditList.RoleOrInitiator = '';
+				AuditList.AuditWay = this.AuditWay;
+				AuditList.Sort = this.myAuditList.length + 1;
+				AuditList.AuditDescription = this.AuditDescription;
+				AuditList.SpecialNode = this.GetNodeValue;
+				this.myAuditList[this.updateItemIndex]=AuditList;
+
+			}
 		    if(type==8){//记账负责人
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")
@@ -1193,7 +1211,7 @@ export default {
 				this.showRole.push({DepartmentName:obj.AduitName,Id:obj.RoleOrInitiator})
 				this.SpecialNodeSelectType = obj.AuditType;
 			}
-			if(obj.AuditType==5||obj.AuditType==6||obj.AuditType==7 || obj.AuditType==8 || obj.AuditType==9){
+			if(obj.AuditType==5||obj.AuditType==6||obj.AuditType==7 || obj.AuditType==8 || obj.AuditType==9||obj.AuditType==10){
 				this.AuditWay=obj.AuditWay;
 				this.WindowID = obj.RoleOrInitiator;
 				this.SpecialNodeSelectType = obj.AuditType;
@@ -1383,6 +1401,19 @@ export default {
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
 			}		
+			if(type==10){//分公司op
+				// if(!this.WindowID){
+				// 	this.$message.error("请选择窗口！")
+				// 	return
+				// }
+				AuditList.AuditType = 10;
+				AuditList.RoleOrInitiator = '';
+				AuditList.AuditWay = this.AuditWay;
+				AuditList.Sort = this.myAuditList.length + 1;
+				AuditList.AuditDescription = this.AuditDescription;
+				AuditList.SpecialNode = this.GetNodeValue;
+				this.myAuditList.push(AuditList);
+			}	
 				if(type==8){//记账出纳
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")