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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-26 18:32:14 +08:00
parent 7317c3d73e 809d6049ef
commit c35509fe94
8 changed files with 95 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="机床图号" style="margin-top:28px">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()">
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()" @focus="typeChange()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -34,51 +34,51 @@
</el-form>
</el-col>
<el-col style="width: 530px">
<el-col style="width: 530px;margin-left: 50px">
<el-form label-width="70px" label-position="left" class="Time">
<el-form-item label="计划下达">
<el-col :span="11">
<el-date-picker v-model="time_planStart" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_planStart" size="small" type="date" class="time" readonly/>
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_planFinish" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_planFinish" size="small" type="date" class="time" readonly/>
</el-col>
</el-form-item>
<el-form-item label="工艺">
<el-col :span="11">
<el-date-picker v-model="time_gongyiStart" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_gongyiStart" size="small" type="date" class="time" readonly/>
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_gongyiFinish" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_gongyiFinish" size="small" type="date" class="time" readonly/>
</el-col>
</el-form-item>
<el-form-item label="定额">
<el-col :span="11">
<el-date-picker v-model="time_dingeStart" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_dingeStart" size="small" type="date" class="time" readonly/>
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_dingeFinish" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_dingeFinish" size="small" type="date" class="time" readonly/>
</el-col>
</el-form-item>
<el-form-item label="计划平衡">
<el-col :span="11">
<el-date-picker v-model="time_planpinghengStart" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_planpinghengStart" size="small" type="date" class="time" readonly/>
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_planpinghengFinish" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_planpinghengFinish" size="small" type="date" class="time" readonly/>
</el-col>
</el-form-item>
<el-form-item label="加工">
<el-col :span="11">
<el-date-picker v-model="time_machiningStart" size="small" type="datetime" class="time" readonly/>
<el-col :span="8">
<el-date-picker v-model="time_machiningStart" size="small" type="date" class="time" readonly/>
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
<el-col :span="8">
<el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:150px"/>
</el-col>
</el-form-item>
</el-form>
@@ -371,7 +371,7 @@
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:160px" clearable/>
</el-form-item>
<el-form-item label="零件数量" prop="零件数量">
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:160px"/>
<el-input-number v-model="form10.零件数量" :step="1" :min="1" size="mini" style="width:160px"/>
</el-form-item>
<el-form-item label="零件备注" prop="零件备注">
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:160px" clearable/>
@@ -531,16 +531,16 @@ export default {
// if (to.name === 'InitialProduction') {
// _this.typeChange()
// }
// },
// '$route': {
// handler(route) {
// const _this = this
// console.log(route.name)
// if (route.name === 'InitialProduction') {
// _this.typeChange()
// }
// }
// }
// // '$route': {
// // handler(route) {
// // const _this = this
// // console.log(route.name)
// // if (route.name === 'InitialProduction') {
// // _this.typeChange()
// // }
// // }
// // }
// },
created() {
this.typeChange()
@@ -1347,7 +1347,7 @@ export default {
margin: 10px 0 10px 10px;
}
.time{
width: 200px;
width: 150px;
}
.Time>.el-form-item{
margin:2px;
@@ -1373,4 +1373,3 @@ export default {
margin-bottom: 13px;
}
</style>

1
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -496,6 +496,7 @@ export default {
})
},
rowClick(row) {
this.radio = ''
searchtable(1, row.项目流水号, 1, row.机床流水号, 0, 0, 0, '', '', 0, '', '', 1, 100).then(response => {
if (response.data.total !== 0) {
this.machineNum = row.机床图号

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

@@ -19,7 +19,7 @@
<el-button type="primary" class="el-icon-search" size="small" plain style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
</el-card>
<el-row>
<el-col :span="8">
<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-column label="操作者" align="center" show-overflow-tooltip>
@@ -32,7 +32,7 @@
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" width="110px">
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.完成总工时 }}
</template>
@@ -42,7 +42,7 @@
<!--{{ scope.row.修补准结总工时 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="扫码工时(分)" align="center" width="110px">
<el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.扫码总工时 }}
</template>
@@ -58,10 +58,10 @@
</div>
</el-card>
</el-col>
<el-col :span="16">
<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-column label="零件图号" align="center" width="135px" show-overflow-tooltip>
<el-table-column label="零件图号" align="center" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -86,12 +86,12 @@
<!--{{ scope.row.计划工时 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="单件工时(分)" align="center" width="110px">
<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="110px">
<el-table-column label="加工工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
@@ -101,7 +101,7 @@
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center" width="110px">
<el-table-column label="扫码工时(分)" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
@@ -111,7 +111,7 @@
{{ scope.row.完成日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="130px">
<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>
</template>