Kaynağa Gözat

运营管理

liuhairui 1 yıl önce
ebeveyn
işleme
de57e75aec

+ 18 - 18
src/view/layout/bottomInfo/bottomInfo.vue

@@ -1,24 +1,24 @@
 <!-- 此文件禁止修改!如果您没有购买授权,请联系wx:shouzi_1994购买授权,未授权状态只需保留此代码 不影响任何正常使用 -->
 
-<template>
-  <div class="flex gap-4 items-center text-sm text-gray-500 justify-center mb-4">
-    <span>Powered by</span>
-    <span>
-      <a
-        class="text-gray-800 font-bold"
-        href="#"
-      >mes -admin ui</a>
-    </span>
+<!--<template>-->
+<!--  <div class="flex gap-4 items-center text-sm text-gray-500 justify-center mb-4">-->
+<!--    <span>Powered by</span>-->
+<!--    <span>-->
+<!--      <a-->
+<!--        class="text-gray-800 font-bold"-->
+<!--        href="#"-->
+<!--      >mes -admin ui</a>-->
+<!--    </span>-->
 
-    <span>Copyright</span>
-    <span>
-      <a
-        class="text-gray-800 font-bold"
-        href="#"
-      >Abc 团队</a>
-    </span>
-  </div>
-</template>
+<!--    <span>Copyright</span>-->
+<!--    <span>-->
+<!--      <a-->
+<!--        class="text-gray-800 font-bold"-->
+<!--        href="#"-->
+<!--      >Abc 团队</a>-->
+<!--    </span>-->
+<!--  </div>-->
+<!--</template>-->
 
 <script  setup>
 // 此文件内容为版权信息,如需改动,请联系wx:shouzi_1994购买授权 未授权状态只需保留此代码 不影响任何正常使用

+ 4 - 1
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -518,7 +518,9 @@
 
         </div>
       </layout-header>
-      <layout>
+
+
+        <layout>
         <!--    左侧树侧形结构-->
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
@@ -1002,6 +1004,7 @@
             </template>
           </el-dialog>
         </layout-content>
+
       </layout>
     </layout>
   </div>

+ 103 - 70
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -1,41 +1,45 @@
 <template>
   <div>
     <layout>
-      <layout-sider :resize-directions="['right']" :width="300">
 
-        <div class="JKWTree-tree" style="height: 740px">
-          <h3>组织架构</h3>
-          <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
-<!--            <template #default="{node,data}">{{data['名称']}}<{{data['num']}}人></template>-->
-            <template #default="{ node, data }">
-              {{ data['名称'] }}
-              <{{ data['num'] ? data['num'] + '人' : data['total'] + '人' }}>
-            </template>
-          </el-tree>
+      <layout-header>
+        <div class="">
+          <!--          按钮部分-->
+          <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+            <el-form-item>
+              <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
+              <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
+              <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出到Excel</el-button>
+              <el-dialog v-model="dialogexportToExcel" disabled title="员工基本资料导出" width="50%">
+              </el-dialog>
+            </el-form-item>
+          </el-form>
         </div>
+      </layout-header>
 
-      </layout-sider>
 
-      <!-- 右侧区域 -->
-      <layout-content >
+      <layout>
 
-        <el-main>
-<!--          按钮 搜索 部分-->
-          <div class="gva-search-box">
-            <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-              <el-form-item>
-                <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
-                <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
-                <el-button disabled type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出到Excel</el-button>
-                <el-dialog v-model="dialogexportToExcel" disabled title="员工基本资料导出" width="50%">
-                </el-dialog>
-              </el-form-item>
-            </el-form>
+        <!--    左侧树侧形结构-->
+        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
+          <div class="JKWTree-tree" style="height: 200px">
+            <h3>组织架构</h3>
+            <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+            <!--<template #default="{node,data}">{{data['名称']}}<{{data['num']}}人></template>-->
+              <template #default="{ node, data }">
+                {{ data['名称'] }}
+                <{{ data['num'] ? data['num'] + '人' : data['total'] + '人' }}>
+              </template>
+            </el-tree>
           </div>
+        </layout-sider>
 
