From 0d2fe87dca4a9f8a3558b03ffb6e5dd30b713a4d Mon Sep 17 00:00:00 2001
From: BINGWU <HuJiaCheng2003@163.com>
Date: Tue, 21 May 2024 23:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/api/employee.js                       |  30 +++
 app/src/api/reward.js                         |  33 ++++
 app/src/db/asideData.js                       |  48 ++++-
 app/src/views/EmployeeManageView.vue          |  99 +++++++++-
 app/src/views/RewardManageView.vue            |   2 +
 .../views/components/form/EmployeeFormCom.vue | 168 +++++++++++++++++
 .../views/components/form/RewardFormCom.vue   | 172 ++++++++++++++++++
 .../__pycache__/commonViews.cpython-311.pyc   | Bin 5386 -> 5338 bytes
 serve/serve/commonViews/commonViews.py        |   1 -
 9 files changed, 548 insertions(+), 5 deletions(-)
 create mode 100644 app/src/api/employee.js
 create mode 100644 app/src/api/reward.js
 create mode 100644 app/src/views/components/form/EmployeeFormCom.vue
 create mode 100644 app/src/views/components/form/RewardFormCom.vue

diff --git a/app/src/api/employee.js b/app/src/api/employee.js
new file mode 100644
index 0000000..d73321c
--- /dev/null
+++ b/app/src/api/employee.js
@@ -0,0 +1,30 @@
+import http from '@/utils/http'
+import { deleteRequest } from '@/utils/http'
+const getEmployee = (_id) => {
+  return http.get('/employee/get', {
+    params: {
+      _id
+    }
+  })
+}
+const createEmployee = (params) => {
+  return http.post('/employee/create', params)
+}
+const updateEmployee = (params) => {
+  return http.put('/employee/update', params)
+}
+const deleteEmployee = (params) => {
+  return deleteRequest('/employee/delete', params)
+}
+const getAllEmployee = (params) => {
+  return http.get('/employee/get-all', {
+    params
+  })
+}
+export {
+  getEmployee,
+  createEmployee,
+  getAllEmployee,
+  updateEmployee,
+  deleteEmployee
+}
diff --git a/app/src/api/reward.js b/app/src/api/reward.js
new file mode 100644
index 0000000..aa6ddc6
--- /dev/null
+++ b/app/src/api/reward.js
@@ -0,0 +1,33 @@
+/*
+ * @Author: BINGWU
+ * @Date: 2024-05-21 23:05:12
+ * @LastEditors: BINGWU HuJiaCheng2003@163.com
+ * @LastEditTime: 2024-05-21 23:05:24
+ * @FilePath: \reward-information-management-system\app\src\api\reward.js
+ * @Describe:
+ * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა
+ */
+import http from '@/utils/http'
+import { deleteRequest } from '@/utils/http'
+const getReward = (_id) => {
+  return http.get('/reward/get', {
+    params: {
+      _id
+    }
+  })
+}
+const createReward = (params) => {
+  return http.post('/reward/create', params)
+}
+const updateReward = (params) => {
+  return http.put('/reward/update', params)
+}
+const deleteReward = (params) => {
+  return deleteRequest('/reward/delete', params)
+}
+const getAllReward = (params) => {
+  return http.get('/reward/get-all', {
+    params
+  })
+}
+export { getReward, createReward, getAllReward, updateReward, deleteReward }
diff --git a/app/src/db/asideData.js b/app/src/db/asideData.js
index f51ead5..5c10e20 100644
--- a/app/src/db/asideData.js
+++ b/app/src/db/asideData.js
@@ -92,12 +92,58 @@ export const asideData = [
   }
 ]
 
