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

src/components/FinancialModule/addFinancialProcess.vue

@@ -379,6 +379,9 @@
             <el-checkbox  :value="4" :label="4" :key="4">{{$t('fnc.zjinchi')}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
+		<el-form-item label="排序">
+					<el-input v-model="addMsg.Sort" class="w250"  maxlength="60"></el-input>
+				</el-form-item>
         <el-form-item :label="$t('fnc.mbmiaoshu')">
 					<el-input v-model="addMsg.DescribeInfo" class="w450"  maxlength="100"></el-input>
 				</el-form-item>
@@ -553,6 +556,7 @@ export default {
 				Id:0,
 				Name:'',
 				DescribeInfo:'',
+				Sort:'0',
 				TemplateType:'8',
 				TempLateClass:'',
 				FinancialInstitutions:[],
@@ -830,6 +834,7 @@ export default {
 					this.addMsg.Id= data.Id;
 					this.addMsg.Name= data.Name;
 					this.addMsg.DescribeInfo = data.DescribeInfo;
+					this.addMsg.Sort=data.Sort;
 					this.addMsg.TempLateClass = data.TempLateClass;
 					this.addMsg.IsUploadPic = data.IsUploadPic;
 					this.addMsg.IsShow = data.IsShow;
@@ -997,6 +1002,7 @@ export default {
 						Id:this.addMsg.Id,
 						Name:this.addMsg.Name,
 						DescribeInfo:this.addMsg.DescribeInfo,
+						Sort:this.addMsg.Sort,
 						TemplateType:this.addMsg.TemplateType,
 						TempLateClass:this.radio,
 						FinancialInstitutions:[],