Commit 32b19aa0 authored by 吴志坤's avatar 吴志坤

工序库设备领用登录弹窗

parent 086f7252
...@@ -463,6 +463,12 @@ export default { ...@@ -463,6 +463,12 @@ export default {
next() next()
}, },
created() { 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() this.getList()
}, },
methods: { methods: {
......
...@@ -271,6 +271,10 @@ ...@@ -271,6 +271,10 @@
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQueryWarehouse">查询</el-button> <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-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQueryWarehouse">重置</el-button>
</el-form-item> </el-form-item>
<el-radio-group v-model="radio1" class="ml-4" style="padding: 25px 7px;" @change="login">
<el-radio label="1" size="large">设备库</el-radio>
<el-radio label="2" size="large">工序库</el-radio>
</el-radio-group>
</el-form> </el-form>
<el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange"> <el-table v-loading="loadingDetail" border :data="detailApplyList" @selection-change="handleSelectionChange">
...@@ -333,6 +337,21 @@ ...@@ -333,6 +337,21 @@
>确定</el-button> >确定</el-button>
</div> </div>
</el-dialog> </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 v-model="loginform.username"></el-input>
</el-form-item>
<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="handleSubmit">登录</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -343,6 +362,13 @@ export default { ...@@ -343,6 +362,13 @@ export default {
name: 'Draw', name: 'Draw',
data() { data() {
return { return {
loginform: {
username: '',
password: ''
},
// 打开登录验证界面
openLogin: false,
radio1: '',
ptype: '', ptype: '',
pgx: '', pgx: '',
prank: '', prank: '',
...@@ -467,7 +493,6 @@ export default { ...@@ -467,7 +493,6 @@ export default {
methods: { methods: {
handleCance() { handleCance() {
this.loadingDetail = true this.loadingDetail = true
console.log('multipleSelection', this.multipleSelection)
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个要处理的设备') this.$message.warning('请至少选择一个要处理的设备')
} else { } else {
...@@ -522,7 +547,6 @@ export default { ...@@ -522,7 +547,6 @@ export default {
}) })
}, },
handle(row) { handle(row) {
console.log('row', row)
this.applyId = row.businessId this.applyId = row.businessId
this.pn = row.pn this.pn = row.pn
this.ptype = row.ptype this.ptype = row.ptype
...@@ -542,7 +566,6 @@ export default { ...@@ -542,7 +566,6 @@ export default {
if (res.code && res.code === null ) { if (res.code && res.code === null ) {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
console.log('res')
if (res.rows.createDate && res.rows.createDate !== null) { if (res.rows.createDate && res.rows.createDate !== null) {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}') res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
} }
...@@ -550,16 +573,8 @@ export default { ...@@ -550,16 +573,8 @@ export default {
this.loadingDetail = false this.loadingDetail = false
this.openHandle = true this.openHandle = true
}) })
// this.applyId = row.businessId
this.title = '处理' this.title = '处理'
// this.openHandle = !this.openHandle
this.loadingDetail = true this.loadingDetail = true
// detailList(this.queryParamsDetail).then(res => {
// res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
// this.totalDetail = res.total
// this.detailApplyList = res.rows
// this.loadingDetail = false
// })
}, },
// 获取所选行详情信息 // 获取所选行详情信息
handleDetail(row) { handleDetail(row) {
...@@ -568,9 +583,7 @@ export default { ...@@ -568,9 +583,7 @@ export default {
this.singleDetails = row this.singleDetails = row
this.title = '详情' this.title = '详情'
detail(id).then(res => { detail(id).then(res => {
console.log('res', res)
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}') res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
// this.totalApplyDetail = res.total
this.applyList = res.data.wbApplyDetailList this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus this.applyStatus = res.data.pstatus
this.loadingDetail = false this.loadingDetail = false
...@@ -639,11 +652,16 @@ export default { ...@@ -639,11 +652,16 @@ export default {
phd: '', phd: '',
prank: '', prank: '',
pstatus: '', pstatus: '',
ptype: '2' ptype: '2',
delFlag: 0
} }
// this.dateRange = []
this.handleQuery() this.handleQuery()
}, },
// 登录
login() {
this.title = '登录'
this.openLogin = true
},
// warehouse的重置按钮 // warehouse的重置按钮
resetQueryWarehouse() { resetQueryWarehouse() {
this.queryParamsDetail.pn = null 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