hanst
/
wms-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

申请单退料修改

master
shenzhouyu 2 months ago
parent
a1569e752b
commit
7175a175f8
4 changed files with 504 additions and 258 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/orderIssure/inboundNotification.js
  2. 6
      src/api/orderIssure/productionInboundRequest.js
  3. 91
      src/views/modules/orderIssure/inboundNotification.vue
  4. 651
      src/views/modules/productionInbound/productionInboundRequest.vue

2
src/api/orderIssure/inboundNotification.js
View File

@ -6,3 +6,5 @@ export const createNotify = data => createAPI(`/orderIssure/issureNotify/createN
export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data)
export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data)
export const searchNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchNotifyMaterialList`,'post',data)
export const deleteNotifyUnissue= data => createAPI(`/orderUnissue/unissueNotify/deleteNotifyUnissue`,'post',data)
export const searchUnissueNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyMaterialList`,'post',data)

6
src/api/orderIssure/productionInboundRequest.js
View File

@ -17,8 +17,6 @@ export const saveUnissueMaterialDetail= data => createAPI(`/orderUnissue/unissue
export const deleteNotifyUnissue= data => createAPI(`/orderUnissue/unissueNotify/deleteNotifyUnissue`,'post',data)
export const xiadaNotify= data => createAPI(`/orderIssure/issureNotify/xiadaNotify`,'post',data)
export const searchNotifyOrderList= data => createAPI(`/orderIssure/issureNotify/searchNotifyOrderList`,'post',data)
export const searchUnissueNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyMaterialList`,'post',data)
@ -46,3 +44,7 @@ export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNoti
export const getEamWorkShop = data => createAPI(`/orderIssure/issureNotify/getEamWorkShop`,'post',data)
export const getIFSShopOrderByOrderNo = data => createAPI(`/orderUnissue/unissueNotify/getIFSShopOrderByOrderNo`,'post',data)
export const getUnissueShopOrderAndMaterialByShoporder = data => createAPI(`/orderUnissue/unissueNotify/getUnissueShopOrderAndMaterialByShoporder`,'post',data)
export const saveNewUnissueNotifyOrderList = data => createAPI(`/orderUnissue/unissueNotify/saveNewUnissueNotifyOrderList`,'post',data)

91
src/views/modules/orderIssure/inboundNotification.vue
View File

@ -15,10 +15,8 @@
</el-form-item> -->
<el-form-item :label="'单据状态'">
<el-select multiple collapse-tags v-model="searchData.orderStatusList" clearable style="width: 160px">
<el-option label="草稿" value="UNISSUE"></el-option>
<el-option label="已下达" value="ISSUE"></el-option>
<el-option label="已完成" value="FINISH"></el-option>
<el-option label="已关闭" value="CLOSED"></el-option>
<el-option label="ISSUE" value="ISSUE"></el-option>
<el-option label="CLOSED" value="CLOSED"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'申请单日期'">
@ -49,8 +47,8 @@
<el-table :height="height" :data="dataList" border v-loading="searchLoading" ref="inboundTable"
:row-style="rowStyle" @row-click="inboundClickRow" @current-change="changeCurrentRow"
@selection-change="selectionInbound" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column>
<!-- <el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column> -->
<el-table-column v-for="(item,index) in columnList" :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"
@ -130,14 +128,14 @@
<!-- 页签 -->
<el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card"
@tab-click="tabClick" class="customer-tab">
<el-tab-pane label="入库明细" name="inboundDetail">
<el-tab-pane label="申请明细" name="inboundDetail">
<!-- <el-form label-position="top" style="margin-left: 2px;">
<el-button type="primary" @click="deleteInboundDetail()" icon="el-icon-delete">删除</el-button>
</el-form> -->
<el-table :data="detailList" :height="secondHeight - 68" border @selection-change="selectionInboundDetail"
v-loading="searchLoading" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column>
<!-- <el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column> -->
<el-table-column v-for="(item,index) in columnDetailList" :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"
@ -175,9 +173,10 @@
</el-table-column>
<el-table-column prop="actualStockInQty" header-align="center" align="right" min-width="100" label="实际入库数量">
</el-table-column> -->
<el-table-column fixed="right" header-align="center" align="center" width="90" label="操作">
<el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="enterSOSDetail(scope.row)">入库明细</el-link>
<a type="text" size="small" @click="enterSOSDetail(scope.row)">修改</a>
<a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
@ -525,6 +524,8 @@ import {
createNotify,
getNotifyNoDetail,
searchNotifyMaterialList,
deleteNotifyUnissue,
searchUnissueNotifyMaterialList
} from '@/api/orderIssure/inboundNotification.js'
import Chooselist from '@/views/modules/common/Chooselist_eam'
import { getChooselist } from '@/api/chooselist/chooselist.js'
@ -558,7 +559,7 @@ export default {
orderNo: '',
orderType: '',
orderStatus: '',
orderStatusList: ['UNISSUE'],
orderStatusList: ['ISSUE'],
startDate: '',
endDate: '',
page: 1,
@ -1050,7 +1051,7 @@ export default {
columnLabel: '物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
@ -1130,24 +1131,6 @@ export default {
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 701001,
serialNumber: '701001Table2PartNo',
tableId: '701001Table2',
tableName: '查询派工单',
columnProp: 'fgpartNo',
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: 701001,
@ -1185,24 +1168,6 @@ export default {
fixed: '',
columnWidth: 80,
}, */
{
userId: this.$store.state.user.name,
functionId: 701001,
serialNumber: '701001Table2Qtyreported',
tableId: '701001Table2',
tableName: '查询派工单',
columnProp: 'unissureQty',
headerAlign: 'center',
align: 'right',
columnLabel: '退料数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 701001,
@ -2239,7 +2204,7 @@ export default {
searchUnissueNotifyMaterialList(row){
this.bomLoadFlag = true
this.materialModalFlag = true
searchNotifyMaterialList(row).then(({ data }) => {
searchUnissueNotifyMaterialList(row).then(({ data }) => {
if (data.code === 0) {
this.sobomList = data.rows
}
@ -2266,6 +2231,32 @@ export default {
})
},
// 删除
deleteNotifySOS(row) {
this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
deleteNotifyUnissue(row).then(({ data }) => {
if (data && data.code === 0) {
this.getNotifyNoDetail()
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {},
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定',
})
}
})
})
.catch(() => {})
},
//获取按钮的权限数据
getButtonAuthData() {
if (this.$store.state.user.id === 1) {

651
src/views/modules/productionInbound/productionInboundRequest.vue
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save