diff --git a/src/views/manage/mission/count/table/detail.vue b/src/views/manage/mission/count/table/detail.vue index 4345201..ab1d8c2 100644 --- a/src/views/manage/mission/count/table/detail.vue +++ b/src/views/manage/mission/count/table/detail.vue @@ -68,7 +68,7 @@ export default { return '已完成' case 4: return '已失效' - + } } }, @@ -151,12 +151,6 @@ export default { prop: "wage", slot: true }, - { - label: "报名截止日期", - prop: "etimePub", - slot: true, - display: false, - }, { label: "开始时间", prop: "stime", diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index 023d7ad..90f316a 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -298,16 +298,6 @@ export default { minWidth: 100, format: "yyyy-MM-dd", }, - { - label: "报名截止日期", - prop: "etimePub", - type: "date", - search: false, - searchSpan: 5, - display: false, - minWidth: 100, - format: "yyyy-MM-dd", - }, { label: "工资", prop: "wage", diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index 65b1506..04fe771 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -492,6 +492,11 @@ export default { dialogType: "dialog", dialogClickModal: false, column: [ + { + label: "社区街道名称", + prop: "companyName", + addDisplay: false, + }, { label: "服务名称", prop: "name", diff --git a/src/views/tenant/main/talents/index.vue b/src/views/tenant/main/talents/index.vue index a25c03a..83d0de0 100644 --- a/src/views/tenant/main/talents/index.vue +++ b/src/views/tenant/main/talents/index.vue @@ -288,7 +288,7 @@ export default { viewBtn: true, searchMenuSpan: 6, border: true, - index: true, + index: false, indexLabel: "序号", selection: true, dialogType: "drawer", diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue index 8fcd07a..363b7bd 100644 --- a/src/views/tenant/mission/Dialog/CopyMission.vue +++ b/src/views/tenant/mission/Dialog/CopyMission.vue @@ -322,36 +322,10 @@ export default { ], }, { - label: "任务时间", - prop: "etimePub", - type: "date", - placeholder: "请选择报名截止日期", - format: "yyyy-MM-dd", - valueFormat: "yyyy-MM-dd 23:59:59", - pickerOptions: { - disabledDate(time) { - return !( - time.getTime() > Date.now() - 8.64e7&& - (!self.startTime || time.getTime() < self.startTime) && - (!self.endTime || time.getTime() < self.endTime) - ); - }, - }, - rules: [ - { - required: true, - message: "请选择报名截止日期", - trigger: "blur", - }, - ], - span: 10, - }, - { - label: "", - labelWidth: 0, + label: "发布时间", prop: "stime", type: "date", - placeholder: "请选择任务开始日期", + placeholder: "请选择任务发布时间", format: "yyyy-MM-dd", valueFormat: "yyyy-MM-dd 00:00:00", pickerOptions: { @@ -383,16 +357,14 @@ export default { trigger: "blur", }, ], - span: 7, + span: 12, }, { - label: "", - labelWidth: 0, + label: "结束时间", prop: "etime", type: "date", placeholder: "请选择任务结束日期", format: "yyyy-MM-dd", - valueFormat: "yyyy-MM-dd 23:59:59", disabled:self.endTimeFlag, pickerOptions: { disabledDate(time) { @@ -418,7 +390,7 @@ export default { trigger: "blur", }, ], - span: 7, + span: 12, }, ], }, @@ -984,13 +956,13 @@ export default { item.child.forEach(item2 => { if(item2.id == row.workSkills[1]) { row.skillNames = item2.name; - } + } }) } } }) } - + if(this.tradeData && this.tradeData.length > 0) { this.tradeData.forEach(item => { if(row.tradeId == item.id) { @@ -999,7 +971,7 @@ export default { }) } - + if (this.type === "add" || this.type === "copy") { this.$jlEvent("trialCheck") .then(() => { diff --git a/src/views/tenant/mission/Dialog/Employ.vue b/src/views/tenant/mission/Dialog/Employ.vue index 705efe5..57af880 100644 --- a/src/views/tenant/mission/Dialog/Employ.vue +++ b/src/views/tenant/mission/Dialog/Employ.vue @@ -107,7 +107,7 @@ --> -