Skip to content

D
dxgaqgl-vue
Commit bd5d5f73 authored by 李苏's avatar 李苏 💬
Browse files
Options

调整

parent 78a94195
Show whitespace changes
Inline Side-by-side
Showing with 405 additions and 202 deletions
src/views/contingency/contingencyplan/edit.vue
View file @ bd5d5f73
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <!-- <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练负责人" ref="ylfzr" prop="ylfzr"> <el-form-item label="演练负责人" ref="ylfzr" prop="ylfzr">
<el-input :readonly="readonly" v-model="form.ylfzr" ></el-input> <el-input :readonly="readonly" v-model="form.ylfzr" ></el-input>
...@@ -78,8 +78,13 @@ ...@@ -78,8 +78,13 @@
<el-input :readonly="readonly" v-model="form.zlfzr" ></el-input> <el-input :readonly="readonly" v-model="form.zlfzr" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row :gutter="24"> <el-row :gutter="24">
<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>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="估计费用(元)" ref="gjfy" prop="gjfy"> <el-form-item label="估计费用(元)" ref="gjfy" prop="gjfy">
<el-input type='number' :readonly="readonly" v-model="form.gjfy" ></el-input> <el-input type='number' :readonly="readonly" v-model="form.gjfy" ></el-input>
...@@ -112,6 +117,7 @@ ...@@ -112,6 +117,7 @@
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
form: { form: {
yldj:'',
//ID //ID
id:'', id:'',
//演练名称 //演练名称
......
src/views/contingency/contingencyplan/index.vue
View file @ bd5d5f73
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
<div class="search-item"> <div class="search-item">
<span class="search-span">年度:</span> <span class="search-span">年度:</span>
<!-- <el-date-picker v-model="queryParams.year"></el-date-picker> --> <!-- <el-date-picker v-model="queryParams.year"></el-date-picker> -->
<el-date-picker <el-date-picker value-format='yyyy' v-model="queryParams.year" type="year" placeholder="选择年">
value-format='yyyy'
v-model="queryParams.year"
type="year"
placeholder="选择年">
</el-date-picker> </el-date-picker>
</div> </div>
</el-col> </el-col>
...@@ -21,11 +17,7 @@ ...@@ -21,11 +17,7 @@
<span class="search-span">季度:</span> <span class="search-span">季度:</span>
<!-- <el-date-picker v-model="queryParams.month"></el-date-picker> --> <!-- <el-date-picker v-model="queryParams.month"></el-date-picker> -->
<el-select clearable v-model="queryParams.quarter" placeholder="请选择"> <el-select clearable v-model="queryParams.quarter" placeholder="请选择">
<el-option <el-option v-for="item in 4" :key="item" :label="item+'季度'" :value="item">
v-for="item in 4"
:key="item"
:label="item+'季度'"
:value="item">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -98,35 +90,131 @@ ...@@ -98,35 +90,131 @@
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
year: '', year: '',
quarter:'', quarter: '',
yljhName: '' yljhName: ''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [{
{label: "年度", prop: "year", fieldType: "int"}, label: "年度",
prop: "year",
fieldType: "int"
},
//{label: "季度", prop: "quarter", fieldType: "ftString",width:80}, //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
{label: "季度", prop: "quarter",formatter:function(row, column, value, index) { {
let jdobj=['','第一季度','第二季度','第三季度','第四季度'] label: "季度",
prop: "quarter",
formatter: function(row, column, value, index) {
let jdobj = ['', '第一季度', '第二季度', '第三季度', '第四季度']
return jdobj[value] return jdobj[value]
},width:80}, },
{label: "演练名称", prop: "name", fieldType: "ftString",width:180}, width: 80
{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180}, },
{label: "培训人数", prop: "pxrs", fieldType: "int"}, {
{label: "演练目标", prop: "ylmb", fieldType: "ftString",width:180}, label: "演练名称",
{label: "演练方式", prop: "ylfs", fieldType: "ftString",width:100}, prop: "name",
{label: "演练责任人", prop: "ylzrr", fieldType: "ftString",width:180}, fieldType: "ftString",
{label: "演练时长", prop: "ylsc", fieldType: "int"}, width: 180
{label: "主(协)办单位", prop: "zbdw", fieldType: "ftString",width:180}, },
{label: "目标完成标准", prop: "mbwcbz", fieldType: "ftString",width:180}, {
{label: "演练负责人", prop: "ylfzr", fieldType: "ftString",width:180}, label: "演练组织单位",
{label: "质量负责人", prop: "zlfzr", fieldType: "ftString",width:180}, prop: "zzdw",
{label: "估计费用", prop: "gjfy", fieldType: "money"}, fieldType: "ftString",
{label: "备注", prop: "bz", fieldType: "ftString",width:180}, width: 180
{label: "维护人", prop: "whr", fieldType: "ftString"}, },
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}, {
{label: "创建人", prop: "cjr", fieldType: "ftString"}, label: "培训人数",
{label: "创建时间", prop: "cjsj", fieldType: "ftDateTime"}, prop: "pxrs",
fieldType: "int"
},
{
label: "演练等级",
prop: "yldj",
width: 180,
transform: {
url: 'aqgl/yjgl/yjyljh/init/yldj',
label: 'name',
value: 'id'
}
},
{
label: "演练目标",
prop: "ylmb",
fieldType: "ftString",
width: 180
},
{
label: "演练方式",
prop: "ylfs",
fieldType: "ftString",
width: 100
},
{
label: "演练责任人",
prop: "ylzrr",
fieldType: "ftString",
width: 180
},
{
label: "演练时长",
prop: "ylsc",
fieldType: "int"
},
{
label: "主(协)办单位",
prop: "zbdw",
fieldType: "ftString",
width: 180
},
{
label: "目标完成标准",
prop: "mbwcbz",
fieldType: "ftString",
width: 180
},
// {
// label: "演练负责人",
// prop: "ylfzr",
// fieldType: "ftString",
// width: 180
// },
// {
// label: "质量负责人",
// prop: "zlfzr",
// fieldType: "ftString",
// width: 180
// },
{
label: "估计费用",
prop: "gjfy",
fieldType: "money"
},
{
label: "备注",
prop: "bz",
fieldType: "ftString",
width: 180
},
{
label: "维护人",
prop: "whr",
fieldType: "ftString"
},
{
label: "维护时间",
prop: "whsj",
fieldType: "ftDateTime"
},
{
label: "创建人",
prop: "cjr",
fieldType: "ftString"
},
{
label: "创建时间",
prop: "cjsj",
fieldType: "ftDateTime"
},
] ]
} }
}, },
...@@ -156,4 +244,3 @@ ...@@ -156,4 +244,3 @@
<style scoped> <style scoped>
</style> </style>
src/views/contingency/contingencystudy/index.vue
View file @ bd5d5f73
...@@ -10,13 +10,20 @@ ...@@ -10,13 +10,20 @@
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">开始日期:</span> <span class="search-span">开始日期:</span>
<el-date-picker value-format="timestamp" v-model='queryParams.ksrq' ></el-date-picker> <el-date-picker value-format="timestamp" v-model='queryParams.ksrq'></el-date-picker>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">结束日期:</span> <span class="search-span">结束日期:</span>
<el-date-picker value-format="timestamp" v-model='queryParams.jsrq' ></el-date-picker> <el-date-picker value-format="timestamp" v-model='queryParams.jsrq'></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">演练等级:</span>
<RelSelect style="width: 100%;" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable
:match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect>
</div> </div>
</el-col> </el-col>
...@@ -40,16 +47,16 @@ ...@@ -40,16 +47,16 @@
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query'
@getRow='getRow'> @selectItem='selectItem' @getRow='getRow'>
</TablePager> </TablePager>
</div> </div>
</div> </div>
<div class="min_full" style="height: 60%;padding: 10px;"> <div class="min_full" style="height: 60%;padding: 10px;">
<!-- 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 ref="report" /> <Report ref="report" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -79,7 +86,9 @@ ...@@ -79,7 +86,9 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery({setFirstCurrent:true}) this.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
}, },
data() { data() {
return { return {
...@@ -93,46 +102,126 @@ ...@@ -93,46 +102,126 @@
baseUrl: '/aqgl/yjgl/yjyljh', baseUrl: '/aqgl/yjgl/yjyljh',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
yldj: '',
info: '', info: '',
ksrq:new Date().getTime()-1000*60*60*24*30, ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
jsrq:new Date().getTime() jsrq: new Date().getTime()
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [{
{label: "年度", prop: "year", fieldType: "int"}, label: "年度",
prop: "year",
fieldType: "int"
},
//{label: "季度", prop: "quarter", fieldType: "ftString",width:80}, //{label: "季度", prop: "quarter", fieldType: "ftString",width:80},
{label: "季度", prop: "quarter", formatter:function(row, column, value, index) { {
let jdobj=['','第一季度','第二季度','第三季度','第四季度'] label: "季度",
prop: "quarter",
formatter: function(row, column, value, index) {
let jdobj = ['', '第一季度', '第二季度', '第三季度', '第四季度']
return jdobj[value] return jdobj[value]
},fieldType: "ftString",width:80}, },
{label: "演练名称", prop: "name", fieldType: "ftString",width:180}, fieldType: "ftString",
{label: "演练组织单位", prop: "zzdw", fieldType: "ftString",width:180}, width: 80
{label: "培训人数", prop: "pxrs", fieldType: "int"}, },
{label: "演练目标", prop: "ylmb", fieldType: "ftString",width:180}, {
{label: "演练方式", prop: "ylfs", fieldType: "ftString",width:100}, label: "演练名称",
{label: "演练责任人", prop: "ylzrr", fieldType: "ftString",width:180}, prop: "name",
{label: "演练时长", prop: "ylsc", fieldType: "int"}, fieldType: "ftString",
{label: "主(协)办单位", prop: "zbdw", fieldType: "ftString",width:180}, width: 180
{label: "目标完成标准", prop: "mbwcbz", fieldType: "ftString",width:180}, },
{label: "演练负责人", prop: "ylfzr", fieldType: "ftString",width:180}, {
{label: "质量负责人", prop: "zlfzr", fieldType: "ftString",width:180}, label: "演练组织单位",
{label: "估计费用", prop: "gjfy", fieldType: "money"}, prop: "zzdw",
{label: "备注", prop: "bz", fieldType: "ftString",width:180}, fieldType: "ftString",
{label: "维护人", prop: "whr", fieldType: "ftString"}, width: 180
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"} },
{
label: "培训人数",
prop: "pxrs",
fieldType: "int"
},
{
label: "演练等级",
prop: "yldj",
width: 180,
transform: {
url: 'aqgl/yjgl/yjyljh/init/yldj',
label: 'name',
value: 'id'
}
},
{
label: "演练目标",
prop: "ylmb",
fieldType: "ftString",
width: 180
},
{
label: "演练方式",
prop: "ylfs",
fieldType: "ftString",
width: 100
},
{
label: "演练责任人",
prop: "ylzrr",
fieldType: "ftString",
width: 180
},
{
label: "演练时长",
prop: "ylsc",
fieldType: "int"
},
{
label: "主(协)办单位",
prop: "zbdw",
fieldType: "ftString",
width: 180
},
{
label: "目标完成标准",
prop: "mbwcbz",
fieldType: "ftString",
width: 180
},
// {label: "演练负责人", prop: "ylfzr", fieldType: "ftString",width:180},
// {label: "质量负责人", prop: "zlfzr", fieldType: "ftString",width:180},
{
label: "估计费用",
prop: "gjfy",
fieldType: "money"
},
{
label: "备注",
prop: "bz",
fieldType: "ftString",
width: 180
},
{
label: "维护人",
prop: "whr",
fieldType: "ftString"
},
{
label: "维护时间",
prop: "whsj",
fieldType: "ftDateTime"
}
] ]
} }
}, },
methods: { methods: {
getRow: function(e) { getRow: function(e) {
this.rowItem = e this.rowItem = e
this.$refs.report.queryParams.yljhid=e.id this.$refs.report.queryParams.yljhid = e.id
this.$refs.report.$refs.TablePager.pageQuery() this.$refs.report.$refs.TablePager.pageQuery()
}, },
handleClick(val){ handleClick(val) {
console.log(val,'val') console.log(val, 'val')
}, },
/* 基础查询*/ /* 基础查询*/
query: doQuery, query: doQuery,
......
src/views/daily/fcgzysqd/index.vue
View file @ bd5d5f73
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
<AttachFileShow :app='ctx.basePage' ></AttachFileShow> <AttachFileShow :app='ctx.basePage'></AttachFileShow>
</template> </template>
</BasePage> </BasePage>
...@@ -117,14 +117,14 @@ ...@@ -117,14 +117,14 @@
[{ [{
label: '单号', label: '单号',
prop: 'djid', prop: 'djid',
span: 6, span: 4,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
"label": "作业类型", "label": "作业类型",
"prop": "ufcgzylxid", "prop": "ufcgzylxid",
"span": 6, "span": 4,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
{ {
"label": "部门", "label": "部门",
"prop": "bmid", "prop": "bmid",
"span": 8, "span": 4,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -149,8 +149,24 @@ ...@@ -149,8 +149,24 @@
} }
} }
}, },
{
label: '开始时间',
prop: 'kssj',
span: 6,
type: 'datetime',
value: ''
},
{
label: '结束时间',
prop: 'jssj',
span: 6,
type: 'datetime',
value: ''
}
] ],
// [
// ]
], ],
/* 默认启停用 */ /* 默认启停用 */
showqt: false, showqt: false,
......
src/views/equipment/archives/index.vue
View file @ bd5d5f73
...@@ -44,6 +44,11 @@ ...@@ -44,6 +44,11 @@
<AttachFileButton :app='app'></AttachFileButton> <AttachFileButton :app='app'></AttachFileButton>
<FieldButton :app='app'></FieldButton> <FieldButton :app='app'></FieldButton>
<ExcelButton :app='app'></ExcelButton> <ExcelButton :app='app'></ExcelButton>
<ImportButton style="margin-right: 10px;" @success="()=>{
$refs['TablePager'].pageQuery()
}" :url="'wms/ckgl/jhtz/import'" />
<el-button @click.native.prevent="jcwc" size='mini' type="primary"> <el-button @click.native.prevent="jcwc" size='mini' type="primary">
检测完成 检测完成
</el-button> </el-button>
...@@ -233,7 +238,7 @@ ...@@ -233,7 +238,7 @@
let params = { let params = {
id: this.app.singleItem.id id: this.app.singleItem.id
} }
this.$post('aqgl/sbgl/sbxx/check/complete',params).then(res => { this.$post('aqgl/sbgl/sbxx/check/complete', params).then(res => {
if (res.success) { if (res.success) {
this.$success('操作成功') this.$success('操作成功')
this.app.$refs['TablePager'].reLoad() this.app.$refs['TablePager'].reLoad()
......
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