update

src/components/FinancialModule/addFinancialProcess.vue

@@ -314,6 +314,17 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item v-if="xingzhenState" label="审批类型">
+					<el-select filterable v-model='addMsg.PropertyType' class="w200">
+						<el-option v-for='item in PropertyTypeList'
+							:label='item.Name'
+							:value='item.ID'
+							:key='item.ID'>
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<!-- 判断行政流程修改还是 -->
+				<div v-show="!xingzhenState">
 					<el-form-item :label="$t('fnc.lcleixing')">
 						<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled"  :label="1">{{$t('restaurant.res_income')}}</el-radio>
 						<el-radio v-model="radio" v-else @change="getCostTypeList(1),CostIdS=[],accListShow=true" :label="1">{{$t('restaurant.res_income')}}</el-radio>
@@ -383,6 +394,11 @@
 							<el-checkbox  :value="4" :label="4" :key="4">{{$t('fnc.zjinchi')}}</el-checkbox>
 						</el-checkbox-group>
 					</el-form-item>
+
+				</div>
+				
+
+
 		<el-form-item label="排序">
 					<el-input v-model="addMsg.Sort" class="w250"  maxlength="60"></el-input>
 				</el-form-item>
@@ -550,6 +566,8 @@ export default {
 	components: { Treeselect },
 	data(){
 		return{
+			PropertyTypeList:[],
+			xingzhenState:false,
 			DepartmentList:[],
 			EmployeeList:[],
 			Auditshow:false,
@@ -574,6 +592,7 @@ export default {
 				IsShow: 1,
 				ShowEmployeeList:[],
 				ShowDepartmentList:[],
+				PropertyType:'',
 			},
 			AuditUserList:{
 				EmName:'',
@@ -738,7 +757,13 @@ export default {
 		}
 	},
 	mounted(){
-
+		if(this.$route.query.xingzhen){
+			this.xingzhenState=true;
+			this.addMsg.TemplateSorce=2;
+			this.CostIdS.push('0')
+			// this.addMsg.PropertyType="";
+			this.getPropertyType();
+		}
 		this.getCompanyList();
 		this.getMaxDepartmentTierList();
 		if(this.TemplateId!=0){
@@ -752,6 +777,18 @@ export default {
 		this.getDepartment();
 	},
 	methods:{
+		getPropertyType(){
+			this.apipost(
+				"FinancialFlowTemplate_post_GetPropertyTypeList",
+				{},
+				res => {
+				if (res.data.resultCode == 1) {
+					this.PropertyTypeList=res.data.data;
+				}
+				},
+				err => {}
+			);
+		},
 		  //根据多公司获取部门
     getDepartment() {
 		let  msg= {
@@ -846,6 +883,7 @@ export default {
 					this.addMsg.IsShow = data.IsShow;
 					this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
 					this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
+					this.addMsg.PropertyType= data.PropertyType;
 					
 					
 					if (data.list && data.list[0] !== -1) {
@@ -934,6 +972,12 @@ export default {
 			}
 		},
 		saveApproval(){  // 保存数据
+			if(this.xingzhenState){
+				if(!this.addMsg.PropertyType || this.addMsg.PropertyType=='' ){
+					this.Error("请选择审批类型！");
+					return;
+				}
+			}
       if (this.accListMsg.length === 0) {
         this.addMsg.list = [-1]
       } else {
@@ -1001,10 +1045,20 @@ export default {
 				if(res.data.resultCode==1){
 					this.loading=false;
 					this.$message.success(this.$t('tips.czchenggong'))
+					if(this.xingzhenState){
+						this.$router.push({ name: 'XProcessmanagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
+						
+					}else{
 						this.$router.push({ name: 'FProcessManagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
+
+					}
 				}else{
 					this.loading=false;
+					if(this.xingzhenState){
+						this.addMsg.TemplateSorce=2;
+					}
 					this.addMsg = {
+						PropertyType:'',
 						Id:this.addMsg.Id,
 						Name:this.addMsg.Name,
 						DescribeInfo:this.addMsg.DescribeInfo,

src/router/config.js

@@ -641,6 +641,14 @@ export default {
                                 title: '联盟管理'
                             },
                         },
+                        {
+                            path: '/XProcessmanagement', //联盟管理
+                            name: 'XProcessmanagement',
+                            component: resolve => require(['@/components/administrative/XProcessmanagement'], resolve),
+                            meta: {
+                                title: '流程管理'
+                            },
+                        },
                         {
                             path: '/custumerXzCertification', //客户实名认证
                             name: 'custumerXzCertification',