Commit 776464073763de232d2dfea26867d43df5dc9137
1 parent
4862a857
feat: 修改提示字段
Showing
4 changed files
with
9 additions
and
9 deletions
src/views/main/main/index.vue
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | </template> |
| 34 | 34 | </el-table-column> |
| 35 | 35 | <el-table-column label="工种" align="center" prop="posts" /> |
| 36 | - <el-table-column label="班型名称" align="center" prop="ruleDictName" width="180" /> | |
| 36 | + <el-table-column label="班次名称" align="center" prop="ruleDictName" width="180" /> | |
| 37 | 37 | <el-table-column label="第一段上班签到时间" align="center" prop="firstWorkSignInTime" width="180"> |
| 38 | 38 | <template #default="scope"> |
| 39 | 39 | <el-text class="mx-1" v-if="scope.row.workFlag == 0"></el-text> | ... | ... |
src/views/main/manager/index.vue
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | |
| 88 | 88 | <!-- 顶班 --> |
| 89 | 89 | <el-dialog :title="'顶班 ' + jobCodes + '/' + name" v-model="updateDataFlag" width="800px" append-to-body> |
| 90 | - <el-text class="mx-1" size="small">规则不选择默认被顶班人当天上班规则</el-text> | |
| 90 | + <el-text class="mx-1" size="small">规则不选择默认顶替当天排班规则,被顶班人员会自动设置为休息。</el-text> | |
| 91 | 91 | <schedulingAdd v-if="updateDataFlag" ref="schedulingChildrenSecond" :schedulingNowValue="schedulingNowValue" |
| 92 | 92 | :schedulingOptions="schedulingOptions" /> |
| 93 | 93 | <el-form :inline="true" style="margin-top: 15px;" v-if="updateDataFlag" ref="updateDataRef" :model="updateDataUser" | ... | ... |
src/views/num/num/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <div class="app-container"> |
| 3 | 3 | <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px"> |
| 4 | - <el-form-item label="班型名称" prop="ruleDictName"> | |
| 5 | - <el-input v-model="queryParams.ruleDictName" placeholder="请输入班型名称" clearable @keyup.enter="handleQuery" /> | |
| 4 | + <el-form-item label="班次名称" prop="ruleDictName"> | |
| 5 | + <el-input v-model="queryParams.ruleDictName" placeholder="请输入班次名称" clearable @keyup.enter="handleQuery" /> | |
| 6 | 6 | </el-form-item> |
| 7 | 7 | <el-form-item label="班次类型" prop="ruleType"> |
| 8 | 8 | <el-select v-model="queryParams.ruleType" placeholder="请选择班次类型" clearable> |
| ... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 | |
| 43 | 43 | <el-table border max-height="600" v-loading="loading" :data="numList" @selection-change="handleSelectionChange"> |
| 44 | 44 | <el-table-column type="selection" width="55" align="center" /> |
| 45 | - <el-table-column label="班型名称" align="center" prop="ruleDictName" /> | |
| 45 | + <el-table-column label="班次名称" align="center" prop="ruleDictName" /> | |
| 46 | 46 | <el-table-column label="班次类型" align="center" prop="ruleType"> |
| 47 | 47 | <template #default="scope"> |
| 48 | 48 | <dict-tag :options="rule_type_dict" :value="scope.row.ruleType" /> |
| ... | ... | @@ -72,8 +72,8 @@ |
| 72 | 72 | <!-- 添加或修改班次管理对话框 --> |
| 73 | 73 | <el-dialog :title="title" v-model="open" width="600px" append-to-body> |
| 74 | 74 | <el-form ref="numRef" :model="form" :rules="rules" label-width="80px"> |
| 75 | - <el-form-item label="班型名称" prop="ruleDictName"> | |
| 76 | - <el-input v-model="form.ruleDictName" placeholder="请输入班型名称" /> | |
| 75 | + <el-form-item label="班次名称" prop="ruleDictName"> | |
| 76 | + <el-input v-model="form.ruleDictName" placeholder="请输入班次名称" /> | |
| 77 | 77 | </el-form-item> |
| 78 | 78 | <el-form-item label="班次类型" prop="ruleType"> |
| 79 | 79 | <el-select v-model="form.ruleType" placeholder="请选择班次类型"> | ... | ... |
src/views/schedulingAssociateNum/Attendance/num/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <div> |
| 3 | 3 | <el-form ref="numRef" :disabled="true" :model="resultNumDetail" label-width="80px"> |
| 4 | - <el-form-item label="班型名称" prop="ruleDictName"> | |
| 5 | - <el-input v-model="resultNumDetail.ruleDictName" placeholder="请输入班型名称" /> | |
| 4 | + <el-form-item label="班次名称" prop="ruleDictName"> | |
| 5 | + <el-input v-model="resultNumDetail.ruleDictName" placeholder="请输入班次名称" /> | |
| 6 | 6 | </el-form-item> |
| 7 | 7 | <el-form-item label="班次类型" prop="ruleType"> |
| 8 | 8 | <el-select v-model="resultNumDetail.ruleType" placeholder="请选择班次类型"> | ... | ... |