起止时间:2022-07-21 14:00 ~ 2022-7-30 14:00
@@ -76,13 +76,13 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue
new file mode 100644
index 00000000..f4742451
--- /dev/null
+++ b/src/components/drawers/ProjManagePower.vue
@@ -0,0 +1,1219 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 1aea1e0c..ba60607a 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -48,7 +48,7 @@
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
- :scroll="{ x: 900, y: 400 }"
+ :scroll="{ x: 900 }"
:pagination="false"
:row-selection="{
columnWidth: 30,
@@ -345,9 +345,9 @@ export default {
}
}
.drawerMain {
- min-width: 600px;
+ min-width: 550px;
margin: 0px 32px 0px 32px;
- overflow-x: scroll;
+ // overflow-x: scroll;
display: flex;
flex-direction: column;
.header {
@@ -358,6 +358,7 @@ export default {
align-items: center;
// background-color: red;
margin-bottom: 20px;
+ flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
@@ -370,7 +371,7 @@ export default {
width: 100%;
height: 100%;
// background-color: #bfa;
- // overflow-y: auto;
+ overflow-y: auto;
.search {
width: 100%;
display: flex;
@@ -487,6 +488,12 @@ export default {
justify-content: center;
// position: absolute;
// bottom: 20px;
+ .ant-pagination-item,
+ .ant-pagination-prev,
+ .ant-pagination-next,
+ .ant-pagination-options {
+ margin-bottom: 10px;
+ }
}
// .tab {
// .ant-table-thead > tr > th {
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 9dd0a596..4fb99c0b 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -1,3 +1,4 @@
+
+
-
-
-
- 批量签到
-
- 批量签退
+
+
- 批量签退
+
@@ -137,14 +137,162 @@
/>
-->
导出数据
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 您确定要批量签到吗
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 您确定要批量签退吗
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 您确定要签到吗
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 您确定要签退吗
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 您确定要请假吗
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+ 管理权
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 姓名:
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ 选择组织:
+
+
+
+
+
+
+
+ 姓名:
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择受众:
+
+
+
+
+
+
+ 姓名:
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+ 已选
+ 6
+ 人
+
+
+ 全部清除
+
+
+
+
+ 李明
+
+
+
+ 李大明
+
+
+
+ 李二明
+
+
+
+ 李明
+
+
+
+ 李大明
+
+
+
+ 李二明
+
+
+
+
+
+
+
+
-
-
-
- 组织:
-
-
+
+ 选择组织:
+
+
+
+
+
+
姓名:
+
-
+
-
-
+
+ 受众名称:
-
-
-
-
@@ -133,8 +141,75 @@
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择受众:
+
+
+
+
+
+
+ 姓名:
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 重置
+
@@ -168,9 +243,9 @@
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
- :pageSize="pageSize"
- :current="currentPage"
- :total="tableDataTotal"
+ :pageSize="pageSize2"
+ :current="currentPage2"
+ :total="tableDataTotal2"
class="pagination"
/>
@@ -181,7 +256,11 @@
-
已选
+
+
已选
+ 6
+ 人
+
全部清除
@@ -238,47 +317,116 @@ export default {
pageSize: 10,
currentPage: 1,
tableDataTotal: 50,
+ pageSize1: 10,
+ currentPage1: 1,
+ tableDataTotal1: 50,
+ pageSize2: 10,
+ currentPage2: 1,
+ tableDataTotal2: 50,
+ selectedRowKeys: [],
+ selectedRowKeys1: [],
+ selectedRowKeys2: [],
activeKey: "1",
- name: "", //输入名字搜索
value: [], //级联选择框
choosevalue: null, //受众选择
- organizeList: [
+ valueSelect: null, //树形选择
+ name: "",
+ nameadd: "",
+ nameaddd: "",
+ treeData: [
{
- id: 1,
+ title: "京东方",
value: "京东方",
- label: "京东方",
children: [
{
- id: 2,
+ title: "产研部",
value: "产研部",
- label: "产研部",
children: [
{
- id: 4,
- value: "产品部门",
- label: "产品部门",
+ title: "产品部",
+ value: "产品部",
},
{
- id: 5,
- value: "研发部门",
- label: "研发部门",
+ title: "研究部",
+ value: "研究部",
},
],
},
{
- id: 3,
- value: "人力资源部",
- label: "人力资源部",
+ title: "二级标题",
+ value: "二级标题",
children: [
{
- id: 6,
+ title: "三级标题",
+ value: "三级标题",
+ children: [
+ {
+ title: "四级标题",
+ value: "四级标题",
+ children: [
+ {
+ title: "五级标题",
+ value: "五级标题",
+ children: [
+ {
+ title: "六级标题",
+ value: "六级标题",
+ children: [
+ {
+ title: "七级标题",
+ value: "七级标题",
+ children: [
+ {
+ title: "八级标题",
+ value: "八级标题",
+ children: [
+ {
+ title: "九级标题",
+ value: "九级标题",
+ children: [
+ {
+ title: "十级标题",
+ value: "十级标题",
+ children: [
+ {
+ title: "十一级标题",
+ value: "十一级标题",
+ children: [
+ {
+ title: "十二级标题",
+ value: "十二级标题",
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ ],
+ },
+ {
+ title: "人力资源部",
+ value: "人力资源部",
+ children: [
+ {
+ title: "人事部",
value: "人事部",
- label: "人事部",
},
{
- id: 7,
+ title: "行政部",
value: "行政部",
- label: "行政部",
},
],
},
@@ -290,55 +438,64 @@ export default {
key: 1,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 2,
name: "小刘",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 3,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 4,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 5,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 6,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 7,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 8,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
{
key: 9,
name: "小李",
bum: "产研部",
- gangw: "产品经理",
+ numb: "000000",
+ guishu: "",
},
],
tablecolumns: [
@@ -351,18 +508,26 @@ export default {
className: "h",
},
{
- title: "部门",
- dataIndex: "bum",
- key: "bum",
- width: 45,
+ title: "工号",
+ dataIndex: "numb",
+ key: "numb",
+ width: 35,
align: "center",
className: "h",
},
{
- title: "岗位",
- dataIndex: "gangw",
- key: "gangw",
- width: 45,
+ title: "归属组织",
+ dataIndex: "guishu",
+ key: "guishu",
+ width: 30,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "部门",
+ dataIndex: "bum",
+ key: "bum",
+ width: 40,
align: "center",
className: "h",
},
@@ -370,56 +535,71 @@ export default {
tabledata1: [
{
key: 1,
- name: "学习受众",
- time: "2022-10-31 23:12:00",
- total: "1",
- state: "已发布",
- type: "普通受众",
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
key: 2,
- name: "2",
- time: "2022-10-31 23:12:00",
- total: "2",
- state: "已发布",
- type: "普通受众",
+ name: "小刘",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
key: 3,
- name: "mask",
- time: "2022-10-31 23:12:00",
- total: "1",
- state: "已发布",
- type: "普通受众",
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
key: 4,
- name: "学习受众",
- time: "2022-10-31 23:12:00",
- total: "1",
- state: "已发布",
- type: "普通受众",
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
key: 5,
- name: "学业受众",
- time: "2022-10-31 23:12:00",
- total: "2",
- state: "已发布",
- type: "普通受众",
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
key: 6,
- name: "案例受众",
- time: "2022-10-31 23:12:00",
- total: "3",
- state: "已发布",
- type: "普通受众",
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 7,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 8,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 9,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
],
tablecolumns1: [
{
- title: "受众名称",
+ title: "姓名",
dataIndex: "name",
key: "name",
width: 30,
@@ -427,84 +607,188 @@ export default {
className: "h",
},
{
- title: "创建时间",
- dataIndex: "time",
- key: "time",
+ title: "工号",
+ dataIndex: "numb",
+ key: "numb",
+ width: 35,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "归属组织",
+ dataIndex: "guishu",
+ key: "guishu",
+ width: 30,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "部门",
+ dataIndex: "bum",
+ key: "bum",
width: 40,
align: "center",
className: "h",
},
+ ],
+ tabledata2: [
{
- title: "人数",
- dataIndex: "total",
- key: "total",
- width: 20,
- align: "center",
- className: "h",
+ key: 1,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
- title: "状态",
- dataIndex: "state",
- key: "state",
- width: 20,
- align: "center",
- className: "h",
+ key: 2,
+ name: "小刘",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
},
{
- title: "类型",
- dataIndex: "type",
- key: "type",
+ key: 3,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 4,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 5,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 6,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 7,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 8,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ {
+ key: 9,
+ name: "小李",
+ bum: "产研部",
+ numb: "000000",
+ guishu: "",
+ },
+ ],
+ tablecolumns2: [
+ {
+ title: "姓名",
+ dataIndex: "name",
+ key: "name",
width: 30,
+ align: "left",
+ className: "h",
+ },
+ {
+ title: "工号",
+ dataIndex: "numb",
+ key: "numb",
+ width: 35,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "归属组织",
+ dataIndex: "guishu",
+ key: "guishu",
+ width: 30,
+ align: "center",
+ className: "h",
+ },
+ {
+ title: "部门",
+ dataIndex: "bum",
+ key: "bum",
+ width: 40,
align: "center",
className: "h",
},
],
organizeList1: [
{
- value: "项目一",
- label: "项目一",
+ value: "产品受众群体",
+ label: "产品受众群体",
+ },
+ {
+ value: "人力资源hrbp",
+ label: "人力资源hrbp",
},
],
});
const closeDrawer = () => {
+ state.activeKey = "1";
ctx.emit("update:ProjOwnervisible", false);
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
};
+ const onSelectChange = (selectedRowKeys) => {
+ console.log("selectedRowKeys changed: ", selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+ };
+ const onSelectChange1 = (selectedRowKeys) => {
+ console.log("selectedRowKeys changed: ", selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+ };
+ const onSelectChange2 = (selectedRowKeys) => {
+ console.log("selectedRowKeys changed: ", selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+ };
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
+ onSelectChange,
+ onSelectChange1,
+ onSelectChange2,
// change,
};
},
};
-
\ No newline at end of file
+.changetreedropdown {
+ width: 550px !important;
+}
+
+.ant-select-tree-list-scrollbar {
+ width: 5px !important;
+ .ant-select-tree-list-scrollbar-thumb {
+ background-color: #4ea6ff !important;
+ }
+}
+
diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue
index b7e26a90..11e4a5df 100644
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -69,7 +69,7 @@
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
- :scroll="{ x: 500}"
+ :scroll="{ x: 500 }"
@expand="expandTable"
:pagination="false"
:row-selection="{
@@ -778,7 +778,7 @@ export default {