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

信息接口

luckysheet-xiaowang-Intelligen
是小王呀\24601 8 months ago
parent
6bb6847609
commit
b895bd74f5
2 changed files with 105 additions and 64 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. 32
      src/views/modules/base/smartExcel/cpts/filling-info.vue
  2. 137
      src/views/modules/base/smartExcel/filling.vue

32
src/views/modules/base/smartExcel/cpts/filling-info.vue
View File

@ -11,24 +11,24 @@
<el-col :span="8">
<el-form-item label="任务主题">
<div style="display: flex; align-items: center;">
<div>{{ formData.title}}</div>
<div>{{ formData.taskTitle}}</div>
</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="任务发布时间">
<div>{{formData.date}}</div>
<div>{{formData.createdTime}}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="任务发布部门">
<div>{{formData.bumen}}</div>
<div>{{formData.agencyName}}</div>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="任务发布人">
<div>{{formData.person}}</div>
<div>{{formData.createByName}}</div>
</el-form-item>
</el-col>
<el-col :span="8">
@ -38,13 +38,13 @@
</el-col>
<el-col :span="16">
<el-form-item label="任务周期">
<div>{{formData.cycle}}</div>
<div>{{formData.taskPeriod === 'once' ? '一次性' : '每周'}}</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="任务接收人">
<div style="display: flex;flex-direction: row; align-items: center;">
<div>{{formData.fenfa}}</div>
<div>{{formData.userName}}</div>
<el-button @click="oncClickInfo('adjust')" style="margin-left: 10px;"
type="primary">转派其他接受人</el-button>
</div>
@ -54,7 +54,7 @@
<el-col :span="24">
<el-form-item label="任务说明">
<div style="display: flex;flex-direction: row; align-items: center;">
<div>{{formData.shuoming}}</div>
<div>{{formData.taskIntroduction}}</div>
</div>
</el-form-item>
</el-col>
@ -100,6 +100,7 @@
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import excelView from "./excel-view.vue";
import acceptingPersonel from "./acceptingPersonel.vue";
@ -133,7 +134,18 @@ export default {
};
},
created() { },
async mounted() {
this.getDetail()
},
methods: {
getDetail() {
let parms = {
id: this.taskId,
};
requestGet('/actual/base/communityOneTablePeriodPublish/getDetail', parms).then(res => {
this.formData=res.data
});
},
close() {
this.showView = false
},
@ -164,6 +176,12 @@ export default {
...mapGetters(['clientHeight', 'resolution']),
},
watch: {},
props: {
taskId: {
type: String,
default: ""
},
},
}
</script>

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

@ -4,23 +4,18 @@
<div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="发布组织" prop="agencyId">
<!-- <el-form-item label="发布组织" prop="agencyId">
<el-cascader class="u-item-width-normal" size="small" ref="myCascader"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
:show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
</el-form-item>
</el-form-item> -->
<el-form-item label="任务主题" prop="eventContent">
<el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small"
clearable placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="传创建人" prop="eventContent">
<el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small"
<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-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="开始时间">
@ -32,14 +27,22 @@
</el-date-picker>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select class="u-item-width-normal" v-model.trim="formData.status" 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">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="创建人" prop="createdBy">
<el-select class="u-item-width-normal" v-model.trim="formData.createByName"
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">
@ -57,23 +60,30 @@
<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="gridName" align="center" label="发布组织" :show-overflow-tooltip="true">
<el-table-column prop="agencyName" align="center" label="发布组织" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="categoryName" label="任务主题" min-width="140" align="center"
<el-table-column prop="taskTitle" label="任务主题" min-width="140" align="center"
:show-overflow-tooltip="true" />
<el-table-column prop="responsibleName" align="center" width="100" label="任务周期"
<el-table-column prop="taskPeriod" align="center" width="100" label="任务周期"
:show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.taskPeriod === 'once' ? '一次性' : '每周' }}
</template>
</el-table-column>
<el-table-column prop="name" align="center" width="100" label="任务状态" :show-overflow-tooltip="true">
<el-table-column prop="taskState" align="center" width="100" label="任务状态"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taskState === 'rejected' ? '已驳回' : scope.row.taskState === 'submit' ?
'已提交' : '已改派' }}</span>
</template>
</el-table-column>
<el-table-column prop="satisfactionName" align="center" width="100" label="发布人"
<el-table-column prop="createByName" align="center" width="100" label="发布人"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="happenTime" align="center" width="140" :show-overflow-tooltip="true"
<el-table-column prop="createdTime" align="center" width="140" :show-overflow-tooltip="true"
label="发布时间">
</el-table-column>
@ -93,7 +103,7 @@
</div>
</div>
<div v-if="pageType == 'info'">
<FillingInfo @handleShowPage="handleShowPage"></FillingInfo>
<FillingInfo :taskId="taskId" @handleShowPage="handleShowPage"></FillingInfo>
</div>
@ -102,7 +112,7 @@
</template>
<script>
import { requestPost } from "@/js/dai/request";
import { requestPost,requestGet } from "@/js/dai/request";
import { mapGetters } from "vuex";
import FillingInfo from "./cpts/filling-info.vue";
export default {
@ -137,27 +147,30 @@ export default {
checkStrictly: true
}
return {
taskId:"",
statusArray: [
{
label: '已提交',
value: 'submit'
},
{
label: '已驳回',
value: 'rejected',
},
{
label: '已改派',
value: 'reassigned',
}],
pageType: "list", // 列表list 新增add 详情info
tableData: [],
formData: {
agencyId: '',
eventContent: '',
startTime: '',
endTime: '',
status: ''
orgId: '',//组织Id
taskTitle: '',//任务主题
taskType: '',//任务类型
startTime: '',//开始时间
endTime: '',//结束时间
createdBy: ''//创建人
},
statusArray: [
{
label: '1',
value: '1'
}, {
label: '1',
value: '2'
}, {
label: '1',
value: '3'
},
],
orgOptionProps,
orgOptions: [],
pageNo: 1,
@ -183,12 +196,35 @@ export default {
},
watch: {
},
mounted() {
this.getTableData()
this.getOrgTreeList()
},
async mounted() {
const user = this.$store.state.user;
await this.getStafflist()
if (user) {
if (user.roleList.findIndex(item => item === "manager") !== -1) {
this.manager = false;
}else {
this.manager = true;
this.formData.createdBy = this.createdByArray.find(item=>item.mobile === user.phone).staffId
}
}
this.getTableData()
},
methods: {
handleInfo() {
async getStafflist() {
let parms = {
orgId:this.$store.state.user.agencyId,
orgType: 'agency',
pageNo: 1,
pageSize: 100,
};
let {data,code} = await requestPost('/data/aggregator/org/stafflist',parms)
if(code === 0){
this.createdByArray = data.staffList;
}
},
handleInfo(value) {
console.log(value,"sd;ljkfsdlk;fj");
this.taskId=value.id
this.pageType = 'info'
},
handleChangeAgency(val) {
@ -239,21 +275,8 @@ export default {
},
async getTableData() {
const url = "/actual/base/communityOneTablePeriodPublish/myPageList";
console.log(this.formData, "formData");
if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
if (this.level == "grid") {
this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.agencyId = "";
} else {
this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
this.formData.gridId = "";
}
} else {
this.formData.agencyId = "";
this.formData.gridId = "";
}
const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, {
const { data, code, msg } = await requestGet(url, {
pageSize,
pageNo,
...formData,

Write Preview
Loading…
Cancel
Save