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

1

java8
ruanqi 1 year ago
parent
bc16ec4181
commit
c06fb7cfe6
3 changed files with 379 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/api/orderIssure/soIssueNotify.js
  2. 150
      src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
  3. 253
      src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue

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

@ -36,3 +36,6 @@ export const deleteNotifySOSPlus= data => createAPI(`/orderIssure/issureNotify/d
export const updateNotifyStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyStatus`,'post',data) export const updateNotifyStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyStatus`,'post',data)
export const deleteNotifyMaterial= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterial`,'post',data) export const deleteNotifyMaterial= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterial`,'post',data)
export const saveOtherPart= data => createAPI(`/orderIssure/issureNotify/saveOtherPart`,'post',data) export const saveOtherPart= data => createAPI(`/orderIssure/issureNotify/saveOtherPart`,'post',data)
export const getNoControlPartList= data => createAPI(`/orderIssure/issureNotify/getNoControlPartList`,'post',data)
export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searchOtherPart`,'post',data)
export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)

150
src/views/modules/orderIssure/soIssueNotify/newSoIssueNotify.vue
View File

@ -9,6 +9,7 @@
<el-button v-if="notifyNo!=''" type="primary" @click="deleteNotify()" class="yzzButtonAn">删除申请单</el-button> <el-button v-if="notifyNo!=''" type="primary" @click="deleteNotify()" class="yzzButtonAn">删除申请单</el-button>
<el-button v-if="notifyNo!=''" type="primary" @click="updateBuModel()" class="yzzButtonAn">修改BU</el-button> <el-button v-if="notifyNo!=''" type="primary" @click="updateBuModel()" class="yzzButtonAn">修改BU</el-button>
<el-button v-if="notifyNo!=''" type="primary" @click="noBomModel()" class="yzzButtonAn">非BOM物料</el-button> <el-button v-if="notifyNo!=''" type="primary" @click="noBomModel()" class="yzzButtonAn">非BOM物料</el-button>
<el-button v-if="notifyNo!=''" type="primary" @click="noControlModel()" class="yzzButtonAn">不管控物料</el-button>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<span @click="favoriteFunction()"> <span @click="favoriteFunction()">
@ -500,7 +501,81 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </el-dialog>
<el-dialog
width="600px"
title="选择不管控物料"
:close-on-click-modal="false"
:visible.sync="noControlPartModelFlag">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-row :gutter="20">
<el-col :span="6">
<el-form-item style="margin-left: 0px" label="物料编码">
<el-input v-model="partSearch.partNo" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item style="margin-left: 0px" label="物料名称">
<el-input v-model="partSearch.partDesc" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item style="margin-left: 0px" label="规格型号">
<el-input v-model="partSearch.spec" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label=" ">
<el-button type="primary" @click="searchNoControlPartModel()">{{'查询'}}</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table
height="450"
:data="partList2"
border
@row-dblclick="chooseNoControlPartNo"
style="width: 100%;">
<el-table-column
prop="partNo"
header-align="center"
align="left"
min-width="80"
style="font-size: 20px"
label="物料编码">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="120"
style="font-size: 20px"
label="物料描述">
</el-table-column>
<el-table-column
prop="spec"
header-align="center"
align="left"
min-width="120"
style="font-size: 20px"
label="规格型号">
</el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="left"
min-width="80"
label="SKU">
</el-table-column>
<el-table-column
prop="umid"
header-align="center"
align="left"
min-width="60"
label="计量单位">
</el-table-column>
</el-table>
</el-dialog>
<el-dialog <el-dialog
width="500px" width="500px"
title="物料库存 VS 需求数量" title="物料库存 VS 需求数量"
@ -626,6 +701,8 @@
getPartList, getPartList,
checkPartStock, checkPartStock,
saveOtherPart, saveOtherPart,
getNoControlPartList,
searchOtherPart,
}from "@/api/orderIssure/soIssueNotify.js" }from "@/api/orderIssure/soIssueNotify.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
export default { export default {
@ -643,8 +720,10 @@
data () { data () {
return { return {
activeName:'sos', activeName:'sos',
noControlPartModelFlag: false,
buList:[], buList:[],
partList:[], partList:[],
partList2:[],
notifyNo:'', notifyNo:'',
notifyData:{ notifyData:{
site:'', site:'',
@ -1389,6 +1468,20 @@
} }
this.saveOtherPartModalFlag=true this.saveOtherPartModalFlag=true
}, },
chooseNoControlPartNo(row){
this.otherPartData={
site:this.notifyData.site,
notifyNo:this.notifyData.notifyNo,
itemNo:999,
bOMItemNo:'',
componentPartNo:row.partNo,
qtyToIssue:'',
issueType:'不管控物料',
partDesc:row.partDesc,
umid:row.umid,
}
this.saveOtherPartModalFlag=true
},
tableRowClassName ({row, rowIndex}) { tableRowClassName ({row, rowIndex}) {
if(row.qtyToIssue>row.qtyAvailable){ if(row.qtyToIssue>row.qtyAvailable){
@ -1422,6 +1515,8 @@
this.notifyNo = data.row.notifyNo this.notifyNo = data.row.notifyNo
this.notifyData=data.row this.notifyData=data.row
this.getNotifyNoDetail(); this.getNotifyNoDetail();
this.searchOtherPart('非BOM物料')
this.searchOtherPart('不管控物料')
}else { }else {
this.notifyNo ='' this.notifyNo =''
this.notifyData={ this.notifyData={
@ -1773,6 +1868,17 @@
this.partModelFlag=true this.partModelFlag=true
this. searchPartModel() this. searchPartModel()
}, },
noControlModel(){
this.partSearch={
site:this.notifyData.site,
sourceBu:this.notifyData.bu,
partNo:'',
partDesc:'',
spec:'',
}
this.noControlPartModelFlag=true
this. searchNoControlPartModel()
},
searchPartModel(){ searchPartModel(){
getPartList(this.partSearch).then(({data})=>{ getPartList(this.partSearch).then(({data})=>{
if (data.code === 0) { if (data.code === 0) {
@ -1780,8 +1886,15 @@
} }
}) })
}, },
searchNoControlPartModel(){
getNoControlPartList(this.partSearch).then(({data})=>{
if (data.code === 0) {
this.partList2=data.rows
}
})
},
xiadaNotifyModel(){ xiadaNotifyModel(){
if(this.dataList.length==0){
if(this.dataList.length==0&&this.dataList2.length==0&&this.dataList3.length==0){
this.$alert('没有明细记录无法下达！!', '提示', { this.$alert('没有明细记录无法下达！!', '提示', {
confirmButtonText: '确定' confirmButtonText: '确定'
}) })
@ -1804,6 +1917,7 @@
// } // }
xiadaNotify(this.notifyData).then(({data})=>{ xiadaNotify(this.notifyData).then(({data})=>{
if (data.code === 0) { if (data.code === 0) {
this.xiadaModelFlag=false
this.getUserNotifyNo() this.getUserNotifyNo()
this.$message.success( '操作成功') this.$message.success( '操作成功')
}else { }else {
@ -1825,9 +1939,18 @@
}).then(() => { }).then(() => {
saveOtherPart(this.otherPartData).then(({data})=>{ saveOtherPart(this.otherPartData).then(({data})=>{
if (data.code === 0) { if (data.code === 0) {
this.saveSeqNoModalFlag=false
this.getNotifyNoDetail()
this.itemNo=data.itemNo
this.saveOtherPartModalFlag=false
if(this.otherPartData.issueType==='非BOM物料'){
this.partModelFlag=false
this.activeName='noBom'
this.searchOtherPart('非BOM物料')
}
if(this.otherPartData.issueType==='不管控物料'){
this.noControlPartModelFlag=false
this.activeName='noControl'
this.searchOtherPart('不管控物料')
}
this.$message.success( '操作成功')
}else { }else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1896,6 +2019,23 @@
} }
}) })
}, },
searchOtherPart(type){
let inData={
site:this.notifyData.site,
notifyNo:this.notifyData.notifyNo,
issueType:type
}
searchOtherPart(inData).then(({data}) =>{
if (data && data.code === 0) {
if(type==='非BOM物料'){
this.dataList2=data.rows
}
if(type==='不管控物料'){
this.dataList3=data.rows
}
}
})
},
// 删除 // 删除
deleteNotifySOS (row) { deleteNotifySOS (row) {
this.$confirm(`是否删除这个派工单的申请信息?`, '提示', { this.$confirm(`是否删除这个派工单的申请信息?`, '提示', {

253
src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
View File

@ -118,6 +118,16 @@
border border
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%; "> 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 <el-table-column
v-for="(item,index) in columnList2" :key="index" v-for="(item,index) in columnList2" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
@ -134,17 +144,6 @@
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
header-align="center"
align="center"
width="80"
fixed="left"
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> </el-table>
</el-tab-pane> </el-tab-pane>
@ -165,6 +164,16 @@
<!-- <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>--> <!-- <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </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==='已下达'" @click="deleteNotifyMaterial(scope.row)">删除</a>
</template>
</el-table-column>
<el-table-column <el-table-column
v-for="(item,index) in columnList3" :key="index" v-for="(item,index) in columnList3" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
@ -181,22 +190,46 @@
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="材料汇总" name="sum">
<el-table
:data="dataList4"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<!-- <el-table-column-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="80"-->
<!-- fixed="left"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column <el-table-column
header-align="center"
align="center"
width="80"
fixed="left"
label="操作">
v-for="(item,index) in columnList4" :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"> <template slot-scope="scope">
<a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifyMaterial(scope.row)">删除</a>
<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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="材料汇总" name="sum">
<el-tab-pane label="删除记录" name="change">
<el-table <el-table
:data="dataList4"
:data="dataList5"
:height="height" :height="height"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -212,7 +245,7 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
v-for="(item,index) in columnList4" :key="index"
v-for="(item,index) in columnList5" :key="index"
:sortable="item.columnSortable" :sortable="item.columnSortable"
:prop="item.columnProp" :prop="item.columnProp"
:header-align="item.headerAlign" :header-align="item.headerAlign"
@ -245,6 +278,7 @@
,deleteNotifySOSPlus ,deleteNotifySOSPlus
,updateNotifyStatus ,updateNotifyStatus
,deleteNotifyMaterial ,deleteNotifyMaterial
,searchNotifyLog
}from "@/api/orderIssure/soIssueNotify.js" }from "@/api/orderIssure/soIssueNotify.js"
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
export default { export default {
@ -260,6 +294,7 @@
dataList2: [], dataList2: [],
dataList3: [], dataList3: [],
dataList4: [], dataList4: [],
dataList5: [],
addOrUpdateVisible:false, addOrUpdateVisible:false,
searchData: { searchData: {
page: 1, page: 1,
@ -910,6 +945,170 @@
columnWidth: 80 columnWidth: 80
}, },
], ],
columnList5:[
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5UpdateType',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "updateType",
headerAlign: "center",
align: "center",
columnLabel: "删除类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5ItemNo',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "itemNo",
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: 701002,
serialNumber: '701002Table5SOOrderNo',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "sOOrderNo",
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: '701002Table5SeqNo',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "seqNo",
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: '701002Table5ComponentPartNo',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "componentPartNo",
headerAlign: "center",
align: "left",
columnLabel: "材料物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5IssueType',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "issueType",
headerAlign: "center",
align: "left",
columnLabel: "材料类型",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5QtyToIssue',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "qtyToIssue",
headerAlign: "center",
align: "right",
columnLabel: "要求领料数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5UpdateBy',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "updateBy",
headerAlign: "center",
align: "left",
columnLabel: "删除账号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 701002,
serialNumber: '701002Table5UpdateDate',
tableId: "701002Table5",
tableName: "申请单材料删除记录表",
columnProp: "updateDate",
headerAlign: "center",
align: "center",
columnLabel: "删除时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
],
dataRole: { dataRole: {
partTypeDesc: [ partTypeDesc: [
{ {
@ -936,7 +1135,7 @@
}, },
mounted () { mounted () {
this.$nextTick(() => { this.$nextTick(() => {
this.height = (window.innerHeight- 260) / 2
this.height = (window.innerHeight- 250) / 2
}) })
}, },
@ -1017,6 +1216,16 @@
this.dataList3 = []; this.dataList3 = [];
} }
}); });
}else if(this.activeName==='change'){
searchNotifyLog(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况
if (data && data.code == 0) {
this.dataList5 = data.rows
} else {
this.dataList5 = [];
}
});
}else { }else {
searchSumNotifyMaterialList(this.currentRow).then(({data}) => { searchSumNotifyMaterialList(this.currentRow).then(({data}) => {
//区分请求成功和失败的状况 //区分请求成功和失败的状况

Write Preview
Loading…
Cancel
Save