Commit dcc6b719 authored by 李苏's avatar 李苏 💬

大溪沟调整

parent 2e9072e6
......@@ -26,6 +26,13 @@
:match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">年度:</span>
<RelYearSelect style="width: 100%;"
v-model='queryParams.year'></RelYearSelect>
</div>
</el-col>
</el-row>
</div>
......@@ -85,7 +92,15 @@
name: 'appVersion',
/* 初始额外赋值*/
created() {
this.queryParams={
...this.queryParams,
...this.$route.query
}
},
async mounted() {
this.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
......@@ -102,6 +117,7 @@
baseUrl: '/aqgl/yjgl/yjyljh',
/* 查询参数*/
queryParams: {
year:'',
yldj: '',
info: '',
ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
......
<template>
<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.yljhid' >
<!-- 查询条件-->
<!-- <div class="search" v-condition>
<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>
<span class="search-span">月份:</span>
<el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</div>
</el-col>
</el-row>
</div> -->
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
......@@ -41,7 +32,7 @@
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
<TablePager @getData='getData' :ref="'TablePager'" :rowClass='rowClass' :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
......@@ -69,10 +60,13 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
this.queryParams.month=this.$route.query.month
// this.$refs['TablePager'].pageQuery()
},
data() {
return {
/*需要的额外参数 */
showDialog: false,
DialogName: '',
......@@ -82,10 +76,19 @@
baseUrl: 'aqgl/yjgl/yjyl',
/* 查询参数*/
queryParams: {
yljhid: ''
yljhid: '',
month:''
},
/* 表格标题对应参数*/
tableTitle: [
{label:"状态", prop: "zt",width:80,formatter(row,c,v){
if( row.attachcount>0){
return '完成'
}else{
return '未完成'
}
}},
{label: "月份", prop: "month",width:80},
{label: "演练名称", prop: "name", fieldType: "ftString",width:300},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "演练组织单位", prop: "yldwName", fieldType: "ftString",width:192},
......@@ -117,7 +120,13 @@
}
},
methods: {
rowClass({ row, rowIndex }) {
if (row.attachcount == 0) {
return "warning-row";
} else {
return "success-row";
}
},
/* 基础查询*/
query: doQuery,
/* 基础增*/
......
......@@ -2,10 +2,12 @@
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写-->
<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="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input>
<el-input :readonly="readonly" v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -13,7 +15,8 @@
required: true,
rules:rules
}" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs'
:match="{value:'id',label:'bmmc'}" v-model='form.gsid'></RelSelect>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
......@@ -46,23 +49,26 @@
required: true,
rules:rules
}" ref="yldwid" prop="yldwid">
<RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
<RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"
src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}"
v-model='form.yldwid'></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练地点" ref="ylmb" prop="ylmb">
<el-input :readonly="readonly" v-model="form.ylmb" ></el-input>
<el-input :readonly="readonly" v-model="form.ylmb"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练等级" ref="yldj" prop="yldj">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.yldj' ></RelSelect>
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable
:match="{value:'id',label:'name'}" v-model='form.yldj'></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练时间" ref="ylrq" prop="ylrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="datetime"
v-model="form.ylrq" placeholder="选择日期">
<el-date-picker style="width: 100%;" :readonly="readonly" type="datetime" v-model="form.ylrq"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -73,7 +79,7 @@
required: true,
rules:rules
}" label="演练责任人" ref="ylzrrid" prop="ylzrrid">
<personSelector :label="form.ylzrrName||'暂无'" @selected='ylzrrSelected' ></personSelector>
<personSelector :label="form.ylzrrName||'暂无'" @selected='ylzrrSelected'></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.ylzrrid" ></el-input> -->
</el-form-item>
</el-col>
......@@ -84,21 +90,32 @@
</el-col>-->
<el-col :span="12">
<el-form-item label="协办单位" ref="zbdwid" prop="zbdwid">
<el-input :readonly="readonly" v-model="form.zbdwid" ></el-input>
<el-input :readonly="readonly" v-model="form.zbdwid"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item v-rule="{
required: true,
rules:rules
}" label="月份" ref="month" prop="month">
<!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> -->
<el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练人数" ref="ylrs" prop="ylrs">
<el-input :readonly="readonly" v-model="form.ylrs" ></el-input>
<el-input :readonly="readonly" v-model="form.ylrs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input>
<el-input :readonly="readonly" v-model="form.bz"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">
......@@ -111,12 +128,14 @@
</RelDialog>
</template>
<script>
import {editMixin} from 'common'
import {
editMixin
} from 'common'
export default {
mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
this.form.yljhid=this.app.queryParams.yljhid
this.form.yljhid = this.app.queryParams.yljhid
},
/* 组件名称*/
name: "aqglYjylEdit",
......@@ -132,54 +151,55 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
ylrs:'',
yldj:'',
month: '',
ylrs: '',
yldj: '',
//ID
id:'',
id: '',
//演练名称
name:'',
name: '',
//分公司ID
gsid:'',
gsid: '',
//演练组织单位ID
yldwid:'',
yldwid: '',
//演练计划ID
yljhid:'',
yljhid: '',
//培训人数
pxrs:'',
pxrs: '',
//演练目标
ylmb:'',
ylmb: '',
//演练方式
ylfs:'',
ylfs: '',
//演练时间
ylrq:new Date().getTime(),
ylrq: new Date().getTime(),
//演练责任人
ylzrrid:'',
ylzrrid: '',
//演练时长
ylsc:'',
ylsc: '',
//主(协)办单位
zbdwid:'',
zbdwid: '',
//演练负责人ID
ylfzrid:'',
ylfzrid: '',
//质量负责人ID
zlfzrid:'',
zlfzrid: '',
//估计费用
gjfy:'',
gjfy: '',
//备注
bz:'',
bz: '',
//维护人编码
whrid:'',
whrid: '',
//维护人
whr:'',
whr: '',
//维护时间
whsj:new Date().getTime(),
whsj: new Date().getTime(),
//创建人编码
cjrid:'',
cjrid: '',
//创建人
cjr:'',
cjr: '',
//创建时间
// cjsj:new Date().getTime(),
//系统版本
sysversion:'',
sysversion: '',
},
/* form提交时的规则,具体规则参考官网*/
rules: {
......@@ -188,14 +208,14 @@
}
},
methods: {
ylzrrSelected(row){
this.form.ylzrrid=row.id
ylzrrSelected(row) {
this.form.ylzrrid = row.id
},
ylfzrSelected(row){
this.form.ylfzrid=row.id
ylfzrSelected(row) {
this.form.ylfzrid = row.id
},
zlfzrSelected(row){
this.form.zlfzrid=row.id
zlfzrSelected(row) {
this.form.zlfzrid = row.id
}
}
......
......@@ -26,6 +26,13 @@
:match="{value:'id',label:'name'}" v-model='queryParams.pxdj'></RelSelect>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">年度:</span>
<RelYearSelect style="width: 100%;"
v-model='queryParams.year'></RelYearSelect>
</div>
</el-col>
</el-row>
</div>
......@@ -85,6 +92,12 @@
name: 'aqpx',
/* 初始额外赋值*/
created() {
this.queryParams={
...this.queryParams,
...this.$route.query
}
},
async mounted() {
this.$refs['TablePager'].pageQuery({
setFirstCurrent: true
......
<template>
<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.pxjhid' >
<!-- 查询条件-->
<!-- <div class="search" v-condition>
<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>
<span class="search-span">月份:</span>
<el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</div>
</el-col>
</el-row>
</div> -->
</div>
<!-- 按钮操作-->
<el-row class="tool-bar">
<PrintButton :app='app'></PrintButton>
......@@ -41,7 +32,7 @@
</el-row>
<!-- 表格-->
<div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
<TablePager @getData='getData' :rowClass='rowClass' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'>
</TablePager>
......@@ -69,7 +60,11 @@
/* 初始额外赋值*/
async mounted() {
this.$refs['TablePager'].pageQuery()
this.queryParams={
...this.queryParams,
...this.$route.query
}
// this.$refs['TablePager'].pageQuery()
},
data() {
return {
......@@ -82,10 +77,19 @@
baseUrl: 'aqgl/pxgl/uaqpx',
/* 查询参数*/
queryParams: {
pxjhid: ''
pxjhid: '',
month:''
},
/* 表格标题对应参数*/
tableTitle: [
{label:"状态", prop: "zt",width:80,formatter(row,c,v){
if( row.attachcount>0){
return '完成'
}else{
return '未完成'
}
}},
{label: "月份", prop: "month",width:80},
{label: "培训名称", prop: "name", fieldType: "ftString",width:300},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "培训组织单位", prop: "pxdwName", fieldType: "ftString",width:192},
......@@ -117,6 +121,13 @@
}
},
methods: {
rowClass({ row, rowIndex }) {
if (row.attachcount == 0) {
return "warning-row";
} else {
return "success-row";
}
},
/* 基础查询*/
query: doQuery,
......
......@@ -90,7 +90,18 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item v-rule="{
required: true,
rules:rules
}" label="月份" ref="month" prop="month">
<!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> -->
<el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input :readonly="readonly" v-model="form.pxrs" ></el-input>
......@@ -132,6 +143,7 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
month:'',
pxrs:'',
pxdj:'',
//ID
......
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