+        <!-- 右侧区域 -->
+        <layout-content >
+        <el-main>
           <div class="gva-table-box">
             <!-- 表格数据 -->
-            <el-table ref="multipleTable" style="width: 100%;height: 62vh" tooltip-effect="dark"
+            <el-table ref="multipleTable" style="width: 100%;height: 65vh" tooltip-effect="dark"
                       :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="tableData"  border row-key="ID"
@@ -43,26 +47,26 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column sortable align="left" label="员工编号" prop="员工编号"  width="100" />
-              <el-table-column sortable align="left" label="员工姓名" prop="员工姓名"  width="100"/>
-              <el-table-column sortable align="left" label="性别" prop="性别" />
-              <el-table-column sortable align="left" label="聘用日期" prop="聘用日期" width="160" />
-              <el-table-column sortable align="left" label="转正日期" prop="转正日期" width="160" />
-              <el-table-column sortable align="left" label="所在部门" prop="所在部门" width="140"  />
-              <el-table-column sortable align="left" label="职称职务" prop="职称职务" width="300" />
-              <el-table-column sortable align="left" label="身份证号" prop="身份证号" width="170" />
-              <el-table-column sortable align="left" label="出生日期" prop="出生日期" width="160" />
-              <el-table-column sortable align="left" label="人员性质" prop="人员性质" width="120" />
-              <el-table-column sortable align="left" label="人员类别" prop="人员类别" width="100" />
-              <el-table-column sortable align="left" label="班次类型" prop="班次类型" width="120" />
-              <el-table-column sortable align="left" label="工资表类别" prop="工资表类别" width="160" />
-              <el-table-column sortable align="left" label="薪酬核算分组" prop="薪酬核算分组" width="130" />
-              <el-table-column sortable align="left" label="MES在职" prop="在职状态" width="100" />
-              <el-table-column sortable align="left" label="U8在职" prop="U8在职" width="100" />
-              <el-table-column sortable align="left" label="U8离职日期" prop="U8离职日期" width="160" />
-              <el-table-column sortable align="left" label="创建用户" prop="sys_id" width="160" />
-              <el-table-column sortable align="left" label="创建时间" prop="sys_rq" width="160" />
-              <el-table-column sortable align="left" label="修改时间" prop="mod_rq" width="160" />
+              <el-table-column  align="center" label="员工编号" prop="员工编号"  width="80" />
+              <el-table-column  align="left" label="员工姓名" prop="员工姓名"  width="80"/>
+              <el-table-column  align="center" label="性别" prop="性别" width="45"/>
+              <el-table-column  align="left" label="聘用日期" prop="聘用日期" width="110" />
+              <el-table-column  align="left" label="转正日期" prop="转正日期" width="110" />
+              <el-table-column  align="left" label="所在部门" prop="所在部门" width="110"  />
+              <el-table-column  align="left" label="职称职务" prop="职称职务" width="100" />
+              <el-table-column  align="left" label="身份证号" prop="身份证号" width="160" />
+              <el-table-column  align="left" label="出生日期" prop="出生日期" width="110" />
+              <el-table-column  align="left" label="人员性质" prop="人员性质" width="110" />
+              <el-table-column  align="left" label="人员类别" prop="人员类别" width="90" />
+              <el-table-column  align="left" label="班次类型" prop="班次类型" width="120" />
+              <el-table-column  align="left" label="工资表类别" prop="工资表类别" width="160" />
+              <el-table-column  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
+              <el-table-column  align="left" label="MES在职" prop="在职状态" width="80" />
+              <el-table-column  align="left" label="U8在职" prop="U8在职" width="80" />
+              <el-table-column  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <el-table-column  align="left" label="创建用户" prop="sys_id" width="110" />
+              <el-table-column  align="left" label="创建时间" prop="sys_rq" width="110" />
+              <el-table-column  align="left" label="修改时间" prop="mod_rq" width="110" />
             </el-table>
 
             <!-- 分页 -->
@@ -75,36 +79,36 @@
           </div>
 
           <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 600px;" :title="'修改员工基本资料'" destroy-on-close>
-            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 52%;" :title="'修改员工基本资料'" destroy-on-close>
+            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
               <div>
                 <div style="float: left; width: 34%;">
                   <!-- 左侧部分 -->
