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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-03-25 17:25:00 +08:00
parent 0261b5c008 018b75a070
commit b39213762e
8 changed files with 138 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/PurchasingCenter/ProjectTotalSearch.js
View File

@@ -11,15 +11,39 @@ export function initProject() {
} }
}) })
} }
// 机床查询
export function searchMachine(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
param: '项目流水号_check=1&项目流水号=' + num
}
})
}
// 分组查询
export function searchGroup(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_组件名称_查询数据',
param: '机床流水号=' + num
}
})
}
// 初始化项目金额统计表 // 初始化项目金额统计表
export function searchProjectTotal(num) { export function searchProjectTotal(check1, num1, check2, num2, check3, num3) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '采购管理_项目采购总价_查询数据', name: '采购管理_项目采购总价_查询数据',
param: `项目流水号=${num}` param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}`
} }
}) })
} }

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

@@ -1,16 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">增加</el-button> <div slot="header" class="clearfix">
</el-card> <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
<el-card> </div>
<el-table <el-table :data="tableData" border size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
:data="tableData"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400"
@row-click="getWarehouse">
<el-table-column label="仓库编号" align="center" width="200"> <el-table-column label="仓库编号" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库编号 }} {{ scope.row.仓库编号 }}
@@ -21,27 +15,27 @@
{{ scope.row.仓库名称 }} {{ scope.row.仓库名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库描述" align="center" width="110"> <el-table-column label="仓库描述" min-width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.仓库描述 }} {{ scope.row.仓库描述 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="地址" align="center"> <el-table-column label="地址" min-width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.地址 }} {{ scope.row.地址 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="联系人" align="center"> <el-table-column label="联系人" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.联系人 }} {{ scope.row.联系人 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" width="180" align="center"> <el-table-column label="备注" min-width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="200" align="center" fixed="right"> <el-table-column label="操作" width="300" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@@ -59,13 +53,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table v-loading="listLoading" :data="tableData2" border size="mini" style="width: 100%;max-height: 300px" height="300">
v-loading="listLoading"
:data="tableData2"
border
size="mini"
style="width: 100%;max-height: 400px"
height="400">
<el-table-column label="货位名称" align="center" width="200"> <el-table-column label="货位名称" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位名称 }} {{ scope.row.货位名称 }}
@@ -592,8 +580,20 @@ export default {
</script> </script>
<style scoped> <style scoped>
.code{ .code{
width:120px!important; width:120px!important;
height: auto!important; height: auto!important;
} }
.el-card{
margin-bottom: 15px;
}
.el-select{
width:200px
}
.el-input{
width:200px
}
span{
margin: 10px 0 10px 10px;
}
</style> </style>

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

@@ -206,6 +206,7 @@ export default {
rules: { // 表单验证规则 rules: { // 表单验证规则
ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }], ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }], MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }],
GroupNumValue: [{ required: true, message: '请选择分组', trigger: 'blur' }],
DirectNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }] DirectNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }]
}, },
locateNumber: '', locateNumber: '',

8
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -62,7 +62,7 @@
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" min-width="110"> <el-table-column label="申请时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }} {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template> </template>
@@ -72,7 +72,7 @@
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template> </template>
@@ -82,7 +82,7 @@
{{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }} {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }} {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
</template> </template>
@@ -92,7 +92,7 @@
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }} {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }} {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template> </template>

16
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -62,7 +62,7 @@
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请时间" align="center" min-width="110"> <el-table-column label="申请时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }} {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template> </template>
@@ -72,29 +72,29 @@
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="财务审批" align="center" min-width="60"> <el-table-column label="财务审批" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }} {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }} {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总经理审批" align="center" min-width="70"> <el-table-column label="总经理审批" align="center" min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }} {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" min-width="110"> <el-table-column label="审批时间" align="center" min-width="115">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }} {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">

5
src/views/PurchasingCenter/MaterialManagement/index.vue
View File

@@ -309,6 +309,11 @@
@click.native="param=1;openSupplier()"/> @click.native="param=1;openSupplier()"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="常用符号">
Φ × ∠ — ○ ⊥
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">

69
src/views/PurchasingCenter/ProjectTotalSearch/index.vue
View File

@@ -2,13 +2,29 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>项目名称:</span> <span>项目名称:</span>
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable> <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
<el-option <el-option
v-for="item in project" v-for="item in project"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>机床图号:</span>
<el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>组号:</span>
<el-select v-model="groupValue" style="width:200px" placeholder="请选择" size="small" clearable filterable>
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button <el-button
type="success" type="success"
size="small" size="small"
@@ -25,9 +41,14 @@
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号" align="center" min-width="100"> <el-table-column align="center" label="机床图号" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.图号 }} {{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="80px">
<template slot-scope="scope">
{{ scope.row.组号 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" min-width="100"> <el-table-column label="名称" align="center" min-width="100">
@@ -35,6 +56,11 @@
{{ scope.row.名称 }} {{ scope.row.名称 }}
</template> </template>
</el-table-column> </el-table-column>
<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" min-width="100"> <el-table-column label="规格" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
@@ -66,7 +92,7 @@
</template> </template>
<script> <script>
import { initProject, searchProjectTotal } from '@/api/PurchasingCenter/ProjectTotalSearch' import { initProject, searchMachine, searchGroup, searchProjectTotal } from '@/api/PurchasingCenter/ProjectTotalSearch'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@@ -75,6 +101,10 @@ export default {
return { return {
projectValue: '', projectValue: '',
project: [], project: [],
machineValue: '',
machine: [],
groupValue: '',
group: [],
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 10, pageSize1: 10,
total1: 0, total1: 0,
@@ -103,9 +133,38 @@ export default {
} }
}) })
}, },
projectChange() {
this.machine = []
this.machineValue = ''
this.group = []
this.groupValue = ''
searchMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machine.push({
value: response.data[i].机床流水号,
label: response.data[i].机床图号
})
}
})
},
machineChange() {
this.group = []
this.groupValue = ''
searchGroup(this.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.group.push({
value: response.data[i].组件流水号,
label: response.data[i].组号
})
}
})
},
searchTable1() { searchTable1() {
if (this.projectValue) { if (this.projectValue) {
searchProjectTotal(this.projectValue).then(response => { let check2, check3
this.machineValue ? check2 = 1 : check2 = 0
this.groupValue ? check3 = 1 : check3 = 0
searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => {
console.log(response.data) console.log(response.data)
this.tableData1 = response.data this.tableData1 = response.data
}) })

4
src/views/PurchasingCenter/ReceiveCheck/index.vue
View File

@@ -121,6 +121,9 @@ export default {
}, },
projectChange() { projectChange() {
this.machine = [] this.machine = []
this.machineValue = ''
this.group = []
this.groupValue = ''
searchMachine(this.projectValue).then(response => { searchMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.machine.push({ this.machine.push({
@@ -132,6 +135,7 @@ export default {
}, },
machineChange() { machineChange() {
this.group = [] this.group = []
this.groupValue = ''
searchGroup(this.machineValue).then(response => { searchGroup(this.machineValue).then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.group.push({ this.group.push({