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

0429文档相关修改

Browse Source
This commit is contained in:
liulujia
2020-04-29 17:28:20 +08:00
parent 11959d8ab9
commit 0b6bfc1655
6 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ export function groupSelect(machineValue) {
})
}
export function basicPartsData(machine_check, machine, group_check, group, pageSize, pageCurrent) {
export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) {
return request({
url: '',
method: 'post',
@@ -49,11 +49,25 @@ export function basicPartsData(machine_check, machine, group_check, group, pageS
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_查询数据_综合gj',
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`,
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 根据机床和组查询规格型号 LLJ 新增
export function searchModel(machine_check, machine, group_check, group) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '三表查询_根据机床组号查询规格型号',
param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}`
}
})
}
export function purchasePartsData(num, pageCurrent, pageSize) {
return request({
url: '',

5
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -201,6 +201,11 @@
</template>
</template>
</el-table-column>
<el-table-column label="操作工" align="center" width="90px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工姓名 }}
</template>
</el-table-column>
<el-table-column label="质检时间" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.操作时间 }}

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

@@ -133,7 +133,7 @@
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"

26
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -49,7 +49,7 @@
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
@@ -161,7 +161,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent0"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize0"
:total="total0"
style="margin-top:10px;display:inline-block;width:50%"
@@ -172,7 +172,7 @@
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
<template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -276,7 +276,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize1"
:total="total1"
style="margin-top:10px;display:inline-block;width:50%"
@@ -287,7 +287,7 @@
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
<template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -397,7 +397,7 @@
<div class="block">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize2"
:total="total2"
style="margin-top:10px;display:inline-block;width:50%"
@@ -434,13 +434,13 @@ export default {
tableData2: [],
tableData3: [],
pageCurrent0: 1,
pageSize0: 20,
pageSize0: 50,
total0: 0,
pageCurrent1: 1,
pageSize1: 20,
pageSize1: 50,
total1: 0,
pageCurrent2: 1,
pageSize2: 20,
pageSize2: 50,
total2: 0
}
},
@@ -657,6 +657,10 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '供货商') {
this.partName = 4
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}
@@ -728,6 +732,8 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}
@@ -801,6 +807,8 @@ export default {
this.partName = 4
} else if (column.prop === '供应商名称') {
this.partName = 5
} else if (column.prop === '询价状态编号') {
this.partName = 6
} else {
this.partName = ''
}

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

@@ -1,20 +1,27 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small">
<el-select v-model="machineValue" placeholder="机床图号" style="width: 150px" filterable size="small" @change="searchModel()">
<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">
<el-select v-model="groupValue" placeholder="组号" style="width: 150px;margin-top: 10px;margin-bottom: 5px" filterable size="small" clearable="" @change="searchModel()">
<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-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>
@@ -278,7 +285,7 @@
</template>
<script>
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, searchModel } from '@/api/TechnologyCenter/QueryParts'
import { mapGetters } from 'vuex'
import { ServerIP } from '@/utils/request'
export default {
@@ -290,6 +297,8 @@ export default {
groupValue: '',
group: [],
group1: [],
ModelValue: '', // 规格型号
Model: [], // 规格型号组
loading: false,
loadingWB: false,
dialogFormVisible: false,
@@ -375,14 +384,26 @@ export default {
this.form.组号 = ''
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
},
searchModel() {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
var param = []
param[0] = machine_check
param[1] = this.machineValue
param[2] = group_check
param[3] = this.groupValue
this.getSelect(searchModel, ['规格', '规格'], 'Model', param)
console.log(this.Model, 989898)
},
getTableData() {
this.getFileData(this.machineValue)
console.log(this.hadFile, 88899)
if (this.machineValue) {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
const Model_check = this.ModelValue ? 1 : 0
this.loading = true
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, Model_check, this.ModelValue, this.pageSize, this.pageCurrent).then(response => {
this.loading = false
const res = response.data
this.total = res.total

12
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -17,7 +17,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>备料时间段:</span>
<span>接收时间:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
@@ -97,6 +97,16 @@
{{ scope.row.开票时间 ? scope.row.开票时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="接收时间" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.备料任务接受时间 ? scope.row.备料任务接受时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="分配时间" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.备料任务分配时间 ? scope.row.备料任务分配时间.split(' ')[0] : '' }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination