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

人员追溯V2

Browse Source
This commit is contained in:
liulujia1
2020-04-09 18:05:38 +08:00
parent 001df32ec4
commit 792b1caf2b
6 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/CreatePreparationBill.js
View File

@@ -46,7 +46,7 @@ export function edit(num1) {
}) })
} }
// 外购备料 // 外购备料
export function edit2(num1) { export function edit2(num1, id) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
@@ -55,7 +55,7 @@ export function edit2(num1) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '2', type: '2',
name: '车间生产管理工艺_备料单导出_外购备料', name: '车间生产管理工艺_备料单导出_外购备料',
param: `工艺计划流水号组=${num1}&是否外购备料=1` param: `工艺计划流水号组=${num1}&是否外购备料=1&分配人员编号=${id}`
} }
}) })
} }

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

@@ -250,12 +250,13 @@ export default {
} }
}, },
edit2() { edit2() {
console.log(this.$store.state.user.id, 9090)
if (this.tableData2.length === 0) { if (this.tableData2.length === 0) {
this.$message.warning('暂无数据') this.$message.warning('暂无数据')
} else { } else {
this.a = 0 this.a = 0
for (let i = 0; i < this.tableData2.length; i++) { for (let i = 0; i < this.tableData2.length; i++) {
edit2(this.tableData2[i].工艺计划流水号).then(response => { edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => {
this.a += parseInt(response.data[0].result) this.a += parseInt(response.data[0].result)
if (this.a === this.tableData2.length) { if (this.a === this.tableData2.length) {
this.pageSize = 10 this.pageSize = 10

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

@@ -127,7 +127,7 @@ export default {
loginsession() { loginsession() {
this.$axios({ this.$axios({
methods: 'post', methods: 'post',
url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000', url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222',
data: { data: {
userName: '0000' userName: '0000'
} }

12
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -111,6 +111,16 @@
{{ scope.row.完成日期 }} {{ scope.row.完成日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="编辑时间" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.修改时间 }}
</template>
</el-table-column>
<el-table-column label="编辑人" align="center" width="115px">
<template slot-scope="scope">
{{ scope.row.修改人员 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="90px"> <el-table-column align="center" label="操作" fixed="right" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button> <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -288,6 +298,8 @@ export default {
param[4] = ['录入工时', this.form1.录入工时] param[4] = ['录入工时', this.form1.录入工时]
param[5] = ['录入准结', this.form1.录入准结] param[5] = ['录入准结', this.form1.录入准结]
param[6] = ['备注', this.form1.备注] param[6] = ['备注', this.form1.备注]
param[7] = ['修改人员', this.$store.state.user.id]
console.log(this.$store.state.user.id, 9999)
var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param) var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param)
this.ExecDatabase(Data1).then(response => { this.ExecDatabase(Data1).then(response => {
if (response.data[0].result === 1) { if (response.data[0].result === 1) {

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

@@ -16,26 +16,27 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px"> <el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1480px">
<el-table-column label="序号" align="center" type="index" width="55"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="外协状态" align="center" width="80px"> <el-table-column label="外协状态" align="center" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag> <el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到</el-tag> <el-tag v-if="Number(scope.row.到货状态)===9" type="success" size="mini">未外协</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到</el-tag> <el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目名称" align="center" width="130px"> <el-table-column label="项目名称" align="center" width="115px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="160px"> <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" width="120px"> <el-table-column label="零件名称" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -60,7 +61,7 @@
{{ scope.row.加工价格_成交 }} {{ scope.row.加工价格_成交 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协厂家" align="center" width="160px"> <el-table-column label="外协厂家" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.外协厂家名称 }} {{ scope.row.外协厂家名称 }}
</template> </template>
@@ -75,6 +76,11 @@
{{ scope.row.任务下达日期.split(' ')[0] }} {{ scope.row.任务下达日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.外协计划员 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination

5
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -59,6 +59,11 @@
{{ scope.row.备料任务分配时间 }} {{ scope.row.备料任务分配时间 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分配人" prop="分配人姓名" width="90" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.分配人姓名 }}
</template>
</el-table-column>
</el-table> </el-table>
<div v-show="false" class="block"> <div v-show="false" class="block">
<el-pagination <el-pagination