合并分支 'master_dev' 到 'master'

客户资源业务类型BUG修复



查看合并请求 !28

@@ -146,6 +146,16 @@
 						</el-option>
 						</el-option>
 					</el-select>
 					</el-select>
 				</el-form-item>
 				</el-form-item>
+				<el-form-item label=" " prop="addForm.orgtype">
+					<el-select v-model="addForm.orgtype" placeholder="业务类型">
+						<el-option
+								v-for="item in options"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+						</el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label=" " prop="roleName">
 				<el-form-item label=" " prop="roleName">
 					<el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入组织机构名称：例如:公司名称">
 					<el-input v-model="addForm.roleName" auto-complete="off" placeholder="请输入组织机构名称：例如:公司名称">
 						<template slot="prepend">组织机构名称</template>
 						<template slot="prepend">组织机构名称</template>
@@ -226,6 +236,18 @@
     	name:'Role',
     	name:'Role',
 		data() {
 		data() {
 			return {
 			return {
+				options: [
+					{
+						value: "S",
+						label: '供应商'
+					}, {
+						value: "C",
+						label: '客户'
+					},{
+						value: "M",
+						label: '自身'
+					}
+				],
 				filters: {
 				filters: {
                     roleName: '',
                     roleName: '',
 					orgtype:'',
 					orgtype:'',
@@ -290,6 +312,9 @@
 					],
 					],
 					departmentid:[
 					departmentid:[
 						{ required: true, message: '请输入承运人代码', trigger: 'blur' }
 						{ required: true, message: '请输入承运人代码', trigger: 'blur' }
+					],
+					'addForm.orgtype': [
+						{ required: true, message: '请选择业务类型', trigger: 'blur' }
 					]
 					]
 				},
 				},
 				//新增界面数据
 				//新增界面数据
@@ -302,7 +327,8 @@
                     businessLicense: '',
                     businessLicense: '',
                     customsRegCode: '',
                     customsRegCode: '',
 					parentName: '',
 					parentName: '',
-					mqcode: ''
+					mqcode: '',
+					orgtype:''
 
 
 				},
 				},
 				isExpansion:true,
 				isExpansion:true,