qsh 1 week ago
parent 07850f1233
commit 65af79e9a1
  1. 2
      src/components/SSTable/index.vue
  2. 3
      src/router/modules/static.ts
  3. 4
      src/views/Clue/Pool/Comp/DialogClue.vue
  4. 7
      src/views/Clue/Pool/Comp/DialogSuccess.vue
  5. 2
      src/views/Clue/Pool/Comp/DrawerClue.vue
  6. 1
      src/views/Clue/Pool/index.vue
  7. 12
      src/views/OKR/Meeting/MeetingInfo.vue

@ -35,7 +35,7 @@
@end="onDragEnd" @end="onDragEnd"
> >
<template #item="{ element: item }"> <template #item="{ element: item }">
<el-checkbox :key="item.id" :label="item.id"> <el-checkbox :key="item.id" :label="item.id" :value="item.id">
{{ item.label }} {{ item.label }}
</el-checkbox> </el-checkbox>
</template> </template>

@ -73,7 +73,8 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
}, },
visible: false, visible: false,
alwaysShow: true, alwaysShow: true,
redirect: '' redirect: '',
keepAlive: true
} }
], ],
meta: { meta: {

@ -19,7 +19,7 @@
:disabled="!row.editable" :disabled="!row.editable"
> >
<el-option <el-option
v-for="item in props.userOptions" v-for="item in props.allUserOptions"
:key="item.id" :key="item.id"
:label="item.nickname" :label="item.nickname"
:value="item.id" :value="item.id"
@ -88,7 +88,7 @@
<div class="w-100px">线索位置</div> <div class="w-100px">线索位置</div>
<el-input v-model="address" disabled placeholder="请输入线索位置" clearable /> <el-input v-model="address" disabled placeholder="请输入线索位置" clearable />
</div> </div>
<el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool"> <el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
展示场地 展示场地
</el-checkbox> </el-checkbox>
</div> </div>

@ -165,7 +165,12 @@
/> />
</template> </template>
<template v-else-if="fieldItem.component == 'Radio'"> <template v-else-if="fieldItem.component == 'Radio'">
<el-radio v-for="item in fieldItem.options" :key="item.id" :label="item.id"> <el-radio
v-for="item in fieldItem.options"
:key="item.id"
:label="item.id"
:value="item.id"
>
{{ item.name }} {{ item.name }}
</el-radio> </el-radio>
</template> </template>

@ -86,7 +86,7 @@
<el-tab-pane label="详细信息" name="infoDetail"> <el-tab-pane label="详细信息" name="infoDetail">
<Descriptions :data="info" :schema="showSchema" :columns="2" /> <Descriptions :data="info" :schema="showSchema" :columns="2" />
<div v-if="appStore.getAppInfo?.instanceType == 1"> <div v-if="appStore.getAppInfo?.instanceType == 1">
<el-checkbox v-model="showSchool" :label="true" @change="handleShowSchool"> <el-checkbox v-model="showSchool" :label="true" :value="true" @change="handleShowSchool">
展示场地 展示场地
</el-checkbox> </el-checkbox>
<div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div> <div id="dialogMap" class="mt-20px" style="height: 400px; width: 100%"></div>

@ -67,6 +67,7 @@
class="mt-20px" class="mt-20px"
v-model:tableObject="tableObject" v-model:tableObject="tableObject"
:tableColumns="allSchemas.tableColumns" :tableColumns="allSchemas.tableColumns"
rowkey="clueId"
@get-list="getTableList" @get-list="getTableList"
@get-checked-columns="getCheckedColumns" @get-checked-columns="getCheckedColumns"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"

@ -1,11 +1,11 @@
<template> <template>
<div> <div>
<el-affix postion="top" :offset="95" v-if="!isDetail"> <!-- <el-affix postion="top" :offset="95" target="#app" v-if="!isDetail"> -->
<div class="flex justify-between mb-4 bg-white"> <div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
<b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b> <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
<el-button type="success" @click="submit()">保存</el-button> <el-button type="success" @click="submit()">保存</el-button>
</div> </div>
</el-affix> <!-- </el-affix> -->
<el-form <el-form
:model="form" :model="form"
ref="formRef" ref="formRef"

Loading…
Cancel
Save