南大三十年教职工疗休养
This commit is contained in:
+11
-11
@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
|
||||
<el-option v-for="item in settingOptions" :key="item.id" :label="item.configName" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
<search-item label="分配路线">
|
||||
<el-select v-model="pageForm.matterId" clearable filterable placeholder="请选择分配路线" style="width: 100%">
|
||||
<search-item label="分配批次">
|
||||
<el-select v-model="pageForm.matterId" clearable filterable placeholder="请选择分配批次" style="width: 100%">
|
||||
<el-option v-for="item in pageMatterOptions" :key="item.matterId" :label="matterOptionLabel(item)" :value="item.matterId"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
@@ -135,7 +135,7 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" v-if="$auth.hasPermission('thirtyTeachTour.branchUserAssignment.selectMatter')">
|
||||
<el-form-item label="分配路线" prop="matterId">
|
||||
<el-form-item label="分配批次" prop="matterId">
|
||||
<el-select v-model="assignForm.matterId" clearable filterable placeholder="可选,选择后代报名" style="width: 100%" :disabled="assignForm.personType === 'BACKUP'">
|
||||
<el-option v-for="item in assignMatterOptions" :key="item.matterId" :label="matterOptionLabel(item)" :value="item.matterId"></el-option>
|
||||
</el-select>
|
||||
@@ -225,7 +225,7 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="手机号" prop="mobile" width="130" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="所属分工会" prop="unionName" min-width="160" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="所在单位" prop="unitName" min-width="220" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="材料" width="110" align="center" header-align="center">
|
||||
<el-table-column label="上传照片" width="110" align="center" header-align="center">
|
||||
<template slot-scope="{row}">
|
||||
<el-button type="text" size="mini" :disabled="!isCandidateSelected(row)" @click="openPhotoUpload(row)">
|
||||
{{ photoFileCount(row) > 0 ? "已上传" : "上传" }}
|
||||
@@ -334,7 +334,7 @@ layout("/layouts/platform.html"){
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="选择分配路线"
|
||||
title="选择分配批次"
|
||||
:visible.sync="selectMatterDialogVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="520px"
|
||||
@@ -343,8 +343,8 @@ layout("/layouts/platform.html"){
|
||||
<el-form-item label="分配人员">
|
||||
<el-input v-model="selectMatterForm.userName" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="分配路线" prop="matterId">
|
||||
<el-select v-model="selectMatterForm.matterId" clearable filterable placeholder="请选择分配路线" style="width: 100%">
|
||||
<el-form-item label="分配批次" prop="matterId">
|
||||
<el-select v-model="selectMatterForm.matterId" clearable filterable placeholder="请选择分配批次" style="width: 100%">
|
||||
<el-option v-for="item in selectMatterOptions" :key="item.matterId" :label="matterOptionLabel(item)" :value="item.matterId"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -557,7 +557,7 @@ layout("/layouts/platform.html"){
|
||||
personType: [{required: true, message: "请选择人员类型", trigger: ["change", "blur"]}]
|
||||
},
|
||||
selectMatterRules: {
|
||||
matterId: [{required: true, message: "请选择分配路线", trigger: ["change", "blur"]}]
|
||||
matterId: [{required: true, message: "请选择分配批次", trigger: ["change", "blur"]}]
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1143,11 +1143,11 @@ layout("/layouts/platform.html"){
|
||||
}).then((res) => {
|
||||
if (res.code === 0) {
|
||||
const data = res.data || {}
|
||||
this.$message.success("分配路线选择成功" + (data.ledgerCount > 0 ? ",已代报名" + data.ledgerCount + "人" : ""))
|
||||
this.$message.success("分配批次选择成功" + (data.ledgerCount > 0 ? ",已代报名" + data.ledgerCount + "人" : ""))
|
||||
this.selectMatterDialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(res.msg || "分配路线选择失败")
|
||||
this.$message.warning(res.msg || "分配批次选择失败")
|
||||
}
|
||||
}).finally(() => {
|
||||
this.selectMatterSubmitting = false
|
||||
@@ -1212,7 +1212,7 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
}).catch(() => {})
|
||||
},
|
||||
// 分配路线选项按业务事项展示,线路名称仅作为历史数据缺失事项名称时的兜底。
|
||||
// 分配批次选项按业务事项展示,线路名称仅作为历史数据缺失事项名称时的兜底。
|
||||
matterOptionLabel(item) {
|
||||
return item.matterName || item.lineName || ""
|
||||
}
|
||||
|
||||
+12
-12
@@ -21,8 +21,8 @@ layout("/layouts/platform.html"){
|
||||
<el-option v-for="item in settingOptions" :key="item.id" :label="item.configName" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
<search-item label="分配线路">
|
||||
<el-select v-model="pageForm.matterId" clearable filterable placeholder="请选择分配线路" style="width: 100%">
|
||||
<search-item label="分配批次">
|
||||
<el-select v-model="pageForm.matterId" clearable filterable placeholder="请选择分配批次" style="width: 100%">
|
||||
<el-option v-for="item in pageMatterOptions" :key="item.matterId" :label="matterOptionLabel(item)" :value="item.matterId"></el-option>
|
||||
</el-select>
|
||||
</search-item>
|
||||
@@ -181,7 +181,7 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="分配线路" prop="matterId">
|
||||
<el-form-item label="分配批次" prop="matterId">
|
||||
<el-select
|
||||
v-model="assignForm.matterId"
|
||||
clearable
|
||||
@@ -245,7 +245,7 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="手机号" prop="mobile" width="130" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="所属分工会" prop="unionName" min-width="160" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="所在单位" prop="unitName" min-width="220" align="center" header-align="center" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="分配线路" min-width="260" align="center" header-align="center">
|
||||
<el-table-column label="分配批次" min-width="260" align="center" header-align="center">
|
||||
<template slot-scope="{row}">
|
||||
<el-select
|
||||
v-model="row.assignmentMatterId"
|
||||
@@ -258,7 +258,7 @@ layout("/layouts/platform.html"){
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" width="110" align="center" header-align="center">
|
||||
<el-table-column label="上传照片" width="110" align="center" header-align="center">
|
||||
<template slot-scope="{row}">
|
||||
<el-button type="text" size="mini" :disabled="!isCandidateSelected(row)" @click="openPhotoUpload(row)">
|
||||
{{ photoFileCount(row) > 0 ? "已上传" : "上传" }}
|
||||
@@ -367,7 +367,7 @@ layout("/layouts/platform.html"){
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="选择分配线路"
|
||||
title="选择分配批次"
|
||||
:visible.sync="selectMatterDialogVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="520px"
|
||||
@@ -376,8 +376,8 @@ layout("/layouts/platform.html"){
|
||||
<el-form-item label="分配人员">
|
||||
<el-input v-model="selectMatterForm.userName" disabled></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="分配线路" prop="matterId">
|
||||
<el-select v-model="selectMatterForm.matterId" clearable filterable placeholder="请选择分配线路" style="width: 100%">
|
||||
<el-form-item label="分配批次" prop="matterId">
|
||||
<el-select v-model="selectMatterForm.matterId" clearable filterable placeholder="请选择分配批次" style="width: 100%">
|
||||
<el-option v-for="item in selectMatterOptions" :key="item.matterId" :label="matterOptionLabel(item)" :value="item.matterId"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -551,7 +551,7 @@ layout("/layouts/platform.html"){
|
||||
settingId: [{required: true, message: "请选择疗休养配置", trigger: ["change", "blur"]}]
|
||||
},
|
||||
selectMatterRules: {
|
||||
matterId: [{required: true, message: "请选择分配线路", trigger: ["change", "blur"]}]
|
||||
matterId: [{required: true, message: "请选择分配批次", trigger: ["change", "blur"]}]
|
||||
},
|
||||
remindRules: {
|
||||
content: [{required: true, message: "请输入提醒内容", trigger: ["blur"]}]
|
||||
@@ -1133,11 +1133,11 @@ layout("/layouts/platform.html"){
|
||||
}).then((res) => {
|
||||
if (res.code === 0) {
|
||||
const data = res.data || {}
|
||||
this.$message.success("分配线路选择成功" + (data.ledgerCount > 0 ? ",已代报名" + data.ledgerCount + "人" : ""))
|
||||
this.$message.success("分配批次选择成功" + (data.ledgerCount > 0 ? ",已代报名" + data.ledgerCount + "人" : ""))
|
||||
this.selectMatterDialogVisible = false
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(res.msg || "分配线路选择失败")
|
||||
this.$message.warning(res.msg || "分配批次选择失败")
|
||||
}
|
||||
}).finally(() => {
|
||||
this.selectMatterSubmitting = false
|
||||
@@ -1214,7 +1214,7 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
}).catch(() => {})
|
||||
},
|
||||
// 分配线路选项按业务事项展示,线路名称仅作为历史数据缺失事项名称时的兜底。
|
||||
// 分配批次选项按业务事项展示,线路名称仅作为历史数据缺失事项名称时的兜底。
|
||||
matterOptionLabel(item) {
|
||||
return item.matterName || item.lineName || ""
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user