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

20200206lljV2外购备料部分修改

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-06 16:42:34 +08:00
parent 3219f76d3e
commit 0985586eff
4 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/WorkshopProcurement/OfflineProcurement.js
View File

@@ -109,14 +109,14 @@ export function getGroups(stepNumber) {
})
}
export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) {
export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新',
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m,
param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})

2
src/utils/request.js
View File

@@ -20,7 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel
export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231

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

@@ -20,7 +20,7 @@
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button>
<el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 50%; float: left">

41
src/views/WorkshopProcurement/OfflineProcurement/index.vue
View File

@@ -25,19 +25,19 @@
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
</el-card>
<el-card style="width: 1137px">
<el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @selection-change="handleSelectionChange">
<el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="机床图号" prop="机床图号" min-width="180" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" width="120" align="center">
<el-table-column label="组号" prop="组号" width="120" sortable="custom" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="220">
<el-table-column label="零件图号" prop="零件图号" align="center" sortable="custom" width="220">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -52,7 +52,7 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" min-width="160">
<el-table-column label="材料" prop="材料" align="center" sortable="custom" min-width="160">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
@@ -71,8 +71,8 @@
</div>
</el-card>
<el-card style="width: 1137px">
<span>离线采购计划编号:</span>
<el-input v-model="purchasingOrder" placeholder="离线采购计划编号" size="small" style="width: 160px" clearable/>
<span>离线备料单号:</span>
<el-input v-model="purchasingOrder" placeholder="离线备料单号" size="small" style="width: 160px" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-select v-model="supplierName" placeholder="供应商" size="small" style="width: 150px" filterable clearable>
<el-option
@@ -346,7 +346,7 @@ export default {
},
created() {
this.searchRawMaterial()
this.searchTable()
// this.searchTable()
this.getMachine()
},
methods: {
@@ -377,7 +377,7 @@ export default {
if (Cookie.get('group') !== undefined) {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.getTableData()
// this.getTableData()
this.Group = parseInt(Cookie.get('group'))
// this.getTableData()
Cookie.remove('machineValue')
@@ -418,7 +418,28 @@ export default {
this.Group = response.data[0].组件流水号
})
this.getTableData()
}, // 按条件查询
},
// 按零件图号 组号 材料排序
sortChange(column) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '组号') {
this.ordername = 1
} else if (column.prop === '零件图号') {
this.ordername = 2
} else if (column.prop === '材料') {
this.ordername = 3
} else {
this.ordername = ''
}
console.log(this.ordername, 9990999)
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.getTableData()
},
// 按条件查询
getTableData() {
this.tableData10 = []
if (this.Machine === '') {
@@ -436,7 +457,7 @@ export default {
} else {
this.checkbox_number = 1
}
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10).then(response => {
getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => {
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData10.push({