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.112:10010/r/高精2.0

Browse Source
This commit is contained in:
caoxinyu
2019-01-12 09:03:33 +08:00
parent 2364cb7806 33319826e3
commit 07451ad4b1
17 changed files with 401 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ export function searchPurchasePartOut(teampart) {
data: {
type: '1',
name: '库存管理_库存盘点_外购件出库记录',
param: '组件零件流水号=' + teampart
param: '采购合同明细流水号=' + teampart
}
})
}
@@ -167,7 +167,7 @@ export function searchBasicPartOut(craftNumber) {
method: 'post',
data: {
type: '1',
name: 'dbo.库存管理_库存盘点_基本件出库记录',
name: '库存管理_库存盘点_基本件出库记录',
param: '工艺计划流水号=' + craftNumber
}
})

6
src/api/ManufacturingCenter/InitialProduction.js
View File

@@ -13,14 +13,14 @@ export function getEntryNameValue() {
})
}
// 机床名称
export function getToolNum(num) {
export function getToolNum() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据',
param: '项目流水号=' + num + '=int&是否传递=1=int'
name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
param: '是否传递=1'
}
})
}

43
src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
View File

@@ -1,13 +1,48 @@
import request from '@/utils/request'
// 初始化 项目名称
export function searchtable() {
// 初始化 工位
export function getMachine() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_项目名称_查询数据',
param: '考核状态=5=int'
name: '车间生产管理工艺_加工顺序调整_查询工位'
}
})
}
export function searchtable(num, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'MES_机加工MES_记录零件待加工显示',
param: 'MES终端编号=' + num,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 调序
export function Order(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'MES_机加工MES_待加工区列表_排序',
param: 'MES终端编号=' + num1 + '&排序ID=' + num2 + '&排序类型=' + num3
}
})
}
// 调序权限
export function JurisdictionControl(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_加工顺序调整_更改权限',
param: 'MES终端号=' + num1 + '&变更类型=' + num2
}
})
}

12
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -382,3 +382,15 @@ export function searchRecord(num) {
}
})
}
// 重量拷贝
export function WeightCopy(num, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
param: '工艺计划流水号=' + num + '&重量信息=' + num2
}
})
}

6
src/api/ManufacturingCenter/ProcessTaskAssignment.js
View File

@@ -24,14 +24,14 @@ export function getProject0() {
})
}
// 获取机床图号（全部）
export function getGraphNum(num) {
export function getGraphNum() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据',
param: '项目流水号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
param: '是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1&单件是否外协=0'
}
})
}

8
src/api/ManufacturingCenter/ProcessingStatus.js
View File

@@ -11,15 +11,15 @@ export function getNames() {
}
})
}
export function getMachines(gongyi) {
// 机床名称
export function getMachines() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床',
param: '项目流水号=' + gongyi + '=int'
name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
}
})
}

8
src/api/ManufacturingCenter/ProductionCapacityBalance.js
View File

@@ -11,15 +11,15 @@ export function getEntryNameValue() {
}
})
}
// 项目名称
export function getToolNum(num) {
// 机床名称
export function getToolNum() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_传递后_机床名称_查询数据',
param: '项目流水号=' + num + '=int&是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
param: '是否传递=2=int&考核状态=5=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
}
})
}

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

@@ -1690,7 +1690,7 @@ export default {
this.HouseDataBasicIn = response.data
this.listLoading7 = false
})
searchPurchasePartOut(this.TeamPartNumber).then(response => {
searchPurchasePartOut(this.ContractDetailValue).then(response => {
this.HouseDataBasicOut = response.data
this.listLoading8 = false
})

5
src/views/Inventory/SubPartCome/index.vue
View File

@@ -40,6 +40,11 @@
{{ 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.申请时间 }}

37
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -33,6 +33,21 @@
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.原材料规格 }}
</template>
</el-table-column>
<el-table-column label="备料" align="center">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
@@ -55,22 +70,31 @@
<div v-show="false" id="BL">
<table border cellspacing="0px" style="table-layout: fixed; width: 600px;">
<colgroup>
<col style="width: 100px">
<col style="width: 150px">
<col style="width: 120px">
<col style="width: 180px">
<col style="width: 110px">
<col style="width: 110px">
<col style="width: 110px">
<col style="width: 450px">
</colgroup>
<tr>
<th height="60px">GAOJING</th>
<th colspan="2" height="60px"><span style="font-weight:bold">备料单</span></th>
<th colspan="2" height="60px">GAOJING</th>
<th colspan="4" height="60px"><span style="font-weight:bold">备料单</span></th>
</tr>
<tr>
<td align="center">零件名称</td>
<td align="center">零件图号</td>
<td align="center">材料</td>
<td align="center">原材料规格</td>
<td align="center">批次数量</td>
<td align="center">备料</td>
</tr>
<tr v-for="(list, index) in tableData2" :key="index">
<td align="center">{{ list.零件名称 }}</td>
<td align="center">{{ list.零件图号 }}</td>
<td align="center">{{ list.材料 }}</td>
<td align="center">{{ list.原材料规格 }}</td>
<td align="center">{{ list.批次数量 }}</td>
<td>{{ list.工艺要求 }}</td>
</tr>
</table>
@@ -141,7 +165,10 @@ export default {
零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印,
工艺要求: response.data[0].工艺要求
工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料,
原材料规格: this.Data[i].原材料规格,
批次数量: this.Data[i].批次数量
})
})
this.loading = false

