Commit 1eabb4c4 authored by 高宇's avatar 高宇

Merge remote-tracking branch 'origin/project1' into project1

# Conflicts:
#	src/views/processManagement/draw.vue
parents e9affbda c783a85a
......@@ -42,3 +42,15 @@ export function detail(id) {
method: 'get'
})
}
// 菜单权限验证接口
export function checkPermission(password) {
return request({
url: '/wbapply/checkPermission',
method: 'post',
password,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......@@ -227,12 +227,6 @@
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
<span v-if="scope.row.pissb === '0'"></span>
<span v-else></span>
</template>
</el-table-column>
</el-table>
</el-dialog>
......@@ -312,12 +306,6 @@
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<template slot-scope="scope">
<span v-if="scope.row.pissb === '0'"></span>
<span v-else></span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="totalDetail>0"
......@@ -463,6 +451,12 @@ export default {
next()
},
created() {
this.resetQuery()
if (this.$store.getters.searchParams[this.$route.path]) {
const { searchParams } = this.$store.getters; const { path } = this.$route
const param = JSON.parse(searchParams[path]) // 保留着的查询条件
this.queryParams = { ...param }
}
this.getList()
},
methods: {
......
......@@ -271,6 +271,10 @@
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQueryWarehouse">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQueryWarehouse">重置</el-button>
</el-form-item>
<el-radio-group v-model="radio1" class="ml-4" style="padding: 25px 7px;" @change="login">
<el-radio label="2" size="large">工序库</el-radio>
<el-radio label="1" size="large">设备库</el-radio>
</el-radio-group>
</el-form>
<el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange">
......@@ -311,10 +315,9 @@
{{ scope.row.psm || '-' }}
</template>
</el-table-column>
<el-table-column label="pissb" prop="pissb">
<el-table-column label="回收时间" prop="recycleDate">
<template slot-scope="scope">
<span v-if="scope.row.pissb === '0'"></span>
<span v-else></span>
{{ scope.row.recycleDate || '-' }}
</template>
</el-table-column>
</el-table>
......@@ -333,16 +336,35 @@
>确定</el-button>
</div>
</el-dialog>
<!-- 登录验证-->
<el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body>
<el-form ref="form" :model="loginform" label-width="80px">
<el-form-item label="密码">
<el-input type="password" v-model="loginform.password"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleConfirm">确定</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { getEquipment } from '@/api/equipment/application'
import { listWbApply, deleteLogical, batchAddition, detail } from '@/api/equipment/draw'
import { listWbApply, deleteLogical, batchAddition, detail, checkPermission } from '@/api/equipment/draw'
import { parseTime } from '@/utils'
export default {
name: 'Draw',
data() {
return {
loginform: {
username: '',
password: ''
},
// 打开登录验证界面
openLogin: false,
radio1: '2',
ptype: '',
pgx: '',
prank: '',
......@@ -465,9 +487,18 @@ export default {
this.getList()
},
methods: {
// 菜单权限验证确定
handleConfirm() {
checkPermission(this.loginform.password).then(res => {
if (res.code === 200) {
this.$message.warning('已切换到设备库')
}
})
},
handleCance() {
this.loadingDetail = true
console.log('multipleSelection', this.multipleSelection)
if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个要处理的设备')
} else {
......@@ -488,7 +519,6 @@ export default {
})
console.log('canceList', this.canceList)
batchAddition(this.canceList).then(res => {
console.log('res', res)
if (res.code === 200) {
this.loadingDetail = false
this.openHandle = false
......@@ -562,9 +592,7 @@ export default {
this.singleDetails = row
this.title = '详情'
detail(id).then(res => {
console.log('res', res)
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
// this.totalApplyDetail = res.total
this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus
this.loadingDetail = false
......@@ -633,11 +661,16 @@ export default {
phd: '',
prank: '',
pstatus: '',
ptype: '2'
ptype: '2',
delFlag: 0
}
// this.dateRange = []
this.handleQuery()
},
// 登录
login() {
this.title = '菜单权限'
this.openLogin = true
},
// warehouse的重置按钮
resetQueryWarehouse() {
this.queryParamsDetail.pn = null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment