|
|
|
@ -9,7 +9,11 @@ |
|
|
|
<el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'工艺类型'"> |
|
|
|
<el-input v-model="searchData.routingType" clearable style="width: 120px"></el-input> |
|
|
|
<el-select v-model="searchData.routingType" clearable style="width: 120px"> |
|
|
|
<el-option label="Manufacturing" value="Manufacturing"></el-option> |
|
|
|
<el-option label="Repair" value="Repair"></el-option> |
|
|
|
<el-option label="Prototype" value="Prototype"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'Routing版本号'"> |
|
|
|
<el-input v-model="searchData.routingRevision" clearable style="width: 120px"></el-input> |
|
|
|
@ -158,7 +162,7 @@ |
|
|
|
<el-button v-if="modalData.flag === '2'" type="primary" @click="copyRoutingAlternative">Copy</el-button> |
|
|
|
<el-button v-if="detailData.status === 'Tentative' || detailData.status === 'Obsolete'" type="primary" @click="updateStatusToBuildable">Build</el-button> |
|
|
|
<el-button v-if="detailData.status === 'Buildable' && (modalData.effPhaseOutDate == null || modalData.effPhaseOutDate === '')" type="primary" @click="updateStatusToObsolete">Retire</el-button> |
|
|
|
<el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y'" type="primary" @click="toBecomeOfficialRouting" :loading="toBecomeOfficialLoading">转正式Routing</el-button> |
|
|
|
<el-button v-if="modalData.flag === '2' && detailData.officialFlag !== 'Y' && (modalData.ifsPartNo == null || modalData.ifsPartNo === '')" type="primary" @click="toBecomeOfficialRouting" :loading="toBecomeOfficialLoading">转正式Routing</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="detailData" :rules="rules" style="margin-left: 7px"> |
|
|
|
@ -344,6 +348,16 @@ |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<!-- 分页插件 --> |
|
|
|
<el-pagination |
|
|
|
@size-change="sizeChangeHandle2" |
|
|
|
@current-change="currentChangeHandle2" |
|
|
|
:current-page="pageIndex2" |
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
:page-size="pageSize2" |
|
|
|
:total="totalPage2" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="partModelFlag=false">关闭</el-button> |
|
|
|
@ -400,7 +414,10 @@ |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px"> |
|
|
|
<el-form-item prop="workCenterNo" :rules="componentRules.workCenterNo"> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(119)"><a herf="#">加工中心编码</a></span> |
|
|
|
<el-input v-model="componentData.workCenterNo" @blur="workCenterBlur(119)" style="width: 221px"></el-input> |
|
|
|
<el-input v-model="componentData.workCenterNo" @blur="workCenterBlur(119)" style="width: 103px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-input v-model="componentData.workCenterType" readonly style="width: 103px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'加工中心名称'"> |
|
|
|
<el-input v-model="componentData.workCenterDesc" disabled style="width: 221px"></el-input> |
|
|
|
@ -456,7 +473,7 @@ |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'外协采购料号'"> |
|
|
|
<el-input v-model="componentData.outsideOpItem" style="width: 456px"></el-input> |
|
|
|
<el-input v-model="componentData.outsideOpItem" :readonly="componentData.workCenterType !== '外部'" style="width: 456px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px"> |
|
|
|
@ -523,15 +540,18 @@ |
|
|
|
<legend>Source Revision</legend> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input v-model="modalData.partNo" readonly style="width: 185px"></el-input> |
|
|
|
<el-input v-model="modalData.partNo" readonly style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="site"> |
|
|
|
<el-input v-model="modalData.site" disabled style="width: 185px"></el-input> |
|
|
|
<el-form-item label="物料名称"> |
|
|
|
<el-input v-model="modalData.partDesc" readonly style="width: 249px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="Site"> |
|
|
|
<el-input v-model="modalData.site" readonly style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Routing版本号"> |
|
|
|
<el-input v-model="modalData.routingRevision" readonly style="width: 185px"></el-input> |
|
|
|
<el-input v-model="modalData.routingRevision" readonly style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="工艺类型"> |
|
|
|
<el-input v-model="modalData.routingType" readonly style="width: 185px"></el-input> |
|
|
|
@ -570,19 +590,23 @@ |
|
|
|
<fieldset style="width: 426px"> |
|
|
|
<legend>Destination Revision</legend> |
|
|
|
<el-form :inline="true" label-position="top" :model="copyRoutingData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input v-model="copyRoutingData.partNo" style="width: 185px"></el-input> |
|
|
|
<el-form-item> |
|
|
|
<span slot="label" @click="queryCopyPartModal"><a herf="#">物料编码</a></span> |
|
|
|
<el-input v-model="copyRoutingData.partNo" @change="copyRoutingTypeChange" @blur="copyPartBlur" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="site"> |
|
|
|
<el-input v-model="copyRoutingData.site" disabled style="width: 185px"></el-input> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="copyRoutingData.partDesc" disabled style="width: 249px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="copyRoutingData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="Site"> |
|
|
|
<el-input v-model="copyRoutingData.site" disabled style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Routing版本号"> |
|
|
|
<el-input v-model="copyRoutingData.routingRevision" style="width: 185px"></el-input> |
|
|
|
<el-input v-model="copyRoutingData.routingRevision" style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="工艺类型"> |
|
|
|
<el-select v-model="copyRoutingData.routingType" style="width: 185px"> |
|
|
|
<el-select v-model="copyRoutingData.routingType" @change="copyRoutingTypeChange" style="width: 185px"> |
|
|
|
<el-option label="Manufacturing" value="Manufacturing"></el-option> |
|
|
|
<el-option label="Repair" value="Repair"></el-option> |
|
|
|
<el-option label="Prototype" value="Prototype"></el-option> |
|
|
|
@ -599,7 +623,7 @@ |
|
|
|
</el-form> |
|
|
|
</fieldset> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="copyRouting">保存</el-button> |
|
|
|
<el-button type="primary" :loading="copyLoading" @click="copyRouting">保存</el-button> |
|
|
|
<el-button type="primary" @click="copyRoutingModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
@ -610,15 +634,18 @@ |
|
|
|
<legend>Source Revision</legend> |
|
|
|
<el-form :inline="true" label-position="top" :model="detailData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input v-model="detailData.partNo" readonly style="width: 185px"></el-input> |
|
|
|
<el-input v-model="detailData.partNo" readonly style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="site"> |
|
|
|
<el-input v-model="detailData.site" disabled style="width: 185px"></el-input> |
|
|
|
<el-form-item label="物料名称"> |
|
|
|
<el-input v-model="modalData.partDesc" readonly style="width: 249px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="detailData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="Site"> |
|
|
|
<el-input v-model="detailData.site" readonly style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Routing版本号"> |
|
|
|
<el-input v-model="detailData.routingRevision" readonly style="width: 185px"></el-input> |
|
|
|
<el-input v-model="detailData.routingRevision" readonly style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="工艺类型"> |
|
|
|
<el-input v-model="detailData.routingType" readonly style="width: 185px"></el-input> |
|
|
|
@ -636,16 +663,20 @@ |
|
|
|
<fieldset style="width: 426px"> |
|
|
|
<legend>Destination Revision</legend> |
|
|
|
<el-form :inline="true" label-position="top" :model="copyAlternativeData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input v-model="copyAlternativeData.partNo" style="width: 185px"></el-input> |
|
|
|
<el-form-item> |
|
|
|
<span slot="label" @click="queryCopyPartModal"><a herf="#">物料编码</a></span> |
|
|
|
<el-input v-model="copyAlternativeData.partNo" @blur="copyPartBlur" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="site"> |
|
|
|
<el-input v-model="copyAlternativeData.site" disabled style="width: 185px"></el-input> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="copyAlternativeData.partDesc" disabled style="width: 249px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="copyAlternativeData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="Site"> |
|
|
|
<el-input v-model="copyAlternativeData.site" disabled style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Routing版本号"> |
|
|
|
<el-input v-model="copyAlternativeData.routingRevision" style="width: 185px"></el-input> |
|
|
|
<el-input v-model="copyAlternativeData.routingRevision" style="width: 85px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="工艺类型"> |
|
|
|
<el-select v-model="copyAlternativeData.routingType" style="width: 185px"> |
|
|
|
@ -665,7 +696,7 @@ |
|
|
|
</el-form> |
|
|
|
</fieldset> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="copyAlternative">保存</el-button> |
|
|
|
<el-button type="primary" :loading="copyLoading" @click="copyAlternative">保存</el-button> |
|
|
|
<el-button type="primary" @click="copyAlternativeModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
@ -794,6 +825,56 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- copy物料模态框 --> |
|
|
|
<el-dialog title="物料清单" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="copyPartModelFlag" width="700px"> |
|
|
|
<el-form :inline="true" label-position="top" :model="copyPartData"> |
|
|
|
<el-form-item :label="'物料编码'"> |
|
|
|
<el-input v-model="copyPartData.partNo" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'物料名称'"> |
|
|
|
<el-input v-model="copyPartData.partDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="queryCopyPartList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="250" |
|
|
|
:data="copyPartList" |
|
|
|
@row-dblclick="getCopyRowData" |
|
|
|
border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in componentPartColumnList" :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"> |
|
|
|
<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> |
|
|
|
</el-table> |
|
|
|
<!-- 分页插件 --> |
|
|
|
<el-pagination |
|
|
|
@size-change="sizeChangeHandle4" |
|
|
|
@current-change="currentChangeHandle4" |
|
|
|
:current-page="pageIndex4" |
|
|
|
:page-sizes="[20, 50, 100, 200, 500]" |
|
|
|
:page-size="pageSize4" |
|
|
|
:total="totalPage4" |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
<el-footer style="height:35px;margin-top:10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="copyPartModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- chooseList模态框 --> |
|
|
|
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList> |
|
|
|
</div> |
|
|
|
@ -813,6 +894,7 @@ import { |
|
|
|
updateAlternativeStatus, // 修改明细状态 |
|
|
|
routingDetailDelete, // routing 明细删除 |
|
|
|
queryPartList, // 查询物料清单 |
|
|
|
queryPartListRouting, // 查出可创建Routing的物料 |
|
|
|
queryRoutingComponent, // 查询 routing 子明细 |
|
|
|
saveRoutingComponent, // 新增 routing 子明细 |
|
|
|
updateRoutingComponent, // 修改 routing 子明细 |
|
|
|
@ -908,6 +990,12 @@ export default { |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 50, |
|
|
|
totalPage: 0, |
|
|
|
pageIndex2: 1, |
|
|
|
pageSize2: 20, |
|
|
|
totalPage2: 0, |
|
|
|
pageIndex4: 1, |
|
|
|
pageSize4: 20, |
|
|
|
totalPage4: 0, |
|
|
|
selectedDataNum: 0, |
|
|
|
// 条件查询 |
|
|
|
searchData: { |
|
|
|
@ -925,6 +1013,7 @@ export default { |
|
|
|
saveDetailLoading: false, |
|
|
|
saveAllLoading: false, |
|
|
|
toBecomeOfficialLoading: false, |
|
|
|
copyLoading: false, |
|
|
|
// 初始页签 |
|
|
|
detailTable: 'routing_detail', |
|
|
|
subDetailTable: 'routing_sub_detail', |
|
|
|
@ -994,6 +1083,7 @@ export default { |
|
|
|
machineNo: '', |
|
|
|
workCenterNo: '', |
|
|
|
workCenterDesc: '', |
|
|
|
workCenterType: '', |
|
|
|
laborClassNo: '', |
|
|
|
laborClassDesc: '', |
|
|
|
setupLaborClassNo: '', |
|
|
|
@ -1011,6 +1101,8 @@ export default { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
}, |
|
|
|
operationData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -1070,6 +1162,7 @@ export default { |
|
|
|
copyRoutingData: { |
|
|
|
site: '', |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
routingRevision: '', |
|
|
|
routingType: '', |
|
|
|
phaseInDate: '', |
|
|
|
@ -1080,6 +1173,7 @@ export default { |
|
|
|
copyAlternativeData: { |
|
|
|
site: '', |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
routingRevision: '', |
|
|
|
routingType: '', |
|
|
|
alternativeNo: '', |
|
|
|
@ -1134,6 +1228,14 @@ export default { |
|
|
|
ifsRowId: '', |
|
|
|
ifsRowVersion: '' |
|
|
|
}, |
|
|
|
copyPartData: { |
|
|
|
type: '', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
}, |
|
|
|
// ======== 数据列表 ======== |
|
|
|
dataList: [], |
|
|
|
partList: [], |
|
|
|
@ -1146,6 +1248,7 @@ export default { |
|
|
|
routingToolList: [], |
|
|
|
alternativeList: [], |
|
|
|
workGuidelineList: [], |
|
|
|
copyPartList: [], |
|
|
|
// ======== 列表表头 ======== |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
@ -1398,7 +1501,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 60 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1416,7 +1519,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
columnWidth: 150 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1434,7 +1537,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 60 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1452,7 +1555,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1470,7 +1573,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1488,7 +1591,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1506,7 +1609,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1524,7 +1627,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1542,7 +1645,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1560,7 +1663,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 85 |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -1578,6 +1681,24 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 104003, |
|
|
|
serialNumber: '104003Table2WorkCenterNo', |
|
|
|
tableId: '104003Table2', |
|
|
|
tableName: 'Routing工序表', |
|
|
|
columnProp: 'workCenterNo', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '加工中心编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
}, |
|
|
|
{ |
|
|
|
@ -1588,8 +1709,26 @@ export default { |
|
|
|
tableName: 'Routing工序表', |
|
|
|
columnProp: 'workCenterDesc', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'left', |
|
|
|
columnLabel: '加工中心名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 200 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 104003, |
|
|
|
serialNumber: '104003Table2WorkCenterType', |
|
|
|
tableId: '104003Table2', |
|
|
|
tableName: 'Routing工序表', |
|
|
|
columnProp: 'workCenterType', |
|
|
|
headerAlign: 'center', |
|
|
|
align: 'center', |
|
|
|
columnLabel: '加工中心', |
|
|
|
columnLabel: '加工中心类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
@ -1650,7 +1789,7 @@ export default { |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
columnWidth: 200 |
|
|
|
}, |
|
|
|
], |
|
|
|
columnRoutingToolList: [ |
|
|
|
@ -2019,6 +2158,68 @@ export default { |
|
|
|
columnWidth: 80 |
|
|
|
} |
|
|
|
], |
|
|
|
componentPartColumnList: [ |
|
|
|
{ |
|
|
|
columnProp: 'partNo', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '物料编码', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partDesc', |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: '物料名称', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'familyName', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '物料分类', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'printUnit', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '计量单位', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'spec', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '规格型号', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
}, |
|
|
|
{ |
|
|
|
columnProp: 'partType', |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: '零件类型', |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
} |
|
|
|
], |
|
|
|
// ======== 必填规则 ======== |
|
|
|
rules: { |
|
|
|
partNo: [ |
|
|
|
@ -2266,7 +2467,8 @@ export default { |
|
|
|
queryWorkGuidelineModal: false, |
|
|
|
saveWorkGuidelineModal: false, |
|
|
|
workGuidelineDisableModal: false, |
|
|
|
headerSaveFlag: false |
|
|
|
headerSaveFlag: false, |
|
|
|
copyPartModelFlag: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2332,6 +2534,148 @@ export default { |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 每页数 |
|
|
|
* @param val |
|
|
|
*/ |
|
|
|
sizeChangeHandle2 (val) { |
|
|
|
this.pageSize2 = val |
|
|
|
this.pageIndex2 = 1 |
|
|
|
this.queryPartList() |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 当前页 |
|
|
|
* @param val |
|
|
|
*/ |
|
|
|
currentChangeHandle2 (val) { |
|
|
|
this.pageIndex2 = val |
|
|
|
this.queryPartList() |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 每页数 |
|
|
|
* @param val |
|
|
|
*/ |
|
|
|
sizeChangeHandle4 (val) { |
|
|
|
this.pageSize4 = val |
|
|
|
this.pageIndex4 = 1 |
|
|
|
this.queryCopyPartModal() |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 当前页 |
|
|
|
* @param val |
|
|
|
*/ |
|
|
|
currentChangeHandle4 (val) { |
|
|
|
this.pageIndex4 = val |
|
|
|
this.queryCopyPartModal() |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* copy物料列表 |
|
|
|
*/ |
|
|
|
queryCopyPartModal () { |
|
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
|
this.copyPartData.page = this.pageIndex4 |
|
|
|
// 查询所有物料 |
|
|
|
queryPartList(this.copyPartData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.copyPartList = data.page.list |
|
|
|
this.pageIndex4 = data.page.currPage |
|
|
|
this.pageSize4 = data.page.pageSize |
|
|
|
this.totalPage4 = data.page.totalCount |
|
|
|
this.copyPartModelFlag = true |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* copy物料查询列表 |
|
|
|
*/ |
|
|
|
queryCopyPartList () { |
|
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
|
this.copyPartData.page = this.pageIndex4 |
|
|
|
// 查询所有物料 |
|
|
|
queryPartList(this.copyPartData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.copyPartList = data.page.list |
|
|
|
this.pageIndex4 = data.page.currPage |
|
|
|
this.pageSize4 = data.page.pageSize |
|
|
|
this.totalPage4 = data.page.totalCount |
|
|
|
} else { |
|
|
|
this.copyPartList = [] |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// copy物料编码失焦事件 |
|
|
|
copyPartBlur () { |
|
|
|
if (this.copyPartData.type === '1') { |
|
|
|
if (this.copyRoutingData.partNo != null && this.copyRoutingData.partNo !== '') { |
|
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
|
this.copyPartData.page = this.pageIndex4 |
|
|
|
this.copyPartData.partNo = this.copyRoutingData.partNo |
|
|
|
queryPartList(this.copyPartData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
if (data.page.list.length === 1) { |
|
|
|
this.copyRoutingData.partDesc = data.page.list[0].partDesc |
|
|
|
} else { |
|
|
|
this.$message.warning('该物料不存在！') |
|
|
|
this.copyRoutingData.partDesc = '' |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (this.copyAlternativeData.partNo != null && this.copyAlternativeData.partNo !== '') { |
|
|
|
this.copyPartData.limit = this.pageSize4 |
|
|
|
this.copyPartData.page = this.pageIndex4 |
|
|
|
this.copyPartData.partNo = this.copyAlternativeData.partNo |
|
|
|
queryPartList(this.copyPartData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
if (data.page.list.length === 1) { |
|
|
|
this.copyAlternativeData.partDesc = data.page.list[0].partDesc |
|
|
|
} else { |
|
|
|
this.$message.warning('该物料不存在！') |
|
|
|
this.copyAlternativeData.partDesc = '' |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 双击选择copy物料 |
|
|
|
getCopyRowData (row) { |
|
|
|
if (this.copyPartData.type === '1') { |
|
|
|
this.copyRoutingData.partNo = row.partNo |
|
|
|
this.copyRoutingData.partDesc = row.partDesc |
|
|
|
this.copyRoutingTypeChange() |
|
|
|
} else { |
|
|
|
this.copyAlternativeData.partNo = row.partNo |
|
|
|
this.copyAlternativeData.partDesc = row.partDesc |
|
|
|
} |
|
|
|
this.copyPartModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
// copy BOM类型改变 |
|
|
|
copyRoutingTypeChange () { |
|
|
|
// 获取物料的routing版本号 |
|
|
|
getRottingRevision(this.copyRoutingData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.copyRoutingData.routingRevision = data.routingRevision |
|
|
|
} else { |
|
|
|
this.copyRoutingData.routingRevision = '' |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// ======== 页签切换相关方法 ======== |
|
|
|
/** |
|
|
|
* 明细页签选择替换 |
|
|
|
@ -2383,11 +2727,11 @@ export default { |
|
|
|
*/ |
|
|
|
getDataList () { |
|
|
|
//如果是跳转过来的 要判断 |
|
|
|
if(localStorage.getItem('routeData')!=undefined){ |
|
|
|
let data=JSON.parse(localStorage.getItem('routeData')); |
|
|
|
this.searchData.partNo=data.partNo |
|
|
|
this.searchData.routingType=data.routingType |
|
|
|
this.searchData.routingRevision=data.routingRevision |
|
|
|
if (localStorage.getItem('routeData') != undefined) { |
|
|
|
let data = JSON.parse(localStorage.getItem('routeData')) |
|
|
|
this.searchData.partNo = data.partNo |
|
|
|
this.searchData.routingType = data.routingType |
|
|
|
this.searchData.routingRevision = data.routingRevision |
|
|
|
} |
|
|
|
this.searchData.limit = this.pageSize |
|
|
|
this.searchData.page = this.pageIndex |
|
|
|
@ -2399,16 +2743,14 @@ export default { |
|
|
|
this.pageSize = data.page.pageSize |
|
|
|
this.totalPage = data.page.totalCount |
|
|
|
this.$refs.selectDiv.setLengthAll( this.dataList.length) |
|
|
|
if(localStorage.getItem('routeData')!=undefined){ |
|
|
|
|
|
|
|
if (localStorage.getItem('routeData') != undefined) { |
|
|
|
this.updateModal(this.dataList[0]) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
this.queryLoading = false |
|
|
|
if(localStorage.getItem('routeData')!=undefined){ |
|
|
|
if (localStorage.getItem('routeData') != undefined) { |
|
|
|
this.$nextTick(function () { |
|
|
|
localStorage.removeItem('routeData'); |
|
|
|
localStorage.removeItem('routeData') |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
@ -2504,7 +2846,9 @@ export default { |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
printUnit: row.printUnit, |
|
|
|
printUnitName: row.printUnitName, |
|
|
|
officialFlag: row.officialFlag |
|
|
|
officialFlag: row.officialFlag, |
|
|
|
alternativeNo: row.alternativeNo, |
|
|
|
ifsPartNo: row.ifsPartNo |
|
|
|
} |
|
|
|
// 查routing明细 |
|
|
|
queryRoutingDetail(this.modalData).then(({data}) => { |
|
|
|
@ -2665,6 +3009,7 @@ export default { |
|
|
|
machineNo: '', |
|
|
|
workCenterNo: '', |
|
|
|
workCenterDesc: '', |
|
|
|
workCenterType: '', |
|
|
|
laborClassNo: '', |
|
|
|
laborClassDesc: '', |
|
|
|
setupLaborClassNo: '', |
|
|
|
@ -2719,6 +3064,7 @@ export default { |
|
|
|
machineNo: row.machineNo, |
|
|
|
workCenterNo: row.workCenterNo, |
|
|
|
workCenterDesc: row.workCenterDesc, |
|
|
|
workCenterType: row.workCenterType, |
|
|
|
laborClassNo: row.laborClassNo, |
|
|
|
laborClassDesc: row.laborClassDesc, |
|
|
|
setupLaborClassNo: row.setupLaborClassNo, |
|
|
|
@ -2934,9 +3280,14 @@ export default { |
|
|
|
* 查询物料 |
|
|
|
*/ |
|
|
|
queryPartList () { |
|
|
|
queryPartList(this.partData).then(({data}) => { |
|
|
|
this.partData.limit = this.pageSize2 |
|
|
|
this.partData.page = this.pageIndex2 |
|
|
|
queryPartListRouting(this.partData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.partList = data.rows |
|
|
|
this.partList = data.page.list |
|
|
|
this.pageIndex2 = data.page.currPage |
|
|
|
this.pageSize2 = data.page.pageSize |
|
|
|
this.totalPage2 = data.page.totalCount |
|
|
|
this.partModelFlag = true |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
@ -2948,13 +3299,15 @@ export default { |
|
|
|
|
|
|
|
// 物料编码失焦事件 |
|
|
|
partNoBlur () { |
|
|
|
this.partData.limit = this.pageSize2 |
|
|
|
this.partData.page = this.pageIndex2 |
|
|
|
this.partData.partNo = this.modalData.partNo |
|
|
|
queryPartList(this.partData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
if (data.rows.length === 1) { |
|
|
|
this.modalData.partDesc = data.rows[0].partDesc |
|
|
|
this.modalData.printUnit = data.rows[0].printUnit |
|
|
|
this.modalData.printUnitName = data.rows[0].printUnitName |
|
|
|
if (data.page.list.length === 1) { |
|
|
|
this.modalData.partDesc = data.page.list[0].partDesc |
|
|
|
this.modalData.printUnit = data.page.list[0].printUnit |
|
|
|
this.modalData.printUnitName = data.page.list[0].printUnitName |
|
|
|
// 获取物料的routing版本号 |
|
|
|
getRottingRevision(this.modalData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
@ -3315,6 +3668,7 @@ export default { |
|
|
|
this.copyRoutingData = { |
|
|
|
site: this.modalData.site, |
|
|
|
partNo: this.modalData.partNo, |
|
|
|
partDesc: this.modalData.partDesc, |
|
|
|
routingRevision: this.modalData.routingRevision + 1, |
|
|
|
routingType: this.modalData.routingType, |
|
|
|
phaseInDate: this.dayjs(new Date()).format('YYYY-MM-DD'), |
|
|
|
@ -3323,6 +3677,14 @@ export default { |
|
|
|
createBy: this.$store.state.user.name, |
|
|
|
officialFlag: 'N' |
|
|
|
} |
|
|
|
this.copyPartData = { |
|
|
|
type: '1', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
} |
|
|
|
this.copyRoutingModelFlag = true |
|
|
|
}, |
|
|
|
/** |
|
|
|
@ -3341,12 +3703,17 @@ export default { |
|
|
|
this.$message.warning('请选择工艺类型！') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.copyRoutingData.phaseOutDate != null && this.copyRoutingData.phaseOutDate !== '' && this.copyRoutingData.phaseOutDate < this.copyRoutingData.phaseInDate) { |
|
|
|
this.$message.warning('失效日期必须大于生效日期！') |
|
|
|
return |
|
|
|
} |
|
|
|
this.copyRoutingData.previousVersion = this.modalData |
|
|
|
this.copyLoading = true |
|
|
|
// 新增主表信息 |
|
|
|
copyRouting(this.copyRoutingData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.modalData.phaseOutDate = data.rows.phaseOutDate |
|
|
|
this.copyRoutingModelFlag = false |
|
|
|
this.updateModal(data.rows) |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
@ -3358,6 +3725,9 @@ export default { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
this.copyLoading = false |
|
|
|
}).catch(()=>{ |
|
|
|
this.copyLoading = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
/** |
|
|
|
@ -3367,6 +3737,7 @@ export default { |
|
|
|
this.copyAlternativeData = { |
|
|
|
site: this.detailData.site, |
|
|
|
partNo: this.detailData.partNo, |
|
|
|
partDesc: this.modalData.partDesc, |
|
|
|
routingRevision: this.detailData.routingRevision, |
|
|
|
routingType: this.detailData.routingType, |
|
|
|
alternativeNo: this.detailData.alternativeNo, |
|
|
|
@ -3386,6 +3757,14 @@ export default { |
|
|
|
previousVersion: {}, |
|
|
|
createBy: this.$store.state.user.name |
|
|
|
} |
|
|
|
this.copyPartData = { |
|
|
|
type: '2', |
|
|
|
site: this.$store.state.user.site, |
|
|
|
partNo: '', |
|
|
|
partDesc: '', |
|
|
|
page: 1, |
|
|
|
limit: 10 |
|
|
|
} |
|
|
|
this.copyAlternativeModelFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
@ -3623,10 +4002,11 @@ export default { |
|
|
|
return |
|
|
|
} |
|
|
|
this.copyAlternativeData.previousVersion = this.detailData |
|
|
|
this.copyLoading = true |
|
|
|
copyAlternative(this.copyAlternativeData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.detailDataList = data.rows.detailDataList |
|
|
|
this.copyAlternativeModelFlag = false |
|
|
|
this.updateModal(data.rows) |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
@ -3638,6 +4018,9 @@ export default { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
this.copyLoading = false |
|
|
|
}).catch(()=>{ |
|
|
|
this.copyLoading = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -4020,6 +4403,7 @@ export default { |
|
|
|
if (this.tagNo === 119) { |
|
|
|
this.componentData.workCenterNo = val.work_center_no |
|
|
|
this.componentData.workCenterDesc = val.work_center_desc |
|
|
|
this.componentData.workCenterType = val.work_center_type |
|
|
|
} |
|
|
|
if (this.tagNo === 122) { |
|
|
|
this.routingToolData.toolId = val.tool_id |
|
|
|
@ -4049,6 +4433,7 @@ export default { |
|
|
|
if (data.baseListData.length > 0) { |
|
|
|
this.componentData.workCenterNo = data.baseListData[0].work_center_no |
|
|
|
this.componentData.workCenterDesc = data.baseListData[0].work_center_desc |
|
|
|
this.componentData.workCenterType = data.baseListData[0].work_center_type |
|
|
|
} else { |
|
|
|
this.$message.warning('该加工中心不存在！') |
|
|
|
this.componentData.workCenterDesc = '' |
|
|
|
|
fengyuan_yang
1 year ago