31
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -11,26 +11,20 @@
<el-radio :label="1">整改件投产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="项目名称" style="margin-top:28px">
<el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="机床号">
<el-select v-model="toolNumValue" filterable size="small" placeholder="机床号" style="margin-bottom:10px" @change="typeChange1()">
<el-form-item label="机床号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="机床组号">
<el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="机床组号">
<el-form-item label="分组">
<el-select v-model="NumValue" filterable size="small" style="margin-bottom:10px" placeholder="分组">
<el-option
v-for="item in Num"
:key="item.value"
@@ -434,7 +428,7 @@ export default {
])
},
created() {
this.fetchData()
this.typeChange()
this.getCurrentTime()
this.getNowTime()
},
@@ -505,15 +499,14 @@ export default {
})
},
typeChange() {
this.toolNumValue = ''
this.toolNum = []
this.NumValue = ''
this.Num = []
getToolNum(this.entryNameValue).then(response => {
getToolNum().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})

199
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -2,7 +2,18 @@
<div class="app-container">
<el-card>
<el-button type="success" class="el-icon-search" size="small">查询</el-button>
<span>工位号:</span>
<el-select v-model="MachineValue" size="small" filterable placeholder="工位号" style="width: 180px;">
<el-option
v-for="item in Machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="searchTable();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
<el-badge :value="num" :max="99" class="item">
<el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">调序权限</el-button>
</el-badge>
</el-card>
<el-card>
@@ -12,58 +23,45 @@
align="center"
type="index"
width="50"/>
<el-table-column label="外协厂家名称" align="center" width="280px">
<el-table-column label="零件名称" align="center" width="310px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="外协厂家简称" align="center" width="110px">
<el-table-column label="零件图号" align="center" width="330px">
<template slot-scope="scope">
{{ scope.row.外协厂家简称 }}
{{ scope.row.零件图号_短 }}
</template>
</el-table-column>
<el-table-column label="地址" align="center" width="280px">
<el-table-column label="待加工工序" align="center">
<template slot-scope="scope">
{{ scope.row.地址 }}
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="联系人" align="center" width="120px">
<el-table-column label="操作" width="300" align="center" fixed="right">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column label="电话" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column label="传真" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.传真 }}
</template>
</el-table-column>
<el-table-column label="设备情况" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.设备情况 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200px" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<el-button
size="mini"
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
<div>
<el-button
size="mini"
icon="el-icon-arrow-up"
type="primary"
@click="upOne(scope.row)"/>
<el-button
size="mini"
icon="el-icon-arrow-down"
type="primary"
@click="downOne(scope.row)"/>
<el-button
size="mini"
icon="el-icon-upload2"
type="primary"
@click="TOP(scope.row)"/>
<el-button
size="mini"
icon="el-icon-download"
type="primary"
@click="Down(scope.row)"/>
</div>
</template>
</el-table-column>
</el-table>
@@ -80,14 +78,50 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" width="60%">
<el-table :data="gridData" height="500" size="mini" border>
<el-table-column property="date" label="工位号" width="300" align="center">
<template slot-scope="scope">
{{ scope.row.MES终端号 }}
</template>
</el-table-column>
<el-table-column property="name" label="调序权限" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.调序权限===1" type="success" size="small">已开放</el-tag>
<el-tag v-else type="info" size="small">未开放</el-tag>
</template>
</el-table-column>
<el-table-column property="date" label="操作" align="center">
<template slot-scope="scope">
<el-button
v-if="scope.row.调序权限===0"
size="mini"
type="success"
@click="JurisdictionControl1(scope.row)">开启</el-button>
<el-button
v-if="scope.row.调序权限===1"
size="mini"
type="danger"
@click="JurisdictionControl2(scope.row)">关闭</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import {} from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
import { getMachine, searchtable, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
export default {
data() {
return {
num: 0,
count: 0,
dialogFormVisible: false,
gridData: [],
Machine: [],
MachineValue: '',
loading0: false,
tableData: [], // 表格数据
pageSize: 10,
@@ -96,8 +130,80 @@ export default {
}
},
created() {
this.Jurisdiction()
this.fetchData()
},
methods: {
// 初始化获取工位
fetchData() {
this.MachineValue = ''
this.Machine = []
getMachine().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machine.push({
label: response.data[i].MES终端号,
value: response.data[i].MES终端号
})
}
})
},
searchTable() {
if (this.MachineValue !== '' && this.MachineValue !== null) {
this.loading0 = true
searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows
this.total = response.data.total
}).then(() => {
this.loading0 = false
})
} else {
this.$message.error('请选择工位')
}
},
Jurisdiction() {
this.count = 0
getMachine().then(response => {
this.gridData = response.data
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].调序权限 === 1) { this.count = this.count + 1 }
}
this.num = this.count
})
},
JurisdictionControl1(row) {
JurisdictionControl(row.MES终端号, 1).then(response => {
this.Jurisdiction()
})
},
JurisdictionControl2(row) {
JurisdictionControl(row.MES终端号, 2).then(response => {
this.Jurisdiction()
})
},
// 上移
upOne(row) {
Order(this.MachineValue, row.工序流水号, '上移').then(response => {
this.searchTable()
})
},
// 下移
downOne(row) {
Order(this.MachineValue, row.工序流水号, '下移').then(response => {
this.searchTable()
})
},
// 置顶
TOP(row) {
Order(this.MachineValue, row.工序流水号, '置顶').then(response => {
this.searchTable()
})
},
// 置底
Down(row) {
Order(this.MachineValue, row.工序流水号, '置底').then(response => {
this.searchTable()
})
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
@@ -119,4 +225,9 @@ export default {
.el-input{
width: 210px;
}
.item {
float: right;
margin-top: 10px;
margin-right: 40px;
}
</style>

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

@@ -34,7 +34,7 @@
placeholder="零件号"
size="small"
@clear="clearDetail"
@change="searchParts">
@change="searchParts();searchDetail()">
<el-option
v-for="item in partNum"
:key="item.value"
@@ -59,10 +59,40 @@
<el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
</el-input>
<span>规格:</span>
<el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
<span>投产总数量:</span>
<el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
</div>
<div>
<el-row>
<el-col :span="4">
<span>物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 20px;width:100px" placeholder="物料类型" @change="clear()">
<el-option
v-for="item in materiel"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col v-show="materielValue==='1'" :span="20">
<span>长:</span>
<el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>宽:</span>
<el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>高:</span>
<el-input-number v-model="height1" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='2'" :span="20">
<span>直径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>高:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation2()">计算重量</el-button>
</el-col>
</el-row>
</div>
</el-card>
<el-card>
@@ -490,6 +520,7 @@
<script>
import '@/icon/iconfont.css'
import {
WeightCopy,
initCraftmen,
getPartnames1,
getPartnames2,
@@ -531,6 +562,22 @@ export default {
},
data() {
return {
Result1: '',
Result2: '',
Result3: '',
Length: '',
Width: '',
height1: '',
diameter: '',
height2: '',
materiel: [{
value: '1',
label: '方'
}, {
value: '2',
label: '柱'
}],
materielValue: '1',
total: 0,
pageCurrent: 1,
pageSize: 10,
@@ -626,6 +673,37 @@ export default {
this.getList()
},
methods: {
clear() {
this.Length = ''
this.Width = ''
this.height1 = ''
this.diameter = ''
this.height2 = ''
},
// 长宽高计算
Calculation1() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
this.Result1 = '长:' + this.Length + ' 宽:' + this.Width + ' 高:' + this.height1 + ' 重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
WeightCopy(this.partNumValue, this.Result1).then(response => {
this.searchDetail()
})
}
},
// 直径高计算
Calculation2() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
this.Result2 = Math.pow(parseInt(this.diameter) / 2, 2) * parseFloat(this.height2) * Math.PI
this.Result2 = this.Result2.toFixed(2)
this.Result3 = '直径:' + this.diameter + ' 高:' + this.height2 + ' 重量:' + this.Result2
WeightCopy(this.partNumValue, this.Result3).then(response => {
this.searchDetail()
})
}
},
clearDetail() {
this.checked = false
this.partNumValue = ''
@@ -785,10 +863,9 @@ export default {
this.isShow = true
}
},
searchDetail() { // 查主表和上面显示的信息
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请选择零件作为查询对象')
} else {
// 查主表和上面显示的信息
searchDetail() {
if (this.partNumValue !== '' && this.partNumValue !== null) {
this.loading0 = true
detailInfo(this.partNumValue).then(response => {
if (response.data.length !== 0) {
@@ -963,7 +1040,8 @@ export default {
}
})
},
processCopy1() { // 完艺工艺拷贝
// 完艺工艺拷贝
processCopy1() {
this.dialogFormVisible1 = false
if (this.partNumValue === '') {
this.$message.error('请在主界面选择一个零件作为被拷贝对象')
@@ -1055,10 +1133,11 @@ export default {
}
}
},
confirmSelect() { // 确定选择主表的工艺名称及要求
// 确定选择主表的工艺名称及要求
confirmSelect() {
this.tableData[this.index].工艺编号 = this.processN1
this.tableData[this.index].工艺名称 = this.processNameValue
this.str = this.str + ' ' + this.processRequestValue
this.str = this.str + this.processRequestValue
this.tableData[this.index].工艺要求 = this.str
this.dialogFormVisible2 = false
selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {

36
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -5,34 +5,19 @@
<el-radio :label="1">当天</el-radio>
<el-radio :label="2">全部</el-radio>
</el-radio-group>
<span>项目名称:</span>
<el-select
v-loading="loading"
v-model="projectNameValue"
element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading"
filterable
clearable
size="small"
placeholder="请选择项目名称"
style="width: 200px;margin-right:10px"
@change="getGraphNum()">
<el-option
v-for="item in projectName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-select v-model="graphNumValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="getGroupNum()">
<el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
<el-option
v-for="item in graphNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
<el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
<el-option
v-for="item in GroupNum"
:key="item.value"
@@ -168,7 +153,7 @@ export default {
}
},
created() {
this.fetchData()
this.getGraphNum()
this.initPerson()
},
methods: {
@@ -221,16 +206,15 @@ export default {
getGraphNum() { // 获取下拉图号
this.tableData = []
this.total = 0
this.graphNum = []
this.graphNumValue = ''
this.GroupNumValue = ''
this.GroupNum = []
if (this.radio === 2) { // 全部
getGraphNum(this.projectNameValue).then(response => {
getGraphNum().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.graphNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})

59
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -2,42 +2,30 @@
<div class="app-container">
<el-card>
<el-row>
<span>项目名称:</span>
<el-select v-model="project" size="small" filterable clearable placeholder="项目名称" style="width: 180px;" @change="getMachine">
<el-option
v-for="item in projects"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床号:</span>
<el-select v-model="Machine" size="small" clearable placeholder="机床号" style="width: 180px;" @change="getGroup">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 180px;">
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row>
<el-select v-show="false" v-model="part" size="small" placeholder="是否外协">
<el-option
v-for="item in parts"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
</el-row>
<el-row style="margin-top:10px;">
<span>进度颜色：</span>
<span style="background-color: red">拖期</span>
<span style="background-color: yellow">即将拖期</span>
@@ -372,7 +360,7 @@ export default {
}
},
created() {
this.fetchData()
this.getMachine()
this.getTableData()
},
methods: {
@@ -394,16 +382,15 @@ export default {
this.Machines = []
this.Group = ''
this.Groups = []
if (this.project !== '') {
getMachines(this.project).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
}
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
},
getGroup() {
this.Group = ''
@@ -420,11 +407,7 @@ export default {
// 按条件查询
getTableData() {
this.listLoading1 = true
if (this.project === '') {
this.checkbox_project = false
} else {
this.checkbox_project = true
}
this.checkbox_project = false
if (this.Machine === '') {
this.checkbox_Machine = false
} else {
@@ -456,7 +439,7 @@ export default {
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.part, this.pageCurrent, this.pageSize).then(response => {
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.pageCurrent, this.pageSize).then(response => {
this.length = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
this.零件图号.push(response.data.rows[i].零件图号)
@@ -471,7 +454,7 @@ export default {
}
if (this.零件图号.length !== 0) {
for (let i = 0; i < this.零件图号.length; i++) {
getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], this.part).then(response => {
getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => {
this.liushuihao = response.data[0].工艺计划流水号
for (let k = 0; k < response.data.length; k++) {
if (response.data[k].工艺计划流水号 === this.liushuihao) {

25
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -4,26 +4,20 @@
<el-card>
<div style="margin-top: -10px;">
<el-row>
<span>项目名称:</span>
<el-select v-model="entryNameValue" size="small" filterable clearable placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床号:</span>
<el-select v-model="toolNumValue" size="small" filterable clearable placeholder="机床号" @change="typeChange1()" >
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>机床组号:</span>
<el-select v-model="NumValue" size="small" filterable clearable placeholder="机床组号">
<span>分组:</span>
<el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
<el-option
v-for="item in Num"
:key="item.value"
@@ -727,7 +721,7 @@ export default {
])
},
created() {
this.fetchData()
this.typeChange()
this.Selection1()
this.getTable()
},
@@ -990,7 +984,8 @@ export default {
for (let i = 0; i < response.data.length; i++) {
this.toolNum.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})

2
src/views/Outsourcing/UnqualifiedTreatment/index.vue
View File

@@ -128,8 +128,6 @@
</el-dialog>
<dialog :visible="true"/>
</div>
</template>