疗休养优化1.1

src/main/resources/views/platform/zhgh/dayofficework/Tour/schoolUserAssignment/index.html

@@ -37,6 +37,11 @@ layout("/layouts/platform.html"){
                         <el-option label="替补人员" value="BACKUP"></el-option>
                     </el-select>
                 </search-item>
+                <search-item label="分配类别">
+                    <el-select v-model="pageForm.assignSource" clearable placeholder="请选择分配类别" style="width: 100%">
+                        <el-option v-for="item in assignSourceOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                    </el-select>
+                </search-item>
                 <search-item label="姓名/工号">
                     <el-input
                         v-model="pageForm.keyword"
@@ -75,6 +80,11 @@ layout("/layouts/platform.html"){
                 <el-table-column label="线路" prop="lineName" min-width="200" sortable="custom" align="center" header-align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column label="出行时间" prop="travelPeriod" min-width="180" align="center" header-align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column label="乘车地点" prop="boardingPlace" min-width="140" align="center" header-align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column label="分配类别" prop="assignSource" width="120" sortable="custom" align="center" header-align="center">
+                    <template slot-scope="{row}">
+                        <el-tag size="mini" :type="row.assignSource === 'BRANCH_UNION' ? 'warning' : 'primary'">{{ assignSourceText(row.assignSource) }}</el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="人员类型" prop="personType" width="110" sortable="custom" align="center" header-align="center">
                     <template slot-scope="{row}">
                         <el-tag size="mini" :type="row.personType === 'BACKUP' ? 'warning' : 'success'">{{ personTypeText(row.personType) }}</el-tag>
@@ -88,9 +98,9 @@ layout("/layouts/platform.html"){
                 <el-table-column label="分配时间" prop="assignedAt" width="170" sortable="custom" align="center" header-align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" width="320" align="center" header-align="center" fixed="right">
                     <template slot-scope="{row}">
-                        <el-button v-if="!row.matterId && row.personType !== 'BACKUP'" size="mini" type="primary" @click="openSelectMatter(row)">选择线路</el-button>
-                        <el-button v-if="isCancelled(row) && $auth.hasPermission('tour.schoolUserAssignment.cancelRestore')" size="mini" type="warning" @click="restoreCancel(row)">取消退出</el-button>
-                        <el-button size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                        <el-button v-if="isSchoolUnionAssignment(row) && !row.matterId && row.personType !== 'BACKUP'" size="mini" type="primary" @click="openSelectMatter(row)">选择线路</el-button>
+                        <el-button v-if="isSchoolUnionAssignment(row) && isCancelled(row) && $auth.hasPermission('tour.schoolUserAssignment.cancelRestore')" size="mini" type="warning" @click="restoreCancel(row)">取消退出</el-button>
+                        <el-button v-if="isSchoolUnionAssignment(row)" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -283,6 +293,10 @@ layout("/layouts/platform.html"){
             return {
                 settingOptions: [],
                 pageMatterOptions: [],
+                assignSourceOptions: [
+                    {label: "校工会分配", value: "SCHOOL_UNION"},
+                    {label: "分工会分配", value: "BRANCH_UNION"}
+                ],
                 assignSettingOptions: [],
                 assignMatterOptions: [],
                 unionOptions: [],
@@ -305,6 +319,7 @@ layout("/layouts/platform.html"){
                     matterId: "",
                     unionId: "",
                     personType: "",
+                    assignSource: "SCHOOL_UNION",
                     keyword: ""
                 },
                 assignForm: {
@@ -366,6 +381,8 @@ layout("/layouts/platform.html"){
                 this.pageForm.matterId = ""
                 this.pageForm.unionId = ""
                 this.pageForm.personType = ""
+                // 页面打开和重置后默认查看校工会分配，清空该筛选项时后端会查询全部来源。
+                this.pageForm.assignSource = "SCHOOL_UNION"
                 this.pageForm.keyword = ""
                 this.loadSettingOptions()
             },
@@ -667,6 +684,18 @@ layout("/layouts/platform.html"){
             personTypeText(personType) {
                 return personType === "BACKUP" ? "替补人员" : "正式人员"
             },
+            assignSourceText(assignSource) {
+                if (assignSource === "SCHOOL_UNION") {
+                    return "校工会分配"
+                }
+                if (assignSource === "BRANCH_UNION") {
+                    return "分工会分配"
+                }
+                return assignSource || ""
+            },
+            isSchoolUnionAssignment(row) {
+                return row && row.assignSource === "SCHOOL_UNION"
+            },
             isCancelled(row) {
                 return row && (row.cancelled === true || row.cancelled === 1)
             },

src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/lineInfo.html

@@ -306,7 +306,7 @@ layout("/layouts/platform_h5.html"){
                     }
                     return this.canModifySignup() ? "修改报名" : "审核中"
                 }
-                return "我要报名"
+                return "我要核对信息"
             },
             detailActionType() {
                 return this.canRevokeSignup() ? "danger" : "info"