Explorar el Código

app2.0 判断会议状态

长阳分支推送专用
杨晓琪 hace 2 años
padre
commit
22688e3db4
Se han modificado 2 ficheros con 44 adiciones y 18 borrados
  1. +34
    -10
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue
  2. +10
    -8
      Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue

+ 34
- 10
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue Ver fichero

@@ -41,15 +41,20 @@
{{ displayListItem(item, "EndTime") }}
</view>

<view class="customlist-item-field">
<!-- <view class="customlist-item-field">
<text class="customlist-item-field-title">申请人:</text>
{{ displayListItem(item, "CreateUser") }}
</view>
</view> -->
<view class="customlist-item-field">
<text class="customlist-item-field-title">会议状态:</text>
{{ displayListItem(item, "CheckStatus") }}
</view>

<view class="customlist-item-field">
<!-- <view class="customlist-item-field">
<text class="customlist-item-field-title">会议记录者:</text>
{{ displayListItem(item, "RecordPerson") }}
</view>
</view> -->

<!-- <view class="customlist-item-field">
<text class="customlist-item-field-title">会议内容:</text>
@@ -65,9 +70,9 @@
buttonText="会议纪要" -->
<l-customlist-action
@join="action('join', item.Id)"
showEdit
:showEdit="item.CheckStatus=='0'"
@edit="action('edit', item.Id)"
showDelete
:showDelete="item.CheckStatus=='0'"
@delete="action('delete', item.Id)"
@view="action('view', item.Id)"
/>
@@ -153,12 +158,13 @@ export default {
scheme: {
MeetingTitle: { type: "text" },
MeetingPlace: { type: "select", dataSource: "0" },
BeginTime: { type: "datetime", dateformat: "0" },
EndTime: { type: "datetime", dateformat: "0" },
BeginTime: { type: "datetime", dateformat: "1" },
EndTime: { type: "datetime", dateformat: "1" },
RecordPerson: { type: "organize", dataType: "user" },
Content: { type: "texteditor" },
Files: { type: "upload" },
CreateUser: { type: "organize", dataType: "user" },
// CreateUser: { type: "organize", dataType: "user" },
CheckStatus:{ type: "select"},
},

// 查询条件
@@ -167,12 +173,30 @@ export default {
queryData: {
MeetingTitle: "",
MeetingPlace: "",
CreateUser: "",
// CreateUser: "",
},

// 数据源
dataSource: {
MeetingPlace: [],
CheckStatus:[
{
value:'0',
text:"未审核"
},
{
value:'1',
text:"已通过"
},
{
value:'2',
text:"未通过"
},
{
value:'3',
text:"审核中"
},
]
},

// 页面相关参数


+ 10
- 8
Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue Ver fichero

@@ -14,25 +14,25 @@
:range="dataSource.MeetingManagement.MeetingPlace"
title="会议地点"
/>
<l-date-picker
<l-datetime-picker
@input="setValue('MeetingManagement.BeginTime', $event)"
:value="getValue('MeetingManagement.BeginTime')"
:disabled="!edit"
title="开始时间"
/>
<l-date-picker
<l-datetime-picker
@input="setValue('MeetingManagement.EndTime', $event)"
:value="getValue('MeetingManagement.EndTime')"
:disabled="!edit"
title="结束时间"
/>
<l-organize-picker
<!-- <l-organize-picker
@input="setValue('MeetingManagement.CreateUser', $event)"
:value="getValue('MeetingManagement.CreateUser')"
:readonly="!edit"
type="user"
title="申请人"
/>
/> -->
<l-input
@input="setValue('MeetingManagement.Linkman', $event)"
:value="getValue('MeetingManagement.Linkman')"
@@ -75,7 +75,7 @@
/>
</view>

<view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
<view v-if="ready&&(origin.MeetingManagement.CheckStatus=='0'||edit)" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
<l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block>
保存草稿
</l-button>
@@ -136,15 +136,15 @@ export default {
MeetingManagement: {
MeetingTitle: { type: 'text', title: '会议主题' ,verify:"NotNull"},
MeetingPlace: { type: 'select', title: '会议地点', dataSource: '0',verify:"NotNull" },
BeginTime: { type: 'datetime', title: '开始时间', dateformat: '0',verify:"NotNull" },
EndTime: { type: 'datetime', title: '结束时间', dateformat: '0',verify:"NotNull" },
BeginTime: { type: 'datetime', title: '开始时间', dateformat: '1',verify:"NotNull" },
EndTime: { type: 'datetime', title: '结束时间', dateformat: '1',verify:"NotNull" },
InternalParticipants: { type: 'organize', title: '参会人员', dataType: 'user',verify:"NotNull" },
RecordPerson: { type: 'organize', title: '会议记录者', dataType: 'user' },
Content: { type: 'texteditor', title: '会议内容',verify:"NotNull" },
Linkman: { type: 'text', title: '联系人',verify:"NotNull" },
LinkPhone: { type: 'text', title: '联系方式',verify:"Mobile" },
Files: { type: 'upload', title: '附件上传' },
CreateUser: { type: 'organize', title: '申请人', dataType: 'user',verify:"NotNull" },
// CreateUser: { type: 'organize', title: '申请人', dataType: 'user',verify:"NotNull" },
},

},
@@ -188,9 +188,11 @@ export default {
async fetchForm() {
if (this.mode === 'create') {
this.origin = await this.getDefaultForm()
console.log(this.origin)
} else {
const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
this.origin = await this.formatFormData(result)
console.log(this.origin)
}
this.current = this.COPY(this.origin)
},


Cargando…
Cancelar
Guardar