|
|
@ -42,7 +42,7 @@ |
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
:align="item.align" |
|
|
:align="item.align" |
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
:width="item.columnWidth" |
|
|
|
|
|
|
|
|
:min-width="item.columnWidth" |
|
|
:label="item.columnLabel"> |
|
|
:label="item.columnLabel"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> |
|
|
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span> |
|
|
@ -84,26 +84,26 @@ |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form-item :label="'是否是检验员:'"> |
|
|
<el-form-item :label="'是否是检验员:'"> |
|
|
<el-select filterable v-model="modelData.fQCFlag" style="width: 130px"> |
|
|
|
|
|
|
|
|
<el-select filterable v-model="modelData.fQCFlag" :disabled="modelInputFlag" style="width: 130px"> |
|
|
<el-option label="Y" value="Y"></el-option> |
|
|
<el-option label="Y" value="Y"></el-option> |
|
|
<el-option label="N" value="N"></el-option> |
|
|
<el-option label="N" value="N"></el-option> |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item > |
|
|
<el-form-item > |
|
|
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码:</a></span> |
|
|
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码:</a></span> |
|
|
<el-input v-model="modelData.workCenterNo" @change="getWorkCenterDetail" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="modelData.workCenterNo" :disabled="modelInputFlag" @change="getWorkCenterDetail" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'加工中心名称:'"> |
|
|
<el-form-item :label="'加工中心名称:'"> |
|
|
<el-input v-model="modelData.workCenterDesc" disabled style="width: 130px"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="modelData.workCenterDesc" disabled style="width: 130px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
<el-form-item > |
|
|
<el-form-item > |
|
|
<span slot="label" style="" @click="getBaseList(91)"><a herf="#">工作日历:</a></span> |
|
|
<span slot="label" style="" @click="getBaseList(91)"><a herf="#">工作日历:</a></span> |
|
|
<el-input v-model="modelData.calendarID" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="modelData.calendarID" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="'效率:'"> |
|
|
<el-form-item :label="'效率:'"> |
|
|
<el-input v-model="modelData.efficiency" type="number" style="width: 130px"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="modelData.efficiency" type="number" style="width: 130px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
@ -497,6 +497,26 @@ |
|
|
if(this.modelData.efficiency==''||this.modelData.efficiency==null){ |
|
|
if(this.modelData.efficiency==''||this.modelData.efficiency==null){ |
|
|
this.modelData.efficiency=0; |
|
|
this.modelData.efficiency=0; |
|
|
} |
|
|
} |
|
|
|
|
|
if(this.modelData.fQCFlag=='Y'){ |
|
|
|
|
|
if(this.modelData.workCenterNo==''||this.modelData.workCenterNo==null){ |
|
|
|
|
|
this.$alert("请选择加工中心!",'错误',{ |
|
|
|
|
|
confirmButtonText:'确定' |
|
|
|
|
|
}) |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
if(this.modelData.calendarID==''||this.modelData.calendarID==null){ |
|
|
|
|
|
this.$alert("请选择工作日历!",'错误',{ |
|
|
|
|
|
confirmButtonText:'确定' |
|
|
|
|
|
}) |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
if(this.modelData.efficiency==''||this.modelData.efficiency==null){ |
|
|
|
|
|
this.$alert("请输入效率!",'错误',{ |
|
|
|
|
|
confirmButtonText:'确定' |
|
|
|
|
|
}) |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
this.modelData.user=this.$store.state.user.name; |
|
|
this.modelData.user=this.$store.state.user.name; |
|
|
|
|
|
|
|
|
saveProductionLineOperatorRegistration(this.modelData).then(({data}) => { |
|
|
saveProductionLineOperatorRegistration(this.modelData).then(({data}) => { |
|
|
|