|
|
|
@ -103,8 +103,8 @@ |
|
|
|
width="80" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotifyModel(scope.row)">关闭</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -127,15 +127,15 @@ |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%; "> |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="80" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifySOSPlus(scope.row)">删除</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- width="80"--> |
|
|
|
<!-- label="操作">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifySOSPlus(scope.row)">删除</a>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList2" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -164,16 +164,16 @@ |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%; "> |
|
|
|
|
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="80" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifyMaterial(scope.row)">删除</a> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- width="80"--> |
|
|
|
<!-- label="操作">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifyMaterial(scope.row)">删除</a>--> |
|
|
|
|
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in columnList3" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
@ -261,15 +261,15 @@ |
|
|
|
|
|
|
|
<script> |
|
|
|
import { |
|
|
|
searchNotifyHeader |
|
|
|
, searchNotifyOrderList |
|
|
|
, searchNotifyMaterialList |
|
|
|
, searchSumNotifyMaterialList |
|
|
|
searchNotifyHeaderNew |
|
|
|
, searchNotifyOrderListNew |
|
|
|
, searchNotifyMaterialListNew |
|
|
|
, searchSumNotifyMaterialListNew |
|
|
|
, deleteNotifySOSPlus |
|
|
|
, updateNotifyStatus |
|
|
|
, updateNotifyStatusNew |
|
|
|
, deleteNotifyMaterial |
|
|
|
, searchNotifyLog |
|
|
|
, searchNotifyLogClose |
|
|
|
, searchNotifyLogNew |
|
|
|
, searchNotifyLogCloseNew |
|
|
|
|
|
|
|
} from "@/api/orderIssure/soIssueNotify.js" |
|
|
|
|
|
|
|
@ -367,13 +367,13 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table1UserName', |
|
|
|
tableId: "701002Table1", |
|
|
|
tableName: "领料申请主表", |
|
|
|
columnProp: "userName", |
|
|
|
columnProp: "username", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "申请账号", |
|
|
|
@ -387,20 +387,20 @@ |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table1UserDisplay', |
|
|
|
serialNumber: '701002Table1EnteredDate', |
|
|
|
tableId: "701002Table1", |
|
|
|
tableName: "领料申请主表", |
|
|
|
columnProp: "userDisplay", |
|
|
|
columnProp: "enteredDate", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "申请人姓名", |
|
|
|
align: "center", |
|
|
|
columnLabel: "录入时间", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 100 |
|
|
|
columnWidth: 120 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
@ -452,13 +452,30 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table1ConfirmStatus', |
|
|
|
tableId: "701002Table1", |
|
|
|
tableName: "领料申请主表", |
|
|
|
columnProp: "confirmStatus", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "确认状态", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
},{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table1WcsPushFlag', |
|
|
|
tableId: "701002Table1", |
|
|
|
tableName: "领料申请主表", |
|
|
|
columnProp: "wcsPushFlag", |
|
|
|
columnProp: "pushWcsFlag", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "推送WCS", |
|
|
|
@ -524,13 +541,13 @@ |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
},{ |
|
|
|
}, { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table2SOOrderNo', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "申请单派工单明细表", |
|
|
|
columnProp: "sOOrderNo", |
|
|
|
columnProp: "soorderNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "生产订单", |
|
|
|
@ -547,7 +564,7 @@ |
|
|
|
serialNumber: '701002Table2FGPartNo', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "申请单派工单明细表", |
|
|
|
columnProp: "fGPartNo", |
|
|
|
columnProp: "fgPartNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "工单物料", |
|
|
|
@ -559,7 +576,41 @@ |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
|
|
|
|
}, |
|
|
|
}, { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table2ReleaseNo', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "申请单派工单明细表", |
|
|
|
columnProp: "releaseNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "发布号", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
}, { |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 701002, |
|
|
|
serialNumber: '701002Table2SequenceNo', |
|
|
|
tableId: "701002Table2", |
|
|
|
tableName: "申请单派工单明细表", |
|
|
|
columnProp: "sequenceNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "序号", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
columnSortable: false, |
|
|
|
sortLv: 0, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80 |
|
|
|
} |
|
|
|
|
|
|
|
], |
|
|
|
columnList3:[ |
|
|
|
@ -688,7 +739,7 @@ |
|
|
|
serialNumber: '701002Table3SOOrderNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "orderNo", |
|
|
|
columnProp: "soorderNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "生产订单", |
|
|
|
@ -705,7 +756,7 @@ |
|
|
|
serialNumber: '701002Table3BOMItemNo', |
|
|
|
tableId: "701002Table3", |
|
|
|
tableName: "申请单材料明细表", |
|
|
|
columnProp: "bOMItemNo", |
|
|
|
columnProp: "bomitemNo", |
|
|
|
headerAlign: "center", |
|
|
|
align: "right", |
|
|
|
columnLabel: "BOM序号", |
|
|
|
@ -912,7 +963,7 @@ |
|
|
|
this.currentRow={site:'',notifyNo:''} |
|
|
|
} |
|
|
|
if(this.activeName==='detail'){ |
|
|
|
searchNotifyOrderList(this.currentRow).then(({data}) => { |
|
|
|
searchNotifyOrderListNew(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList2 = data.rows |
|
|
|
@ -922,7 +973,7 @@ |
|
|
|
} |
|
|
|
}); |
|
|
|
}else if(this.activeName==='sub'){ |
|
|
|
searchNotifyMaterialList(this.currentRow).then(({data}) => { |
|
|
|
searchNotifyMaterialListNew(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList3 = data.rows |
|
|
|
@ -932,7 +983,7 @@ |
|
|
|
} |
|
|
|
}); |
|
|
|
}else if(this.activeName==='change'){ |
|
|
|
searchNotifyLog(this.currentRow).then(({data}) => { |
|
|
|
searchNotifyLogNew(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList5 = data.rows |
|
|
|
@ -942,7 +993,7 @@ |
|
|
|
} |
|
|
|
}); |
|
|
|
}else if(this.activeName==='close'){ |
|
|
|
searchNotifyLogClose(this.currentRow).then(({data}) => { |
|
|
|
searchNotifyLogCloseNew(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList6 = data.rows |
|
|
|
@ -952,7 +1003,7 @@ |
|
|
|
} |
|
|
|
}); |
|
|
|
}else { |
|
|
|
searchSumNotifyMaterialList(this.currentRow).then(({data}) => { |
|
|
|
searchSumNotifyMaterialListNew(this.currentRow).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList4 = data.rows |
|
|
|
@ -966,7 +1017,7 @@ |
|
|
|
searchTable(){ |
|
|
|
this.searchData.limit = this.pageSize |
|
|
|
this.searchData.page = this.pageIndex |
|
|
|
searchNotifyHeader(this.searchData).then(({data}) => { |
|
|
|
searchNotifyHeaderNew(this.searchData).then(({data}) => { |
|
|
|
//区分请求成功和失败的状况 |
|
|
|
if (data && data.code == 0) { |
|
|
|
this.dataList = data.page.list |
|
|
|
@ -999,7 +1050,7 @@ |
|
|
|
username:this.$store.state.user.name, |
|
|
|
status:'已关闭', |
|
|
|
} |
|
|
|
updateNotifyStatus(inData).then(({data}) => { |
|
|
|
updateNotifyStatusNew(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.closeModalFlag=false |
|
|
|
this.searchTable() |
|
|
|
@ -1026,9 +1077,9 @@ |
|
|
|
let inData={ |
|
|
|
site:row.site, |
|
|
|
notifyNo:row.notifyNo, |
|
|
|
status:'已下达', |
|
|
|
status:'ISSUE', |
|
|
|
} |
|
|
|
updateNotifyStatus(inData).then(({data}) => { |
|
|
|
updateNotifyStatusNew(inData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.searchTable() |
|
|
|
this.$message({ |
|
|
|
@ -1099,7 +1150,7 @@ |
|
|
|
async createExportData() { |
|
|
|
this.searchData.limit = -1 |
|
|
|
this.searchData.page = 1 |
|
|
|
const {data} = await searchNotifyHeader(this.searchData) |
|
|
|
const {data} = await searchNotifyHeaderNew(this.searchData) |
|
|
|
return data.page.list; |
|
|
|
}, |
|
|
|
startDownload() { |
|
|
|
|
