Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-admin-web/src/views/sys/org/form.vue

@@ -23,6 +23,7 @@
 					}"
 					selectable="false"
 					tree-line
+					disabled
 				/>
 			</a-form-item>
 			<a-form-item label="组织名称：" name="name">
@@ -77,9 +78,9 @@
 		formData.value = {
 			sortCode: 99
 		}
-		if (parentId) {
-			formData.value.parentId = parentId
-		}
+
+		//
+
 		if (record) {
 			const param = {
 				id: record.id
@@ -87,6 +88,8 @@
 			orgApi.orgDetail(param).then((data) => {
 				formData.value = Object.assign({}, data)
 			})
+		} else {
+			formData.value.parentId = 0
 		}
 		// 获取机构树并加入顶级
 		orgApi.orgOrgTreeSelector().then((res) => {

snowy-admin-web/src/views/sys/user/form.vue

@@ -420,8 +420,7 @@
 		account: [required('请输入账号')],
 		name: [required('请输入姓名')],
 		sex: [required('请选择性别')],
-		orgId: [required('请选择组织')],
-		positionId: [required('请选择职位')]
+		orgId: [required('请选择组织')]
 	}
 	// 机构选择后查询对应的职位
 	const selePositionData = (orgId, type) => {