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-04-08 18:05:24 +08:00
parent 307598eb96
commit 9525a0fdc2
10 changed files with 571 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@
<el-row>
<el-col :span="7">
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="600px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="操作者" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 }}
@@ -60,7 +60,7 @@
</el-col>
<el-col :span="17">
<el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="600px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -91,16 +91,16 @@
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column label="录入准结" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
@@ -111,6 +111,16 @@
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column label="编辑人员" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.修改人员 }}
</template>
</el-table-column>
<el-table-column label="编辑时间" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.修改时间 ? scope.row.修改时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="90px">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -150,7 +160,7 @@
<!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入工时" placeholder="录入工时" style="width:200px;" type="number"/>-->
</el-form-item>
<el-form-item label="录入准结(分)：" prop="录入准结">
<el-input-number :min="0" v-model="form1.录入准结" style="width: 200px"/>
<el-input-number :min="0" v-model="form1.录入准结" style="width: 200px" @change="timeChange()"/>
<!--<el-input class="editWorkTime" v-positive="'float'" v-model="form1.录入准结" placeholder="录入准结" style="width:200px;" type="number"/>-->
</el-form-item>
<el-form-item label="加工工时(分)：" prop="加工时间">
@@ -171,6 +181,7 @@
<script>
import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/ScheduleCompletionDetails'
import { getNowShotTime } from '@/utils/tool'
import { mapGetters } from 'vuex'
export default {
data() {
return {
@@ -203,6 +214,14 @@ export default {
剩余数量: 0
}
},
computed: {
...mapGetters([
'sidebar',
'avatar',
'name',
'id'
])
},
created() {
this.searchTable()
},
@@ -273,9 +292,9 @@ export default {
},
timeChange() {
if (this.form1.完成数量 > 0) {
this.加工时间 = this.form1.录入工时 * this.form1.完成数量
this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量) + Number(this.form1.录入准结)
} else {
this.加工时间 = this.form1.录入工时
this.加工时间 = Number(this.form1.录入工时) + Number(this.form1.录入准结)
}
},
submit1() {
@@ -288,6 +307,7 @@ export default {
param[4] = ['录入工时', this.form1.录入工时]
param[5] = ['录入准结', this.form1.录入准结]
param[6] = ['备注', this.form1.备注]
param[7] = ['修改人员', this.id]
var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param)
this.ExecDatabase(Data1).then(response => {
if (response.data[0].result === 1) {