bug修改

src/views/finance/cash/refundInfo.vue

@@ -53,7 +53,7 @@
         <el-table-column label="客户名称" align="center" prop="customerName" min-width="200" />
         <el-table-column label="合同名称" align="center" prop="contractName" min-width="100" />
         <el-table-column label="回款日期" align="center" prop="refundDate" min-width="100" />
-        <el-table-column label="回款金额" align="center" prop="refundMoney" min-width="100" />
+        <el-table-column label="回款金额(元)" align="center" prop="refundMoney" min-width="100" />
         <el-table-column label="创建人" align="center" prop="creatorName" min-width="80" />
         <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
           <template v-slot="scope">

src/views/oa/entry/DataList.vue

@@ -59,11 +59,7 @@
       <el-table-column label="入职人" align="center" prop="entryName" min-width="120" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="150" />
       <el-table-column label="职位" align="center" prop="position" min-width="150" />
-      <el-table-column label="员工类型" align="center" prop="employeeType" min-width="100">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.employeeType"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="员工类型" align="center" prop="employeeTypeDesc" min-width="100"/>
       <el-table-column label="性别" align="center" prop="gender" min-width="100">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender"/>
@@ -81,6 +77,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="100" />
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"

src/views/oa/entry/detail.vue

@@ -32,8 +32,8 @@
           <div class="field-name">员工类型</div>
         </div>
         <div class="field-component">
-          <span :title="form.employeeTypeName">
-            <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="form.employeeType"/>
+          <span :title="form.employeeTypeDesc">
+            {{ form.employeeTypeDesc }}
           </span>
         </div>
       </div>

src/views/oa/leave/DataList.vue

@@ -63,7 +63,7 @@
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
-      <el-table-column label="请假类型" align="center" prop="leaveType" min-width="100" />
+      <el-table-column label="请假类型" align="center" prop="leaveTypeDesc" min-width="100" />
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="120" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="120" />
       <el-table-column label="请假天数" align="center" prop="day" min-width="100" />

src/views/oa/leave/detail.vue

@@ -42,7 +42,7 @@
           <div class="field-name">请假类型</div>
         </div>
         <div class="field-component">
-          <span :title="form.leaveType">{{ form.leaveType }}</span>
+          <span :title="form.leaveTypeDesc">{{ form.leaveTypeDesc }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">

src/views/oa/turnover/detail.vue

@@ -60,7 +60,7 @@
           <div class="field-name">离职原因</div>
         </div>
         <div class="field-component">
-          <span :title="form.turnoverReason">{{ form.turnoverReason }}</span>
+          <span :title="form.turnoverReasonDesc">{{ form.turnoverReasonDesc }}</span>
         </div>
       </div>
 

src/views/personnel/attendance/info/daily.vue

@@ -9,8 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
           :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
-      <el-form-item label="手机号" prop="employeePhone">
-        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+      <el-form-item label="手机号" prop="employeeMobile">
+        <el-input v-model="queryParams.employeeMobile" placeholder="请输入手机号" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="开始日期" prop="attendanceStartDate">
@@ -50,7 +50,7 @@
     <el-table v-loading="loading" :data="typeList">
       <el-table-column label="员工姓名" align="center" prop="employeeName" min-width="80" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
-      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="手机号" align="center" prop="employeeMobile" min-width="100" />
       <el-table-column label="日期" align="center" prop="attendanceDate" min-width="100" />
       <el-table-column label="上班时间" align="center" prop="workStartTime" min-width="100" />
       <el-table-column label="下班下班" align="center" prop="workEndTime" min-width="100" />
@@ -96,7 +96,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        employeePhone: undefined,
+        employeeMobile: undefined,
         attendanceStartDate: this.getNowDate(),
         attendanceEndDate: this.getNowDate(),
       },

src/views/personnel/attendance/leave/index.vue

@@ -74,7 +74,7 @@
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="120" />
-      <el-table-column label="请假类型" align="center" prop="leaveType" min-width="100" />
+      <el-table-column label="请假类型" align="center" prop="leaveTypeDesc" min-width="100" />
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="120" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="120" />
       <el-table-column label="请假天数" align="center" prop="day" min-width="100" />
@@ -242,7 +242,7 @@
               <div class="field-name">请假类型</div>
             </div>
             <div class="field-component">
-              <span :title="form.leaveType">{{ form.leaveType }}</span>
+              <span :title="form.leaveTypeDesc">{{ form.leaveTypeDesc }}</span>
             </div>
           </div>
           <div class="fx-field x-grid-col-12">

src/views/personnel/relations/entry/index.vue

@@ -74,11 +74,7 @@
       <el-table-column label="入职人" align="center" prop="entryName" min-width="100" />
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
-      <el-table-column label="员工类型" align="center" prop="employeeType" min-width="100">
-        <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.employeeType" />
-        </template>
-      </el-table-column>
+      <el-table-column label="员工类型" align="center" prop="employeeTypeName" min-width="100"/>
       <el-table-column label="性别" align="center" prop="gender" min-width="100">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender" />
@@ -253,9 +249,7 @@
           <div class="field-name">员工类型</div>
         </div>
         <div class="field-component">
-          <span :title="form.employeeTypeName">
-            <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="form.employeeType"/>
-          </span>
+          <span :title="form.employeeTypeDesc">{{ form.employeeTypeDesc }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">

src/views/personnel/relations/turnover/index.vue

@@ -226,7 +226,7 @@
           <div class="field-name">离职原因</div>
         </div>
         <div class="field-component">
-          <span :title="form.turnoverReason">{{ form.turnoverReason }}</span>
+          <span :title="form.turnoverReasonDesc">{{ form.turnoverReasonDesc }}</span>
         </div>
       </div>
 

src/views/system/tenantDict/data.vue

@@ -44,6 +44,11 @@
       </el-table-column>
       <!-- <el-table-column label="颜色类型" align="center" prop="colorType" />
       <el-table-column label="CSS Class" align="center" prop="cssClass" /> -->
+      <el-table-column label="数据类型" align="center" prop="dataType">
+      <template v-slot="scope">
+          <span>{{ scope.row.dataType== 1 ? '内置' : '自定义'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">