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

生产退库修改

master
shenzhouyu 3 months ago
parent
9e7d8906e5
commit
6677550025
2 changed files with 34 additions and 36 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. 3
      src/api/orderIssure/inboundNotification.js
  2. 65
      src/views/modules/orderIssure/inboundNotification.vue

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

@ -1,5 +1,6 @@
import { createAPI } from "@/utils/httpRequest.js";
export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNotify/getSiteAndBuByUserName`,'post',data)
export const searchNotifyHeader= data => createAPI(`/orderIssure/issureNotify/searchNotifyHeader`,'post',data)
export const searchNotifyHeader= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyHeader`,'post',data)
export const createNotify = data => createAPI(`/orderIssure/issureNotify/createNotify`,'post',data)
export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data)

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

@ -5,23 +5,20 @@
<el-form-item :label="'单据号'">
<el-input v-model="searchData.orderNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'单据类型'">
<!-- <el-form-item :label="'单据类型'">
<el-select v-model="searchData.orderType" clearable style="width: 100px">
<el-option label="采购入库" value="采购入库"></el-option>
<el-option label="生产入库" value="生产入库"></el-option>
<el-option label="销售退货" value="销售退货"></el-option>
<el-option label="其他入库" value="其他入库"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item :label="'单据状态'">
<el-select multiple collapse-tags v-model="searchData.orderStatusList" clearable style="width: 160px">
<el-option label="草稿" value="草稿"></el-option>
<el-option label="待检验" value="待检验"></el-option>
<el-option label="编辑中" value="编辑中"></el-option>
<el-option label="待入库" value="待入库"></el-option>
<el-option label="已完成" value="已完成"></el-option>
<el-option label="已关闭" value="已关闭"></el-option>
<el-option label="已归档" value="已归档"></el-option>
<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-select>
</el-form-item>
<el-form-item :label="'要求入库日期'">
@ -39,13 +36,12 @@
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
<el-button v-if="!authSave" type="primary" @click="saveModal()">新增</el-button>
<el-button v-if="!authDelete" type="primary" @click="deleteModal()">删除</el-button>
<!-- <el-button v-if="!authDelete" type="primary" @click="deleteModal()">删除</el-button> -->
<!-- <el-button v-if="!authArchive" type="primary" @click="archiveModal()">归档</el-button> -->
</el-form-item>
<el-form-item :label="' '">
<!-- <el-form-item :label="' '">
<el-button @click="exportExcel()" type="primary" style="margin-left: 2px">{{'导出'}}</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
<!-- 展示列表 -->
@ -131,7 +127,6 @@
@tab-click="tabClick" class="customer-tab">
<el-tab-pane label="入库明细" name="inboundDetail">
<el-form label-position="top" style="margin-left: 2px;">
<el-button type="primary" @click="chooseSOSModal()" icon="el-icon-plus">新增</el-button>
<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"
@ -515,7 +510,7 @@ export default {
orderNo: '',
orderType: '',
orderStatus: '',
orderStatusList: ['草稿'],
orderStatusList: ['UNISSUE'],
startDate: '',
endDate: '',
page: 1,
@ -572,7 +567,7 @@ export default {
updatedBy: '',
},
seqNoData: {
site: this.$store.state.user.site,
site: localStorage.getItem('site'),
bu: '',
orderno: '',
seqno: '',
@ -601,7 +596,7 @@ export default {
serialNumber: '610Table1OrderNo',
tableId: '610Table1',
tableName: '收货入库任务表',
columnProp: 'orderNo',
columnProp: 'notifyNo',
headerAlign: 'center',
align: 'center',
columnLabel: '单据号',
@ -613,7 +608,7 @@ export default {
fixed: '',
columnWidth: 120,
},
{
/* {
userId: this.$store.state.user.name,
functionId: 610,
serialNumber: '610Table1OrderType',
@ -630,14 +625,14 @@ export default {
status: true,
fixed: '',
columnWidth: 100,
},
}, */
{
userId: this.$store.state.user.name,
functionId: 610,
serialNumber: '610Table1OrderStatus',
tableId: '610Table1',
tableName: '收货入库任务表',
columnProp: 'orderStatus',
columnProp: 'status',
headerAlign: 'center',
align: 'left',
columnLabel: '单据状态',
@ -649,7 +644,7 @@ export default {
fixed: '',
columnWidth: 100,
},
{
/* {
userId: this.$store.state.user.name,
functionId: 610,
serialNumber: '610Table1SupplierId',
@ -684,17 +679,17 @@ export default {
status: true,
fixed: '',
columnWidth: 200,
},
}, */
{
userId: this.$store.state.user.name,
functionId: 610,
serialNumber: '610Table1RequiredInboundDate',
tableId: '610Table1',
tableName: '收货入库任务表',
columnProp: 'requiredInboundDate',
columnProp: 'notifyDate',
headerAlign: 'center',
align: 'center',
columnLabel: '要求入库日期',
columnLabel: '申请单日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -709,7 +704,7 @@ export default {
serialNumber: '610Table1CreatedDate',
tableId: '610Table1',
tableName: '收货入库任务表',
columnProp: 'createdDate',
columnProp: 'enteredDate',
headerAlign: 'center',
align: 'center',
columnLabel: '创建时间',
@ -727,7 +722,7 @@ export default {
serialNumber: '610Table1CreatedBy',
tableId: '610Table1',
tableName: '收货入库任务表',
columnProp: 'createdBy',
columnProp: 'username',
headerAlign: 'center',
align: 'center',
columnLabel: '创建人',
@ -739,7 +734,7 @@ export default {
fixed: '',
columnWidth: 100,
},
{
/* {
userId: this.$store.state.user.name,
functionId: 610,
serialNumber: '610Table1UpdatedDate',
@ -774,7 +769,7 @@ export default {
status: true,
fixed: '',
columnWidth: 100,
},
}, */
],
columnList2: [
{
@ -1202,7 +1197,7 @@ export default {
// 按钮控制
this.getButtonAuthData()
// 获取用户的 site 和 bu
this.getSiteAndBuByUserName()
//this.getSiteAndBuByUserName()
// 动态列
this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
this.getTableUserColumn(this.$route.meta.menuId + 'table2', 2)
@ -1230,6 +1225,8 @@ export default {
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
this.searchData.orderStatus = this.searchData.orderStatusList.join(',')
console.log("this.",this.searchData);
this.searchLoading = true
searchNotifyHeader(this.searchData)
.then(({ data }) => {
@ -1335,7 +1332,7 @@ export default {
if (this.modalData.flag === '1') {
// 新增
this.modalData.orderType = '退料入库'
this.modalData.site = this.$store.state.user.site
this.modalData.site = localStorage.getItem('site')
createNotify(this.modalData)
.then(({ data }) => {
if (data && data.code === 0) {
@ -1540,7 +1537,7 @@ export default {
chooseSOSModal() {
this.seqNoData = {
site: this.$store.state.user.site,
site: localStorage.getItem('site'),
orderno: '',
seqno: '',
sResourceid: '',
@ -1647,7 +1644,7 @@ export default {
type: 'warning',
}).then(() => {
let inData = {
site: this.$store.state.user.site,
site: localStorage.getItem('site'),
notifyNo: this.notifyNo,
fGPartNo: row.partNo,
sOOrderNo: row.orderno,
@ -1673,7 +1670,7 @@ export default {
},
getNotifyNoDetail() {
let inData = {
site: this.$store.state.user.site,
site: localStorage.getItem('site'),
notifyNo: this.notifyNo,
}
getNotifyNoDetail(inData).then(({ data }) => {
@ -1693,7 +1690,7 @@ export default {
}
this.bomLoadFlag = true
let inData = {
site: this.$store.state.user.site,
site: localStorage.getItem('site'),
notifyNo: this.notifyNo,
orderno: row.orderno,
seqno: row.seqno,

Write Preview
Loading…
Cancel
Save