Skip to content

T
template_vue
Commit 23b5672c authored by shifangwuji's avatar shifangwuji
Browse files
Options

9/16

parent 74b1892b
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 65 deletions
src/api/production/application.js
View file @ 23b5672c
......@@ -55,3 +55,12 @@ export function exporTable(params) {
responseType: 'blob'
})
}
// 根据key值查询数据字典数据
export function getDictData(params) {
return request({
url: '/wbapply/queryDict',
method: 'get',
params
})
}
\ No newline at end of file
src/views/production/craftsmanship/index.vue
View file @ 23b5672c
......@@ -151,99 +151,75 @@
@pagination="getList"
/>
<!-- TODO: 详情 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
<el-row>
<el-col :span="12">
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="formDetails" :model="singleDetails" size="small" label-width="80px">
<el-form-item label="jxpn：" prop="jxpn">
<el-input v-model.trim="singleDetails.jxpn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="jbcode：" prop="jbcode">
<el-input v-model.trim="singleDetails.jbcode" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="jbrank：" prop="jbrank">
<el-input v-model.trim="singleDetails.jbrank" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="wb：" prop="wb">
<el-input v-model.trim="singleDetails.wb" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="jl：" prop="jl">
<el-input v-model.trim="singleDetails.jl" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="gx：" prop="gx">
<el-input v-model.trim="singleDetails.gx" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="操作人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- 新增修改弹出 -->
<el-dialog title="设备绑定" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false" @close="cancel">
<el-dialog title="设备绑定" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="jxpn" prop="jxpn">
<el-input ref="input1" v-model.trim="form.jxpn" :maxlength="30" placeholder="请输入jxpn" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="jbcode" prop="jbcode">
<el-input ref="input2" v-model.trim="form.jbcode" :maxlength="30" placeholder="请输入jbcode" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="jbrank" prop="jbrank">
<el-input ref="input3" v-model.trim="form.jbrank" :maxlength="30" placeholder="请输入jbrank" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="wb" prop="wb">
<el-input ref="input4" v-model.trim="form.wb" :maxlength="30" placeholder="请输入wb" @keyup.enter.native="handelTab(4,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="jl" prop="jl">
<el-input ref="input5" v-model.trim="form.jl" :maxlength="30" placeholder="请输入jl" @keyup.enter.native="handelTab(5,$event)" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="gx" prop="gx">
<el-select
v-model="form.pgx"
v-model="form.gx"
clearable
placeholder="请选择gx"
style="width: 325px"
@change="handlePgxChange"
style="width: 340px"
@change="handleGxChange"
>
<el-option
v-for="(dict,index) in pissbList"
......@@ -254,8 +230,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
......@@ -266,13 +241,14 @@
</template>
<script>
import { queryList, add, getDetailById, updataInfo, deleteLogical, exporTable } from '@/api/production/application'
import { queryList, add, getDetailById, updataInfo, deleteLogical, exporTable, getDictData } from '@/api/production/application'
import { parseTime } from '@/utils'
export default {
name: 'Index',
data() {
return {
phdList: ['003'],
title: '',
open: false,
form: {
......@@ -283,6 +259,7 @@ export default {
jbcode: [{ required: true, message: '请输入jbcode', trigger: 'blur' }],
jbrank: [{ required: true, message: '请输入jbrank', trigger: 'blur' }],
},
pissbList: [],
total: 0,
loading: false,
queryParams: {
......@@ -311,6 +288,13 @@ export default {
this.getList()
},
methods: {
handleGxChange() {
if (this.phdList.includes(this.form.gx)){
this.isRequired = true
} else {
this.isRequired = false
}
},
// 回车跳转下一个输入框
focusNextInput(form) {
this.$nextTick(() => {
......@@ -413,6 +397,15 @@ export default {
this.form = res.data
this.open = true
})
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
},
// 获取行详情信息
handleDetail(row) {
......@@ -420,12 +413,21 @@ export default {
this.openDetails = true
this.singleDetails = row
this.title = '详情'
detail(id).then(res => {
getDetailById(id).then(res => {
res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
this.applyList = res.data.wbApplyDetailList
this.applyStatus = res.data.pstatus
this.loadingDetail = false
})
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
},
// 初始化获取数据
getList() {
......@@ -442,17 +444,6 @@ export default {
this.queryParams.page = 1
this.getList()
},
getDict() {
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
},
// 重置
resetQuery() {
this.queryParams = {
......@@ -466,6 +457,16 @@ export default {
handleAdd() {
this.open = true
this.title = '添加基础信息表单'
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
},
handleExport() {
const obj = {
......@@ -491,6 +492,18 @@ export default {
window.URL.revokeObjectURL(href)
// this.download(response.msg);
})
},
// 调数据字典查询
getDict() {
const obj = {
key: 'GX_CODE'
}
getDictData(obj).then(res => {
console.log('res', res)
if (res.code === 200 && res.data !== null) {
this.pissbList = res.data
}
})
}
}
}
......
src/views/production/gxlog/index.vue
View file @ 23b5672c
......@@ -111,7 +111,7 @@
{{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
<el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
<template slot-scope="scope">
<!-- <el-button
size="mini"
......@@ -124,12 +124,12 @@
type="text"
@click="handleDetail(scope.row)"
>详情</el-button>
<el-button
<!-- <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
>删除</el-button> -->
</template>
</el-table-column>
<!-- <el-table-column label="操作">-->
......
src/views/sample/basicInformation/index.vue
View file @ 23b5672c
......@@ -127,7 +127,7 @@
@pagination="getList"
/>
<!-- 新增修改弹出 -->
<el-dialog title="样品库信息" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-dialog title="样品库信息111" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="pn" prop="pn">
<el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
......
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