|
|
|
@ -849,8 +849,7 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- workGuideline --> |
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal" |
|
|
|
width="1000px"> |
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal" width="1000px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="workGuidelineData" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'物料编码'"> |
|
|
|
<el-input v-model="workGuidelineData.partNo" readonly style="width: 120px"></el-input> |
|
|
|
@ -934,13 +933,10 @@ |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- workGuideline 新增模态框 --> |
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" |
|
|
|
width="664px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" |
|
|
|
style="margin-left: 5px"> |
|
|
|
<el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" width="664px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq"> |
|
|
|
<el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" |
|
|
|
style="width: 60px"></el-input-number> |
|
|
|
<el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" style="width: 60px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'工艺指导名称'" prop="guidelineDesc" :rules="guidelineRules.guidelineDesc"> |
|
|
|
<el-input v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px"></el-input> |
|
|
|
@ -949,8 +945,7 @@ |
|
|
|
<el-input v-model="saveWorkGuidelineData.guidelineText" style="width: 413px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" |
|
|
|
style="margin-left: 5px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'工艺指导类型'" prop="guidelineType" :rules="guidelineRules.guidelineType"> |
|
|
|
<el-select v-model="saveWorkGuidelineData.guidelineType" style="width: 200px"> |
|
|
|
<el-option label="Subtask" value="Subtask"></el-option> |
|
|
|
@ -963,8 +958,7 @@ |
|
|
|
<el-option label="Not Required" value="Not Required"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" |
|
|
|
:rules="guidelineRules.inspectionSignOffRequired"> |
|
|
|
<el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" :rules="guidelineRules.inspectionSignOffRequired"> |
|
|
|
<el-select v-model="saveWorkGuidelineData.inspectionSignOffRequired" style="width: 200px"> |
|
|
|
<el-option label="Required to Shop Order" value="Required to Shop Order"></el-option> |
|
|
|
<el-option label="Required to Close Operation" value="Required to Close Operation"></el-option> |
|
|
|
@ -973,7 +967,7 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:35px;margin-top:25px;text-align:center"> |
|
|
|
<el-button type="primary" @click="workGuidelineCommit">保存</el-button> |
|
|
|
<el-button type="primary" :loading="guidelineLoading" @click="workGuidelineCommit">保存</el-button> |
|
|
|
<el-button type="primary" @click="saveWorkGuidelineModal = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
@ -1013,8 +1007,7 @@ |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<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> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -1038,8 +1031,7 @@ |
|
|
|
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList> |
|
|
|
|
|
|
|
<!-- 加工中心模态框 --> |
|
|
|
<el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterModelFlag" |
|
|
|
width="940px"> |
|
|
|
<el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterModelFlag" width="940px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="searchData"> |
|
|
|
<el-form-item :label="'编码'" @keyup.enter.native="queryWorkCenter"> |
|
|
|
<el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input> |
|
|
|
@ -1069,8 +1061,7 @@ |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<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> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -2864,7 +2855,8 @@ export default { |
|
|
|
workGuidelineDisableModal: false, |
|
|
|
headerSaveFlag: false, |
|
|
|
copyPartModelFlag: false, |
|
|
|
toolModelFlag: false |
|
|
|
toolModelFlag: false, |
|
|
|
guidelineLoading: false |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -4320,6 +4312,7 @@ export default { |
|
|
|
this.$message.warning('请选择检验签字!') |
|
|
|
return |
|
|
|
} |
|
|
|
this.guidelineLoading = true |
|
|
|
if (this.saveWorkGuidelineData.flag === '1') { |
|
|
|
workGuidelineSave(this.saveWorkGuidelineData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
@ -4332,11 +4325,15 @@ export default { |
|
|
|
onClose: () => { |
|
|
|
} |
|
|
|
}) |
|
|
|
this.guidelineLoading = false |
|
|
|
} else { |
|
|
|
this.guidelineLoading = false |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}).catch(() => { |
|
|
|
this.guidelineLoading = false |
|
|
|
}) |
|
|
|
} else { |
|
|
|
workGuidelineEdit(this.saveWorkGuidelineData).then(({data}) => { |
|
|
|
@ -4350,11 +4347,15 @@ export default { |
|
|
|
onClose: () => { |
|
|
|
} |
|
|
|
}) |
|
|
|
this.guidelineLoading = false |
|
|
|
} else { |
|
|
|
this.guidelineLoading = false |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}).catch(() => { |
|
|
|
this.guidelineLoading = false |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
|