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

Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0

Browse Source
This commit is contained in:
chenjianan
2018-11-24 17:08:10 +08:00
parent 4371cc7b95 5874fb3477
commit 5f411fe8a8
3 changed files with 637 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/api/Inventory/InventoryCheck.js
View File

@@ -171,4 +171,29 @@ export function searchGeneralPart(pageCurrent, pageSize, project_check, project,
}
})
}
// 车间采购基本件查询
export function searchHourseBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间采购基本件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 车间采购外购件查询
export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_库存盘点_车间采购外购件查询',
param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
Pagination: pageCurrent + '&' + pageSize
}
})
}

487
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -1,8 +1,16 @@
<template>
<div class="app-container">
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick" >
<el-tab-pane label="基本件" name="first"><el-card>
<span>项目名称:</span>
<el-tab-pane label="自制" name="first"><el-card>
<el-radio-group
v-model="radio"
size="small"
style="margin: 10px;"
@change="visual()">
<el-radio v-model="radio" :label="1" >基本件</el-radio>
<el-radio v-model="radio" :label="2" style="margin-left: 2px" >通用件</el-radio>
</el-radio-group>
<span style="margin-left: 20px">项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
v-for="item in Project"
@@ -26,9 +34,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchBasciPartinfo()">基本件查询</el-button><br>
<el-button v-show="basicshow" size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchBasciPartinfo()">基本件查询</el-button><br>
</el-card>
<el-card>
<el-card v-show="basicshow">
<el-table
v-loading="listLoading"
:data="tableDataBasic"
@@ -87,7 +95,7 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-card v-show="basicshow">
<el-table
v-loading="listLoading1"
:data="BasicPartIn"
@@ -147,11 +155,10 @@
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
<el-tab-pane label="通用件" name="second">
<el-card>
<span>项目名称:</span>
<el-card v-show="purchaseshow">
<el-radio v-model="radio2" :label="3">外购件</el-radio>
<el-radio v-model="radio2" :label="4" style="margin-left: 2px">标准件</el-radio>
<span style="margin-left: 20px" >项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
v-for="item in Project"
@@ -177,7 +184,7 @@
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="total1 = 0;pageSize1 = 10;pageList1 = 1;searchGeneralPartinfo()">通用件查询</el-button><br>
</el-card>
<el-card>
<el-card v-show="purchaseshow">
<el-table
v-loading="listLoading3"
:data="tableDataGeneral"
@@ -237,7 +244,7 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<el-card v-show="purchaseshow">
<el-table
v-loading="listLoading4"
:data="PurchasePartIn"
@@ -293,8 +300,10 @@
</el-table-column>
</el-table>
</el-card>
</el-card>
</el-tab-pane>
<el-tab-pane label="外购件" name="third"><el-card>
<el-tab-pane label="采购采购" name="second">
<el-card>
<span>项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
@@ -436,8 +445,6 @@
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
<el-tab-pane label="标准件" name="fourth">
<el-card>
<span>项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -595,12 +602,336 @@
</el-table>
</el-card>
</el-tab-pane>
<el-tab-pane label="车间采购" name="third">
<el-card>
<el-radio v-model="radio3" :label="5">基本件</el-radio>
<el-radio v-model="radio3" :label="6" style="margin-left: 2px">外购件</el-radio>
<span style="margin-left: 20px">项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
v-for="item in Project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in Machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px">
<el-option
v-for="item in GroupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchHouseBasci()">车间采购基本件查询</el-button><br>
</el-card>
<el-table
v-loading="listLoadingx"
:data="HouseDataBasic"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addWorkshopDetailinfor(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total5"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
<el-card>
<el-table
v-loading="listLoading10"
:data="HouseDataBasicIn"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="实际到货数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.实际到货数量 }}
</template>
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading11"
:data="HouseDataBasicOut"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
</template>
</el-table-column>
<el-table-column label="领用者" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.领用者 }}
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<span style="margin-left: 20px">项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
v-for="item in Project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
<el-option
v-for="item in Machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px">
<el-option
v-for="item in GroupNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchHousePurchase()">车间采购外购件查询</el-button><br>
</el-card>
<el-table
v-loading="listLoadingx"
:data="HouseDataPurchase"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="物料名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货位存量 }}
</template>
</el-table-column>
<el-table-column label="待出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.待出库数量 }}
</template>
</el-table-column>
<el-table-column label="零件类型" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="80">
<template slot-scope="scope" align="center">
<el-button size="small" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="HousePurchaseRecord(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent6"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="total6"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange6"
@current-change="handleCurrentChange6"/>
</div>
<el-card>
<el-table
v-loading="listLoading10"
:data="HouseDataPurchaseIn"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="实际到货数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.实际到货数量 }}
</template>
</el-table-column>
<el-table-column label="入库人员" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.入库人员 }}
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<el-table
v-loading="listLoading11"
:data="HouseDataPurchaseOut"
border
style="width: 100%;"
height="200">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="出库数量" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库数量 }}
</template>
</el-table-column>
<el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.出库时间 }}
</template>
</el-table-column>
<el-table-column label="领用者" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.领用者 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut } from '@/api/Inventory/InventoryCheck'
import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart } from '@/api/Inventory/InventoryCheck'
export default {
data() {
return {
@@ -611,6 +942,7 @@ export default {
craftNumber: '',
tableDataGeneral: [], // 通用件
tableDataPurchase: [], // 外购件
PurchasePart: true,
PurchasePartOut: [], // 外购件出库记录
PurchasePartIn: [], // 外购件入库记录
tableDataStandard: [], // 标准件
@@ -648,6 +980,8 @@ export default {
listLoading9: '',
listLoading10: '',
listLoading11: '',
listLoadingx1: '',
listLoadingx2: '',
PageCurrent: 1,
PageSize: 10,
total: null,
@@ -659,7 +993,24 @@ export default {
total2: null,
PageCurrent3: 1,
PageSize3: 10,
total3: null
total3: null,
PageCurrent5: 1,
PageSize5: 10,
total5: null,
PageCurrent6: 1,
PageSize6: 10,
total6: null,
radio: 1,
radio2: 1,
radio3: 1,
basicshow: true,
purchaseshow: true,
HouseDataBasic: [],
HouseDataBasicOut: [],
HouseDataBasicIn: [],
HouseDataPurchase: [],
HouseDataPurchaseOut: [],
HouseDataPurchaseIn: []
}
},
created() {
@@ -668,6 +1019,14 @@ export default {
methods: {
handleClick(tab, event) {
},
BasicShow() {
this.basicshow = true
this.purchaseshow = false
},
GeneralShow() {
this.purchaseshow = true
this.basicshow = false
},
fetchData() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
},
@@ -938,6 +1297,100 @@ export default {
handleCurrentChange3(val) {
this.PageCurrent3 = val
this.searchPartinfo()
},
handleSizeChange5(val) {
this.PageCurrent5 = 1
this.PageSize5 = val
this.searchHouseBasci()
},
handleCurrentChange5(val) {
this.PageCurrent5 = val
this.searchHouseBasci()
},
handleSizeChange6(val) {
this.PageCurrent6 = 1
this.PageSize6 = val
this.searchHousePurchase()
},
handleCurrentChange6(val) {
this.PageCurrent6 = val
this.searchHousePurchase()
},
// 查询车间采购基本件
searchHouseBasci() {
this.listLoadingx1 = true
this.HouseDataBasic = []
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchHourseBasicPart(this.PageCurrent5, this.PageSize5, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.HouseDataBasic = response.data.rows
this.listLoadingx1 = false
this.total5 = response.data.total
})
},
// 查询外购件记录
HouseBasicRecord(row) {
this.ContractDetailValue = row.采购合同明细流水号
this.TeamPartNumber = row.组件零件流水号
searchPurchasePartIn(this.ContractDetailValue).then(response => {
this.HouseDataBasicIn = response.data
this.listLoading7 = false
})
searchPurchasePartOut(this.TeamPartNumber).then(response => {
this.HouseDataBasicOut = response.data
this.listLoading8 = false
})
},
// 查询车间采购外购件
searchHousePurchase() {
this.listLoadingx2 = true
this.HouseDataPurchase = []
if (this.ProjectValue === '') {
this.ProjectValue_check = 0
} else {
this.ProjectValue_check = 1
}
if (this.MachineValue === '') {
this.MachineValue_check = 0
} else {
this.MachineValue_check = 1
}
if (this.GroupNumValue === '') {
this.GroupNumValue_check = 0
} else {
this.GroupNumValue_check = 1
}
searchHoursePurchasePart(this.PageCurrent6, this.PageSize6, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
this.HouseDataPurchase = response.data.rows
this.listLoadingx2 = false
this.total6 = response.data.total
})
},
// 查询外购件记录
HousePurchaseRecord(row) {
this.ContractDetailValue = row.采购合同明细流水号
this.TeamPartNumber = row.组件零件流水号
searchPurchasePartIn(this.ContractDetailValue).then(response => {
this.HouseDataPurchaseIn = response.data
this.listLoading7 = false
})
searchPurchasePartOut(this.TeamPartNumber).then(response => {
this.HouseDataPurchaseOut = response.data
this.listLoading8 = false
})
}
}
}

4
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -10,8 +10,8 @@
partNumValue = '';typeValue = '';partName = '';
material = '';materialName = '';spec = '';batchNum = '';
searchParts()">
<el-radio :label="1">未编制</el-radio>
<el-radio :label="2">已编制</el-radio>
<el-radio v-model="radio" :label="1">未编制</el-radio>
<el-radio v-model="radio" :label="2">已编制</el-radio>
</el-radio-group>
<span>工艺员:</span>
<el-select