meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asdsd

Browse Source
This commit is contained in:
Vergil
2020-04-20 14:59:39 +08:00
parent 126b272afd
commit fdf7585c21
4 changed files with 300 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/Inventory/MaterialOut.js
View File

@@ -231,3 +231,18 @@ export function selectleaders(department) {
}
})
}
// 领料单查询
export function searchList222(pageCurrent, pageSize, listPeople_check) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '车间装配管理_领料单明细_查询数据_新2',
param: '图号=' + listPeople_check,
Pagination: pageCurrent + '&' + pageSize
}
})
}

267
src/views/Inventory/MaterialOut/index.vue
View File

@@ -1,125 +1,134 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: 2px;margin-bottom: 2px">
<!--<span style="margin: 5px">领料单编号:</span>-->
<el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
<span style="margin: 5px">创建时间:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
<el-button :disabled="审批未通过===true" size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
<el-tabs v-model="activeName" type="border-card" @tab-click="Refresh">
<el-tab-pane>
<span slot="label">领料单</span>
<div style="margin-top: 2px;margin-bottom: 2px">
<!--<span style="margin: 5px">领料单编号:</span>-->
<el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
<span style="margin: 5px">创建时间:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
<el-button :disabled="审批未通过===true" size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
<div style="width: 25%;float: left;margin-right: 10px">
<el-card>
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="95px">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="领料人" show-overflow-tooltip align="center" width="65px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="140px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="float:left;">
<el-pagination
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3"
:total="total3"
layout="total"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</el-card>
</div>
<div style="width: 62%;float: left">
<el-card>
<el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" prop="规格" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="出库" align="center" width="130">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备件" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column label="库存" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<!-- <el-table-column v-if="true" label="备料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备</el-tag>-->
<!-- <el-tag v-else type="warning" size="mini">未备</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column v-if="true" label="领料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未完</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</el-tab-pane>
<el-tab-pane>
<span slot="label">零件</span>
<OperationGuide ref="fresh1"/>
</el-tab-pane>
</el-tabs>
</el-card>
<div style="width: 25%;float: left;margin-right: 10px">
<el-card>
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="95px">
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
</template>
</el-table-column>
<el-table-column label="领料人" prop="领料人" show-overflow-tooltip align="center" width="65px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="140px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="float:left;">
<el-pagination
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3"
:total="total3"
layout="total"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
</el-card>
</div>
<div style="width: 62%;float: left">
<el-card>
<el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" prop="规格" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="出库" align="center" width="130">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备件" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column label="库存" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<!-- <el-table-column v-if="true" label="备料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备</el-tag>-->
<!-- <el-tag v-else type="warning" size="mini">未备</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column v-if="true" label="领料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未完</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
</el-table>
</el-card>
</div>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
@@ -261,12 +270,18 @@
<script>
import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, submitOutStore, initOutType, selectdepartment, selectleaders } from '@/api/Inventory/MaterialOut'
import OperationGuide from '@/views/Inventory/MaterialOut/index2.vue'
import { mapGetters } from 'vuex'
import request from '@/utils/request'
export default {
name: 'MaterialOut',
components: {
'OperationGuide': OperationGuide
},
data() {
return {
activeName: '0',
buttonDisable: false,
dateRange: '',
multipleSelection1: [],
@@ -372,6 +387,22 @@ export default {
this.getHouse()
},
methods: {
Refresh() {
switch (this.activeName) {
case '0': {
this.pickListTable2 = []
this.fetchData()
this.searchList()
this.getHouse()
break
}
// ANDON
case '1': {
this.$refs.fresh1.fetchData(1)
break
}
}
},
// 获取仓库
async getHouse() {
const param = {

131
src/views/Inventory/MaterialOut/index2.vue Normal file
View File

@@ -0,0 +1,131 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: 2px;margin-bottom: 2px">
<el-input v-model="pickingListNumber" placeholder="图号或型号" clearable size="small" style="width:200px" />
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
<el-button size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
<el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
<el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="图号或型号" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.图号或型号 || '—' }}
</template>
</el-table-column>
<el-table-column label="规格" prop="规格" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="出库" align="center" width="130">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column label="备件" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.备件数量 }}
</template>
</el-table-column>
<el-table-column label="库存" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
</el-table-column>
<!-- <el-table-column v-if="true" label="备料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已备</el-tag>-->
<!-- <el-tag v-else type="warning" size="mini">未备</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column v-if="true" label="领料" align="center" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">未完</el-tag>-->
<!-- <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import { searchList222 } from '@/api/Inventory/MaterialOut'
export default {
data() {
return {
pickingListNumber: '',
pickListTable2: []
}
},
methods: {
// 初始化数据
fetchData() {
console.log(111111)
},
searchList() {
searchList222(this.pickingListNum).then(res => {
console.log(res.data)
for (let i = 0; i < res.data.length; i++) {
if (res.data[i].离线采购件流水号 !== 0) {
res.data[i].货位存量1 = res.data[i].货位存量
}
if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
res.data[i].货位存量1 = res.data[i].货位存量
}
if (res.data[i].货位存量1 > res.data[i].总数量) {
res.data[i].出库数量 = res.data[i].总数量
}
if (res.data[i].出库数量1 >= res.data[i].总数量) {
res.data[i].出库数量 = 0
}
}
this.pickListTable2 = res.data
})
},
tableRowClassName1({ row }) {
if (parseInt(row.出库数量1) === 0) {
return 'weilingliao-row'
} else if (parseInt(row.总数量) > parseInt(row.出库数量1) && parseInt(row.出库数量1)) {
return 'weilingwan-row'
} else {
return ''
}
},
// 多选
handleSelectionChange(val) {
this.multipleSelection1 = []
val.map(v => {
this.multipleSelection1.push(v.领料单明细流水号)
})
}
}
}
</script>

5
src/views/layout/components/TagsView.vue
View File

@@ -96,6 +96,11 @@ export default {
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1950px'
document.getElementsByClassName('navbar')[0].style.minWidth = '1950px'
break
case 'AutomaticScheduling': // 车间排产
document.getElementById('app-main').style.width = '1910px'
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1910px'
document.getElementsByClassName('navbar')[0].style.minWidth = '1910px'
break
default:
document.getElementById('app-main').style.width = '1380px'
document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1380px'