Commit 2ad00bb2 authored by 周毅's avatar 周毅

调整安全活动、安全活动执行、外协单位档案管理、职工持证信息管理

parent ac850fc6
import request from 'common/src/utils/request'
/*query */
export function doQuery(query) {
return request({
url: '/aqgl/rcgl/aqhdzxgz/query',
method: 'post',
data: query||{}
})
}
......@@ -2,94 +2,35 @@ import request from 'common/src/utils/request'
/* 外协单位申报query */
export function doQuery(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/query',
method: 'post',
data: query||{}
return request({
url: '/aqgl/wxgl/wxdwda/query',
method: 'post',
data: query||{}
})
}
/* 外协单位申报更新 */
export function doUpdate(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/update',
method: 'post',
data: query||{}
url: '/aqgl/wxgl/wxdwda/update',
method: 'post',
data: query||{}
})
}
/* 外协单位申报新增 */
export function doAdd(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/add',
method: 'post',
data: query||{}
url: '/aqgl/wxgl/wxdwda/add',
method: 'post',
data: query||{}
})
}
/* 外协单位申报删除 */
export function doDelete(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/delete',
method: 'post',
data: query||{}
})
}
/* 状态接口 */
export function initZt(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/init/zt',
method: 'post',
data: query||{}
})
}
/* 单位类型接口 */
export function initDwlx(query) {
return request({
url: '/aqgl/wxgl/wxdwsb/init/dwlx',
url: '/aqgl/wxgl/wxdwda/delete',
method: 'post',
data: query||{}
})
}
/* 外协单位审批查询 */
export function doQuerySp(query) {
return request({
url: '/aqgl/wxgl/wxdwsp/query',
method: 'post',
data: query||{}
})
}
/* 隐患记录查询 */
export function yhjl(query) {
return request({
url: '/aqgl/wxgl/wxdwsp/yhjl/query',
method: 'post',
data: query||{"zrdwid":"","fzrid":""}
})
}
/* 教育培训记录查询 */
export function pxjl(query) {
return request({
url: '/aqgl/wxgl/wxdwsp/pxjl/query',
method: 'post',
data: query||{"zrdwid":"","fzrid":""}
})
})
}
/* 三违记录查询 */
export function swjl(query) {
return request({
url: '/aqgl/wxgl/wxdwsp/swjl/query',
method: 'post',
data: query||{"zrdwid":"","fzrid":""}
})
}
......@@ -527,6 +527,19 @@ export const powerRoutes=[
name:'planManage',
path:"planManage"
},
{
component:'daily/zsfl/index',
hidden:false,
meta:{
"title": "证书分类",
"icon": "",
"noCache": false,
"link": null,
"mkid":905000500,
},
name:'zsfl',
path:"zsfl"
},
{
component:'daily/holdCertificate/index',
hidden:false,
......@@ -553,6 +566,19 @@ export const powerRoutes=[
name:'activityRecord',
path:"activityRecord"
},
{
component:'daily/aqhdzxgz/index',
hidden:false,
meta:{
"title": "维护安全活动记录",
"icon": "",
"noCache": false,
"link": null,
"mkid":905000900,
},
name:'aqhdzxgz',
path:"aqhdzxgz"
},
{
component:'daily/nrtm/index',
hidden:false,
......
......@@ -37,20 +37,20 @@
<el-row class="tool-bar" >
<PrintButton :app='this'></PrintButton>
<EditButton ref="add" :app='this'></EditButton>
<!-- <ViewButton ref="view" :app='this'></ViewButton>
<!-- <ViewButton ref="view" :app='this'></ViewButton>
<CopyButton ref="copy" :app='this'></CopyButton>
<FieldButton :app='this'></FieldButton>
<ExcelButton :app='this'></ExcelButton> -->
<!-- <AttachFileButton :app='this' ></AttachFileButton> -->
<el-button @click="upload" size='mini' type="primary">上传</el-button>
<el-button @click="upload" size='mini' type="primary">新增</el-button>
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager v-loading='isupLoad' @getData='getData' :ref="'TablePager'" :app='this' :query='query' @selectItem='selectItem'
@getRow='getRow'>
<template slot="tabCustom">
<el-table-column label="附件操作" width="240" header-align="center" fixed="right" >
<el-table-column label="附件操作" width="160" header-align="center" fixed="right" >
<template slot-scope="scope">
<div style="width: 100%;display: flex;">
<el-button style="text-align: center;color: #3399ff;width: 33.3%;"
......@@ -131,40 +131,11 @@
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: 'title',
label: '标题',
width: '400'
},
// {
// prop: 'fbrq',
// label: '发布日期',
// ...this.$common('ftDateTime')
// },
// {
// prop: 'ssrq',
// label: '实施日期',
// ...this.$common('ftDateTime')
// },
// {
// prop: 'sytk',
// label: '适用条款',
// width: '120'
// },
// {
// prop: 'bz',
// label: '备注',
// width: '120'
// },
{
prop: 'fileName',
label: '文件名',
width: '400'
},
{
prop: 'fileSize',
label: '文件大小',
width: '120',
{prop: 'title', label: '文档名称', width: '340'},
{prop: 'fileVersion', label: '版本', width: '60'},
{prop: 'createTime', label: '上传时间', fieldType: "ftDateTime"},
{prop: 'updUserName', label: '上传人', width: "80"},
{prop: 'fileSize', label: '大小', width: '70',
formatter:function(a,b,bytes){
if(!bytes){
return '未上传文件'
......
......@@ -11,23 +11,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="频次记录" ref="pcjl" prop="pcjl">
<el-input type="number" :readonly="readonly" v-model="form.pcjl" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="组织部门" ref="bmid" prop="bmid">
<RelSelect style="width: 100%;" src='kzzx/bm/query' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
<el-form-item label="组织单位" ref="bmid" prop="bmid">
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryBz' :readonly="readonly" :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect>
<!-- <el-input :readonly="readonly" v-model="form.bmid" ></el-input> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -41,18 +29,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
</el-form>
</RelDialog>
</template>
......@@ -111,14 +87,9 @@
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
hdrq: [{required: true, trigger: 'blur'}],
bmid: [{required: true, trigger: 'blur'}],
content: [{required: true, trigger: 'blur'}]
}
}
},
......
......@@ -20,7 +20,7 @@
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">部门:</span>
<RelSelect src='kzzx/bm/query' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
<RelSelect src='jcsj/common/bm/queryBz' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
</el-row>
......@@ -32,7 +32,7 @@
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<AttachFileButton :app='app' ></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -90,17 +90,14 @@
/* 表格标题对应参数*/
tableTitle: [
{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
{label: "频次记录", prop: "pcjl", fieldType: "ftString",width:120},
// {label: "组织部门", prop: "bmid", fieldType: "ftString",width:160},
{label: "组织部门", prop: "bmName", fieldType: "ftString",width:160},
{label: "活动名称", prop: "name", fieldType: "ftString",width:300},
{label: "组织单位", prop: "bmName", fieldType: "ftString",width:160},
{label: "活动内容", prop: "content", fieldType: "ftString",width:300},
{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString", show: false},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime", show: true},
]
}},
methods: {
......
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动日期" ref="hdrq" prop="hdrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.hdrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="频次记录" ref="pcjl" prop="pcjl">
<el-input :readonly="readonly" v-model="form.pcjl" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="组织部门" ref="bmid" prop="bmid">
<el-input :readonly="readonly" v-model="form.bmid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动内容" ref="content" prop="content">
<el-input :readonly="readonly" v-model="form.content" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动结论" ref="hdjl" prop="hdjl">
<el-input :readonly="readonly" v-model="form.hdjl" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
/* 组件名称*/
name: "aqglRcglAqhdEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化,根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
//ID
id:'',
//活动日期
hdrq:new Date().getTime(),
//频次记录
pcjl:'',
//组织部门
bmid:'',
//活动名称
name:'',
//活动内容
content:'',
//活动结论
hdjl:'',
//备注
bz:'',
//维护人编码
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: {
}
}
</script>
<style scoped lang="scss">
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="12" class="search-col">
<div class="search-item">
<span class="search-span">名称:</span>
<el-input v-model="queryParams.info"></el-input>
</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>
/* 引入需要的接口*/
import {
doQuery,
doAdd,
doUpdate,
doDelete
} from '@/api/daily/activityRecord.js';
/* edit页面*/
import Edit from './edit'
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'aqglRcglAqhd',
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: '/aqgl/rcgl/aqhd',
/* 查询参数*/
queryParams: {
info: ''
},
/* 表格标题对应参数*/
tableTitle: [
{label: "活动日期", prop: "hdrq", fieldType: "ftDateTime"},
{label: "频次记录", prop: "pcjl", fieldType: "ftString",width:180},
// {label: "组织部门", prop: "bmid", fieldType: "ftString",width:192},
{label: "组织部门", prop: "bmName", fieldType: "ftString",width:192},
{label: "活动名称", prop: "name", fieldType: "ftString",width:300},
{label: "活动内容", prop: "content", fieldType: "ftString",width:300},
{label: "活动结论", prop: "hdjl", fieldType: "ftString",width:300},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
]
}
},
methods: {
/* 基础查询*/
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
}
},
components: {
Edit,
}
}
</script>
<style scoped>
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<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-date-picker v-model="queryParams.year"></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 v-model="queryParams.month"></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">部门:</span>
<RelSelect src='jcsj/common/bm/queryBz' clearable :match="{value:'id',label:'bmmc'}" v-model='queryParams.bmid' ></RelSelect>
</div>
</el-col>
</el-row>
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
<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>
/* 引入需要的接口*/
import {
doQuery
} from '@/api/daily/aqhdzxgz.js';
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'appVersion',
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: '/aqgl/rcgl/aqhdzxgz',
/* 查询参数*/
queryParams: {
bmid: ''
},
/* 表格标题对应参数*/
tableTitle: [
{label: "年度", prop: "year", fieldType: "int"},
{label: "月份", prop: "bmName", fieldType: "int",width:160},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:300},
{label: "班组", prop: "bmName", fieldType: "ftString",width:300},
{label: "安全活动次数/计划次数", prop: "bz", fieldType: "ftString",width:100},
{label: "安全活动次数", prop: "count", fieldType: "ftString",width:100},
{label: "计划次数", prop: "planCount", fieldType: "ftString",width:100}
]
}},
methods: {
/* 基础查询*/
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
}
},
components: {
Edit,
}
}
</script>
<style scoped>
</style>
......@@ -4,7 +4,7 @@
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="职工姓名" ref="userid" prop="userid">
<el-form-item label="职工" ref="userid" prop="userid">
<!-- <el-input :readonly="readonly" v-model="form.userid" ></el-input> -->
<personSelector :label="form.username||form.userid||'暂无'" @selected='userSelected' ></personSelector>
</el-form-item>
......@@ -14,29 +14,47 @@
<el-input :readonly="readonly" v-model="form.code" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="证书名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="发证单位" ref="fzdw" prop="fzdw">
<el-input :readonly="readonly" v-model="form.fzdw" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="作业类别" ref="flid" prop="flid">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/ygczxx/init/zsfl' clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发证日期" ref="fzsq" prop="fzsq">
<el-form-item label="适用范围" ref="syfw" prop="syfw">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="发证日期" ref="fzrq" prop="fzrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.fzsq" placeholder="选择日期">
v-model="form.fzrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="有效期(年)" ref="yxq" prop="yxq">
<el-input type="number" :readonly="readonly" v-model="form.yxq" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="9">
<el-form-item label="截止日期" ref="jzrq" prop="jzrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.jzrq" placeholder="选择日期">
......@@ -44,7 +62,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="复审日期1" ref="fsrq1" prop="fsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
......@@ -53,22 +71,23 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复审日期2" ref="fsrq2" prop="fsrq2">
<el-form-item label="实际复审日期1" ref="sjfsrq1" prop="sjfsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.fsrq2" placeholder="选择日期">
v-model="form.sjfsrq1" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="实际复审日期1" ref="sjfsrq1" prop="sjfsrq1">
<el-form-item label="复审日期2" ref="fsrq2" prop="fsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.sjfsrq1" placeholder="选择日期">
v-model="form.fsrq2" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12">
<el-form-item label="实际复审日期2" ref="sjfsrq2" prop="sjfsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date" value-format="timestamp"
v-model="form.sjfsrq2" placeholder="选择日期">
......@@ -76,25 +95,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="适用范围" ref="syfw" prop="syfw">
<RelSelect :readonly="readonly" src='aqgl/rcgl/ygczxx/init/syfw' clearable :match="{value:'id',label:'name'}" v-model='form.syfw' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="发证单位" ref="fzdw" prop="fzdw">
<el-input :readonly="readonly" v-model="form.fzdw" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="8">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col> -->
</el-row>
</el-form>
</RelDialog>
</template>
......@@ -120,7 +120,7 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
userName:'',
userName:'',
//ID
id:'',
//用户编码
......@@ -129,22 +129,23 @@
code:'',
//证书名称
name:'',
flid:'',
//发证日期
fzsq:new Date().getTime(),
fzrq:'',
//有效期
yxq:'',
//截止日期
jzrq:new Date().getTime(),
jzrq:'',
//状态
zt:'',
//复审日期1
fsrq1:new Date().getTime(),
fsrq1:'',
//复审日期2
fsrq2:new Date().getTime(),
fsrq2:'',
//实际复审日期1
sjfsrq1:new Date().getTime(),
sjfsrq1:'',
//实际复审日期2
sjfsrq2:new Date().getTime(),
sjfsrq2:'',
//备注
bz:'',
//维护人编码
......@@ -168,14 +169,13 @@
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
userid: [{required: true,trigger: 'blur'}, ],
fzdw: [{required: true,trigger: 'blur'},],
fzrq: [{required: true,trigger: 'blur'}, ],
code: [{required: true,trigger: 'blur'}, ],
name: [{required: true,trigger: 'blur'}, ],
flid: [{required: true,trigger: 'blur'}, ],
syfw: [{required: true,trigger: 'blur'}, ],
}
}
},
......
......@@ -38,7 +38,7 @@
<AddButton ref="add" :app='app'></AddButton>
<CopyButton ref="copy" :app='app'></CopyButton>
<EditButton ref="edit" :app='app'></EditButton>
<AttachFileButton :app='app' ></AttachFileButton>
<AttachFileButton :app='app' ></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton>
<!-- 额外按钮-->
......@@ -99,26 +99,27 @@ import {
},
/* 表格标题对应参数*/
tableTitle: [
{label: "职工工号", prop: "usercode", fieldType: "ftString",width:140},
{label: "职工姓名", prop: "username", fieldType: "ftString",width:160},
{label: "证书编号", prop: "code", fieldType: "ftString",width:160},
{label: "证书名称", prop: "name", fieldType: "ftString",width:180},
{label: "发证日期", prop: "fzsq", fieldType: "ftDateTime"},
{label: "有效期", prop: "yxq", fieldType: "float"},
{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "状态", prop: "ztName", fieldType: "ftString",width:60},
{label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"},
{label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"},
{label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"},
{label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"},
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
// {label: "适用范围", prop: "syfw", fieldType: "ftString",width:60},
{label: "适用范围", prop: "syfwName", fieldType: "ftString",width:160},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}
{label: "状态", prop: "ztName", fieldType: "ftString",width:60},
{label: "职工工号", prop: "usercode", fieldType: "ftString",width:140},
{label: "职工姓名", prop: "username", fieldType: "ftString",width:160},
{label: "证书编号", prop: "code", fieldType: "ftString",width:160},
{label: "证书名称", prop: "name", fieldType: "ftString",width:180},
{label: "作业类别", prop: "zsflName", fieldType: "ftString", width: 100},
{label: "发证日期", prop: "fzrq", fieldType: "ftDateTime"},
{label: "有效期", prop: "yxq", fieldType: "float"},
{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"},
{label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"},
{label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"},
{label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"},
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
// {label: "适用范围", prop: "syfw", fieldType: "ftString",width:60},
{label: "适用范围", prop: "syfwName", fieldType: "ftString",width:160},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString", show: false},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime", show: false}
]
}
......
<template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="用户编码" ref="userid" prop="userid">
<el-input :readonly="readonly" v-model="form.userid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证书编号" ref="code" prop="code">
<el-input :readonly="readonly" v-model="form.code" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="证书名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="发证日期" ref="fzsq" prop="fzsq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fzsq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="有效期" ref="yxq" prop="yxq">
<el-input :readonly="readonly" v-model="form.yxq" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="截止日期" ref="jzrq" prop="jzrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.jzrq" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="复审日期1" ref="fsrq1" prop="fsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fsrq1" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="复审日期2" ref="fsrq2" prop="fsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.fsrq2" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际复审日期1" ref="sjfsrq1" prop="sjfsrq1">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.sjfsrq1" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="实际复审日期2" ref="sjfsrq2" prop="sjfsrq2">
<el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.sjfsrq2" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="发证单位" ref="fzdw" prop="fzdw">
<el-input :readonly="readonly" v-model="form.fzdw" ></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="适用范围" ref="syfw" prop="syfw">
<el-input :readonly="readonly" v-model="form.syfw" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
/* 组件名称*/
name: "aqgl/rcglYgczxxEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化,根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
//ID
id:'',
//用户编码
userid:'',
//证书编号
code:'',
//证书名称
name:'',
//发证日期
fzsq:new Date().getTime(),
//有效期
yxq:'',
//截止日期
jzrq:new Date().getTime(),
//状态
zt:'',
//复审日期1
fsrq1:new Date().getTime(),
//复审日期2
fsrq2:new Date().getTime(),
//实际复审日期1
sjfsrq1:new Date().getTime(),
//实际复审日期2
sjfsrq2:new Date().getTime(),
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
//发证单位
fzdw:'',
//适用范围
syfw:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
}
}
},
methods: {
}
}
</script>
<style scoped lang="scss">
</style>
<template>
<div class="min_full">
<!-- 查询条件-->
<div class="search" v-condition>
<SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="12" class="search-col">
<div class="search-item">
<span class="search-span">名称:</span>
<el-input v-model="queryParams.info"></el-input>
</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>
/* 引入需要的接口*/
import {
doQuery,
doAdd,
doUpdate,
doDelete,
doInitSyfw
} from '@/api/daily/holdCertificate.js';
/* edit页面*/
import Edit from './edit'
import {
tableMixin
} from 'common'
export default {
mixins: [tableMixin],
name: 'aqgl/rcglYgczxx',
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: '/aqgl/rcgl/ygczxx',
/* 查询参数*/
queryParams: {
info: ''
},
/* 表格标题对应参数*/
tableTitle: [
{label: "用户编码", prop: "userid", fieldType: "ftString",width:192},
{label: "证书编号", prop: "code", fieldType: "ftString",width:240},
{label: "证书名称", prop: "name", fieldType: "ftString",width:300},
{label: "发证日期", prop: "fzsq", fieldType: "ftDateTime"},
{label: "有效期", prop: "yxq", fieldType: "float"},
{label: "截止日期", prop: "jzrq", fieldType: "ftDateTime"},
{label: "状态", prop: "zt", fieldType: "ftString",width:60},
{label: "复审日期1", prop: "fsrq1", fieldType: "ftDateTime"},
{label: "复审日期2", prop: "fsrq2", fieldType: "ftDateTime"},
{label: "实际复审日期1", prop: "sjfsrq1", fieldType: "ftDateTime"},
{label: "实际复审日期2", prop: "sjfsrq2", fieldType: "ftDateTime"},
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "发证单位", prop: "fzdw", fieldType: "ftString",width:300},
// {label: "适用范围", prop: "syfw", fieldType: "ftString",width:60},
{label: "适用范围", prop: "syfwName", fieldType: "ftString",width:60},
]
}
},
methods: {
/* 基础查询*/
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
apiUpdate: doUpdate,
/* 删除操作*/
apiDelete: doDelete,
/* 初始化赋值操作*/
init() {
}
},
components: {
Edit,
}
}
</script>
<style scoped>
</style>
......@@ -23,13 +23,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</RelDialog>
</template>
......
......@@ -19,7 +19,6 @@
<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>
<!-- 额外按钮-->
......@@ -79,8 +78,8 @@
{label: "备注", prop: "bz", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString"},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString"},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"},
{label: "创建人", prop: "cjr", fieldType: "ftString", show: false},
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime", show: false},
]
}
},
......
......@@ -104,7 +104,7 @@
</template>
<script>
import { editMixin } from "common";
import { initDwlx } from "@/api/outsourcingDirector/wxdwsb";
import { initDwlx } from "@/api/outsourcingDirector/wxdwda";
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
......
......@@ -196,7 +196,7 @@ import {
doUpdate,
doDelete,
initDwlx
} from "@/api/outsourcingDirector/wxdwsb";
} from "@/api/outsourcingDirector/wxdwda";
/* edit页面*/
import Edit from "./edit";
......
......@@ -11,7 +11,7 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="档案编号" ref="code" prop="code">
<el-input :readonly="readonly" v-toUpperCase v-model="form.code" :disabled="true"></el-input>
<el-input :readonly="readonly" v-toUpperCase v-model="form.code"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -22,29 +22,25 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位类型" prop="type">
<RelSelect
src="/aqgl/wxgl/wxdwsb/init/dwlx"
:match="{value:'id',label:'bmmc'}"
v-model="form.dwlx"
></RelSelect>
<el-form-item label="单位类型" prop="dwlx">
<el-input :readonly="readonly" v-model="form.dwlx"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="管理责任单位" prop="glzrdw">
<el-form-item label="管理责任单位" prop="gsid">
<RelSelect
style="width: 100%;"
src="kzzx/bm/query"
src="jcsj/common/bm/queryGs"
:readonly="readonly"
:match="{value:'id',label:'bmmc'}"
v-model="form.zrdwid"
v-model="form.gsid"
></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="fzr">
<el-form-item label="负责人" prop="fzrid">
<personSelector :label="form.userName||form.userid||'暂无'" @selected="userSelected"></personSelector>
</el-form-item>
</el-col>
......@@ -72,18 +68,6 @@
<el-input :readonly="readonly" v-model="form.lxr"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" class="padding-right">
<el-form-item label="申报日期" ref="sbrq" prop="sbrq">
<el-date-picker
v-model="form.sbrq"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
......@@ -104,7 +88,7 @@
</template>
<script>
import { editMixin } from "common";
import { initDwlx } from "@/api/outsourcingDirector/wxdwsb";
import { initDwlx } from "@/api/outsourcingDirector/wxdwda";
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
......@@ -122,11 +106,9 @@ export default {
form: {
code: "",
name: "",
sbrq: "",
dwlx: "",
zrdwid: "",
gsid: "",
fzrid:"",
pfzrid: "",
address: "",
email: "",
phone: "",
......
......@@ -35,19 +35,22 @@
<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
<TablePager delButton
@getData="getData"
:ref="'TablePager'"
:app="app"
:query="query"
@selectItem="selectItem"
:delButton="false"
@getRow="getRow"
>
<template slot="tabCustom"></template>
......@@ -62,8 +65,8 @@ import {
doQuery,
doAdd,
doUpdate,
doDelete,initDwlx
} from "@/api/outsourcingDirector/wxdwsb";
doDelete
} from "@/api/outsourcingDirector/wxdwda";
/* edit页面*/
import Edit from "./edit";
......@@ -74,19 +77,6 @@ export default {
/* 初始额外赋值*/
async mounted() {
await this.$asRun(
[initDwlx(),
res => {
var data = res['data']['records'];
let typeMap = []
for (var i in data) {
typeMap[data[i].id] = data[i].name
}
this.systemType = data
this.typeMap = typeMap
}
]
)
this.$refs['TablePager'].pageQuery()
},
data() {
......@@ -110,7 +100,7 @@ export default {
}
],
/* 基础url*/
baseUrl: "aqgl/wxgl/wxdwsb",
baseUrl: "aqgl/wxgl/wxdwda",
/* 查询参数*/
queryParams: {
code: "",
......@@ -119,12 +109,6 @@ export default {
},
/* 表格标题对应参数*/
tableTitle: [
{
prop: "ztName",
label: "状态",
width: "120",
show:false
},
{
prop: "code",
label: "档案编号",
......@@ -135,43 +119,20 @@ export default {
label: "名称",
width: "160"
},
{
prop: "sbrq",
label: "申报日期",
width: "160",
fieldType: "ftDate"
},
{
prop: "dwlx",
label: "单位类型",
width: "160",
show: false
},
{
prop: "dwlxName",
label: "单位类型",
width: "160"
},
{
prop: "zrdwid",
prop: "gsid",
label: "责任单位ID",
width: "160",
show: false
},
{
prop: "zrbmName",
label: "责任单位",
width: "160"
},
{
prop: "pgdwid",
label: "评估单位ID",
width: "160",
show: false
},
{
prop: "pgbmName",
label: "评估单位",
prop: "gsName",
label: "管理责任单位",
width: "160"
},
{
......@@ -181,7 +142,7 @@ export default {
show: false
},
{
prop: "fzrName",
prop: "username",
label: "负责人",
width: "160"
},
......
......@@ -104,7 +104,7 @@
</template>
<script>
import { editMixin } from "common";
import { initDwlx } from "@/api/outsourcingDirector/wxdwsb";
import { initDwlx } from "@/api/outsourcingDirector/wxdwda";
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
......
......@@ -205,7 +205,7 @@ import {
doUpdate,
doDelete,
initDwlx
} from "@/api/outsourcingDirector/wxdwsb";
} from "@/api/outsourcingDirector/wxdwda";
/* edit页面*/
import Edit from "./edit";
......
......@@ -104,7 +104,7 @@
</template>
<script>
import { editMixin } from "common";
import { initDwlx } from "@/api/outsourcingDirector/wxdwsb";
import { initDwlx } from "@/api/outsourcingDirector/wxdwda";
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
......
......@@ -83,7 +83,7 @@ import {
doUpdate,
doDelete,
initDwlx
} from "@/api/outsourcingDirector/wxdwsb";
} from "@/api/outsourcingDirector/wxdwda";
/* edit页面*/
import Edit from "./edit";
import Participants from "./participants.vue";
......@@ -119,7 +119,7 @@ export default {
type: "",
DialogTitle: "",
/* 基础url*/
baseUrl: "aqgl/wxgl/wxdwsb",
baseUrl: "aqgl/wxgl/wxdwda",
/* 查询参数*/
queryParams: {
code: "",
......@@ -239,11 +239,4 @@ export default {
Content
}
};
</script>
<style scoped>
/deep/.el-tabs__item {
font-size: 13px;
color: #666;
}
</style>
</script>
\ No newline at end of file
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