|
|
|
@ -1,10 +1,11 @@ |
|
|
|
<template> |
|
|
|
<div > |
|
|
|
<div> |
|
|
|
<el-main style="background-color: #B3C0D1;padding: 2px;"> |
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px"> |
|
|
|
<el-form-item :label="inputLabel.headerInput.label1"> |
|
|
|
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly v-model="headerData.toolId" ></el-input> <!----> |
|
|
|
<el-input style="width: 100px;" @focus="initToolHeaderModel()" readonly |
|
|
|
v-model="headerData.toolId"></el-input> <!----> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="inputLabel.headerInput.label2"> |
|
|
|
<el-input style="width: 100px;" readonly v-model="headerData.toolDescription"></el-input> |
|
|
|
@ -57,27 +58,29 @@ |
|
|
|
<el-form-item :label="inputLabel.headerInput.label13"> |
|
|
|
<el-input style="width: 205px;" readonly v-model="headerData.remark"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item > |
|
|
|
<el-form-item> |
|
|
|
<upload style="margin-top: 27px;"></upload> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
|
|
|
|
</el-main> |
|
|
|
|
|
|
|
<el-container > |
|
|
|
<el-container> |
|
|
|
|
|
|
|
<el-aside width="50%" style="padding: 0px 2px;"> |
|
|
|
<el-form :inline="true" label-position="top" label-width="95px" style="padding: 5px;"> |
|
|
|
<el-form-item > |
|
|
|
<el-form-item> |
|
|
|
<!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> <!–@click="initViewIfsTable('Y')"–>--> |
|
|
|
<el-button @click="initToolModel()" type="primary" v-show="showDefault">{{ buttons.edit }}</el-button> |
|
|
|
<el-button @click="printReport()" type="primary" v-show="showDefault">{{ buttons.print }}</el-button> |
|
|
|
<el-button @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }}</el-button> |
|
|
|
<el-button @click="initFlagAdd()" type="primary" v-show="showDefault">{{ buttons.badApplication }} |
|
|
|
</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" label-width="100px"> |
|
|
|
<el-form-item :label="inputLabel.leftInput.label1"> |
|
|
|
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)" v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;"> |
|
|
|
<el-select @change="toolInstanceIdChange(currentDetailData.toolInstanceId)" |
|
|
|
v-model="currentDetailData.toolInstanceId" placeholder="请选择" style="width: 115px;"> |
|
|
|
<el-option |
|
|
|
v-for="item in selectList.select4" |
|
|
|
:key="item.value" |
|
|
|
@ -219,7 +222,8 @@ |
|
|
|
</el-container> |
|
|
|
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column> |
|
|
|
|
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px"> |
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag |
|
|
|
:title="inputLabel.headerInput.label16" :visible.sync="setUp.toolHeaderFlag" width="485px"> |
|
|
|
<el-form :inline="true" label-position="left"> |
|
|
|
<el-form-item :label="inputLabel.headerInput.label1"> |
|
|
|
<el-input style="width: 110px;" v-model="queryHeaderData.likeToolId"></el-input> |
|
|
|
@ -227,7 +231,7 @@ |
|
|
|
<el-form-item :label="inputLabel.headerInput.label2"> |
|
|
|
<el-input style="width: 110px;" v-model="queryHeaderData.likeToolDescription"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item > |
|
|
|
<el-form-item> |
|
|
|
<!-- <el-button type="primary">{{ inputLabel.leftInput.label1 }}</el-button> <!–@click="initViewIfsTable('Y')"–>--> |
|
|
|
<el-button @click="getToolHeaderList()" type="primary" v-show="showDefault">{{ buttons.search }}</el-button> |
|
|
|
</el-form-item> |
|
|
|
@ -238,7 +242,7 @@ |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;" |
|
|
|
@row-dblclick="rowDblclick" > |
|
|
|
@row-dblclick="rowDblclick"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList2" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -257,7 +261,8 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" :visible.sync="setUp.toolEditFlag" width="620px"> |
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.leftInput.label15" |
|
|
|
:visible.sync="setUp.toolEditFlag" width="620px"> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item :label="inputLabel.leftInput.label1"> |
|
|
|
<el-input style="width: 130px;" readonly v-model="editData.toolInstanceId"></el-input> |
|
|
|
@ -291,7 +296,7 @@ |
|
|
|
v-model="editData.strPhaseInDate" |
|
|
|
type="date" |
|
|
|
placeholder="选择日期" |
|
|
|
value-format = "yyyy-MM-dd" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
style="width: 130px;"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
@ -300,7 +305,7 @@ |
|
|
|
v-model="editData.strPhaseOutDate" |
|
|
|
type="date" |
|
|
|
placeholder="选择日期" |
|
|
|
value-format = "yyyy-MM-dd HH:mm:ss" |
|
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
style="width: 130px;"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
@ -312,12 +317,12 @@ |
|
|
|
<el-form-item :label="inputLabel.leftInput.label10"> |
|
|
|
<el-input style="width: 130px;" readonly v-model="editData.actualuseQty"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<!--<el-form-item :label="inputLabel.leftInput.label11"> |
|
|
|
<el-input style="width: 130px;" v-model="editData.strCreateDate"></el-input> |
|
|
|
<el-form-item :label="inputLabel.leftInput.label18 || '工程师账号'"> |
|
|
|
<el-input style="width: 130px;" v-model="editData.engineer"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="inputLabel.leftInput.label12"> |
|
|
|
<el-input style="width: 130px;" v-model="editData.createdBy"></el-input> |
|
|
|
</el-form-item>--> |
|
|
|
<!-- <el-form-item :label="inputLabel.leftInput.label12">--> |
|
|
|
<!-- <el-input style="width: 130px;" v-model="editData.createdBy"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item :label="inputLabel.leftInput.label14"> |
|
|
|
@ -330,10 +335,12 @@ |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1" :visible.sync="setUp.modelFlag" width="350px"> |
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.modelInput.label1" |
|
|
|
:visible.sync="setUp.modelFlag" width="350px"> |
|
|
|
<el-form label-position="top"> |
|
|
|
<el-form-item :label="inputLabel.modelInput.label2"> |
|
|
|
<el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;" v-model="remark"></el-input> |
|
|
|
<el-input type="textarea" :rows="3" placeholder="请输入内容" style="width: 300px;padding: 0px 3px;" |
|
|
|
v-model="remark"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
@ -348,6 +355,9 @@ |
|
|
|
|
|
|
|
<script> |
|
|
|
import column from "../common/column"; |
|
|
|
import { |
|
|
|
getTblUserList, |
|
|
|
} from "@/api/toolMan/receive.js" |
|
|
|
import { |
|
|
|
searchSysLanguagePackList, |
|
|
|
searchSysLanguageParam, |
|
|
|
@ -388,141 +398,142 @@ |
|
|
|
}, |
|
|
|
data() { |
|
|
|
return { |
|
|
|
toolHeaderList :[], |
|
|
|
queryHeaderData : { |
|
|
|
site : this.$store.state.user.site, |
|
|
|
toolId : '', |
|
|
|
toolDescription : '', |
|
|
|
likeToolId : '', |
|
|
|
likeToolDescription : '', |
|
|
|
}, |
|
|
|
editData : {}, |
|
|
|
setUp :{ |
|
|
|
toolEditFlag : false, |
|
|
|
saveToolFlag : false, |
|
|
|
toolHeaderFlag : false, |
|
|
|
modelFlag : false, |
|
|
|
saveModelFlag : false, |
|
|
|
}, |
|
|
|
toolInstanceIdUseHist : [], |
|
|
|
sfdcToolingHistList : [], |
|
|
|
selectList:{ |
|
|
|
select1 : [{ |
|
|
|
toolHeaderList: [], |
|
|
|
queryHeaderData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
toolId: '', |
|
|
|
toolDescription: '', |
|
|
|
likeToolId: '', |
|
|
|
likeToolDescription: '', |
|
|
|
}, |
|
|
|
editData: {}, |
|
|
|
setUp: { |
|
|
|
toolEditFlag: false, |
|
|
|
saveToolFlag: false, |
|
|
|
toolHeaderFlag: false, |
|
|
|
modelFlag: false, |
|
|
|
saveModelFlag: false, |
|
|
|
}, |
|
|
|
toolInstanceIdUseHist: [], |
|
|
|
sfdcToolingHistList: [], |
|
|
|
selectList: { |
|
|
|
select1: [{ |
|
|
|
value: 'Y', |
|
|
|
label: '启用' |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
value: 'N', |
|
|
|
label: '禁用' |
|
|
|
}], |
|
|
|
select2 :[{ |
|
|
|
select2: [{ |
|
|
|
value: 'Y', |
|
|
|
label: '是' |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
value: 'N', |
|
|
|
label: '否' |
|
|
|
}], |
|
|
|
select3 :[{ |
|
|
|
select3: [{ |
|
|
|
value: 'P', |
|
|
|
label: '个人' |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
value: 'G', |
|
|
|
label: '组' |
|
|
|
}], |
|
|
|
select4 : [], |
|
|
|
select5 : [], |
|
|
|
}, |
|
|
|
inputLabel :{ |
|
|
|
headerInput : { |
|
|
|
label1 : '工具编码', |
|
|
|
label2 : '工具名称', |
|
|
|
label3 : '规格型号', |
|
|
|
label4 : '工厂编号', |
|
|
|
label5 : '工具分类', |
|
|
|
label6 : '工具分类名称', |
|
|
|
label7 : '计量单位', |
|
|
|
label8 : '在用', |
|
|
|
label9 : '属性模块', |
|
|
|
label10 : '默认库位', |
|
|
|
label11 : '创建物料编码', |
|
|
|
label12 : '物料编码', |
|
|
|
label13 : '说明', |
|
|
|
label14 : '录入日期', |
|
|
|
label15 : '录入人', |
|
|
|
label16 : '工具编码信息', |
|
|
|
label17 : '横排数', |
|
|
|
label18 : '竖排数', |
|
|
|
}, |
|
|
|
leftInput :{ |
|
|
|
label1 : '实例编号', |
|
|
|
label2 : '状态', |
|
|
|
label3 : '供应商编码', |
|
|
|
label4 : '供应商名称', |
|
|
|
label5 : '采购日期', |
|
|
|
label6 : '钢印信息', |
|
|
|
label7 : '入库日期', |
|
|
|
label8 : '停用日期', |
|
|
|
label9 : '预计使用次数', |
|
|
|
label10 : '实际使用次数', |
|
|
|
label11 : '录入日期', |
|
|
|
label12 : '录入人', |
|
|
|
label13 : '采购订单号', |
|
|
|
label14 : '备注', |
|
|
|
label15 : '工具实例信息', |
|
|
|
label16 : '库位编码', |
|
|
|
label17 : '工程师', |
|
|
|
}, |
|
|
|
rightInput :{ |
|
|
|
label1 : '工具使用记录:', |
|
|
|
label2 : '工具维修记录:', |
|
|
|
}, |
|
|
|
modelInput : { |
|
|
|
label1 : '审核信息', |
|
|
|
label2 : '不合格原因', |
|
|
|
}, |
|
|
|
}, |
|
|
|
remark : '', |
|
|
|
currentDetailData :{ |
|
|
|
select4: [], |
|
|
|
select5: [], |
|
|
|
}, |
|
|
|
inputLabel: { |
|
|
|
headerInput: { |
|
|
|
label1: '工具编码', |
|
|
|
label2: '工具名称', |
|
|
|
label3: '规格型号', |
|
|
|
label4: '工厂编号', |
|
|
|
label5: '工具分类', |
|
|
|
label6: '工具分类名称', |
|
|
|
label7: '计量单位', |
|
|
|
label8: '在用', |
|
|
|
label9: '属性模块', |
|
|
|
label10: '默认库位', |
|
|
|
label11: '创建物料编码', |
|
|
|
label12: '物料编码', |
|
|
|
label13: '说明', |
|
|
|
label14: '录入日期', |
|
|
|
label15: '录入人', |
|
|
|
label16: '工具编码信息', |
|
|
|
label17: '横排数', |
|
|
|
label18: '竖排数', |
|
|
|
}, |
|
|
|
leftInput: { |
|
|
|
label1: '实例编号', |
|
|
|
label2: '状态', |
|
|
|
label3: '供应商编码', |
|
|
|
label4: '供应商名称', |
|
|
|
label5: '采购日期', |
|
|
|
label6: '钢印信息', |
|
|
|
label7: '入库日期', |
|
|
|
label8: '停用日期', |
|
|
|
label9: '预计使用次数', |
|
|
|
label10: '实际使用次数', |
|
|
|
label11: '录入日期', |
|
|
|
label12: '录入人', |
|
|
|
label13: '采购订单号', |
|
|
|
label14: '备注', |
|
|
|
label15: '工具实例信息', |
|
|
|
label16: '库位编码', |
|
|
|
label17: '工程师', |
|
|
|
label18: '工程师账号', |
|
|
|
}, |
|
|
|
rightInput: { |
|
|
|
label1: '工具使用记录:', |
|
|
|
label2: '工具维修记录:', |
|
|
|
}, |
|
|
|
modelInput: { |
|
|
|
label1: '审核信息', |
|
|
|
label2: '不合格原因', |
|
|
|
}, |
|
|
|
}, |
|
|
|
remark: '', |
|
|
|
currentDetailData: { |
|
|
|
actualuseQty: '', |
|
|
|
createDate:'', |
|
|
|
createdBy:'', |
|
|
|
description:'', |
|
|
|
createDate: '', |
|
|
|
createdBy: '', |
|
|
|
description: '', |
|
|
|
estUseQty: '', |
|
|
|
inspectDuration:'', |
|
|
|
lastUpdateBy:'', |
|
|
|
latestInspectDate:'', |
|
|
|
latestUseDate:'', |
|
|
|
locationId:'', |
|
|
|
phaseInDate:'', |
|
|
|
phaseOutDate:'', |
|
|
|
purchaseDate:'', |
|
|
|
remark:'', |
|
|
|
site:'', |
|
|
|
status:'', |
|
|
|
statusRef:'', |
|
|
|
supplierId:'', |
|
|
|
supplierName:'', |
|
|
|
toolDescription:'', |
|
|
|
toolId:'', |
|
|
|
toolIndex:'', |
|
|
|
toolInstanceId:'', |
|
|
|
torNumacc:'', |
|
|
|
torNumdown:'', |
|
|
|
workCenterNo:'', |
|
|
|
steelSeal : '', |
|
|
|
strCreateDate:'', |
|
|
|
strLatestInspectDate:'', |
|
|
|
strLatestUseDate:'', |
|
|
|
strPhaseInDate:'', |
|
|
|
strPhaseOutDate:'', |
|
|
|
strPurchaseDate:'', |
|
|
|
}, |
|
|
|
detailList : [], |
|
|
|
headerData :{}, |
|
|
|
site : this.$store.state.user.site, |
|
|
|
userName : this.$store.state.user.name, |
|
|
|
inspectDuration: '', |
|
|
|
lastUpdateBy: '', |
|
|
|
latestInspectDate: '', |
|
|
|
latestUseDate: '', |
|
|
|
locationId: '', |
|
|
|
phaseInDate: '', |
|
|
|
phaseOutDate: '', |
|
|
|
purchaseDate: '', |
|
|
|
remark: '', |
|
|
|
site: '', |
|
|
|
status: '', |
|
|
|
statusRef: '', |
|
|
|
supplierId: '', |
|
|
|
supplierName: '', |
|
|
|
toolDescription: '', |
|
|
|
toolId: '', |
|
|
|
toolIndex: '', |
|
|
|
toolInstanceId: '', |
|
|
|
torNumacc: '', |
|
|
|
torNumdown: '', |
|
|
|
workCenterNo: '', |
|
|
|
steelSeal: '', |
|
|
|
strCreateDate: '', |
|
|
|
strLatestInspectDate: '', |
|
|
|
strLatestUseDate: '', |
|
|
|
strPhaseInDate: '', |
|
|
|
strPhaseOutDate: '', |
|
|
|
strPurchaseDate: '', |
|
|
|
}, |
|
|
|
detailList: [], |
|
|
|
headerData: {}, |
|
|
|
site: this.$store.state.user.site, |
|
|
|
userName: this.$store.state.user.name, |
|
|
|
// table高度 |
|
|
|
height:450, |
|
|
|
tableHeight : 300, |
|
|
|
height: 450, |
|
|
|
tableHeight: 300, |
|
|
|
// 是否收藏 |
|
|
|
favorite: false, |
|
|
|
addLanguage: false, |
|
|
|
@ -707,7 +718,7 @@ |
|
|
|
// fixed: false, |
|
|
|
// } |
|
|
|
], |
|
|
|
columnList2 :[ |
|
|
|
columnList2: [ |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 2501, |
|
|
|
@ -759,8 +770,8 @@ |
|
|
|
download: '导出', |
|
|
|
settingTable: '设置列表', |
|
|
|
defaultTable: '设置默认配置', |
|
|
|
print : "打印", |
|
|
|
badApplication : '不良申请', |
|
|
|
print: "打印", |
|
|
|
badApplication: '不良申请', |
|
|
|
}, |
|
|
|
// 导出 start |
|
|
|
exportData: [], |
|
|
|
@ -856,11 +867,11 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted() { |
|
|
|
this.$nextTick(()=>{ |
|
|
|
this.$nextTick(() => { |
|
|
|
this.height = window.innerHeight - 255; |
|
|
|
}) |
|
|
|
this.$nextTick(()=>{ |
|
|
|
this.tableHeight = (window.innerHeight - 350)/2; |
|
|
|
this.$nextTick(() => { |
|
|
|
this.tableHeight = (window.innerHeight - 350) / 2; |
|
|
|
}) |
|
|
|
}, |
|
|
|
activated() { |
|
|
|
@ -869,12 +880,12 @@ |
|
|
|
this.getLanguageList() |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
modelVerification(){ |
|
|
|
modelVerification() { |
|
|
|
this.saveModelFlag = true |
|
|
|
if(this.remark == ''){ |
|
|
|
if (this.remark == '') { |
|
|
|
this.$alert('请输入原因！', '操作提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type :"warning", |
|
|
|
type: "warning", |
|
|
|
callback: action => { |
|
|
|
this.saveModelFlag = false |
|
|
|
} |
|
|
|
@ -886,11 +897,11 @@ |
|
|
|
this.saveFlagAdd() |
|
|
|
}, |
|
|
|
//判断是否新增不良信息 |
|
|
|
initFlagAdd(){ |
|
|
|
if(this.currentDetailData.status != '在库'){ |
|
|
|
initFlagAdd() { |
|
|
|
if (this.currentDetailData.status != '在库') { |
|
|
|
this.$alert('当前工具状态不为在库！', '操作提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type :"warning", |
|
|
|
type: "warning", |
|
|
|
callback: action => { |
|
|
|
|
|
|
|
} |
|
|
|
@ -900,21 +911,21 @@ |
|
|
|
this.remark = '' |
|
|
|
this.setUp.modelFlag = true |
|
|
|
}, |
|
|
|
saveFlagAdd(){ |
|
|
|
saveFlagAdd() { |
|
|
|
let applyType = "待隔离处理" |
|
|
|
let queryDate = { |
|
|
|
site : this.currentDetailData.site, |
|
|
|
toolInstanceId : this.currentDetailData.toolInstanceId, |
|
|
|
applyType : this.currentDetailData.applyType, |
|
|
|
newApplyType : applyType, |
|
|
|
site: this.currentDetailData.site, |
|
|
|
toolInstanceId: this.currentDetailData.toolInstanceId, |
|
|
|
applyType: this.currentDetailData.applyType, |
|
|
|
newApplyType: applyType, |
|
|
|
} |
|
|
|
flagAdd(queryDate).then(({data}) =>{ |
|
|
|
if(data.success){ |
|
|
|
flagAdd(queryDate).then(({data}) => { |
|
|
|
if (data.success) { |
|
|
|
this.updateOffInspection() |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '操作提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type :"warning", |
|
|
|
type: "warning", |
|
|
|
callback: action => { |
|
|
|
|
|
|
|
} |
|
|
|
@ -923,43 +934,43 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
//更改工具不良信息 |
|
|
|
updateOffInspection(){ |
|
|
|
updateOffInspection() { |
|
|
|
let addFlag = "Y"; |
|
|
|
let passFlag = "N"; |
|
|
|
let status = "隔离"; |
|
|
|
let applyType = "待隔离处理"; |
|
|
|
let jsonData = { |
|
|
|
id : 0, |
|
|
|
passFlag : passFlag, |
|
|
|
actCheckBy : this.userName, |
|
|
|
site : this.currentDetailData.site, |
|
|
|
toolInstanceId : this.currentDetailData.toolInstanceId, |
|
|
|
status : status, |
|
|
|
orderref1 : this.currentDetailData.orderref1, |
|
|
|
toolId : this.currentDetailData.toolId, |
|
|
|
applyType : this.currentDetailData.applyType, |
|
|
|
newApplyType : applyType, |
|
|
|
addFlag : addFlag, |
|
|
|
checkBy :this.currentDetailData.checkBy, |
|
|
|
id: 0, |
|
|
|
passFlag: passFlag, |
|
|
|
actCheckBy: this.userName, |
|
|
|
site: this.currentDetailData.site, |
|
|
|
toolInstanceId: this.currentDetailData.toolInstanceId, |
|
|
|
status: status, |
|
|
|
orderref1: this.currentDetailData.orderref1, |
|
|
|
toolId: this.currentDetailData.toolId, |
|
|
|
applyType: this.currentDetailData.applyType, |
|
|
|
newApplyType: applyType, |
|
|
|
addFlag: addFlag, |
|
|
|
checkBy: this.currentDetailData.checkBy, |
|
|
|
// remark : this.currentDetailData.remark, |
|
|
|
remark : this.remark, |
|
|
|
remark: this.remark, |
|
|
|
} |
|
|
|
let jsonList = [] |
|
|
|
jsonList.push(jsonData) |
|
|
|
updateSoToolInspectionApplyList(jsonList).then(({data}) =>{ |
|
|
|
if(data.code == 0){ |
|
|
|
updateSoToolInspectionApplyList(jsonList).then(({data}) => { |
|
|
|
if (data.code == 0) { |
|
|
|
this.toolInstanceIdChange() |
|
|
|
} |
|
|
|
this.$alert(data.msg, '操作提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type :"warning", |
|
|
|
type: "warning", |
|
|
|
callback: action => { |
|
|
|
|
|
|
|
} |
|
|
|
}); |
|
|
|
}) |
|
|
|
}, |
|
|
|
rowDblclick(row, column, event){ |
|
|
|
rowDblclick(row, column, event) { |
|
|
|
console.log(row) |
|
|
|
console.log(column) |
|
|
|
console.log(event) |
|
|
|
@ -969,94 +980,109 @@ |
|
|
|
this.setUp.toolHeaderFlag = false |
|
|
|
}, |
|
|
|
getTime(date) { |
|
|
|
if(date != null && date != ''){ |
|
|
|
if (date != null && date != '') { |
|
|
|
var json_date = new Date(date).toJSON(); |
|
|
|
return new Date(new Date(json_date) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '') |
|
|
|
} |
|
|
|
}, |
|
|
|
saveToolDetail(){ |
|
|
|
saveToolDetail() { |
|
|
|
this.setUp.saveToolFlag = true |
|
|
|
this.editData.purchaseDate = this.editData.strPurchaseDate |
|
|
|
this.editData.phaseInDate = this.editData.strPhaseInDate |
|
|
|
this.editData.phaseOutDate = this.editData.strPhaseOutDate |
|
|
|
updateToolDetail(this.editData).then((data) =>{ |
|
|
|
|
|
|
|
// 校验 工程师是否存在 |
|
|
|
let dto ={ |
|
|
|
site: this.site, |
|
|
|
baseData: 'engineer', |
|
|
|
engineer: this.editData.engineer |
|
|
|
} |
|
|
|
getTblUserList(dto).then(({data}) =>{ |
|
|
|
if (data.code == 0 && data.list.length >0 ){ |
|
|
|
updateToolDetail(this.editData).then((data) => { |
|
|
|
if (data.code == 0 || data.data.code == 0) { |
|
|
|
this.toolInstanceIdChange() |
|
|
|
} |
|
|
|
this.$alert(data.data.msg, '操作提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
type :"warning", |
|
|
|
type: "warning", |
|
|
|
callback: action => { |
|
|
|
this.setUp.toolEditFlag = false |
|
|
|
} |
|
|
|
}); |
|
|
|
this.setUp.saveToolFlag = false |
|
|
|
}) |
|
|
|
}else { |
|
|
|
this.$message.warning('工程师账号不存在') |
|
|
|
this.setUp.saveToolFlag = false |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
initToolHeaderModel(){ |
|
|
|
initToolHeaderModel() { |
|
|
|
this.toolHeaderList = [] |
|
|
|
this.setUp.toolHeaderFlag = true |
|
|
|
this.queryHeaderData.likeToolId = '' |
|
|
|
this.queryHeaderData.likeToolDescription = '' |
|
|
|
this.getToolHeaderList() |
|
|
|
}, |
|
|
|
getToolHeaderList(){ |
|
|
|
getToolHeaderList(this.queryHeaderData).then(({data}) =>{ |
|
|
|
getToolHeaderList() { |
|
|
|
getToolHeaderList(this.queryHeaderData).then(({data}) => { |
|
|
|
this.toolHeaderList = data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
initToolModel(){ |
|
|
|
initToolModel() { |
|
|
|
this.setUp.toolEditFlag = true |
|
|
|
this.setUp.saveToolFlag = false |
|
|
|
this.editData = JSON.parse(JSON.stringify(this.currentDetailData)) |
|
|
|
}, |
|
|
|
//获取工具使用记录 |
|
|
|
getSfdcToolingHistList(){ |
|
|
|
getSfdcToolingHistList() { |
|
|
|
let queryData = { |
|
|
|
site : this.site, |
|
|
|
toolInstanceId : this.currentDetailData.toolInstanceId |
|
|
|
site: this.site, |
|
|
|
toolInstanceId: this.currentDetailData.toolInstanceId |
|
|
|
} |
|
|
|
getSfdcToolingHistList(queryData).then(({data}) =>{ |
|
|
|
getSfdcToolingHistList(queryData).then(({data}) => { |
|
|
|
this.sfdcToolingHistList = data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
//获取工具使用记录 |
|
|
|
getToolInstanceIdUseHist(){ |
|
|
|
getToolInstanceIdUseHist() { |
|
|
|
let queryData = { |
|
|
|
site : this.site, |
|
|
|
toolInstanceId : this.currentDetailData.toolInstanceId |
|
|
|
site: this.site, |
|
|
|
toolInstanceId: this.currentDetailData.toolInstanceId |
|
|
|
} |
|
|
|
getToolInstanceIdUseHist(queryData).then(({data}) =>{ |
|
|
|
getToolInstanceIdUseHist(queryData).then(({data}) => { |
|
|
|
this.toolInstanceIdUseHist = data.rows |
|
|
|
}) |
|
|
|
}, |
|
|
|
toolInstanceIdChange(){ |
|
|
|
toolInstanceIdChange() { |
|
|
|
this.sfdcToolingHistList = [] |
|
|
|
this.toolInstanceIdUseHist = [] |
|
|
|
let queryData = { |
|
|
|
site : this.site, |
|
|
|
toolInstanceId : this.currentDetailData.toolInstanceId, |
|
|
|
site: this.site, |
|
|
|
toolInstanceId: this.currentDetailData.toolInstanceId, |
|
|
|
} |
|
|
|
getToolDetailList(queryData).then(({data}) =>{ |
|
|
|
getToolDetailList(queryData).then(({data}) => { |
|
|
|
let list = data.rows |
|
|
|
if(list.length > 0){ |
|
|
|
if (list.length > 0) { |
|
|
|
this.currentDetailData = list[0] |
|
|
|
this.getToolInstanceIdUseHist() |
|
|
|
this.getSfdcToolingHistList() |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
getDetailList(){ |
|
|
|
getDetailList() { |
|
|
|
this.currentDetailData = {} |
|
|
|
this.selectList.select4 = [] |
|
|
|
this.sfdcToolingHistList = [] |
|
|
|
this.toolInstanceIdUseHist = [] |
|
|
|
let queryData = { |
|
|
|
site : this.site, |
|
|
|
toolId : this.headerData.toolId, |
|
|
|
toolDescription : this.headerData.toolDescription, |
|
|
|
site: this.site, |
|
|
|
toolId: this.headerData.toolId, |
|
|
|
toolDescription: this.headerData.toolDescription, |
|
|
|
} |
|
|
|
getToolDetailList(queryData).then(({data}) =>{ |
|
|
|
getToolDetailList(queryData).then(({data}) => { |
|
|
|
let list = data.rows |
|
|
|
for (let i = 0; i < list.length; i++) { |
|
|
|
let selectData = { |
|
|
|
@ -1065,53 +1091,50 @@ |
|
|
|
} |
|
|
|
this.selectList.select4.push(selectData); |
|
|
|
} |
|
|
|
if(list.length > 0){ |
|
|
|
if (list.length > 0) { |
|
|
|
this.currentDetailData = list[0] |
|
|
|
this.toolInstanceIdChange() |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
//获取主记录信息 |
|
|
|
getHeaderData(){ |
|
|
|
getHeaderData() { |
|
|
|
let queryData = { |
|
|
|
site : this.site, |
|
|
|
toolId : this.headerData.toolId, |
|
|
|
toolDescription : this.headerData.toolDescription, |
|
|
|
site: this.site, |
|
|
|
toolId: this.headerData.toolId, |
|
|
|
toolDescription: this.headerData.toolDescription, |
|
|
|
} |
|
|
|
getToolHeaderData(queryData).then(({data}) =>{ |
|
|
|
getToolHeaderData(queryData).then(({data}) => { |
|
|
|
this.headerData = data.row |
|
|
|
this.getDetailList() |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 打印方式 |
|
|
|
printReport(){ |
|
|
|
printReport() { |
|
|
|
let row = this.currentDetailData |
|
|
|
// alert( this.$store.state.user.site) |
|
|
|
this.$lodop.print(temp, data); |
|
|
|
const LODOP = getLodop() |
|
|
|
if (LODOP) { |
|
|
|
LODOP.SET_LICENSES("","13F0BE83846277CB60918577C6281375","",""); |
|
|
|
LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", ""); |
|
|
|
LODOP.PRINT_INIT("ToolInstanceID"); |
|
|
|
LODOP.SET_PRINT_PAGESIZE(0,80,40,""); |
|
|
|
LODOP.SET_PRINT_PAGESIZE(0, 80, 40, ""); |
|
|
|
LODOP.SET_PRINT_STYLE("FontSize", 12); |
|
|
|
LODOP.NewPage(); |
|
|
|
|
|
|
|
LODOP.PRINT_INIT('') //初始化 |
|
|
|
LODOP.SET_PRINT_PAGESIZE(0,1000,400,""); |
|
|
|
LODOP.SET_PRINT_STYLE("FontSize",12); |
|
|
|
LODOP.SET_PRINT_STYLE("LineHeight",-2); |
|
|
|
LODOP.ADD_PRINT_BARCODE(3,3,300,120,"QRCode",row.toolInstanceId); |
|
|
|
LODOP.ADD_PRINT_TEXT(10,115,400,150,"实例编码:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(10,205,400,150,row.toolInstanceId ); |
|
|
|
LODOP.ADD_PRINT_TEXT(32,115,400,150,"工具名称:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(32,205,400,150,row.toolDescription ); |
|
|
|
LODOP.ADD_PRINT_TEXT(54,115,400,150,"入库日期:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(54,205,400,150,row.createDate); |
|
|
|
LODOP.ADD_PRINT_TEXT(76,115,400,150,"库位号:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(76,205,400,150,row.currLocationId); |
|
|
|
LODOP.ADD_PRINT_TEXT(98,115,400,150,"供应商编码:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(98,205,400,150,row.supplierId); |
|
|
|
|
|
|
|
LODOP.SET_PRINT_PAGESIZE(0, 1000, 400, ""); |
|
|
|
LODOP.SET_PRINT_STYLE("FontSize", 12); |
|
|
|
LODOP.SET_PRINT_STYLE("LineHeight", -2); |
|
|
|
LODOP.ADD_PRINT_BARCODE(3, 3, 300, 120, "QRCode", row.toolInstanceId); |
|
|
|
LODOP.ADD_PRINT_TEXT(10, 115, 400, 150, "实例编码:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(10, 205, 400, 150, row.toolInstanceId); |
|
|
|
LODOP.ADD_PRINT_TEXT(32, 115, 400, 150, "工具名称:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(32, 205, 400, 150, row.toolDescription); |
|
|
|
LODOP.ADD_PRINT_TEXT(54, 115, 400, 150, "入库日期:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(54, 205, 400, 150, row.createDate); |
|
|
|
LODOP.ADD_PRINT_TEXT(76, 115, 400, 150, "库位号:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(76, 205, 400, 150, row.locationId); |
|
|
|
LODOP.ADD_PRINT_TEXT(98, 115, 400, 150, "供应商编码:"); |
|
|
|
LODOP.ADD_PRINT_TEXT(98, 205, 400, 150, row.supplierId); |
|
|
|
// LODOP.PRINT_DESIGN(); |
|
|
|
//LODOP.PREVIEW(); |
|
|
|
LODOP.PRINT(); |
|
|
|
@ -1119,41 +1142,41 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
// 校验用户是否收藏 |
|
|
|
favoriteIsOk(){ |
|
|
|
let userFavorite ={ |
|
|
|
userId:this.$store.state.user.id, |
|
|
|
languageCode:this.$i18n.locale |
|
|
|
favoriteIsOk() { |
|
|
|
let userFavorite = { |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
languageCode: this.$i18n.locale |
|
|
|
} |
|
|
|
userFavoriteList(userFavorite).then(({data}) =>{ |
|
|
|
let size = data.list.filter(item => item.userId==userFavorite.menuId).length; |
|
|
|
if (size>0){ |
|
|
|
userFavoriteList(userFavorite).then(({data}) => { |
|
|
|
let size = data.list.filter(item => item.userId == userFavorite.menuId).length; |
|
|
|
if (size > 0) { |
|
|
|
this.favorite = true |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
this.favorite = false |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
// 收藏 OR 取消收藏 |
|
|
|
favoriteFunction(){ |
|
|
|
let userFavorite ={ |
|
|
|
favoriteFunction() { |
|
|
|
let userFavorite = { |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
functionId: this.$route.meta.menuId, |
|
|
|
} |
|
|
|
if (this.favorite){ |
|
|
|
if (this.favorite) { |
|
|
|
// 取消收藏 |
|
|
|
this.$confirm(`确定取消收藏`, '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
removeUserFavorite(userFavorite).then(({data})=>{ |
|
|
|
removeUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = false |
|
|
|
}) |
|
|
|
}) |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
// 收藏 |
|
|
|
saveUserFavorite(userFavorite).then(({data})=>{ |
|
|
|
saveUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = true |
|
|
|
}) |
|
|
|
@ -1202,7 +1225,7 @@ |
|
|
|
// 获取button的词典 |
|
|
|
getFunctionButtonList() { |
|
|
|
searchFunctionButtonList(this.queryButton).then(({data}) => { |
|
|
|
if (JSON.stringify(data.data)!=='{}') { |
|
|
|
if (JSON.stringify(data.data) !== '{}') { |
|
|
|
this.buttons = data.data |
|
|
|
} else { |
|
|
|
saveButtonList(this.buttonList).then(({data}) => { |
|
|
|
@ -1334,23 +1357,23 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
fields(){ |
|
|
|
fields() { |
|
|
|
let json = "{" |
|
|
|
this.columnList.forEach((item,index) =>{ |
|
|
|
if (index == this.columnList.length-1 ){ |
|
|
|
json +="\""+item.columnLabel+"\"" +":"+"\""+item.columnProp+"\"" |
|
|
|
}else { |
|
|
|
json += "\""+item.columnLabel+"\"" +":"+"\""+item.columnProp+"\""+ "," |
|
|
|
this.columnList.forEach((item, index) => { |
|
|
|
if (index == this.columnList.length - 1) { |
|
|
|
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" |
|
|
|
} else { |
|
|
|
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + "," |
|
|
|
} |
|
|
|
}) |
|
|
|
json +="}" |
|
|
|
json += "}" |
|
|
|
let s = eval("(" + json + ")") |
|
|
|
return s |
|
|
|
}, |
|
|
|
createExportData() { |
|
|
|
// 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据 |
|
|
|
// TODO:构造需要下载的数据返回 |
|
|
|
if(this.dataListSelections.length>0){ |
|
|
|
if (this.dataListSelections.length > 0) { |
|
|
|
return this.dataListSelections; |
|
|
|
} |
|
|
|
return this.dataList; |
|
|
|
@ -1372,7 +1395,7 @@ |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
<style > |
|
|
|
<style> |
|
|
|
.el-header, .el-footer { |
|
|
|
background-color: #B3C0D1; |
|
|
|
color: #333; |
|
|
|
@ -1406,7 +1429,8 @@ |
|
|
|
.el-container:nth-child(7) .el-aside { |
|
|
|
line-height: 320px; |
|
|
|
} |
|
|
|
.number .el-input__inner{ |
|
|
|
|
|
|
|
.number .el-input__inner { |
|
|
|
text-align: right; |
|
|
|
} |
|
|
|
</style> |
[li_she]
3 years ago