|
|
@ -129,13 +129,7 @@ |
|
|
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick"> |
|
|
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick"> |
|
|
<el-tab-pane label="申请单明细" name="detail"> |
|
|
<el-tab-pane label="申请单明细" name="detail"> |
|
|
<el-form :inline="true" label-position="top" label-width="100px"> |
|
|
<el-form :inline="true" label-position="top" label-width="100px"> |
|
|
<el-button |
|
|
|
|
|
@click="createOrderDetail()" |
|
|
|
|
|
type="primary" |
|
|
|
|
|
style="margin-left: 10px;margin-top: 0px" |
|
|
|
|
|
:disabled="(currentRow.status !== '草稿' && currentRow.status !== '编辑中')"> |
|
|
|
|
|
{{'新增'}} |
|
|
|
|
|
</el-button> |
|
|
|
|
|
|
|
|
<el-button @click="createOrderDetail()" type="primary" style="margin-left: 10px" :disabled="(currentRow.status !== '草稿' && currentRow.status !== '编辑中')">{{'新增'}}</el-button> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<el-table |
|
|
<el-table |
|
|
:data="dataList2" |
|
|
:data="dataList2" |
|
|
@ -149,13 +143,7 @@ |
|
|
width="80" |
|
|
width="80" |
|
|
label="操作"> |
|
|
label="操作"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<a |
|
|
|
|
|
type="text" |
|
|
|
|
|
size="small" |
|
|
|
|
|
@click="deleteNotifySOSPlus(scope.row)" |
|
|
|
|
|
:class="{ 'disabled-link': currentRow.status !== '草稿' && currentRow.status !== '编辑中' }"> |
|
|
|
|
|
删除 |
|
|
|
|
|
</a> |
|
|
|
|
|
|
|
|
<a type="text" size="small" @click="deleteNotifySOSPlus(scope.row)" :class="{ 'disabled-link': currentRow.status !== '草稿' && currentRow.status !== '编辑中' }">删除</a> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
@ -170,8 +158,7 @@ |
|
|
: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> |
|
|
<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> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
</el-table> |
|
|
</el-table> |
|
|
@ -682,7 +669,7 @@ |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6"> |
|
|
|
|
|
|
|
|
<el-col :span="6"> |
|
|
<el-form-item :label="'结束日期'" > |
|
|
<el-form-item :label="'结束日期'" > |
|
|
<el-date-picker |
|
|
<el-date-picker |
|
|
style="width: 100%" |
|
|
style="width: 100%" |
|
|
@ -1461,7 +1448,7 @@ |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
|
columnWidth: 120 |
|
|
}, { |
|
|
}, { |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
@ -1478,7 +1465,7 @@ |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 200 |
|
|
|
|
|
|
|
|
columnWidth: 300 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
@ -1540,20 +1527,20 @@ |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
serialNumber: '701002Table3ItemNo', |
|
|
|
|
|
|
|
|
serialNumber: '701002Table3BOMItemNo', |
|
|
tableId: "701002Table3", |
|
|
tableId: "701002Table3", |
|
|
tableName: "申请单材料明细表", |
|
|
tableName: "申请单材料明细表", |
|
|
columnProp: "itemNo", |
|
|
|
|
|
|
|
|
columnProp: "bOMItemNo", |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "right", |
|
|
align: "right", |
|
|
columnLabel: "序号", |
|
|
|
|
|
|
|
|
columnLabel: "BOM序号", |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 60 |
|
|
|
|
|
|
|
|
columnWidth: 80 |
|
|
},{ |
|
|
},{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
@ -1641,24 +1628,6 @@ |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
columnWidth: 80 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: 701002, |
|
|
|
|
|
serialNumber: '701002Table3NeedDate', |
|
|
|
|
|
tableId: "701002Table3", |
|
|
|
|
|
tableName: "申请单材料明细表", |
|
|
|
|
|
columnProp: "needDate", |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "center", |
|
|
|
|
|
columnLabel: "需求时间", |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 110 |
|
|
|
|
|
}, |
|
|
|
|
|
], |
|
|
], |
|
|
columnList3s:[ |
|
|
columnList3s:[ |
|
|
{ |
|
|
{ |
|
|
@ -1678,41 +1647,26 @@ |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
columnWidth: 80 |
|
|
},{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: 701002, |
|
|
|
|
|
serialNumber: '701002Table3Remark', |
|
|
|
|
|
tableId: "701002Table3", |
|
|
|
|
|
tableName: "申请单材料明细表", |
|
|
|
|
|
columnProp: "remark", |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: "备注", |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 160 |
|
|
|
|
|
},{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: 701002, |
|
|
|
|
|
serialNumber: '701002Table3SOOrderNo', |
|
|
|
|
|
tableId: "701002Table3", |
|
|
|
|
|
tableName: "申请单材料明细表", |
|
|
|
|
|
columnProp: "orderNo", |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: "生产订单", |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 120 |
|
|
|
|
|
},{ |
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
// { |
|
|
|
|
|
// userId: this.$store.state.user.name, |
|
|
|
|
|
// functionId: 701002, |
|
|
|
|
|
// serialNumber: '701002Table3Remark', |
|
|
|
|
|
// tableId: "701002Table3", |
|
|
|
|
|
// tableName: "申请单材料明细表", |
|
|
|
|
|
// columnProp: "remark", |
|
|
|
|
|
// headerAlign: "center", |
|
|
|
|
|
// align: "left", |
|
|
|
|
|
// columnLabel: "备注", |
|
|
|
|
|
// columnHidden: false, |
|
|
|
|
|
// columnImage: false, |
|
|
|
|
|
// columnSortable: false, |
|
|
|
|
|
// sortLv: 0, |
|
|
|
|
|
// status: true, |
|
|
|
|
|
// fixed: '', |
|
|
|
|
|
// columnWidth: 160 |
|
|
|
|
|
// }, |
|
|
|
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
serialNumber: '701002Table3OpsItemNo', |
|
|
serialNumber: '701002Table3OpsItemNo', |
|
|
@ -1721,31 +1675,14 @@ |
|
|
columnProp: "opsItemNo", |
|
|
columnProp: "opsItemNo", |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "right", |
|
|
align: "right", |
|
|
columnLabel: "工序", |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: '', |
|
|
|
|
|
columnWidth: 50 |
|
|
|
|
|
},{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: 701002, |
|
|
|
|
|
serialNumber: '701002Table3SeqNo', |
|
|
|
|
|
tableId: "701002Table3", |
|
|
|
|
|
tableName: "申请单材料明细表", |
|
|
|
|
|
columnProp: "seqNo", |
|
|
|
|
|
headerAlign: "center", |
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: "派工单号", |
|
|
|
|
|
|
|
|
columnLabel: "领料工序", |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 150 |
|
|
|
|
|
|
|
|
columnWidth: 80 |
|
|
},{ |
|
|
},{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
@ -1755,7 +1692,7 @@ |
|
|
columnProp: "locationNo", |
|
|
columnProp: "locationNo", |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "left", |
|
|
align: "left", |
|
|
columnLabel: "机台", |
|
|
|
|
|
|
|
|
columnLabel: "领料机台", |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
@ -1766,20 +1703,20 @@ |
|
|
},{ |
|
|
},{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: 701002, |
|
|
functionId: 701002, |
|
|
serialNumber: '701002Table3BOMItemNo', |
|
|
|
|
|
|
|
|
serialNumber: '701002Table3SeqNo', |
|
|
tableId: "701002Table3", |
|
|
tableId: "701002Table3", |
|
|
tableName: "申请单材料明细表", |
|
|
tableName: "申请单材料明细表", |
|
|
columnProp: "bOMItemNo", |
|
|
|
|
|
|
|
|
columnProp: "seqNo", |
|
|
headerAlign: "center", |
|
|
headerAlign: "center", |
|
|
align: "right", |
|
|
|
|
|
columnLabel: "BOM序号", |
|
|
|
|
|
|
|
|
align: "left", |
|
|
|
|
|
columnLabel: "派工单号", |
|
|
columnHidden: false, |
|
|
columnHidden: false, |
|
|
columnImage: false, |
|
|
columnImage: false, |
|
|
columnSortable: false, |
|
|
columnSortable: false, |
|
|
sortLv: 0, |
|
|
sortLv: 0, |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: '', |
|
|
fixed: '', |
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
|
columnWidth: 150 |
|
|
}, |
|
|
}, |
|
|
], |
|
|
], |
|
|
columnList4:[ |
|
|
columnList4:[ |
|
|
|