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

更新

Browse Source
This commit is contained in:
liushuai
2020-04-02 18:25:25 +08:00
parent 3440f4e75e
commit 3397357a3e
18 changed files with 578 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -292,6 +292,11 @@
{{ scope.row.领料单备注 }}
</template>
</el-table-column>
<el-table-column label="创建日期" prop="创建日期" align="center" min-width="90px">
<template slot-scope="scope">
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="float:left;margin: 10px 0;">
<el-pagination
@@ -308,7 +313,13 @@
<div style="width: 72.5%;float: left">
<el-card>
<el-table v-loading="listDetailsloading" :data="pickListTable2" border style="width: 100%;" size="mini" highlight-current-row height="447px" @row-click="searchMX">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column v-if="true" label="状态" align="center" prop="是否领料确认" width="70px">
<template slot-scope="scope">
<span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
<span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
<span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.名称 }}
@@ -355,13 +366,6 @@
<!--<el-tag v-else type="warning" size="mini">未备料</el-tag>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="true" label="确认" align="center" prop="是否领料确认" width="70px">
<template slot-scope="scope">
<span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
<span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
<span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="120px">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">

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

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: 8px;margin-bottom: 8px">
<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>
@@ -17,23 +17,23 @@
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="float: right; margin-right: 30px" type="distribution" @click="inputPassword()">领料确认</el-button>
<el-button :disabled="审批未通过===true" size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
</el-card>
<div style="width: 29%;float: left;margin-right: 10px">
<div style="width: 21%;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="100px">
<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" min-width="60px">
<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="90px">
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
@@ -51,7 +51,7 @@
</div>
</el-card>
</div>
<div style="width: 70%;float: left">
<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 type="selection" align="center" width="45"/>
@@ -70,7 +70,7 @@
{{ scope.row.规格 || '—' }}
</template>
</el-table-column>
<el-table-column label="领用" align="center" width="70">
<el-table-column label="领用" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
@@ -80,17 +80,17 @@
<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="70">
<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="70">
<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="70">
<el-table-column label="已领" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
</template>
@@ -108,7 +108,7 @@
<!-- <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="100" show-overflow-tooltip>
<el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -189,8 +189,8 @@
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left">
<el-form-item label="出库类别" prop="outTypeValue" label-width="100px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="right">
<el-form-item label="出库类别" prop="outTypeValue" label-width="100px" size="small">
<el-select v-model="form3.outTypeValue" size="small" placeholder="出库类别" style="width: 200px;margin-right:10px">
<el-option
v-for="item in outType"

49
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-card>
<el-row style="margin: 5px">
<span>名称规格型号：</span>
<el-row style="margin: 3px">
<!-- <span>名称规格型号：</span>-->
<el-input v-model="materialName" placeholder="名称规格型号" clearable size="small" @keyup.enter.native="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()"/>
<!--<span>物料规格：</span>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
@@ -13,19 +13,19 @@
</el-card>
<el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600" @row-click="searchoutRecord">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width:63%;" height="600" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料型号" prop="物料型号" align="center" min-width="120">
<el-table-column label="物料型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="物料规格" prop="物料规格" align="center" min-width="120">
<el-table-column label="物料规格" prop="物料规格" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
@@ -35,17 +35,17 @@
<!--{{ scope.row.仓库名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="货位名称" align="center" min-width="80">
<el-table-column label="货位名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.货位名称 }}
</template>
</el-table-column>
<el-table-column label="可出库数量" align="center" min-width="80">
<el-table-column label="可出库数量" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120">
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope" align="center">
<!--<el-button size="mini" type="success" icon="el-icon-search" @click="pageCurrent2=1;pageSize2=10;total2=0;searchoutRecord(scope.row)">查看领用情况</el-button>-->
<el-button :disabled="Number(scope.row.货位存量)===0" size="mini" plain type="primary" icon="el-icon-sort-up" @click="parOut(scope.row)">出库</el-button>
@@ -138,9 +138,9 @@
</el-card>
<!--零件出库对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="零件出库" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="left">
<el-form-item label="项目" prop="ProjectValue" label-width="100px">
<el-select v-model="form.ProjectValue" filterable size="small" placeholder="项目" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-form ref="form" :model="form" :rules="rules" label-position="right">
<el-form-item label="项目" prop="ProjectValue" label-width="100px" size="small">
<el-select v-model="form.ProjectValue" filterable size="small" placeholder="项目" style="width: 200px" @change="searchMachine()">
<el-option
v-for="item in Project"
:key="item.value"
@@ -148,8 +148,8 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="机床" prop="MachineValue" label-width="100px">
<el-select v-model="form.MachineValue" filterable size="small" placeholder="机床" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-form-item label="机床" prop="MachineValue" label-width="100px" size="small">
<el-select v-model="form.MachineValue" filterable size="small" placeholder="机床" style="width: 200px" @change="searchGroupList()">
<el-option
v-for="item in Machine"
:key="item.value"
@@ -190,7 +190,7 @@
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px">
<el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px" size="small">
<el-input v-model="form.DirectNoteCode" size="small" placeholder="请输入人员编号" style="width: 200px"/>
</el-form-item>
<!-- <el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
@@ -481,4 +481,23 @@ export default {
.el-input{
width:200px
}
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>

80
src/views/Inventory/StockInquiry/index.vue
View File

@@ -19,6 +19,17 @@
:value="item.value"/>
</el-select>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
style="width: 250px;margin-left: 10px"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=100;total = 0;pageCurrent0=1;pageSize0=100;total0 = 0;getTableData();getTableData0()">查询</el-button>
</el-card>
@@ -138,6 +149,7 @@ export default {
Group: '',
Groups: [],
number: '',
dateRange: '', // 日期
checkbox_Machine: false,
checkbox_Group: false,
checkbox_number: false,
@@ -188,36 +200,48 @@ export default {
},
// 按条件查询
getTableData() {
this.listLoading1 = true
this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
this.tableData1 = []
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
if (response.data.result.length === 0) {
this.listLoading1 = false
} else {
this.tableData1 = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.listLoading1 = false
}
})
if (this.Machine || this.Group || this.number || this.dateRange) {
this.listLoading1 = true
let check2
this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
this.tableData1 = []
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent, this.pageSize).then(response => {
if (response.data.result.length === 0) {
this.listLoading1 = false
} else {
this.tableData1 = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.listLoading1 = false
}
})
} else {
this.$message.warning('请输入查询条件')
}
},
getTableData0() {
this.listLoading2 = true
this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
this.tableData0 = []
getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent0, this.pageSize0).then(response => {
if (response.data.total === 0) {
this.listLoading2 = false
} else {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.listLoading2 = false
}
})
if (this.Machine || this.Group || this.number || this.dateRange) {
this.listLoading2 = true
let check2
this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
this.tableData0 = []
getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent0, this.pageSize0).then(response => {
if (response.data.total === 0) {
this.listLoading2 = false
} else {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.listLoading2 = false
}
})
} else {
this.$message.warning('请输入查询条件')
}
},
handleSizeChange(val) {
this.pageCurrent = 1