elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into Luckysheet-mk

feture-12345
mk 6 months ago
parent
cced03096a 048480ef56
commit
ae50e2f1c2
3 changed files with 119 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/views/modules/base/smartExcel/cpts/export-search.vue
  2. 19
      src/views/modules/base/smartExcel/filling.vue
  3. 220
      src/views/modules/base/smartExcel/sharedSpace.vue

12
src/views/modules/base/smartExcel/cpts/export-search.vue
View File

@ -98,6 +98,10 @@
</template>
</el-select>
</el-form-item>
<el-form-item label="籍贯">
<el-input v-model.trim="form.nativePlace" class="u-item-width-service" clearable size="small">
</el-input>
</el-form-item>
<el-form-item label="性别">
<el-select v-model.trim="form.gender" class="u-item-width-normal" clearable size="small">
<el-option label='男' value='1'> </el-option>
@ -186,6 +190,14 @@
</template>
</el-select>
</el-form-item>
<el-form-item label="居民年龄">
<el-input style="width: 100px;" v-model.trim="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
</el-input>
<span class="u-data-tag"> 至 </span>
<el-input style="width: 100px;" v-model.trim="form.ageEnd" @change="handleAgeChange" class="u-item-width-daterange u-data-tag"
placeholder="请输入" clearable size="small">
</el-input>
</el-form-item>
</el-form>
</div>
<el-row v-if="showSmartSearchForm" class="resi-row-more f-m0">

