dev-cl
qsh 4 months ago
parent a9c5d16926
commit ab63082327
  1. 16
      src/views/Finance/Salary/Comp/DialogSalary.vue
  2. 17
      src/views/Home/Salary/index.vue

@ -13,7 +13,7 @@
<el-divider direction="horizontal" content-position="left">应发</el-divider> <el-divider direction="horizontal" content-position="left">应发</el-divider>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="底薪" prop="dixin"> <el-form-item label="基本工资" prop="dixin">
<el-input-number v-model="formData.dixin" :min="0" :controls="false" /> <el-input-number v-model="formData.dixin" :min="0" :controls="false" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -36,6 +36,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" :offset="0">
<el-form-item label="补贴" prop="butie">
<el-input-number v-model="formData.butie" :min="0" :controls="false" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="满勤" prop="manqin">
<el-input-number v-model="formData.manqin" :min="0" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0"> <el-col :span="12" :offset="0">
<el-form-item label="其他应发" prop="qitayingfa"> <el-form-item label="其他应发" prop="qitayingfa">
<el-input-number v-model="formData.qitayingfa" :min="0" :controls="false" /> <el-input-number v-model="formData.qitayingfa" :min="0" :controls="false" />
@ -100,7 +112,7 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加
const formData = ref({}) const formData = ref({})
const rules = { const rules = {
dixin: { required: true, message: '底薪不可为空', trigger: 'blur' } dixin: { required: true, message: '基本工资不可为空', trigger: 'blur' }
} }
/** 打开弹窗 */ /** 打开弹窗 */

@ -97,19 +97,6 @@
<span v-else> {{ row.jbgz }}</span> <span v-else> {{ row.jbgz }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="绩效" min-width="90px">
<template #default="{ row }">
<el-input-number
v-if="row.edit"
v-model="row.jbgz"
:min="0"
:controls="false"
size="small"
style="width: 65px"
/>
<span v-else> {{ row.jbgz }}</span>
</template>
</el-table-column>
<el-table-column label="其他" min-width="90px"> <el-table-column label="其他" min-width="90px">
<template #default="{ row }"> <template #default="{ row }">
<el-input-number <el-input-number
@ -125,8 +112,8 @@
</el-table-column> </el-table-column>
<el-table-column label="小计" min-width="90px" /> <el-table-column label="小计" min-width="90px" />
</el-table-column> </el-table-column>
<el-table-column label="应工资" align="center"> <el-table-column label="应工资" align="center">
<el-table-column label="基本工资" min-width="90px"> <el-table-column label="绩效" min-width="90px">
<template #default="{ row }"> <template #default="{ row }">
<el-input-number <el-input-number
v-if="row.edit" v-if="row.edit"

Loading…
Cancel
Save