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

430文档V1

Browse Source
This commit is contained in:
liulujia
2020-04-30 17:04:27 +08:00
parent 85c1f865ff
commit 1df919eab0
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/TechnologyCenter/QueryParts.js
View File

@@ -68,7 +68,7 @@ export function searchModel(machine_check, machine, group_check, group) {
}
})
}
export function purchasePartsData(num, pageCurrent, pageSize) {
export function purchasePartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
@@ -77,7 +77,8 @@ export function purchasePartsData(num, pageCurrent, pageSize) {
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_标准件和外购件_查询数据',
param: `组件流水号=${num}`,
// param: `组件流水号=${num}`,
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`,
pagination: pageCurrent + '&' + pageSize
}
})

2
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -252,7 +252,7 @@
</el-table-column>
<el-table-column align="center" label="采购时间">
<template slot-scope="scope">
{{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : scope.row.采购日期.split(' ')[0] }}
{{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : (scope.row.采购日期 ? scope.row.采购日期.split(' ')[0]: '') }}
</template>
</el-table-column>
<el-table-column align="center" label="到货数量">

7
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -78,7 +78,12 @@
</el-table-column>
<el-table-column label="规定到货日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : scope.row.到货日期 }}
{{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="到货日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
</template>
</el-table-column>
<el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>

6
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -111,7 +111,7 @@
</el-table-column>
<el-table-column label="到货日期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.到货日期 }}
{{ scope.row.到货日期 !=='1900-01-01' ? scope.row.到货日期 : '' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80px">
@@ -247,7 +247,8 @@ export default {
ManufacturerName: [], // 厂家名称
rules: {
外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
运费: [{ required: true, message: '请输入运费', trigger: 'blur' }]
运费: [{ required: true, message: '请输入运费', trigger: 'blur' }],
到货日期: [{ required: true, message: '请输入日期', trigger: 'blur' }]
},
code: 0,
code1: 0,
@@ -394,6 +395,7 @@ export default {
外协工序: response.data[i].外协工序
})
}
console.log(this.List3, 999)
}
this.loading = false
})

1
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -220,6 +220,7 @@ export default {
this.List3 = []
getParts(row.外协加工任务单流水号).then(response => {
this.List3 = response.data
console.log(response.data, 111)
this.loading = false
})
},

24
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -1,27 +1,28 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small" @change="searchModel()">
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="" @change="searchModel()">
<el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">
<el-option
v-for="item in group"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="ModelValue" placeholder="规格" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">
<el-option
v-for="item in Model"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<el-select v-model="ModelValue" placeholder="规格" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="">-->
<!--<el-option-->
<!--v-for="item in Model"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="ModelValue" placeholder="规格" style="width: 180px" size="small" clearable/>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
</el-card>
<el-card>
@@ -423,7 +424,10 @@ export default {
this.$message.warning('请输入查询条件')
}
this.loadingWB = true
purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
const Model_check = this.ModelValue ? 1 : 0
purchasePartsData(machine_check, this.machineValue, group_check, this.groupValue, Model_check, this.ModelValue, this.pageSizeWB, this.pageCurrentWB).then(response => {
this.loadingWB = false
const data = response.data
this.totalWB = data.total