From 5388b34102a678f417a7ce9b42f7108ab78236a3 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 24 Jun 2024 17:42:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E6=8A=A5=E5=B7=A5=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BC=96=E8=BE=91=E9=A1=B5=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/biz/taskdispatch/Dispatchdialog.vue |  12 +--
 .../src/views/biz/taskdispatch/detail.vue     | 100 +++++++++++++-----
 2 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/Dispatchdialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/Dispatchdialog.vue
index 1f45c885..3f805c5b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/Dispatchdialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/Dispatchdialog.vue
@@ -47,12 +47,12 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column label="工序编号" prop="procedureCode" width="120" />
+                <!-- <el-table-column label="工序编号" prop="procedureCode" width="120" />
                 <el-table-column label="是否需要报工" prop="isReport" width="120">
                   <template #default="scope">
                     {{ getDictLabel(DICT_TYPE.BIZ_COMMON_IS_OR_NOT, scope.row.isReport) }}
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="顺序号" align="center" prop="sort" width="140">
                   <template #default="{ row, $index }">
                     <el-form-item
@@ -384,12 +384,12 @@ const handleuserClick = (val, index) => {
 const handleSelectedProcedure = async (row: any, newValue: any) => {
   if (newValue) {
     row.procedureId = newValue.id
-    row.procedureCode = newValue.code
-    row.isReport = newValue.isReport
+    // row.procedureCode = newValue.code
+    // row.isReport = newValue.isReport
   } else {
     row.procedureId = undefined
-    row.procedureCode = undefined
-    row.isReport = undefined
+    // row.procedureCode = undefined
+    // row.isReport = undefined
   }
 }
 const handleSelectedUser = (currentIndex, newValue: any) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/detail.vue
index c7693afa..c455a968 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskdispatch/detail.vue
@@ -219,7 +219,7 @@
                         :rules="subFormRules.procedureId"
                         class="mb-0px!"
                       >
-                        <ProcedureSelect
+                        <!-- <ProcedureSelect
                           :disabled="detailDisabled || row.procedureStatus != 0"
                           v-model="row.procedureId"
                           :anotherProp="formData.workshopId"
@@ -228,16 +228,37 @@
                               handleSelectedProcedure(row, val)
                             }
                           "
-                        />
+                        /> -->
+                        <el-select
+                        :disabled="detailDisabled || row.procedureStatus != 0"
+                          v-model="row.procedureId"
+                          placeholder="请输入工序"
+                          :remote-method="remoteMethod"
+                          remote-show-suffix
+                          remote
+                          clearable
+                          reserve-keyword
+                          filterable
+                          :loading="Loading"
+                          @change="onSelectChange"
+                          @visible-change="onVisibleChange"
+                        >
+                          <el-option
+                            v-for="item in procedureList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                          />
+                        </el-select>
                       </el-form-item>
                     </template>
                   </el-table-column>
-                  <el-table-column label="工序编号" prop="procedureCode" width="140" />
+                  <!-- <el-table-column label="工序编号" prop="procedureCode" width="140" />
                   <el-table-column label="是否需要报工" prop="isReport" width="140">
                     <template #default="scope">
                       {{ getDictLabel(DICT_TYPE.BIZ_COMMON_IS_OR_NOT, scope.row.isReport) }}
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
                   <el-table-column label="顺序号" align="center" prop="sort" width="160">
                     <template #default="{ row, $index }">
                       <el-form-item
@@ -503,12 +524,12 @@ import EquipmentSelect from '@/views/biz/hlvuestyle/equipmentSelect.vue'
 import ProductProcessPrint from './ProductProcessPrint.vue'
 import * as MaterialApi from '@/api/biz/material'
 import { Search } from '@element-plus/icons-vue'
-
+import * as ProcedureApi from '@/api/biz/procedure'
 import UserDialog from './userselect.vue'
 import ProductFrom from './productFrom.vue'
 
 defineOptions({ name: 'TaskDispatchDetail' })
-const goEasy:any = inject('goEasy');
+const goEasy: any = inject('goEasy')
 
 const reload = inject('reload')
 const { t } = useI18n() // 国际化
