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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-20 18:06:37 +08:00
parent 7389ead64d
commit 4d32454b1a
19 changed files with 387 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<el-card>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:160px;margin-top: 3px"/>
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
<el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
<el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回</el-button>
<el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 3px" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/>
<el-table-column label="项目名称" prop="项目名称" align="center" show-overflow-tooltip>
@@ -52,8 +52,12 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="100px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)"/>
<el-button :disabled="scope.row.单据状态==='成交'" plain type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
</div>
<div style="display: inline-block">
<el-button :disabled="scope.row.单据状态==='成交'" type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
</div>
</template>
</el-table-column>
</el-table>
@@ -102,7 +106,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="80px">
<template slot-scope="scope">
<el-button size="mini" type="text" plain icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
<el-button size="mini" type="text" icon="el-icon-right" @click="handleDelete1(scope.row)">移出</el-button>
</template>
</el-table-column>
</el-table>
@@ -615,7 +619,19 @@ export default {
this.loading = true
this.List3 = []
getParts(this.Number).then(response => {
this.List3 = response.data
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.List3.push({
外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
批次数量: response.data[i].批次数量,
外协工序: response.data[i].外协工序
})
}
}
this.loading = false
})
} else { this.$message.error('移除失败') }

63
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -2,7 +2,7 @@
<div>
<el-col style="width: auto">
<el-card>
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1();searchTable()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -12,7 +12,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号">
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号" @change="searchTable">
<el-option
v-for="item in Num"
:key="item.value"
@@ -125,7 +125,6 @@ export default {
},
created() {
this.typeChange()
this.searchTable()
},
methods: {
fetchData() {
@@ -168,35 +167,39 @@ export default {
})
},
searchTable() {
this.loading1 = true
this.tableData1 = []
this.tableData2 = []
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check_entryNameValue = 1
if (this.NumValue || this.toolNumValue || this.partName) {
this.loading1 = true
this.tableData1 = []
this.tableData2 = []
if (this.entryNameValue !== null && this.entryNameValue !== '') {
this.check_entryNameValue = 1
} else {
this.check_entryNameValue = 0
}
if (this.toolNumValue !== null && this.toolNumValue !== '') {
this.check_toolNumValue = 1
} else {
this.check_toolNumValue = 0
}
if (this.NumValue !== null && this.NumValue !== '') {
this.check_NumValue = 1
} else {
this.check_NumValue = 0
}
if (this.partName !== null && this.partName !== '') {
this.check_partName = 1
} else {
this.check_partName = 0
}
searchTable(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, this.pageCurrent1, this.pageSize1).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
}).then(() => {
this.loading1 = false
})
} else {
this.check_entryNameValue = 0
this.$message.warning('请输入查询条件')
}
if (this.toolNumValue !== null && this.toolNumValue !== '') {
this.check_toolNumValue = 1
} else {
this.check_toolNumValue = 0
}
if (this.NumValue !== null && this.NumValue !== '') {
this.check_NumValue = 1
} else {
this.check_NumValue = 0
}
if (this.partName !== null && this.partName !== '') {
this.check_partName = 1
} else {
this.check_partName = 0
}
searchTable(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, this.pageCurrent1, this.pageSize1).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
}).then(() => {
this.loading1 = false
})
},
searchTable2(row) {
this.loading2 = true