Skip to content

S
sgaqgl-vue
Commit 92169e37 authored by zhoumaotao's avatar zhoumaotao
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents cea4fed8 7e7e8bf0
Show whitespace changes
Inline Side-by-side
Showing with 369 additions and 199 deletions
src/views/daily/workInspection/edit.vue
View file @ 92169e37
...@@ -2,49 +2,58 @@ ...@@ -2,49 +2,58 @@
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容，slot=form必写--> <!-- 填写表单内容，slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules"> <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="djid" prop="djid">
<el-input :readonly="readonly" v-model="form.djid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="序号" ref="xh" prop="xh">
<el-input :readonly="readonly" v-model="form.xh" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<el-row :gutter="20"> <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="24"> <el-col :span="24">
<el-form-item label="标题" ref="roleid" prop="roleid"> <el-form-item label="业务日期" ref="ywrq" prop="ywrq">
<el-input :readonly="readonly" v-model="form.roleid"></el-input> <el-date-picker style="width: 100%;" :readonly="readonly" type="date"
v-model="form.ywrq" placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="内容" ref="roleid" prop="roleid"> <el-form-item label="分类" ref="flid" prop="flid">
<el-input :readonly="readonly" type="textarea" v-model="form.roleid"></el-input> <RelSelect style="width: 100%;" src='/aqgl/rcgl/wxzyfl/query' filterable clearable :match="{value:'id',label:'name'}" v-model='form.flid' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="人员" ref="tbrid" prop="tbrid">
<personSelector :label="form.tbrName||form.tbrid||'暂无'" @selected='tbrSelected' ></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.tbrid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="有效期至"> <el-form-item label="备注" ref="bz" prop="bz">
<el-date-picker style="width: 100%;" <el-input :readonly="readonly" v-model="form.bz" ></el-input>
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="编制单位"> <el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-select placeholder="请选择" style="width: 100%;" > <el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
<!-- <el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option> -->
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
</el-form> </el-form>
<!-- 按钮重写， -->
<!-- <div slot="reFooter">
<span slot="footer">
重写按钮写在这里，根据需要重写 slot(reFooter,foorer) 节点样式 重写方法需要在此页重新定义
</span>
</div> -->
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
...@@ -53,9 +62,10 @@ ...@@ -53,9 +62,10 @@
mixins: [editMixin], mixins: [editMixin],
/* 存放index页面传递的额外参数*/ /* 存放index页面传递的额外参数*/
mounted() { mounted() {
}, },
/* 组件名称*/ /* 组件名称*/
name: 'roleManagementEdit', name: "workInspectionEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/ /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() { data() {
...@@ -64,27 +74,54 @@ ...@@ -64,27 +74,54 @@
/* 额外初始化，根据需求*/ /* 额外初始化，根据需求*/
systemType: [], systemType: [],
bmList: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: { form: {
roleid: '', tbrName:'',
rolename: '', //ID
bz: "", id:'',
//单据编号
djid:'',
//序号
xh:'',
//备注
bz:'',
//业务日期
ywrq:new Date().getTime(),
//分类编码
flid:'',
//人员编码
tbrid:'',
//备注
bz:'',
//状态
zt:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
roleid: [{
required: true,
trigger: 'blur'
}, ],
rolename: [{
required: true,
trigger: 'blur'
}, ]
} }
} }
}, },
methods: { methods: {
tbrSelected(row){
this.form.tbrid=row.id
}
} }
} }
</script> </script>
......
src/views/daily/workInspection/index.vue
View file @ 92169e37
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<!-- tabs --> <!-- tabs -->
<el-tabs v-model="activeName" @tab-click="handleClick" > <el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane label="检查内容" name="first" > <el-tab-pane label="检查内容" name="first" >
<Report /> <Report ref="report" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -66,13 +66,11 @@ ...@@ -66,13 +66,11 @@
<script> <script>
/* 引入需要的接口*/ /* 引入需要的接口*/
import { import {
QueryKzzxRole, doQuery,
QueryApptype, doAdd,
AddKzzxRole, doUpdate,
DeleteKzzxRole, doDelete
UpdateKzzxRole, } from '@/api/daily/workInspection';
QtKzzxRole
} from "common/src/api/system/dmgSystem.js";
/* edit页面*/ /* edit页面*/
import Edit from './edit' import Edit from './edit'
import Report from './report.vue' import Report from './report.vue'
...@@ -85,8 +83,7 @@ ...@@ -85,8 +83,7 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery() this.$refs['TablePager'].pageQuery({setFirstCurrent:true})
console.log(_)
}, },
data() { data() {
return { return {
...@@ -97,7 +94,7 @@ ...@@ -97,7 +94,7 @@
type: '', type: '',
DialogTitle: '', DialogTitle: '',
/* 基础url*/ /* 基础url*/
baseUrl: 'kzzx/role', baseUrl: '/aqgl/rcgl/wxzy',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
ksrq: '', ksrq: '',
...@@ -105,89 +102,44 @@ ...@@ -105,89 +102,44 @@
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{ // {label: "单据编号", prop: "djid", fieldType: "ftString",width:120},
prop: 'whsj', {label: "序号", prop: "xh", fieldType: "int"},
label: '年份', // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
show:false, {label: "业务日期", prop: "ywrq", fieldType: "ftDateTime"},
fieldType:'ftDateTime', {label: "分类", prop: "flName", fieldType: "ftString",width:192},
width: '100', {label: "人员", prop: "tbrName", fieldType: "ftString",width:192},
align:'left' // {label: "备注", prop: "bz", fieldType: "ftString",width:300},
}, {label: "状态", prop: "zt", fieldType: "ftString",width:100},
{ {label: "维护人", prop: "whr", fieldType: "ftString"},
prop: 'whsj', {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},
label: '月份', {label: "创建人", prop: "cjr", fieldType: "ftString"},
...this.$common('ftDateTime') {label: "创建时间", prop: "cjsj", fieldType: "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'
}
] ]
} }
}, },
methods: { methods: {
handleClick(val){ handleClick(val){
console.log(val,'val')
}, },
/* 基础查询*/ /* 基础查询*/
query: QueryKzzxRole, query: doQuery,
/* 基础增*/ /* 基础增*/
apiAdd: AddKzzxRole, apiAdd: doAdd,
/* 基础更新*/ /* 基础更新*/
apiUpdate: UpdateKzzxRole, apiUpdate: doUpdate,
/* 删除操作*/ /* 删除操作*/
apiDelete: DeleteKzzxRole, apiDelete: doDelete,
/* 初始化赋值操作*/ /* 初始化赋值操作*/
init() { init() {
}, },
/* 启用停用*/ getRow: function(e) {
setEnable(id) { this.rowItem = e
this.$confirm('是否启用/停用该角色, 是否继续?', '提示', { this.$refs.report.queryParams.mid=e.id
confirmButtonText: '确定', this.$refs.report.$refs.TablePager.pageQuery()
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/workInspection/report.vue
View file @ 92169e37
<template> <template>
<div class="form-detail"> <div class="min_full" style='height:72vh' v-show="queryParams.mid" >
<el-form ref="form" label-width='80px' :model="form" > <!-- 查询条件-->
<el-row :gutter="20"> <!-- 按钮操作-->
<el-col :span="24"> <el-row class="tool-bar">
<el-form-item label="表格"> <PrintButton :app='app'></PrintButton>
<el-input type="textarea" rows="22" > <ViewButton ref="view" :app='app'></ViewButton>
</el-input> <!-- <AddButton ref="add" :app='app'></AddButton>
</el-form-item> <CopyButton ref="copy" :app='app'></CopyButton> -->
</el-col> <EditButton ref="edit" :app='app'></EditButton>
<!-- <AttachFileButton :app='app' ></AttachFileButton>
<FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> -->
<!-- 额外按钮-->
<!-- 表头设置 -->
<!-- 权限-->
</el-row> </el-row>
</el-form> <!-- 表格-->
</div> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' :delButton='false'
@getRow='getRow'>
</TablePager>
</div>
</div>
</template> </template>
<script> <script>
/* 引入需要的接口*/
import {
doQueryDtl,
doAddDtl,
doUpdateDtl,
doDeleteDtl
} from '@/api/daily/workInspection';
/* edit页面*/
import Edit from './reportEdit'
import {
tableMixin
} from 'common'
export default { export default {
mixins: [tableMixin],
name: 'workInspectionDtl',
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
},
data() { data() {
return { return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
type: '',
DialogTitle: '',
/* 基础url*/
baseUrl: '/aqgl/rcgl/wxzymx',
/* 查询参数*/
queryParams: {
mid: ''
},
/* 表格标题对应参数*/
tableTitle: [
// {label: "MID", prop: "mid", fieldType: "ftString",width:192},
// {label: "序号", prop: "xh", fieldType: "int"},
{label: "管控项目", prop: "gkxm", fieldType: "ftString",width:300},
{label: "工作要求", prop: "gzyq", fieldType: "ftString",width:300},
{label: "得分", prop: "df", fieldType: "ftString",width:300},
{label: "扣分细则", prop: "kfxz", 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: { methods: {
handleRemove(file, fileList) {
console.log(file, fileList); /* 基础查询*/
}, query: doQueryDtl,
handlePictureCardPreview(file) { /* 基础增*/
this.dialogImageUrl = file.url; apiAdd: doAddDtl,
this.dialogVisible = true; /* 基础更新*/
apiUpdate: doUpdateDtl,
/* 删除操作*/
apiDelete: doDeleteDtl,
/* 初始化赋值操作*/
init() {
} }
},
components: {
Edit,
} }
} }
</script> </script>
<style scoped> <style scoped>
.form-detail{
height: 500px;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
}
</style> </style>
src/views/daily/workInspection/reportEdit.vue 0 → 100644
View file @ 92169e37
<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="MID" ref="mid" prop="mid">
<el-input :readonly="readonly" v-model="form.mid" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="序号" ref="xh" prop="xh">
<el-input :readonly="readonly" v-model="form.xh" ></el-input>
</el-form-item>
</el-col>
</el-row> -->
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="管控项目" ref="gkxm" prop="gkxm">
<el-input :readonly="true" v-model="form.gkxm" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="得分" ref="df" prop="df">
<el-input :readonly="readonly" v-model="form.df" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="工作要求" ref="gzyq" prop="gzyq">
<el-input type="textarea" :readonly="true" v-model="form.gzyq" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="扣分细则" ref="kfxz" prop="kfxz">
<el-input type="textarea" :readonly="readonly" v-model="form.kfxz" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input type="textarea" :readonly="readonly" v-model="form.bz" ></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: "workInspectionDtlEdit",
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
data() {
return {
/* 额外初始化，根据需求*/
systemType: [],
bmList: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: {
df:'',
//ID
id:'',
//MID
mid:'',
//序号
xh:'',
//管控项目
gkxm:'',
//工作要求
gzyq:'',
//扣分细则
kfxz:'',
//备注
bz:'',
//维护人编码
whrid:'',
//维护人
whr:'',
//维护时间
whsj:new Date().getTime(),
//创建人编码
cjrid:'',
//创建人
cjr:'',
//创建时间
cjsj:new Date().getTime(),
//系统版本
sysversion:'',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
}
}
},
methods: {
}
}
</script>
<style scoped lang="scss">
</style>
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