Skip to content

S
sgaqgl-vue
Commit 2d398405 authored by 李苏's avatar 李苏 💬
Browse files
Options

修正

parent f1690c9d
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 202 deletions
src/api/daily/duty.js
View file @ 2d398405
......@@ -30,6 +30,14 @@ method: 'post',
data: query||{}
})
}
/* 查询分类内容 */
export function queryFlnr(query) {
return request({
url: '/aqgl/rcgl/lzbz/query',
method: 'post',
data: query||{}
})
}
......
src/api/daily/performanceReport.js
View file @ 2d398405
......@@ -29,6 +29,27 @@ export function doQueryDtl(query) {
data: query||{}
})
}
export function doUpdateDtl(query) {
return request({
url: '/aqgl/rcgl/lzrwdtl/update',
method: 'post',
data: query||{}
})
}
export function doDeleteDtl(query) {
return request({
url: '/aqgl/rcgl/lzrwdtl/delete',
method: 'post',
data: query||{}
})
}
export function doAddDtl(query) {
return request({
url: '/aqgl/rcgl/lzrwdtl/add',
method: 'post',
data: query||{}
})
}
src/views/daily/duty/edit.vue
View file @ 2d398405
......@@ -5,7 +5,7 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="履职分类" ref="flid" prop="flid">
<RelSelect src='/aqgl/rcgl/lzfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<RelSelect style="width: 100%;" src='/aqgl/rcgl/lzfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
......@@ -14,14 +14,15 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="履职内容" ref="content" prop="content">
<el-input :readonly="readonly" v-model="form.content" ></el-input>
<RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}" src='/aqgl/rcgl/lzbz/query' clearable :match="{value:'content',label:'content'}" v-model='form.content' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.content" ></el-input> -->
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="履职人员" ref="ryid" prop="ryid">
<personSelector :label="form.ryName||form.ryid||'暂无'" @selected='zrrSelected' ></personSelector>
<personSelector :label="form.ryName||form.ryid||'暂无'" @selected='zrrSelected' ></personSelector>
</el-form-item>
</el-col>
</el-row>
......@@ -30,11 +31,27 @@
</template>
<script>
import {editMixin} from 'common'
import {queryFlnr} from '@/api/daily/duty.js'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
computed:{
flid:function(){
return this.form.flid
}
},
watch:{
flid(val){
queryFlnr({flid:val}).then(res=>{
if(res.data&&res.data.record){
this.content=''
this.optionsData=res.data.record||[]
}
})
}
},
/* 组件名称*/
name: "dutyEdit",
......@@ -44,9 +61,8 @@
return {
/* 额外初始化，根据需求*/
systemType: [],
optionsData: [],
bmList: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
......@@ -96,5 +112,3 @@
<style scoped lang="scss">
</style>
src/views/daily/duty/index.vue
View file @ 2d398405
......@@ -89,8 +89,8 @@
{label: "履职分类", prop: "flName", fieldType: "ftString",width:192},
{label: "履职内容", prop: "content", fieldType: "ftString",width:300},
{label: "履职人员", prop: "ryName", fieldType: "ftString",width:192},
{label: "单据来源", prop: "lyName", fieldType: "ftString",width:48},
{label: "状态", prop: "ztName", fieldType: "ftString",width:48},
{label: "单据来源", prop: "lyName", fieldType: "ftString",width:148},
{label: "状态", prop: "ztName", fieldType: "ftString",width:88},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
]
......
src/views/daily/maintenanceDuty/edit.vue
View file @ 2d398405
......@@ -5,7 +5,7 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="分类" ref="flid" prop="flid">
<RelSelect src='/aqgl/rcgl/lzfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
<RelSelect style="width: 100%;" src='/aqgl/rcgl/lzfl/query' :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
......@@ -77,5 +77,3 @@
<style scoped lang="scss">
</style>
src/views/daily/nroa/index.vue
View file @ 2d398405
......@@ -130,7 +130,9 @@
tableTitle: [
{label: "申请单号", prop: "djid", fieldType: "ftString",width:120},
{label: "申请日期", prop: "sqrq", fieldType: "ftDateTime"},
{label: "作业类型", prop: "flid", fieldType: "ftString",width:300},
{label: "作业类型", prop: "flid", fieldType: "ftString",width:300,transform:{
url:'/aqgl/rcgl/fcgzy/init/zylx',label:'name',value:'id'
}},
{label: "开始时间", prop: "kssj", fieldType: "ftDateTime"},
{label: "结束时间", prop: "jssj", fieldType: "ftDateTime"},
{label: "作业时长", prop: "zysc", fieldType: "float"},
......
src/views/daily/performanceReport/edit.vue
View file @ 2d398405
......@@ -4,87 +4,107 @@
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="标题" ref="roleid" prop="roleid">
<el-input :readonly="readonly" v-model="form.roleid"></el-input>
<el-form-item label="履职分类" ref="flid" prop="flid">
<RelSelect style="width: 100%;" src='/aqgl/rcgl/lzfl/query' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<!--根据分类筛选内容-->
<!--/aqgl/rcgl/lzbz/query; in:flid-->
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="内容" ref="roleid" prop="roleid">
<el-input :readonly="readonly" type="textarea" v-model="form.roleid"></el-input>
<el-form-item label="履职内容" ref="content" prop="content">
<RelSelect hasValue :optionsData='optionsData' style="width: 100%;" :params="{flid:form.flid}" src='/aqgl/rcgl/lzbz/query' clearable :match="{value:'content',label:'content'}" v-model='form.content' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.content" ></el-input> -->
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="有效期至">
<el-date-picker style="width: 100%;"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编制单位">
<el-select placeholder="请选择" style="width: 100%;" >
<!-- <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> -->
</el-select>
<el-col :span="24">
<el-form-item label="履职人员" ref="ryid" prop="ryid">
<personSelector :label="form.ryName||form.ryid||'暂无'" @selected='zrrSelected' ></personSelector>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 按钮重写， -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里，根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
import {queryFlnr} from '@/api/daily/duty.js'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
computed:{
flid:function(){
return this.form.flid
}
},
watch:{
flid(val){
queryFlnr({flid:val}).then(res=>{
if(res.data&&res.data.record){
this.content=''
this.optionsData=res.data.record||[]
}
})
}
},
/* 组件名称*/
name: 'roleManagementEdit',
name: "dutyEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化，根据需求*/
systemType: [],
optionsData: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
roleid: '',
rolename: '',
bz: "",
//ID
id:'',
//履职分类
flid:'',
//履职内容
content:'',
//履职人员
ryid:'',
//单据来源
djly:'',
//状态
zt:'',
//附件数
attachcount:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
}
}
},
methods: {
zrrSelected(row){
this.form.ryid=row.id
}
}
}
</script>
......
src/views/daily/performanceReport/index.vue
View file @ 2d398405
......@@ -31,10 +31,10 @@
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<ViewButton ref="view" :app='app'></ViewButton>
<!-- <AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<EditButton ref="edit" :app='app'></EditButton> -->
<AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
......@@ -45,7 +45,7 @@
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
<TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
......@@ -55,7 +55,7 @@
<!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane label="履职报告" name="first" >
<Report />
<Report ref="report" />
</el-tab-pane>
</el-tabs>
</div>
......@@ -65,14 +65,13 @@
<script>
/* 引入需要的接口*/
import {
QueryKzzxRole,
QueryApptype,
AddKzzxRole,
DeleteKzzxRole,
UpdateKzzxRole,
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* 引入需要的接口*/
import {
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/daily/duty.js';
/* edit页面*/
import Edit from './edit'
import Report from './report.vue'
......@@ -85,8 +84,7 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
console.log(_)
this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
},
data() {
return {
......@@ -97,113 +95,43 @@
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: 'kzzx/role',
baseUrl: '/aqgl/rcgl/lzrw',
/* 查询参数*/
queryParams: {
ksrq: '',
jsrq: ''
},
queryParams: {
info: ''
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'whsj',
label: '报送日期',
show:false,
fieldType:'ftDateTime',
width: '100',
align:'left'
},
{
prop: 'whsj',
label: '作业类型',
...this.$common('ftDateTime')
},
{
prop: 'whr',
label: '计划开始作业时间',
width: '100'
},
{
prop: 'whr',
label: '地点',
width: '100'
},
{
prop: 'whr',
label: '计划完成作业时间',
width: '100'
},
{
prop: 'whr',
label: '计划作业时长',
width: '100'
},
{
prop: 'whr',
label: '作业项目',
width: '100'
},
{
prop: 'whr',
label: '作业地点',
width: '100'
},
{
prop: 'whr',
label: '风险级别',
width: '100'
},
{
prop: 'whr',
label: '作业单位',
width: '100'
},
{
prop: 'whr',
label: '作业申请',
width: '100'
}
{label: "履职分类", prop: "flName", fieldType: "ftString",width:192},
{label: "履职内容", prop: "content", fieldType: "ftString",width:300},
{label: "履职人员", prop: "ryName", fieldType: "ftString",width:192},
{label: "单据来源", prop: "lyName", fieldType: "ftString",width:148},
{label: "状态", prop: "ztName", fieldType: "ftString",width:80},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
]
}
},
methods: {
getRow: function(e) {
this.rowItem = e
this.$refs.report.queryParams.mid=e.id
this.$refs.report.$refs.TablePager.pageQuery()
},
handleClick(val){
console.log(val,'val')
},
/* 基础查询*/
query: QueryKzzxRole,
/* 基础增*/
apiAdd: AddKzzxRole,
/* 基础更新*/
apiUpdate: UpdateKzzxRole,
/* 删除操作*/
apiDelete: DeleteKzzxRole,
/* 初始化赋值操作*/
init() {
},
/* 基础查询*/
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
/* 启用停用*/
setEnable(id) {
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let params = {
id: id
}
QtKzzxRole(params).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.$refs['TablePager'].reLoad()
} else {
this.$error(res.message || '操作失败')
}
})
})
}
},
......
src/views/daily/performanceReport/report.vue
View file @ 2d398405
<template>
<div class="form-detail">
<el-form ref="form" label-width='80px' :model="form" >
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="履职内容">
<el-input type="textarea" rows="22" >
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.mid' >
<!-- 查询条件-->
<!-- <div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">分类:</span>
<el-input></el-input>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">开始日期:</span>
<el-date-picker></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">结束日期:</span>
<el-date-picker></el-date-picker>
</div>
</el-col>
</el-row>
</div> -->
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<ViewButton ref="view" :app='app'></ViewButton>
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
</div>
</div>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
}
}
}
/* 引入需要的接口*/
import {
doQueryDtl,
doUpdateDtl,
doDeleteDtl,
doAddDtl
} from '@/api/daily/performanceReport.js';
/* edit页面*/
import Edit from './reportEdit'
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'aqgl/rcglLzrw',
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: '/aqgl/rcgl/lzrwdtl',
/* 查询参数*/
queryParams: {
mid: ''
},
/* 表格标题对应参数*/
tableTitle: [
{label: "履职日期", prop: "lzrq", fieldType: "ftDateTime",width:192},
{label: "履职信息", prop: "lzxx", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:400},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
]
}
},
methods: {
/* 基础查询*/
query: doQueryDtl,
/* 基础增*/
apiAdd: doAddDtl,
/* 基础更新*/
apiUpdate: doUpdateDtl,
/* 删除操作*/
apiDelete: doDeleteDtl,
/* 初始化赋值操作*/
init() {
}
},
components: {
Edit,
}
}
</script>
<style scoped>
.form-detail{
height: 500px;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
}
</style>
src/views/outsourcingDirector/declare/new/edit.vue
View file @ 2d398405
......@@ -83,6 +83,7 @@
<el-input :readonly="readonly" v-model="form.wfpname" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</RelDialog>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment