Merge branch 'master' of http://git.cc-lotus.info/zkzx/zkzx_admin

package.json

@@ -18,13 +18,10 @@
     "animate.css": "^4.1.1",
     "axios": "^1.3.5",
     "element-plus": "^2.3.3",
-    "install": "^0.13.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "naf-core": "^0.1.2",
-    "npm": "^9.6.4",
     "pinia": "^2.0.34",
-    "sortablejs": "^1.15.0",
     "vue": "^3.2.47",
     "vue-router": "^4.1.6",
     "vuex": "^4.1.0"

src/views/user/company/detail.vue

@@ -44,7 +44,7 @@ const fields: Ref<any> = ref([
   { label: '邀请码', model: 'code', type: 'select' },
   { label: '账号', model: 'account' },
   { label: '密码', model: 'password', type: 'password' },
-  { label: '姓名', model: 'name' },
+  { label: '用户名', model: 'name' },
   { label: '手机号', model: 'phone' },
   { label: '电子邮箱', model: 'email' },
   { label: '联系地址', model: 'address' },

src/views/user/company/index.vue

@@ -65,7 +65,7 @@ const limit = proxy.$limit;
 const fields: Ref<any> = ref([
   { label: '邀请码', model: 'code', isSearch: true },
   { label: '账号', model: 'account', isSearch: true },
-  { label: '姓名', model: 'name', isSearch: true },
+  { label: '用户名', model: 'name', isSearch: true },
   { label: '手机号', model: 'phone', isSearch: true },
   { label: '电子邮箱', model: 'email' },
   { label: '所属辖区', model: 'area', format: (i) => getDict(i, 'area'), isSearch: true, type: 'select' },

src/views/user/expert/detail.vue

@@ -58,7 +58,7 @@ let formFields: Ref<any[]> = ref([
   { label: '邀请码', model: 'code', type: 'select' },
   { label: '账号', model: 'account' },
   { label: '密码', model: 'password', type: 'password' },
-  { label: '名称', model: 'name' },
+  { label: '用户名', model: 'name' },
   { label: '手机号', model: 'phone' },
   { label: '电子邮箱', model: 'email' },
   { label: '联系地址', model: 'address' },
@@ -74,12 +74,12 @@ let formFields: Ref<any[]> = ref([
   { label: '单位名称', model: 'company' },
   { label: '头像图片', model: 'icon', custom: true },
   { label: '职务职称', model: 'zwzc' },
-  { label: '擅长领域', model: 'expertise' },
-  { label: '工作经历', model: 'workexperience' },
-  { label: '科研综述', model: 'scientific' },
-  { label: '承担项目', model: 'undertakingproject' },
-  { label: '科技奖励', model: 'scienceaward' },
-  { label: '社会任职', model: 'social' },
+  { label: '擅长领域', model: 'expertise', type: 'textarea' },
+  { label: '工作经历', model: 'workexperience', type: 'textarea' },
+  { label: '科研综述', model: 'scientific', type: 'textarea' },
+  { label: '承担项目', model: 'undertakingproject', type: 'textarea' },
+  { label: '科技奖励', model: 'scienceaward', type: 'textarea' },
+  { label: '社会任职', model: 'social', type: 'textarea' },
   { label: '状态', model: 'status', type: 'select' },
   { label: '个人用户id', model: 'personal_id', type: 'select' } //查询个人用户，选择
 ]);

src/views/user/expert/index.vue

@@ -70,7 +70,7 @@ let limit: number = proxy.$limit;
 let fields: Ref<any[]> = ref([
   { label: '邀请码', model: 'code', isSearch: true },
   { label: '账号', model: 'account', isSearch: true },
-  { label: '姓名', model: 'name', isSearch: true },
+  { label: '用户名', model: 'name', isSearch: true },
   { label: '手机号', model: 'phone', isSearch: true },
   { label: '所属辖区', model: 'area', format: (i) => getDict(i, 'area'), isSearch: true, type: 'select' },
   { label: '审核状态', model: 'status', format: (i) => getDict(i, 'status'), isSearch: true, type: 'select' }

src/views/user/personal/detail.vue

@@ -51,7 +51,7 @@ let formFields: Ref<any[]> = ref([
   { label: '邀请码', model: 'code', type: 'select' },
   { label: '账号', model: 'account' },
   { label: '密码', model: 'password', type: 'password' },
-  { label: '名称', model: 'name' },
+  { label: '用户名', model: 'name' },
   { label: '手机号', model: 'phone' },
   { label: '电子邮箱', model: 'email' },
   { label: '联系地址', model: 'address' },

src/views/user/personal/index.vue

@@ -69,7 +69,7 @@ let limit: number = proxy.$limit;
 let fields: Ref<any[]> = ref([
   { label: '邀请码', model: 'code', isSearch: true },
   { label: '账号', model: 'account', isSearch: true },
-  { label: '姓名', model: 'name', isSearch: true },
+  { label: '用户名', model: 'name', isSearch: true },
   { label: '手机号', model: 'phone', isSearch: true },
   { label: '电子邮箱', model: 'email' },
   { label: '所属辖区', model: 'area', format: (i) => getDict(i, 'area'), isSearch: true, type: 'select' },