ruanqi 3 years ago
parent
commit
42b2ec86df
  1. 8
      src/api/chooselist/chooselist.js
  2. 5
      src/api/eam/eam.js
  3. 215
      src/views/modules/common/Chooselist_eam.vue
  4. 2
      src/views/modules/eam/eamGroup.vue
  5. 18
      src/views/modules/eam/eamPropertiesItem.vue
  6. 196
      src/views/modules/eam/eamPropertiesModel.vue

8
src/api/chooselist/chooselist.js

@ -5,3 +5,11 @@ export const getChooselist = data => createAPI(`api/chooselist/getChooselist/${d
export const getChooselistData = data => createAPI(`api/chooselist/getChooselistData`,'post',data)
export const getChooselistEam = data => createAPI(`api/pms/chooselist/getChooselist/${data.tagNo}`,'get',data)
export const getChooselistDataEam = data => createAPI(`api/pms/chooselist/getChooselistData`,'post',data)

5
src/api/eam/eam.js

@ -83,3 +83,8 @@ export const eamPropertiesModelSave = data => createAPI(`api/pms/eam/eamProperti
export const eamPropertiesModelEdit = data => createAPI(`api/pms/eam/eamPropertiesModelEdit`,'post',data)
export const eamPropertiesModelDelete = data => createAPI(`api/pms/eam/eamPropertiesModelDelete`,'post',data)
export const searchModalDetails = data => createAPI(`api/pms/eam/searchModalDetails`,'post',data)
export const saveModalDetails = data => createAPI(`api/pms/eam/saveModalDetails`,'post',data)
export const deleteModalDetails = data => createAPI(`api/pms/eam/deleteModalDetails`,'post',data)

215
src/views/modules/common/Chooselist_eam.vue

@ -0,0 +1,215 @@
<template>
<el-dialog :title="baseListData.description"
:close-on-click-modal="false" :close-on-press-escape="false"
@close="closeDialog"
:visible.sync="visible"
width="685px" v-drag>
<el-form label-position="top"
inline="inline"
size="mini"
label-width="120px">
<el-form-item :label="baseListData.caption1" v-if="baseListData.caption1!='' && baseListData.caption1!=null">
<el-input v-model="param1"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption2" v-if="baseListData.caption2!='' && baseListData.caption2!=null">
<el-input v-model="param2"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption4" v-if="baseListData.caption4!='' && baseListData.caption4!=null">
<el-input v-model="param4" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="baseListData.caption3" v-if="baseListData.caption3!='' && baseListData.caption3!=null && this.tagNo !== 1024">
<el-select v-model="param3" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="在用" value="Y"></el-option>
<el-option label="不在用" value="N"></el-option>
</el-select>
</el-form-item>
<el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
</el-button>
</el-form>
<el-table
:height="height"
:data="dataList"
border
@row-dblclick="getRowData"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
{{ scope.row[item.columnProp] }}
</template>
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false" type="primary">关闭</el-button>
</span>
</el-dialog>
</template>
<script>
import {
getChooselistEam,
getChooselistDataEam,
} from "@/api/chooselist/chooselist.js"
export default {
data() {
return {
height: 200,
tagNo: '',
title: '列表',
columnList: [],
queryTable: {},
visible: false,
dataListLoading: true,
fullscreenLoading: false,
param1: '',
param2: '',
param3: '',
param: '',
conSql: '',
param4: this.$store.state.user.site,
dataList: [],
baseListData: {
caption1: '',
caption2: '',
caption3: '',
caption4: '',
description: '',
fieldname1: '',
fieldname2: '',
sqlcode: '',
tagno: '',
},
defaultParam: false
}
},
methods: {
//
init(tagNo,param,conSql) {
this.tagNo = tagNo
this.visible = true;
this.param = param
this.conSql = conSql?conSql: ''
// tagNo
getChooselistEam({"tagNo": tagNo}).then(({data}) => {
this.columnList = []
this.baseListData = data.data
let start = data.data.sqlcode.indexOf("Select")
let end = data.data.sqlcode.indexOf("from")
let length = end - start
let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
let props = columns.split(",")
props.forEach((item, index) => {
let name = '信息列'
switch (index) {
case 0:
name = this.baseListData.caption1
break;
case 1:
name = this.baseListData.caption2
break;
case 2:
name = this.baseListData.caption3
break;
case 3:
name = this.baseListData.caption4
break;
}
let index1 = item.indexOf(" as ");
let index2 = item.indexOf(".");
let l = item.length
let prop = item
if (index1> 0){
prop = item.substring(index1+3,l).trim()
}
if (index1<0 && index2>0){
prop = item.substring(index2+1,l)
}
let column = {
"columnProp":prop.trim(),
"columnLabel": name,
"columnHidden": false,
"columnImage": false,
"columnSortable": false,
"columnWidth": null,
"format": null,
"sortLv": index,
"status": true,
"fixed": false,
"serialNumber": null,
"columnType": null,
"align": null
}
this.columnList.push(column)
})
this.getDataList(true)
})
this.dataListLoading = false
},
getDataList(bool) {
let sql = this.baseListData.sqlcode
if (bool){
sql += " and (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR "+this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
}
if (this.param1) {
sql += " and " + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'"
}
if (this.param2) {
sql += " and " + this.baseListData.fieldname2 + " like '%" + this.param2 + "%'"
}
if (this.param3 && this.tagNo !== 1024) {
sql += " and active like '%" + this.param3 + "%'"
}
if (this.tagNo <1000 && this.tagNo !== 93 ){
console.log(this.tagNo)
if (this.param4) {
sql += " and site=" + this.param4
}
}
sql += this.conSql
getChooselistDataEam({"sqlcode": sql}).then(({data}) => {
if (data.code == 0) {
this.dataList = data.baseListData;
} else {
this.$message.error(data.msg)
}
})
},
getRowData(row) {
this.visible = false
this.$emit('getBaseData',row)
},
closeDialog(){
this.param1= ''
this.param2=''
this.param3= ''
this.param= ''
this.param4=this.$store.state.user.site
}
}
}
</script>
<style>
</style>

2
src/views/modules/eam/eamGroup.vue

@ -68,7 +68,7 @@
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 1000]"
:page-sizes="[20, 100, 500, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">