-                  <el-form-item label="员工编号:" prop="employeeId">
+                  <el-form-item label="员工编号:" prop="employeeId" class="mab">
                     <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="性别:" prop="gender">
+                  <el-form-item label="性别:" prop="gender" class="mab">
                     <el-input v-model="formDataTest['性别']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="身份证号:" prop="gender">
+                  <el-form-item label="身份证号:" prop="gender" class="mab">
                     <el-input v-model="formDataTest['身份证号']"  placeholder="" style="width: 200px;" />
                   </el-form-item>
-                  <el-form-item label="部门名称:" prop="gender">
+                  <el-form-item label="部门名称:" prop="gender"  class="mab">
                     <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="入职日期:" prop="joinDate">
+                  <el-form-item label="入职日期:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="人员类别:" prop="joinDate">
+                  <el-form-item label="人员类别:" prop="joinDate"  v>
                     <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;">
                       <el-option label="生产" value="生产"></el-option>
                       <el-option label="行政" value="行政"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="班次类型:" prop="joinDate">
+                  <el-form-item label="班次类型:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="工资表类别:" prop="joinDate">
+                  <el-form-item label="工资表类别:" prop="joinDate" class="mab">
                     <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;">
                       <el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
                       <el-option label="另发工资" value="另发工资"></el-option>
@@ -112,31 +116,31 @@
                       <el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="U8在职:" prop="joinDate">
+                  <el-form-item label="U8在职:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;" />
                   </el-form-item>
                 </div>
                 <div style="float: left; width: 33%;margin-left: 50px">
                   <!-- 中间部分 -->
-                  <el-form-item label="员工姓名:" prop="name">
+                  <el-form-item label="员工姓名:" prop="name" class="mab">
                     <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="出生日期:" prop="birthDate">
+                  <el-form-item label="出生日期:" prop="birthDate" class="mab">
                     <el-input v-model="formDataTest['出生日期']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="职务:" prop="position">
+                  <el-form-item label="职务:" prop="position" class="mab">
                     <el-input v-model="formDataTest['职称职务']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="部门编号:" prop="position">
+                  <el-form-item label="部门编号:" prop="position" class="mab">
                     <el-input v-model="formDataTest['部门编码']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="转正日期:" prop="departmentId">
+                  <el-form-item label="转正日期:" prop="departmentId" class="mab">
                     <el-input v-model="formDataTest['转正日期']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="扣减司龄:" prop="departmentId">
+                  <el-form-item label="扣减司龄:" prop="departmentId" class="mab">
                     <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="人员性质:" prop="departmentId">
+                  <el-form-item label="人员性质:" prop="departmentId" class="mab">
                     <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;">
                       <el-option label="退休返聘" value="退休返聘"></el-option>
                       <el-option label="劳动合同工" value="劳动合同工"></el-option>
@@ -145,10 +149,10 @@
                       <el-option label="实习生" value="实习生"></el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="工资核算分组:" prop="joinDate">
+                  <el-form-item label="工资核算分组:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;" />
                   </el-form-item>
-                  <el-form-item label="在职状态:" prop="joinDate">
+                  <el-form-item label="在职状态:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;" />
                   </el-form-item>
                 </div>
@@ -178,6 +182,9 @@
 
       </layout-content>
 
+      </layout>
+
+
     </layout>
   </div>
 </template>
@@ -384,9 +391,9 @@ const _ygjbzledit = async ()=>{
 </script>
 
 <style scoped>
-:deep(.el-table td .cell) {
-  line-height: 30px !important;
-}
+/*:deep(.el-table td .cell) {*/
+/*  line-height: 30px !important;*/
+/*}*/
 .JKWTree-container {
   display: flex;
 }
@@ -435,4 +442,30 @@ const _ygjbzledit = async ()=>{
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;
 }
-</style>
+</style>
+<style scoped>
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+:deep(.el-tabs__header){
+  margin-bottom: 0;
+}
+.search{
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+.el-tabs__header{
+  margin: 0px !important;
+}
+.gva-table-box{
+  padding: 0px !important;
+}
+.mab{
+  margin-bottom: 5px;
+}
+</style>