+export const employeeAsideData = [
+  {
+    index: '/feedback',
+    icon: 'icon iconfont icon-fankui',
+    name: '员工反馈与投诉管理',
+    pid: 0,
+    children: [
+      {
+        id: 7,
+        index: '/feedback/view',
+        name: '员工反馈',
+        pid: 5
+      }
+    ]
+  },
+  {
+    index: '/request',
+    icon: 'icon iconfont icon-qingjiashenqing',
+    name: '请假管理',
+    children: [
+      {
+        id: 10,
+        index: '/request/view',
+        name: '个人请假信息',
+        pid: 8
+      }
+    ]
+  },
+  {
+    index: '/person',
+    icon: 'icon iconfont icon-gerenxinxiguanli',
+    name: '个人信息管理',
+    children: [
+      {
+        index: '/person/password',
+        name: '修改密码'
+      },
+      {
+        index: '/person/avatar',
+        name: '修改个人信息'
+      }
+    ]
+  }
+]
+
 export const keys = {
   employeeAdmin: [1, 3, 11],
   customAdmin: [],
   feedbackAdmin: [1, 11, 5],
   rewardAdmin: [1, 4, 11],
-  requestAdmin: [1, 11, 8]
+  requestAdmin: [1, 11, 8],
+  employee:[]
 }
 
 export function generateNested(nodes, parentId = 0) {
diff --git a/app/src/views/EmployeeManageView.vue b/app/src/views/EmployeeManageView.vue
index f134006..619521b 100644
--- a/app/src/views/EmployeeManageView.vue
+++ b/app/src/views/EmployeeManageView.vue
@@ -1,15 +1,108 @@
 <template>
   <div class="employee-manage">
-    <el-button type="primary">添加职工</el-button>
+    <el-button type="primary" @click="openDialog">添加职工</el-button>
     <div clase="table">
-      <BaseTableCom></BaseTableCom>
+      <BaseTableCom
+        :column-data="columnData"
+        :table-data="tableData"
+        :total="total"
+        :show-pagination="true"
+        :page-sizes="[5, 8]"
+        :dropdown-data="dropdownData"
+        ref="baseTableComRef"
+        @update-table-data="updateTableData"
+      ></BaseTableCom>
     </div>
+    <EmployeeFormCom
+      :title="title"
+      ref="employeeFormComRef"
+      @update-table-data="getTableData"
+    ></EmployeeFormCom>
   </div>
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import BaseTableCom from '@/components/table/BaseTableCom.vue'
+import EmployeeFormCom from './components/form/EmployeeFormCom.vue'
+import { deleteEmployee, getAllEmployee } from '@/api/employee'
+const tableData = ref([])
+const dropdownData = [
+  {
+    command: 'command1',
+    handleAction: (row) => {
+      returnData(row, '查看')
+    },
+    icon: 'View',
+    actionName: '查看'
+  },
+  {
+    command: 'command2',
+    handleAction: (row) => {
+      returnData(row, '修改')
+    },
+    icon: 'Edit',
+    actionName: '修改'
+  },
+  {
+    command: 'command3',
+    handleAction: async (row) => {
+      const { _id } = row
+      const res = await deleteEmployee({ _ids: [_id] })
+      const { msg } = res.data
+      await getTableData()
+      ElMessage({
+        message: msg,
+        type: 'success'
+      })
+    },
+    icon: 'Delete',
+    actionName: '删除'
+  }
+]
+const columnData = [
+  {
+    prop: '_id',
+    label: '职工ID'
+  },
+  {
+    prop: 'employeeName',
+    label: '职工名'
+  },
+  {
+    prop: 'userType',
+    label: '用户类型'
+  }
+]
+const total = ref(0)
+const title = ref('')
+const employeeFormComRef = ref(null)
+const baseTableComRef = ref(null)
+const getTableData = async (params = null) => {
+  if (!params) {
+    const { currentPage, pageSize } = baseTableComRef.value.getPaginationData()
+    params = { pageIndex: currentPage, pageSize }
+  }
+  const res = await getAllEmployee(params)
+  tableData.value = res.data.data
+  total.value = res.data.total
+}
+const openDialog = () => {
+  title.value = '添加'
+  employeeFormComRef.value.openDialog()
+}
+const updateTableData = async (pageSize, pageIndex) => {
+  console.log('pp')
+  await getTableData({ pageSize, pageIndex })
+}
+const returnData = (row, newTiltle) => {
+  title.value = newTiltle
+  const { employeeName, password, userType, _id } = row
+  employeeFormComRef.value.openDialog(employeeName, password, userType, _id)
+}
+onMounted(async () => {
+  await getTableData({ pageSize: 5, pageIndex: 1 })
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/app/src/views/RewardManageView.vue b/app/src/views/RewardManageView.vue
index ad99be5..82eb3df 100644
--- a/app/src/views/RewardManageView.vue
+++ b/app/src/views/RewardManageView.vue
@@ -4,12 +4,14 @@
     <div clase="table">
       <BaseTableCom></BaseTableCom>
     </div>
+    <RewardFormCom></RewardFormCom>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
 import BaseTableCom from '@/components/table/BaseTableCom.vue'
+import RewardFormCom from './components/form/RewardFormCom.vue'
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/app/src/views/components/form/EmployeeFormCom.vue b/app/src/views/components/form/EmployeeFormCom.vue
new file mode 100644
index 0000000..85d70c5
--- /dev/null
+++ b/app/src/views/components/form/EmployeeFormCom.vue
@@ -0,0 +1,168 @@
+<!--
+ * @Author: BINGWU
+ * @Date: 2024-05-14 23:46:48
+ * @LastEditors: BINGWU HuJiaCheng2003@163.com
+ * @LastEditTime: 2024-05-21 22:48:01
+ * @FilePath: \employee-information-management-system\app\src\views\components\form\EmployeeFormCom.vue
+ * @Describe: 
+ * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა
+-->
+<template>
+  <div class="employee-form">
+    <el-dialog
+      v-model="dialogVisible"
+      :title="props.title + '职工'"
+      width="500"
+      :before-close="handleClose"
+    >
+      <el-form
+        :model="formData"
+        :rules="rules"
+        label-width="auto"
+        style="max-width: 600px"
+        ref="formRef"
+      >
+        <el-form-item label="职工名" prop="employeeName">
+          <el-input
+            type="text"
+            v-model="formData.employeeName"
+            :disabled="title === '查看'"
+          />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input type="password" show-password v-model="formData.password" />
+        </el-form-item>
+        <el-form-item label="角色类型" prop="userType">
+          <el-radio-group
+            v-model="formData.userType"
+            @change="handleRadioChange"
+            disabled
+          >
+            <el-radio label="employee">普通员工</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer" v-show="title !== '查看'">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleConfirm"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick } from 'vue'
+import { getRouterDataByIds } from '@/db/routerData'
+import { employeeAsideData } from '@/db/asideData'
+import { createEmployee, updateEmployee } from '@/api/employee'
+import axios from 'axios'
+const formData = reactive({
+  name: '',
+  password: '',
+  userType: 'employee',
+  asideData: ['default']
+})
+const dialogVisible = ref(false)
+const props = defineProps({
+  title: {
+    type: String,
+    default: '添加'
+  }
+})
+const formRef = ref(null)
+let newId = ''
+
+const getAsideData = () => {
+  return employeeAsideData
+}
+const rules = ref({
+  employeeName: [
+    { required: true, message: '请输入职工名', trigger: 'blur' },
+    { min: 5, max: 10, message: '长度为5~10个字符', trigger: 'blur' }
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    { min: 5, max: 10, message: '长度为5~10个字符', trigger: 'blur' }
+  ]
+})
+const emits = defineEmits(['updateTableData'])
+const handleConfirm = () => {
+  formRef.value
+    .validate()
+    .then(async () => {
+      let message = ''
+      const asideData = getAsideData()
+      const routerData = getRouterDataByIds([7, 10, 12, 13])
+      if (props.title === '添加') {
+        const res = await axios.get(
+          'https://api.thecatapi.com/v1/images/search'
+        )
+        const avatar = res.data[0].url
+
+        const params = {
+          asideData,
+          routerData,
+          userType: formData.userType,
+          employeeName: formData.employeeName,
+          password: formData.password,
+          avatar
+        }
+        const {
+          data: { msg }
+        } = await createEmployee(params)
+        message = msg
+      } else if (props.title === '修改') {
+        const params = {
+          asideData,
+          routerData,
+          employeeName: formData.employeeName,
+          password: formData.password
+        }
+        const {
+          data: { msg }
+        } = await updateEmployee({
+          data: params,
+          _id: newId
+        })
+        message = msg
+      }
+      ElMessage({
+        message,
+        type: 'success'
+      })
+      emits('updateTableData')
+      offDialog()
+    })
+    .catch(() => {})
+}
+
+const openDialog = (employeeName, password, _, _id) => {
+  dialogVisible.value = true
+  nextTick(() => {
+    formRef.value.clearValidate()
+  })
+  newId = _id
+  formData.password = password
+  formData.employeeName = employeeName
+}
+const handleClose = () => {
+  offDialog()
+}
+const offDialog = () => (dialogVisible.value = false)
+defineExpose({
+  openDialog,
+  offDialog
+})
+</script>
+
+<style lang="scss" scoped>
+.employee-form {
+  .tree-content {
+    width: 100%;
+    border: 1px solid #e5e6e7;
+    border-radius: 2px;
+  }
+}
+</style>
diff --git a/app/src/views/components/form/RewardFormCom.vue b/app/src/views/components/form/RewardFormCom.vue
new file mode 100644
index 0000000..e85f2df
--- /dev/null
+++ b/app/src/views/components/form/RewardFormCom.vue
@@ -0,0 +1,172 @@
+<!--
+ * @Author: BINGWU
+ * @Date: 2024-05-14 23:46:48
+ * @LastEditors: BINGWU HuJiaCheng2003@163.com
+ * @LastEditTime: 2024-05-21 23:03:00
+ * @FilePath: \employee-information-management-system\app\src\views\components\form\RewardFormCom.vue
+ * @Describe: 
+ * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა
+-->
+<template>
+  <div class="reward-form">
+    <el-dialog
+      v-model="dialogVisible"
+      :title="props.title + '用户'"
+      width="500"
+      :before-close="handleClose"
+    >
+      <el-form
+        :model="formData"
+        :rules="rules"
+        label-width="auto"
+        style="max-width: 600px"
+        ref="formRef"
+      >
+        <el-form-item label="类型" prop="rewardType" required>
+          <el-radio-group
+            v-model="formData.userType"
+            @change="handleRadioChange"
+            :disabled="title === '查看'"
+          >
+            <el-radio label="award">奖</el-radio>
+            <el-radio label="punish">惩</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="绩效类型" prop="contentType" required>
+          <el-radio-group
+            v-model="formData.userType"
+            @change="handleRadioChange"
+            :disabled="title === '查看'"
+          >
+            <el-radio label="selfReward">个人绩效</el-radio>
+            <el-radio label="companyReward">公司绩效</el-radio>
+            <el-radio label="departmentReward">部门绩效</el-radio>
+            <el-radio label="otherReward">其他</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="职工名" prop="employeeName">
+          <el-input
+            type="text"
+            v-model="formData.employeeName"
+            :disabled="title === '查看'"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="text"
+            v-model="formData.remark"
+            :disabled="title === '查看'"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer" v-show="title !== '查看'">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleConfirm"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, nextTick } from 'vue'
+import { createReward, updateReward } from '@/api/reward'
+const formData = reactive({
+  employeeName: '',
+  rewardType: 'award',
+  contentType: 'selfReward',
+  remark: '',
+  emloyeeId: ''
+})
+const dialogVisible = ref(true)
+const props = defineProps({
+  title: {
+    type: String,
+    default: '添加'
+  }
+})
+const elTreeRef = ref(null)
+const formRef = ref(null)
+let newId = ''
+
+const rules = ref({
+  employeeName: [
+    { required: true, message: '请输入职工名', trigger: 'blur' },
+    { min: 5, max: 10, message: '长度为5~10个字符', trigger: 'blur' }
+  ]
+})
+const emits = defineEmits(['updateTableData'])
+const handleConfirm = () => {
+  formRef.value
+    .validate()
+    .then(async () => {
+      let message = ''
+      if (props.title === '添加') {
+        const params = {
+          ...formData.value
+        }
+        const {
+          data: { msg }
+        } = await createReward(params)
+        message = msg
+      } else if (props.title === '修改') {
+        const params = {
+          ...formData.value
+        }
+        const {
+          data: { msg }
+        } = await updateReward({
+          data: params,
+          _id: newId
+        })
+        message = msg
+      }
+      ElMessage({
+        message,
+        type: 'success'
+      })
+      emits('updateTableData')
+      offDialog()
+    })
+    .catch(() => {})
+}
+const setCheckedKeys = (keys = []) => {
+  nextTick(() => {
+    elTreeRef.value.setCheckedKeys(keys)
+  })
+}
+
+const openDialog = (keys, username, password, userType, _id) => {
+  dialogVisible.value = true
+  nextTick(() => {
+    formRef.value.clearValidate()
+  })
+  if (keys) {
+    setCheckedKeys(keys)
+  }
+  newId = _id
+  formData.userType = userType
+  formData.password = password
+  formData.username = username
+}
+const handleClose = () => {
+  setCheckedKeys()
+  offDialog()
+}
+const offDialog = () => (dialogVisible.value = false)
+defineExpose({
+  openDialog,
+  offDialog
+})
+</script>
+
+<style lang="scss" scoped>
+.reward-form {
+  .tree-content {
+    width: 100%;
+    border: 1px solid #e5e6e7;
+    border-radius: 2px;
+  }
+}
+</style>
diff --git a/serve/serve/commonViews/__pycache__/commonViews.cpython-311.pyc b/serve/serve/commonViews/__pycache__/commonViews.cpython-311.pyc
index f4cfbcc917f75e9b5c2bfecdbfe81da4e7052b67..aeccf5356340fdd4299882e259b48a50b3ecbd9b 100644
GIT binary patch
delta 245
zcmeCux~0jxoR^o20SG>C_DSR2$Scmz_-?X2quyi<9s$N9lj|6LC%5rPFg8t|&*MK?
zQb2z4TOJ9P6!sF~$x%#FlY0atwM9X?A)tmMiyOvH;abMTz_1#KA)uDCL~`;40a-@L
zNgPrv!3;nik6;!f@8mz6l9MM03QS%u*u&)kR13nzuO{0H$usg#zQ|=TxmU<^^I0Ji
rMtP7-kqC&801;w9;unWaZhlH>PO4pz|6~P`lZt|j>K_<z5MXTpb=x=d

delta 316
zcmcbm*`>w1oR^o20SLsc#L`qZ@{02_@=Ok7)0?cpBfxlhavh`Z<Tf4&#)*^X^Y~Ae
z6p&{s5u6;wB*n(aP{X)@bMi+X5tbD85>b%Y<U9dMPjQf05KzOB#RFrfa4lnEU|0>r
z5KzlmA`N3RFw}4^V+6_qF$4rNlt@p$ARx;qJ^7tL79-!}Kb(?cMchEiB4!X_2PAH>
z78GUXl}v6F?B((V@;!jK`0Hc|A$dlD$rrf{CePwincO2J$bFYbaDsBDSC3bR*XFrG
tCXDhR)kPv8LIOmH0f}E6Ho5sJr8%i~MFEpP2%l6GVpRXYfP(;Q0{|aJL-YUu

diff --git a/serve/serve/commonViews/commonViews.py b/serve/serve/commonViews/commonViews.py
index 0039518..1ac5bd9 100644
--- a/serve/serve/commonViews/commonViews.py
+++ b/serve/serve/commonViews/commonViews.py
@@ -79,7 +79,6 @@ def update(request, collection, useDate=False):
                 data['date'] = datetime.now()
             _id = data['_id']
             update_data = data['data']
-            print(_id)
             updateResult = collection.update_one({'_id': ObjectId(_id)}, {"$set": update_data})
             res = handleEmpty(updateResult.modified_count, '更新')
             return JsonResponse(res)