diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts
index c2e43be..7046e41 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.api.ts
@@ -11,6 +11,13 @@ enum Api {
deleteBatch = '/bizEmployeesInfo/bizEmployeesInfo/deleteBatch',
importExcel = '/bizEmployeesInfo/bizEmployeesInfo/importExcel',
exportXls = '/bizEmployeesInfo/bizEmployeesInfo/exportXls',
+
+ getEmployeesList = '/serviceTag/serviceTag/getEmployeesList',
+ queryTagsById = '/serviceTag/serviceTag/queryById',
+ checkTags='/bizEmployeesInfo/nuBizEmployeesServcieTags/add',
+ removeTags = '/bizEmployeesInfo/nuBizEmployeesServcieTags/delete',
+ getEmployessServiceTags = '/serviceTag/serviceTag/getEmployessServiceTags',
+
}
/**
@@ -29,7 +36,10 @@ export const getImportUrl = Api.importExcel;
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
+export const getEmployessServiceTags = (params) => defHttp.get({ url: Api.getEmployessServiceTags, params });
+export const getEmployeesList = (params) => defHttp.get({ url: Api.getEmployeesList, params });
+export const queryTagsById = (params) => defHttp.get({ url: Api.queryTagsById, params });
/**
* 删除单个
* @param params
@@ -70,3 +80,14 @@ export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}
+
+
+
+export const checkTags = (params) => {
+ let url = Api.checkTags;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+export const removeTags = (params) => {
+ let url = Api.removeTags;
+ return defHttp.delete({ url: url, params }, {joinParamsToUrl: true});
+}
\ No newline at end of file
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts
index 64e61a4..e85d5ad 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfo.data.ts
@@ -232,3 +232,56 @@ export const superQuerySchema = {
regional: {title: '区域',order: 32,view: 'text', type: 'string',},
serviceTag: {title: '服务标签',order: 33,view: 'text', type: 'string',},
};
+
+
+
+
+//列表数据
+export const serviceTagcolumns: BasicColumn[] = [
+ {
+ title: '服务标签名称',
+ align: "center",
+ dataIndex: 'tagName',
+ width:'50%'
+ },
+ {
+ title: '备注',
+ align: "center",
+ dataIndex: 'description'
+ },
+];
+
+//列表数据
+export const employeesTagcolumns: BasicColumn[] = [
+ {
+ title: '序号',
+ dataIndex: 'rowIndex',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function ({ text }) {
+ if (text == undefined) {
+ return '';
+ } else {
+ return parseInt(text) + 1;
+ }
+ },
+ },
+ {
+ title: '服务标签名称',
+ align: "center",
+ dataIndex: 'tagName',
+ width:'50%'
+ },
+ {
+ title: '备注',
+ align: "center",
+ dataIndex: 'description'
+ },
+ {
+ title: '操作',
+ key:'action',
+ align: "center",
+ width:'140px',
+ },
+];
\ No newline at end of file
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue
new file mode 100644
index 0000000..50937b5
--- /dev/null
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList copy.vue
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+ 新增
+ 导出
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
index 0dc7a5a..3cdda5d 100644
--- a/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
+++ b/src/views/biz/bizEmployeesInfo/BizEmployeesInfoList.vue
@@ -34,7 +34,7 @@
编辑
- 工作内容
+ 服务标签
@@ -70,6 +70,7 @@
+
@@ -79,14 +80,16 @@
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BizEmployeesInfo.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import BizEmployeesInfoModal from './components/BizEmployeesInfoModal.vue'
-import { defHttp } from '/@/utils/http/axios';
-import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+ import EmployeesServiceTagModal from '/@/views/biz/bizEmployeesInfo/employeesServiceTag/employeesServiceTagModal.vue'
+ import { defHttp } from '/@/utils/http/axios';
+ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
import { Pagination } from 'ant-design-vue';
const APagination = Pagination;
const formRef = ref();
const queryParam = reactive({});
const registerModal = ref();
+ const registerServiceTagModal = ref();
const dataList = ref([]);
const current = ref(1);
const pageSize = ref(8);
@@ -103,6 +106,7 @@ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
sm: 20,
});
+//当没有员工头像时,默认展示企业logo
function handleHeadPath(headPath){
console.log('headPath--->',headPath);
if(headPath){
@@ -110,7 +114,12 @@ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
}else{
return '../../../../../public/resource/img/logo.png';
}
+ }
+//分配服务标签
+ function handleFwbq(info){
+ registerServiceTagModal.value.disableSubmit = false;
+ registerServiceTagModal.value.init(info);
}
/**
diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
new file mode 100644
index 0000000..ed0a273
--- /dev/null
+++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagForm.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+ 可选服务标签
+
+
+
+
+
+
+
+
+
+
+
+
已选服务标签
+
+
+
+ 移除
+
+ 详情
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+ {{ (index+1) +'、 '+ item.categoryName +'-'+item.typeName +'-'+item.directiveName }}
+ ({{item.tagsName}})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
new file mode 100644
index 0000000..b4bc95f
--- /dev/null
+++ b/src/views/biz/bizEmployeesInfo/employeesServiceTag/EmployeesServiceTagModal.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+