@@ -685,23 +706,22 @@ const submitForm = async (operate) => {
     let jumpActive = 'update'
     if (operate == 'SUBMIT') {
       jumpActive = 'detail'
-    
     }
-      // goEasy.publish({
-      //   channel: 'mayJoysChannel',
-      //   message: 'Hello, GoEasy!'
-      // })
-      //  goEasy.pubsub.publish({
-      //   channel: "mayJoysChannel",
-      //   message: 'Hello, GoEasy!',
-      //   // onSuccess: function () {
-      //   //   content.value = "";
-      //   //   console.log("send message success");
-      //   // },
-      //   // onFailed: function (error) {
-      //   //   unshiftMessage("消息发送失败，错误编码：" + error.code + " 错误信息：" + error.content);
-      //   // }
-      // });
+    // goEasy.publish({
+    //   channel: 'mayJoysChannel',
+    //   message: 'Hello, GoEasy!'
+    // })
+    //  goEasy.pubsub.publish({
+    //   channel: "mayJoysChannel",
+    //   message: 'Hello, GoEasy!',
+    //   // onSuccess: function () {
+    //   //   content.value = "";
+    //   //   console.log("send message success");
+    //   // },
+    //   // onFailed: function (error) {
+    //   //   unshiftMessage("消息发送失败，错误编码：" + error.code + " 错误信息：" + error.content);
+    //   // }
+    // });
     commonStore.setStore('active', jumpActive)
     commonStore.setStore('id', dataId)
     reload()
@@ -780,12 +800,12 @@ const handleproductClick = (vals) => {
 const handleSelectedProcedure = async (row: any, newValue: any) => {
   if (newValue) {
     row.procedureId = newValue.id
-    row.procedureCode = newValue.code
-    row.isReport = newValue.isReport
+    // row.procedureCode = newValue.code
+    // row.isReport = newValue.isReport
   } else {
     row.procedureId = undefined
-    row.procedureCode = undefined
-    row.isReport = undefined
+    // row.procedureCode = undefined
+    // row.isReport = undefined
   }
 }
 
@@ -800,14 +820,38 @@ const ProductProcessPrintRef = ref() // 打印弹框
 const printHandle = (id) => {
   ProductProcessPrintRef.value.open(id)
 }
-
-onMounted(() => {
+//工序
+const queryParams = {
+  pageNo: 1,
+  pageSize: 99,
+  code: undefined,
+  name: undefined,
+  description: undefined,
+  status: 1,
+  creator: undefined,
+  createTime: [],
+  updater: undefined,
+  updateTime: [],
+  deleted: undefined,
+  tenantId: undefined,
+  isReport: undefined,
+  wid: undefined,
+  workShopName: undefined
+}
+const procedureList = ref()
+onMounted(async () => {
   dialogTitle.value = t('action.' + active.value)
   if ('detail' == active.value) {
     detailDisabled.value = true
   }
+  const data = await ProcedureApi.getProcedurePage(queryParams)
+  procedureList.value = data.list
 
   queryData(currentId.value)
 })
+
+const onSelectChange = (newValue: any) => {
+  procedureList.value.find((eqyip) => eqyip.id === newValue) // 更新选中的完整用户对象
+}
 </script>
 <style scoped lang="less"></style>

From 9ad526021361306085cee67dbe2b4c43d33f044e Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 24 Jun 2024 17:53:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=20=E5=8F=8A=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes-ui/mes-ui-admin-vue3/src/utils/dict.ts    |   1 +
 .../src/views/biz/salarysetting/detail.vue    | 320 ++++++++++++++++++
 .../src/views/biz/salarysetting/index.vue     | 120 +++----
 .../views/biz/salarysetting/userDialog.vue    | 184 ++++++++++
 4 files changed, 559 insertions(+), 66 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/detail.vue
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/userDialog.vue

diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
index 63b443fc..a0e1f25f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts
@@ -208,6 +208,7 @@ export enum DICT_TYPE {
 
   // ========== BIZ 业务模块 ==========
   BIZ_COMMON_STATUS = 'biz_common_status',// 业务实体启用禁用状态
+  BIZ_PROCEDURE_RANGE = 'biz_procedure_range',// 适用工序范围
   BIZ_CUSTOMER_LEVEL = 'biz_customer_level', //合立客户级别
   BIZ_SYSTEM_COMMON_STATUS = 'biz_system_common_status', // 系统适配业务状态展示
   BIZ_COMPOSITION_ORIGINAL = 'biz_composition_original', // 材质主要来源
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/detail.vue
new file mode 100644
index 00000000..61830a8d
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/detail.vue
@@ -0,0 +1,320 @@
+<template>
+  <el-card class="hl-card">
+    <template #header>
+      <span><span v-html="dialogTitle"></span>页</span>
+    </template>
+    <el-form
+      ref="formRef"
+      :rules="formRules"
+      label-width="120px"
+      :model="formData"
+      v-loading="formLoading"
+    >
+      <!-- 基础信息  横向布局 -->
+      <el-card class="hl-card-info">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
+        </template>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="员工工号" prop="userId">
+              <el-input
+                class="!w-265px"
+                placeholder="项目负责人"
+                v-model="formData.userCode"
+                readonly
+                :disabled="detailDisabled || updateDisabled"
+                @click.prevent="handleClick()"
+              >
+                <template #append><el-button :icon="Search" @click="openuserDialog()" /></template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="员工姓名">
+              <el-input
+                class="!w-260px"
+                v-model="formData.userName"
+                :disabled="detailDisabled || updateDisabled"
+                placeholder="请输入工价"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="所属部门">
+              <el-input
+                class="!w-260px"
+                v-model="formData.deptName"
+                :disabled="detailDisabled || updateDisabled"
+                placeholder="请输入所属部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="适用工序范围">
+              <el-select
+                v-model="formData.procedure"
+                placeholder="请选择工资类型"
+                class="!w-250px"
+                :disabled="detailDisabled || updateDisabled"
+              >
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_PROCEDURE_RANGE)"
+                  :key="dict.value"
+                  @change="onchangetype(val)"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="工资类型" prop="salaryType">
+              <el-select
+                v-model="formData.salaryType"
+                placeholder="请选择工资类型"
+                class="!w-250px"
+                :disabled="detailDisabled || updateDisabled"
+              >
+                <el-option
+                  v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_SALARY_TYPE)"
+                  :key="dict.value"
+                  @change="onchangetype(val)"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工价" prop="standardLabourPrice">
+              <el-input
+                class="!w-260px"
+                v-model="formData.standardLabourPrice"
+                placeholder="请输入工价"
+                :disabled="detailDisabled || updateDisabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="启用状态" prop="status">
+              <el-switch
+                :disabled="detailDisabled || updateDisabled"
+                v-model="mockDataSwitch"
+                @change="mockDataSwitchChange"
+                size="large"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card class="hl-card-info" v-if="active != 'create'">
+        <template #header>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">系统信息</span>
+        </template>
+        <el-row>
+          <el-col :span="4" />
+          <el-col :span="8">
+            <el-form-item label="创建人" prop="creatorName">
+              <el-input class="!w-260px" v-model="formData.creatorName" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间" prop="createTime">
+              <el-date-picker
+                class="!w-260px"
+                v-model="formData.createTime"
+                type="datetime"
+                value-format="x"
+                placeholder=""
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" />
+
+          <el-col :span="8">
+            <el-form-item label="修改人" prop="updaterName">
+              <el-input class="!w-260px" v-model="formData.updaterName" placeholder="" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="修改时间" prop="updateTime">
+              <el-date-picker
+                class="!w-260px"
+                v-model="formData.updateTime"
+                type="datetime"
+                value-format="x"
+                placeholder=""
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+      <div class="text-center hl-footer">
+        <el-button @click="goback" size="large">取 消</el-button>
+        <el-button
+          v-if="active != 'detail'"
+          @click="submitForm()"
+          type="primary"
+          :disabled="formLoading"
+          size="large"
+          >保 存</el-button
+        >
+      </div>
+    </el-form>
+  </el-card>
+  <UserDialog ref="userDialogref" :dialog-type="dialogType" @success="handleuserClick" />
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as SalarySettingApi from '@/api/biz/salarysetting'
+import { useUserStore } from '@/store/modules/user'
+import * as EquipMaintenanceRecordApi from '@/api/biz/equipmaintenancerecord'
+import { useCommonStore } from '@/store/modules/common'
+import UserDialog from './userDialog.vue'
+import { Search, Plus } from '@element-plus/icons-vue'
+import { log } from 'console'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+// const { query } = useRoute()
+// const active = toRef(query, 'active')
+// const activeId = toRef(query, 'id')
+const router = useRouter()
+const reload: any = inject('reload')
+const commonStore = useCommonStore()
+
+const active = toRef(commonStore.getStore('active'))
+const activeId = toRef(commonStore.getStore('id'))
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userId: undefined,
+  userCode: undefined,
+  userName: undefined,
+  deptName: undefined,
+  salaryType: undefined,
+  procedure: 'all',
+  status: 1
+})
+const formRules = reactive({
+  salaryType: [{ required: true, message: '工资类型不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '员工工号不能为空', trigger: 'change' }],
+  status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+onMounted(() => {
+  // console.log('active', active.value, activeId.value)
+
+  initData()
+  // 绑定默认业务员
+  // if (!formData.value.owner) {
+  //   formData.value.owner = useUserStore().getUser.id // 当前登录的编码
+  // }
+})
+const detailDisabled = ref(false)
+const updateDisabled = ref(false)
+const initData = async () => {
+  resetForm()
+  if ('detail' == active.value) {
+    detailDisabled.value = true
+  }
+  if ('update' == active.value) {
+    updateDisabled.value = true
+  }
+  await queryData(active.value, activeId.value)
+}
+const queryData = async (type: string, id?: number) => {
+  dialogTitle.value = t('action.' + type)
+  if (type == 'create') {
+    formData.value.submitTime = new Date().getTime()
+  }
+
+  if (type == 'update' || type == 'detail') {
+    const res = await SalarySettingApi.getSalarySetting(id)
+    formData.value = res
+  }
+}
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as SalarySettingApi.SalarySettingVO
+    if (active.value === 'create') {
+      const dataid = await SalarySettingApi.createSalarySetting(data)
+      message.success(t('common.createSuccess'))
+      commonStore.setStore('active', 'update')
+      commonStore.setStore('id', dataid)
+      reload()
+    } else {
+      await SalarySettingApi.updateSalarySetting(data)
+      message.success(t('保存成功'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+    // goback()
+  } finally {
+    formLoading.value = false
+  }
+}
+const goback = () => {
+  router.back()
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+   id: undefined,
+  userId: undefined,
+  userCode: undefined,
+  userName: undefined,
+  deptName: undefined,
+  salaryType: undefined,
+  procedure: 'all',
+  status: 1
+  }
+}
+
+const userDialogref = ref()
+const handleClick = () => {
+  openuserDialog()
+}
+const openuserDialog = () => {
+  // 使用传递过来的 dialogType，不需要重新赋值
+  userDialogref.value.open()
+}
+
+const handleuserClick = (val) => {
+  console.log(val)
+  formData.value.userId = val?.id
+  formData.value.userCode = val?.username
+  formData.value.userName = val?.nickname
+  formData.value.deptName = val?.deptName
+}
+const mockDataSwitch = ref(true)
+const mockDataSwitchChange = () => {
+  console.log(mockDataSwitch.value)
+  if (mockDataSwitch.value) {
+    formData.value.status = 1
+  } else {
+    formData.value.status = 2
+  }
+}
+</script>
+<style scoped lang="scss"></style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/index.vue
index dc816aee..a8b730bb 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/index.vue
@@ -1,78 +1,38 @@
 <template>
-  <ContentWrap>
+<el-card class="hl-card">
+  <template #header>
+    <span>员工工资设置</span>
+  </template>
+    <ContentWrap class="borderxx">
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="108px"
     >
-      <el-form-item label="自增字段，唯一" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入自增字段，唯一"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="员工id" prop="userId">
+
+      <el-form-item label="员工工号" prop="userId">
         <el-input
           v-model="queryParams.userId"
-          placeholder="请输入员工id"
+          placeholder="请输入员工工号"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="工资类型字典" prop="salaryType">
-        <el-select
-          v-model="queryParams.salaryType"
-          placeholder="请选择工资类型字典"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_SALARY_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="工序范围" prop="procedure">
+       <el-form-item label="员工姓名" prop="userId">
         <el-input
-          v-model="queryParams.procedure"
-          placeholder="请输入工序范围"
+          v-model="queryParams.userId"
+          placeholder="请输入员工姓名"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态,1表示正常，2表示禁用" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态,1表示正常，2表示禁用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
         <el-button
           type="primary"
@@ -82,7 +42,7 @@
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
-        <el-button
+        <!-- <el-button
           type="success"
           plain
           @click="handleExport"
@@ -90,16 +50,29 @@
           v-hasPermi="['biz:salary-setting:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
+        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="自增字段，唯一" align="center" prop="id" />
-      <el-table-column label="员工id" align="center" prop="userId" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+      <!-- <el-table-column label="自增字段，唯一" align="center" prop="id" /> -->
+
+       <el-table-column type="index" width="100" label="序号" align="center" />
+       <el-table-column label="员工工号" align="center" prop="name" />
+      <el-table-column label="员工姓名" align="center" prop="" />
+      <el-table-column label="工资类型" align="center" prop="salaryType" />
+      <el-table-column label="工价" align="center" prop="" />
+      <el-table-column label="适用工序范围" align="center" prop="procedure" />
+      
+      <el-table-column label="启用状态" align="center" prop="status" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BIZ_COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="员工id" align="center" prop="userId" />
       <el-table-column label="工资类型字典" align="center" prop="salaryType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.BIZ_SALARY_TYPE" :value="scope.row.salaryType" />
@@ -113,7 +86,7 @@
         prop="createTime"
         :formatter="dateFormatter"
         width="180px"
-      />
+      /> -->
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
@@ -144,8 +117,9 @@
     />
   </ContentWrap>
 
+</el-card>
   <!-- 表单弹窗：添加/修改 -->
-  <SalarySettingForm ref="formRef" @success="getList" />
+   <!-- <SalarySettingForm ref="formRef" @success="getList" /> -->
 </template>
 
 <script setup lang="ts">
@@ -153,13 +127,15 @@ import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as SalarySettingApi from '@/api/biz/salarysetting'
-import SalarySettingForm from './SalarySettingForm.vue'
+// import SalarySettingForm from './SalarySettingForm.vue'
+import { useCommonStateWithOut } from '@/store/modules/common'
 
 defineOptions({ name: 'SalarySetting' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const commonStore = useCommonStateWithOut()
+const router = useRouter()
 const loading = ref(true) // 列表的加载中
 const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -200,12 +176,24 @@ const resetQuery = () => {
   handleQuery()
 }
 
+// /** 添加/修改操作 */
+// const formRef = ref()
+// const openForm = (type: string, id?: number) => {
+//   formRef.value.open(type, id)
+// }
+
 /** 添加/修改操作 */
-const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+  commonStore.setStore('active', type)
+  commonStore.setStore('id', id)
+  router.push({
+    name: 'EmployeeSalaryDetail',
+    query: {
+      active: type,
+      id: id
+    }
+  })
 }
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -238,4 +226,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/userDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/userDialog.vue
new file mode 100644
index 00000000..ae5a96a5
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/userDialog.vue
@@ -0,0 +1,184 @@
+<template>
+  <Dialog title="职工信息" width="80%" v-model="dialogVisible" center>
+    <ContentWrap class="borderxx">
+      <!-- 搜索工作栏 -->
+      <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
+        <el-form-item label="姓名/工号" label-width="130px" prop="nickname">
+          <el-input v-model="queryParams.userNickName" placeholder="请输入姓名/工号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        </el-form-item>
+        <el-form-item label="所属部门" prop="deptId">
+          <el-tree-select v-model="queryParams.deptId" :data="deptList" :props="defaultProps" check-strictly node-key="id" clearable placeholder="请选择所属部门" />
+        </el-form-item>
+        <!-- <el-form-item label="岗位" prop="postId">
+          <el-select v-model="queryParams.postId" clearable placeholder="请选择岗位">
+            <el-option v-for="dict in postList" :key="dict.id" :label="dict.name" :value="dict.id" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary">
+            <Icon icon="ep:search" class="mr-5px" /> 搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <el-card class="hl-card">
+      <!-- 列表 -->
+      <ContentWrap>
+        <el-table ref="multipleTable" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" @row-click="clickRow" selection :style="{height: list && list.length > 9 ? '475px' : ''}">
+          <el-table-column type="selection" width="55" :reserve-selection="true" />
+          <el-table-column type="index" width="70" label="序号" align="center" />
+
+          <el-table-column label="员工工号" align="center" prop="username" :show-overflow-tooltip="true" min-width="120" />
+          <el-table-column label="员工姓名" align="center" prop="nickname" :show-overflow-tooltip="true" min-width="120" />
+          <el-table-column label="部门" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" min-width="120" />
+          <!-- <el-table-column label="岗位" align="center" prop="postId" min-width="120" /> -->
+          <!-- <el-table-column label="手机号码" align="center" prop="mobile" min-width="120" /> -->
+          <!-- <el-table-column label="性别" align="center" prop="sex" min-width="120">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
+            </template>
+          </el-table-column> -->
+        </el-table>
+        <!-- 分页 -->
+        <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </ContentWrap>
+    </el-card>
+    <template #footer>
+      <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+      <el-button @click="submitForm" type="success" size="large">保 存</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+import * as PostApi from '@/api/system/post'
+import * as DeptApi from '@/api/system/dept'
+import * as UserApi from '@/api/system/user'
+import { FormRules } from 'element-plus'
+import { ElTable } from 'element-plus'
+import { any, string } from 'vue-types'
+import { toRefs } from 'vue'
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const router = useRouter()
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+
+const deptList = ref<Tree[]>([]) // 树形结构
+const postList = ref([] as PostApi.PostVO[]) // 岗位列表
+
+//接收父组件传递过来的值
+const props = defineProps({
+  dialogType: {
+    type: Object,
+    required: true
+  }
+})
+const dialogTypeValue = toRefs(props).dialogType // 获取 props 中的 dialogType
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userNickName: undefined,
+  nickname: undefined,
+  deptId: undefined,
+  postId: undefined,
+  status: 0
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await UserApi.getUserPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const multipleTable: any = ref<InstanceType<typeof ElTable>>()
+const multipleSelection: any = ref([])
+
+const handleSelectionChange = (val: []) => {
+  if (val.length > 1) {
+    multipleTable.value.clearSelection()
+    multipleTable.value.toggleRowSelection(val.pop())
+  } else {
+    multipleSelection.value = val.pop()
+  }
+}
+//指定key值,数据更新之后保留之前选中的数据
+const getRowKeys = (row) => {
+  return row.matId
+}
+const clickRow = (row: any) => {
+  if (row) {
+    multipleTable.value!.toggleRowSelection(row, undefined)
+  } else {
+    multipleTable.value!.clearSelection()
+  }
+}
+
+/** 提交表单 */
+
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = () => {
+  // if (!multipleSelection.value || multipleSelection.value.length <= 0) {
+  //   message.warning(t('common.selectText'))
+  //   return
+  // }
+  dialogVisible.value = false
+  // 发送操作成功的事件
+  // console.log(dialogTypeValue.value)
+  // console.log(multipleSelection.value);
+
+  emit('success', multipleSelection.value, dialogTypeValue.value)
+  //重置父组件传递过来的值
+}
+
+const userInit = ref()
+
+/** 打开弹窗 */
+const open = async () => {
+  // console.log(dialogTypeValue.value)
+  dialogVisible.value = true
+  queryParams.userNickName = undefined
+  queryParams.deptId = undefined
+  queryParams.postId = undefined
+  // 加载部门树
+  deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  // 加载岗位列表
+  postList.value = await PostApi.getSimplePostList()
+
+  //用户列表数据
+  userInit.value = await UserApi.getSimpleUserList()
+  handleQuery()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
+