18
src/views/modules/eam/eamPropertiesItem.vue

@ -331,6 +331,24 @@
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 101008,
serialNumber: '101008TableValueChooseFlag',
tableId: "101008Table",
tableName: "common",
columnProp: 'valueChooseFlag',
headerAlign: "center",
align: "left",
columnLabel: '是否值可选',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
],
levelList:[],
chooseModalData:{

196
src/views/modules/eam/eamPropertiesModel.vue

@ -49,10 +49,11 @@
fixed="right"
header-align="center"
align="center"
width="100"
width="160"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="updateModal(scope.row)">修改</a>
<a type="text" size="small" @click="detailModal(scope.row)">点检项目</a>
<a type="text" size="small" @click="deletePropertiesModel(scope.row)">删除</a>
</template>
</el-table-column>
@ -89,7 +90,18 @@
<el-dialog title="点检项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="430px">
<el-dialog title="点检项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
<el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
<el-form-item :label="'点检模板编码'">
<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'点检模板名称'">
<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addDetailModal()">新增</el-button>
</el-form-item>
</el-form>
<el-table
:height="300"
:data="detailList"
@ -117,10 +129,11 @@
fixed="right"
header-align="center"
align="center"
width="160"
width="130"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" v-if="scope.row.valueChooseFlag=='Y'" @click="chooseModal(scope.row)">可选值</a>
<a type="text" size="small" @click="deleteModalDetails(scope.row)">删除项目</a>
</template>
</el-table-column>
</el-table>
@ -129,7 +142,23 @@
</el-footer>
</el-dialog>
<el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="430px">
<el-dialog title="添加项目" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item >
<span slot="label" style="" @click="getBaseList(1024)"><a herf="#">点检项目编码</a></span>
<el-input v-model="detailData.itemNo" @blur="itemNoBlur" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="点检项目名称:">
<el-input v-model="detailData.itemDesc" disabled style="width: 120px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="saveModalDetails()">保存</el-button>
<el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="350px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="点检项目名称:">
<el-input v-model="chooseModalData.itemDesc" disabled style="width: 120px"></el-input>
@ -154,7 +183,11 @@
label="属性值">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="chooseModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -165,12 +198,19 @@
eamPropertiesModelEdit,
eamPropertiesModelDelete,
searchItemAvailable,
searchModalDetails,
saveModalDetails,
deleteModalDetails,
eamPropertiesItemSearch,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
components: {
Chooselist
},
data () {
return {
tagNo:'',
searchData: {
codeNo: '',
codeDesc: '',
@ -183,7 +223,7 @@
pageIndex: 1,
pageSize: 100,
totalPage: 0,
addDetailModalFlag:false,
modalFlag:false,
modalDisableFlag:false,
modalData:{
@ -194,7 +234,15 @@
functionType:'A',
userId:this.$store.state.user.name
},
detailData:{
codeNo:'',
codeDesc:'',
functionType:'A',
itemNo:'',
itemDesc:'',
itemType:'A',
userId:this.$store.state.user.name
},
columnList: [
{
userId: this.$store.state.user.name,
@ -288,7 +336,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
@ -306,7 +354,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
@ -324,7 +372,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 140,
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@ -342,7 +390,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
columnWidth: 70,
},
{
userId: this.$store.state.user.name,
@ -360,7 +408,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
columnWidth: 70,
},
{
userId: this.$store.state.user.name,
@ -378,7 +426,7 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
columnWidth: 70,
},
{
userId: this.$store.state.user.name,
@ -396,7 +444,25 @@
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
columnWidth: 70,
},
{
userId: this.$store.state.user.name,
functionId: 101009,
serialNumber: '101009TableValueChooseFlag',
tableId: "101009Table",
tableName: "common",
columnProp: 'valueChooseFlag',
headerAlign: "center",
align: "left",
columnLabel: '是否值可选',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70,
},
],
levelList:[],
@ -417,6 +483,24 @@
this.getDataList();
},
methods: {
// S
getBaseList (val,type) {
this.tagNo = val
this.$nextTick(() => {
let strVal = ''
if (val === 1024) {
strVal = this.detailData.itemNo
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1024) {
this.detailData.itemNo = val.ItemNo
this.detailData.itemDesc = val.ItemDesc
}
},
//
getDataList () {
this.searchData.limit = this.pageSize
@ -550,7 +634,89 @@
})
}
},
//
detailModal(row){
this.detailData.codeNo=row.codeNo
this.detailData.codeDesc=row.codeDesc
searchModalDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.detailModelFlag=true;
},
addDetailModal(){
this.detailData.itemNo='';
this.detailData.itemDesc='';
this.addDetailModalFlag=true;
},
//
saveModalDetails(){
if(this.detailData.itemNo==""||this.detailData.itemNo==null){
this.$alert('请选择点检项目编码!', '错误', {
confirmButtonText: '确定'
})
return false
}
saveModalDetails(this.detailData).then(({data}) => {
if (data && data.code === 0) {
searchModalDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.addDetailModalFlag=false;
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
itemNoBlur(){
let inData={
itemType:'A',
itemNo:this.detailData.itemNo
}
eamPropertiesItemSearch(inData).then(({data}) => {
if(data.rows.length>0){
this.detailData.itemDesc=data.rows[0].itemDesc
}
})
},
deleteModalDetails(row){
this.$confirm(`是否删除这个点检项目?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteModalDetails(row).then(({data}) => {
if (data && data.code === 0) {
searchModalDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}).catch(() => {
})
},
chooseModal(row){
this.chooseModalData.itemNo=row.itemNo;

Loading…
Cancel
Save