|
|
|
@ -81,7 +81,7 @@ |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -137,8 +137,8 @@ |
|
|
|
<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-button type="primary" @click="addFastModal()">快速新增</el-button> |
|
|
|
<!-- <el-button type="primary" @click="addDetailModal()">新增</el-button>--> |
|
|
|
<el-button type="primary" @click="addFastModal()">新增</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
@ -158,7 +158,7 @@ |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -170,7 +170,7 @@ |
|
|
|
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> |
|
|
|
<a type="text" size="small" @click="deleteModalDetails(scope.row)">删除项目</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -179,30 +179,41 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<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="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="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="900px"> |
|
|
|
<el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1200px"> |
|
|
|
<div style="font-size: 12px"> |
|
|
|
点检模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input> |
|
|
|
点检模板名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input> |
|
|
|
<!-- 点检模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>--> |
|
|
|
<!-- 点检模板名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>--> |
|
|
|
<el-form :inline="true" label-position="top" :model="detailData"> |
|
|
|
<el-form-item :label="'项目编码'"> |
|
|
|
<el-input v-model="detailData.itemNo" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'项目名称'"> |
|
|
|
<el-input v-model="detailData.itemDesc" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="queryTemplateItem()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<el-container style="margin-top: -12px;"> |
|
|
|
<el-main style="width: 400px"> |
|
|
|
<span style="font-size: 12px" >可选项目：</span> |
|
|
|
<el-container style="margin-top: 0px;"> |
|
|
|
<el-main style="width: 450px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >可选项目：</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="itemList1" |
|
|
|
@ -223,29 +234,36 @@ |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="项目编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="230" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="项目名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemRemark" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="方法说明"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
<el-main style="width: 100px"> |
|
|
|
<div style="margin-top: 100px"> |
|
|
|
<el-main style="width: 10px;padding: 1px"> |
|
|
|
<div style="margin-top: 200px;margin-left: 18px"> |
|
|
|
<el-button type="primary" @click="addItem()">添加>></el-button> |
|
|
|
</div> |
|
|
|
<div style="margin-top: 20px"> |
|
|
|
<div style="margin-top: 15px;margin-left: 18px"> |
|
|
|
<el-button type="primary" @click="deleteItem()">删除<<</el-button> |
|
|
|
</div> |
|
|
|
</el-main> |
|
|
|
<el-main style="width: 400px"> |
|
|
|
<span style="font-size: 12px" >已有项目：</span> |
|
|
|
<el-main style="width: 450px;padding: 1px"> |
|
|
|
<span style="font-size: 12px" >已有项目：</span> |
|
|
|
<el-table |
|
|
|
height="400px" |
|
|
|
:data="itemList2" |
|
|
|
@ -266,17 +284,24 @@ |
|
|
|
<el-table-column |
|
|
|
prop="itemNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
align="center" |
|
|
|
min-width="80" |
|
|
|
label="项目编码"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="230" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="项目名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="itemRemark" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="200" |
|
|
|
label="方法说明"> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</el-main> |
|
|
|
</el-container> |
|
|
|
@ -390,7 +415,7 @@ |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 100, |
|
|
|
totalPage: 0, |
|
|
|
addDetailModalFlag:false, |
|
|
|
// addDetailModalFlag:false, |
|
|
|
modalFlag:false, |
|
|
|
modalDisableFlag:false, |
|
|
|
modalData:{ |
|
|
|
@ -846,6 +871,7 @@ |
|
|
|
this.pageIndex = val |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
|
|
|
|
addModal(){ |
|
|
|
this.modalData={ |
|
|
|
flag:'1', |
|
|
|
@ -860,6 +886,7 @@ |
|
|
|
this.modalDisableFlag=false; |
|
|
|
this.modalFlag=true; |
|
|
|
}, |
|
|
|
|
|
|
|
updateModal(row){ |
|
|
|
this.modalData={ |
|
|
|
flag:'2', |
|
|
|
@ -873,13 +900,13 @@ |
|
|
|
this.modalDisableFlag=true; |
|
|
|
this.modalFlag=true; |
|
|
|
}, |
|
|
|
|
|
|
|
// 删除 |
|
|
|
deletePropertiesModel (row) { |
|
|
|
this.$confirm(`是否删除这个点检模板?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
|
|
|
|
}).then(() => { |
|
|
|
eamPropertiesModelDelete(row).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
@ -900,6 +927,7 @@ |
|
|
|
}).catch(() => { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
saveData(){ |
|
|
|
if (this.modalData.codeNo == '' || this.modalData.codeNo == null) { |
|
|
|
this.$alert('请输入点检模板编码！', '错误', { |
|
|
|
@ -967,40 +995,40 @@ |
|
|
|
this.detailModelFlag = true; |
|
|
|
}, |
|
|
|
|
|
|
|
addDetailModal(){ |
|
|
|
this.detailData.itemNo = ''; |
|
|
|
this.detailData.itemDesc = ''; |
|
|
|
this.addDetailModalFlag = 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: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
// 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', |
|
|
|
@ -1014,12 +1042,12 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
deleteModalDetails(row){ |
|
|
|
this.$confirm(`是否删除这个点检项目?`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
|
|
|
|
}).then(() => { |
|
|
|
deleteModalDetails(row).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
@ -1053,12 +1081,20 @@ |
|
|
|
this.chooseModalFlag=true; |
|
|
|
}, |
|
|
|
//---------快速添加---------- |
|
|
|
|
|
|
|
queryTemplateItem(){ |
|
|
|
getItemLists(this.detailData).then(({data}) => { |
|
|
|
this.itemList1 = data.row1; |
|
|
|
this.itemList2 = data.row2; |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
addFastModal(){ |
|
|
|
this.itemSelections1 = null |
|
|
|
this.itemSelections2 = null |
|
|
|
getItemLists(this.detailData).then(({data}) => { |
|
|
|
this.itemList1 = data.row1; |
|
|
|
this.itemList2 = data.row2; |
|
|
|
this.itemList1 = data.row1; |
|
|
|
this.itemList2 = data.row2; |
|
|
|
}) |
|
|
|
this.fastAddFlag = true; |
|
|
|
}, |
|
|
|
@ -1073,12 +1109,6 @@ |
|
|
|
selectFlag(){ |
|
|
|
return true; |
|
|
|
}, |
|
|
|
// clickItem1(row){ |
|
|
|
// this.itemListRow1 = JSON.parse(JSON.stringify(row)); |
|
|
|
// }, |
|
|
|
// clickItem2(row){ |
|
|
|
// this.itemListRow2 = JSON.parse(JSON.stringify(row)); |
|
|
|
// }, |
|
|
|
selectionItem1(val){ |
|
|
|
this.itemSelections1 = val |
|
|
|
}, |
|
|
|
|
杨奉源
3 years ago