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

自制件出库

Browse Source
This commit is contained in:
Vergil
2020-05-19 11:21:27 +08:00
parent d981b660cd
commit 9c9d32e1a2
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/Inventory/SelfMadePartsWarehouseOut.js
View File

@@ -45,7 +45,7 @@ export function searchgroup(num, pageCurrent, pageSize) {
})
}
// 获取表单
export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) {
export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, time_check, time1, time2, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -54,7 +54,7 @@ export function searchdata(entryNameValue_check, entryNameValue, machineToolValu
ModularID: router.currentRoute.path,
type: '1',
name: '自制件出库_查询数据',
param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber,
param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber + '&入库时间_check=' + time_check + '&入库时间开始=' + time1 + '&入库时间结束=' + time2,
Pagination: pageCurrent + '&' + pageSize
}
})

1
src/views/Assembly/AssemblyPlan/index.vue
View File

@@ -126,7 +126,6 @@ export default {
},
searchTable() {
this.loading = true
console.log(this.startEndDate)
if (this.startEndDate === '' || this.startEndDate === null || this.startEndDate[0] === '' || this.startEndDate[1] === '') {
this.check2 = 0
this.startEndDate = ''

52
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
View File

@@ -2,13 +2,6 @@
<div class="app-container">
<el-card>
<el-row>
<!-- <el-select v-model="entryNameValue" placeholder="项目名称" style="width:150px;margin: 10px 10px 0px 10px" size="small" clearable filterable @change="SearchMachine">-->
<!-- <el-option-->
<!-- v-for="item in entryName"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<el-select v-model="machineToolValue" placeholder="机床号" filterable size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px" @change="searchGroupList">
<el-option
v-for="item in machineTool"
@@ -24,12 +17,21 @@
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin-left: 0px"/>
<el-date-picker
v-model="InventoryTime"
style="width:250px"
size="small"
type="daterange"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
start-placeholder="入库开始"
end-placeholder="入库结束"/>
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tableData" style="width: 1020px" height="580" stripe size="mini" border @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="45"/>
@@ -54,6 +56,11 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="入库时间" width="100px">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="库存数量" width="90px">
<template slot-scope="scope">
{{ scope.row.出库数量1 }}
@@ -69,16 +76,6 @@
<el-input-number v-model="scope.row.出库数量" :max="scope.row.出库数量1" :min="0" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="入库数量" width="80px">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.入库数量 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="状态" width="80px">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="scope.row.考核状态 === '8'">入库</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 10px;">
@@ -95,7 +92,6 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="出库信息" center width="380px">
<el-form ref="form" :model="form" :rules="rules" label-position="right">
<el-form-item label="部门" prop="部门" label-width="100px" size="small">
<!-- <el-input v-model="form.department" size="small" placeholder="请输入人员编号" style="width: 200px"/>-->
<el-select v-model="form.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
<el-option
v-for="item in departments"
@@ -126,12 +122,12 @@
</template>
<script>
// import { url } from '@/utils/request'
// import axios from 'axios'
import { initProject, searchmachine, searchgroup, searchdata, warehousing, selectdepartment, selectleaders } from '@/api/Inventory/SelfMadePartsWarehouseOut'
export default {
data() {
return {
loading: false,
InventoryTime: '',
wareHousing_disable: false,
entryNameValue: '', // 项目名称
entryName: [],
@@ -170,12 +166,18 @@ export default {
},
methods: {
searchData() {
this.loading = true
this.tableData = []
const entryNameValue_check = this.entryNameValue === '' || this.entryNameValue === null ? 0 : 1
const machineToolValue_check = this.machineToolValue === '' || this.machineToolValue === null ? 0 : 1
const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
var InventoryTime_check
if (this.InventoryTime === '' || this.InventoryTime === null || this.InventoryTime[0] === '' || this.InventoryTime[1] === '') {
InventoryTime_check = 0
this.InventoryTime = ''
} else { InventoryTime_check = 1 }
searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, InventoryTime_check, this.InventoryTime[0], this.InventoryTime[1], this.pageCurrent, this.pageSize).then(response => {
this.totalnumber = response.data.rows.length
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
@@ -185,6 +187,7 @@ export default {
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
已出库数量: Number(response.data.rows[i].出库数量),
入库时间: response.data.rows[i].入库时间,
入库数量: Number(response.data.rows[i].入库数量),
工艺计划流水号: response.data.rows[i].工艺计划流水号,
出库数量: Number(response.data.rows[i].入库数量) - Number(response.data.rows[i].出库数量),
@@ -192,6 +195,7 @@ export default {
})
}
}
this.loading = false
this.total = response.data.total
})
},
@@ -272,10 +276,6 @@ export default {
this.shuzu = []
this.shuzu = val
this.gouxuan = val.length
// val.map(v => {
// this.multipleSelection.push(v.工艺计划流水号)
// this.outgoingQuantity.push(v.出库数量)
// })
},
CHUKU() {
this.keyichuku = 1