|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<view class="content">
|
|
|
- <dj-navbar :title="title" @add_show="show = true" @change_shift="change_shift" />
|
|
|
+ <dj-navbar :title="title" :pressType="pressType" @add_show="show = true" @change_shift="change_shift" @change_press="change_press" />
|
|
|
<view v-if="swipeData.length" id="swipe" :style="swipeHeight">
|
|
|
<u-swipe-action
|
|
|
v-for="(item,index) in swipeData"
|
|
|
@@ -23,6 +23,12 @@
|
|
|
range-key="name"
|
|
|
@confirm="confirm_shift">
|
|
|
</u-picker>
|
|
|
+ <u-picker v-model="pressShow"
|
|
|
+ mode="selector"
|
|
|
+ :range="pressList"
|
|
|
+ range-key="name"
|
|
|
+ @confirm="confirm_press">
|
|
|
+ </u-picker>
|
|
|
<u-toast ref="uToast" />
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -31,7 +37,7 @@
|
|
|
import djNavbar from '@/components/dj-navbar.vue'
|
|
|
import djModal from "@/components/dj-modal.vue"
|
|
|
import djSwipeAction from '@/components/dj-swipe-action.vue'
|
|
|
- import { getLoginUserInfo,shiftList,selectPage,deleteTask } from '@/common/api.js'
|
|
|
+ import { getLoginUserInfo,shiftList,selectPage,deleteTask,pressTypeList } from '@/common/api.js'
|
|
|
import { mapMutations } from 'vuex'
|
|
|
export default {
|
|
|
name: 'index',
|
|
|
@@ -44,11 +50,15 @@
|
|
|
return {
|
|
|
show: false,
|
|
|
shiftShow: false,
|
|
|
+ pressShow: false,
|
|
|
swipeheight: '',
|
|
|
modalType: 1,
|
|
|
swipeData: [],
|
|
|
shiftId: '',
|
|
|
title: '',
|
|
|
+ pressTypeId: '',
|
|
|
+ pressType: '',
|
|
|
+ pressList: [],
|
|
|
shifts: [],
|
|
|
options: [
|
|
|
{
|
|
|
@@ -62,8 +72,8 @@
|
|
|
}
|
|
|
},
|
|
|
onShow() {
|
|
|
- if(this.shiftId) {
|
|
|
- this.select_page(this.shiftId)
|
|
|
+ if(this.shiftId || this.pressTypeId) {
|
|
|
+ this.select_page(this.shiftId,this.pressTypeId)
|
|
|
} else {
|
|
|
this.get_login_user_info()
|
|
|
}
|
|
|
@@ -79,14 +89,14 @@
|
|
|
async get_login_user_info() {
|
|
|
await getLoginUserInfo({}).then(res=> {
|
|
|
this.title = res.data.shift
|
|
|
- this.shiftId = res.data.shiftId
|
|
|
+ // this.shiftId = res.data.shiftId
|
|
|
this.saveShiftName(this.title)
|
|
|
uni.setStorageSync('user', res.data)
|
|
|
this.select_page(this.shiftId)
|
|
|
})
|
|
|
},
|
|
|
- async select_page(id) {
|
|
|
- await selectPage({'shiftId':id}).then(res=> {
|
|
|
+ async select_page(id,ids) {
|
|
|
+ await selectPage({'shiftId':id,'pressTypeId':ids}).then(res=> {
|
|
|
this.swipeData = res.data.row
|
|
|
// this.swipeData.map( item => {
|
|
|
// return item['show'] = false
|
|
|
@@ -111,12 +121,28 @@
|
|
|
this.shifts = res.data
|
|
|
})
|
|
|
},
|
|
|
+ change_press() {
|
|
|
+ this.pressShow = true
|
|
|
+ this.get_press_type_list()
|
|
|
+ },
|
|
|
+ // 获取压机类型
|
|
|
+ get_press_type_list() {
|
|
|
+ pressTypeList().then(res=> {
|
|
|
+ this.pressList = res.data
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 选择压机类型
|
|
|
+ confirm_press(index) {
|
|
|
+ this.pressTypeId = this.pressList[index].id
|
|
|
+ this.pressType = this.pressList[index].name
|
|
|
+ this.select_page(this.shiftId,this.pressTypeId)
|
|
|
+ },
|
|
|
// 选择工位
|
|
|
confirm_shift(index) {
|
|
|
this.shiftId = this.shifts[index].id
|
|
|
this.title = this.shifts[index].name
|
|
|
this.saveShiftName(this.title)
|
|
|
- this.select_page(this.shiftId)
|
|
|
+ this.select_page(this.shiftId,this.pressTypeId)
|
|
|
},
|
|
|
// 删除
|
|
|
async click(index) {
|
zhaozhipeng