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

Merge branch 'master' of ssh://123.56.95.229:29418/高精

Browse Source
This commit is contained in:
jiangfuzhuang
2020-02-06 16:56:29 +08:00
parent 1aef5b7d2e 0985586eff
commit 76db4ae54a
13 changed files with 98 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,27 +458,27 @@ export default {
'id'
])
},
watch: {
// 如果路由有变化，会再次执行该方法
'$route'(to) {
const _this = this
console.log(to, 2222)
if (to.name === 'InitialProduction') {
_this.typeChange()
}
}
// '$route': {
// handler(route) {
// const _this = this
// console.log(route.name)
// if (route.name === 'InitialProduction') {
// _this.typeChange()
// }
// }
// }
},
// watch: {
// // 如果路由有变化，会再次执行该方法
// '$route'(to) {
// const _this = this
// console.log(to, 2222)
// if (to.name === 'InitialProduction') {
// _this.typeChange()
// }
// }
// // '$route': {
// // handler(route) {
// // const _this = this
// // console.log(route.name)
// // if (route.name === 'InitialProduction') {
// // _this.typeChange()
// // }
// // }
// // }
// },
created() {
// this.typeChange()
this.typeChange()
this.getCurrentTime()
this.getNowTime()
},

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

@@ -20,7 +20,7 @@
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button>
<el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 50%; float: left">

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

@@ -36,7 +36,6 @@
height="750"
highlight-current-row
border
stripe
@selection-change="handleSelectionChange">
<el-table-column align="center" type="selection"/>
<el-table-column align="center" label="零件号" prop="零件号" width="160">