19
src/views/modules/base/smartExcel/filling.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="g-main">
<div class="g-main" :style="{ height: tableHeight }">
<div v-show="pageType == 'list'">
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
@ -21,8 +21,8 @@
</el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="taskState">
<el-select class="u-item-width-normal" v-model.trim="formData.taskState" placeholder="请选择"
<el-form-item label="状态" prop="taskType">
<el-select class="u-item-width-normal" v-model.trim="formData.taskType" placeholder="请选择"
size="small" clearable>
<el-option v-for="item in statusArray" :key="item.value" :label="item.label"
:value="item.value">
@ -49,16 +49,14 @@
</div>
</el-form>
</div>
<div class="m-table">
<el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="tableHeight">
<el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="maxTableHeight">
<el-table-column label="" fixed="left" type="selection" align="center" width="50" />
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="agencyName" align="center" label="发布组织" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="taskTitle" label="任务主题" min-width="140" align="center"
:show-overflow-tooltip="true" />
<el-table-column prop="taskPeriodName" align="center" width="100" label="任务周期"
:show-overflow-tooltip="true">
<template slot-scope="scope">
@ -144,7 +142,7 @@ export default {
statusArray: [
{
label: '未提交',
value: 'deal'
value: 'notSubmit'
},
{
label: '已提交',
@ -167,7 +165,7 @@ export default {
formData: {
orgId: '',//组织Id
taskTitle: '',//任务主题
taskState: '',//任务类型
taskType: '',//任务类型
startTime: '',//开始时间
endTime: '',//结束时间
createdBy: ''//创建人
@ -189,9 +187,8 @@ export default {
},
computed: {
tableHeight() {
const h = this.clientHeight - this.searchH - 200 + this.iframeHeight;
const _h = this.clientHeight - 200 - this.searchH;
return this.$store.state.inIframe ? h : _h;
return (this.clientHeight - 140) + 'px'
},
...mapGetters(['clientHeight', 'resolution']),
},

220
src/views/modules/base/smartExcel/sharedSpac.vue → src/views/modules/base/smartExcel/sharedSpace.vue
View File

@ -1,127 +1,64 @@
<template>
<div class="g-main">
<div v-show="pageType == 'list'">
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<div>
<!-- <el-form-item label="发布组织" prop="orgId">
<el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model.trim="formData.orgId"
:options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"
clearable></el-cascader>
</el-form-item> -->
<el-form-item label="任务主题" prop="taskTitle">
<el-input v-model.trim="formData.taskTitle" class="u-item-width-normal" size="small" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="创建时间" prop="startTime">
<el-date-picker v-model.trim="formData.startTime" :picker-options="startPickerOptions"
class="u-item-width-daterange" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd" placeholder="开始时间">
</el-date-picker>
<span class="u-data-tag">至</span>
<el-date-picker v-model.trim="formData.endTime" :picker-options="endPickerOptions"
class="u-item-width-daterange u-data-tag" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss"
value="yyyy-MM-dd" placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="taskState">
<el-select class="u-item-width-normal" v-model.trim="formData.taskState" placeholder="请选择" size="small"
clearable>
<el-option v-for="item in statusArray" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-select class="u-item-width-normal" v-model.trim="formData.createdBy" placeholder="请选择" size="small"
clearable :disabled="manager">
<el-option v-for="item in createdByArray" :key="item.staffId" :label="item.name" :value="item.staffId">
</el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="24" align="right">
<el-button style="margin-left: 30px" size="small" type="primary " @click="handleSearch">查询</el-button>
<el-button style="margin-left: 10px" size="small" class="diy-button--white"
@click="resetSearch">重置</el-button>
</el-col>
</el-row>
</div>
</el-form>
<div class="g-main">
<div v-show="pageType == 'list'">
<div class="m-table">
<div class="flex" >
<div style="align-items: center;justify-items: center;" class="f-align_item flex" :class="{ active: selectedIndex === index }" v-for="(item, index) in titleList"
:key="item.value" @click="selectItem(index)">
<span>{{ item.label }}</span>
</div>
<div class="m-table" >
<div class="div_btn">
<el-button size="small" type="primary " @click="handleAdd">新增</el-button>
</div>
<el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="maxTableHeight">
<el-table-column label="" fixed="left" type="selection" align="center" width="50" />
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="agencyName" align="center" label="发布组织" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="taskTitle" label="任务主题" min-width="140" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="totalNum" label="分发人数" align="center" :show-overflow-tooltip="true" width="100">
</el-table-column>
<el-table-column prop="taskPeriod" align="center" width="100" label="任务周期" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.taskPeriod === 'once' ? '一次性' : scope.row.taskPeriod === 'weekly' ? '每周' : scope.row.taskPeriod
=== 'halfMonth'?'每半月': scope.row.taskPeriod === 'month'?'每月':'每季度'}}
</template>
</el-table-column>
<el-table-column prop="resolveNum" align="center" width="110" label="当前任务进度" :show-overflow-tooltip="true">
<template slot-scope="scope" >
<div style="color: blue;">
{{ scope.row.resolveNum }}/{{ scope.row.totalNum }}
</div>
</template>
</el-table-column>
<el-table-column prop="taskStateName" align="center" width="100" label="任务状态" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taskStateName
}}</span>
</template>
</el-table-column>
<el-table-column prop="createByName" align="center" width="100" label="创建人" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="createdTime" align="center" width="140" :show-overflow-tooltip="true" label="创建时间">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200px">
<template slot-scope="scope">
<el-button @click=" handleInfo(scope.row)" type="text" size="small">查看</el-button>
<!-- 取消操作需要做密码校验 -->
<el-button v-if="scope.row.taskState == 'deal'" @click="handleCancel(scope.row)" type="text" size="small"
class="">取消</el-button>
<!-- 取消后可进行删除 -->
<el-button v-if="scope.row.taskState !== 'deal'" @click="handleDel(scope.row)" type="text" size="small"
class="">删除</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<el-table :data="tableData" border class="m-table-item" style="width: 100%" :height="maxTableHeight">
<el-table-column prop="agencyName" align="center" label="文件名称" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="taskTitle" label="所属任务" min-width="140" align="center" :show-overflow-tooltip="true" />
<el-table-column prop="taskPeriod" align="center" width="100" label="任务周期" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.taskPeriod === 'once' ? '一次性' : scope.row.taskPeriod === 'weekly' ? '每周' :
scope.row.taskPeriod
=== 'halfMonth'?'每半月': scope.row.taskPeriod === 'month'?'每月':'每季度'}}
</template>
</el-table-column>
<el-table-column prop="taskStateName" align="center" width="100" label="状态" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taskStateName
}}</span>
</template>
</el-table-column>
<el-table-column prop="totalNum" label="下载人数" align="center" :show-overflow-tooltip="true" width="100">
</el-table-column>
<el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="createByName" align="center" width="100" label="创建人" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="createdTime" align="center" width="140" :show-overflow-tooltip="true" label="创建时间">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200px">
<template slot-scope="scope">
<el-button @click=" handleInfo(scope.row)" type="text" size="small">查看</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<div v-if="pageType == 'info'">
<excel-info @handleShowPage="handleShowPage" :taskId=task></excel-info>
</div>
<div v-if="pageType == 'add'">
<excel-add @handleShowPage="handleShowPage"></excel-add>
</div>
</div>
</template>
<div v-if="pageType == 'info'">
<excel-info @handleShowPage="handleShowPage" :taskId=task></excel-info>
</div>
<div v-if="pageType == 'add'">
<excel-add @handleShowPage="handleShowPage"></excel-add>
</div>
</div>
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
@ -154,6 +91,21 @@
return time.getTime() > nowData;
};
return {
selectedIndex: 0, // 记录选中的项
titleList:[
{
value:0,
label:'任务文件'
},
{
value:1,
label:'数据共享'
},
{
value:2,
label:'共享图片集'
},
],
task: "",
pageType: "list", // 列表list 新增add 详情info
tableData: [],
@ -218,6 +170,9 @@
this.getTableData()
},
methods: {
selectItem(index) {
this.selectedIndex = index; // 选中点击的项
},
async handleCancel(item) {
let parms = {
id: item.id,
@ -351,10 +306,33 @@
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.m-search {
.u-item-width-normal {
width: 200px;
}
}
</style>
.f-align_item {
width: 100px;
padding: 10px;
cursor: pointer;
font-size: 16px;
}
.f-align_item.active {
width: 100px;
color: blue;
/* 点击时的文字颜色 */
font-weight: bold;
border-bottom: 5px solid blue;
/* 点击时的下划线 */
}
.f-align_item span {
color: black;
/* 默认文字颜色 */
}
</style>
Write Preview
Loading…
Cancel
Save