Skip to content

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

9/19(2)

parent fa5d5ec7
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 91 deletions
src/api/production/gfual.js
View file @ bfee9d41
import request from '@/utils/request' import request from '@/utils/request'
// 根据key值查询数据字典数据
export function getDictData(params) { // 查询列表
export function queryList(params) {
return request({ return request({
url: '/wbapply/queryDict', url: '/ysgxlog/queryYsGxLogByPagination',
method: 'get', method: 'get',
params params
}) })
} }
// 新增设备新增 // 添加基础信息接口
export function addApplication(data) { export function add(data) {
return request({ return request({
url: '/wbapply/add', url: '/ysgxlog/add',
method: 'post', method: 'post',
data, data,
headers: { headers: {
...@@ -18,11 +19,48 @@ export function addApplication(data) { ...@@ -18,11 +19,48 @@ export function addApplication(data) {
} }
}) })
} }
// 分页查询要处理的设备
export function getEquipment(params) { // 根据id查询基础信息接口
export function getDetailById(id) {
return request({
url: '/ysgxlog/detail/' + id,
method: 'get'
})
}
// 编辑基础信息接口
export function updataInfo(data) {
return request({
url: '/ysgxlog/update',
method: 'put',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
// 逻辑删除基础信息接口
export function deleteLogical(id) {
return request({
url: '/ysgxlog/deleteLogical/' + id,
method: 'delete'
})
}
// 导出信息接口
export function exporTable(params) {
return request({ return request({
url: '/wbwarehouse/canceListByPagination', url: '/wbchemistrybaseinfo/export',
method: 'get', method: 'get',
params 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 @ bfee9d41
...@@ -205,27 +205,27 @@ ...@@ -205,27 +205,27 @@
label-width="80px" label-width="80px"
> >
<el-form-item label="jxpn：" prop="jxpn"> <el-form-item label="jxpn：" prop="jxpn">
<el-input v-model.trim="singleDetails.jxpn" :readonly="true" /> <el-input :value="singleDetails.jxpn || '-'" :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="jbcode：" prop="jbcode"> <el-form-item label="jbcode：" prop="jbcode">
<el-input v-model.trim="singleDetails.jbcode" :readonly="true" /> <el-input :value="singleDetails.jbcode || '-'" :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="jbrank：" prop="jbrank"> <el-form-item label="jbrank：" prop="jbrank">
<el-input v-model.trim="singleDetails.jbrank" :readonly="true" /> <el-input :value="singleDetails.jbrank || '-'" :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="wb：" prop="wb"> <el-form-item label="wb：" prop="wb">
<el-input v-model.trim="singleDetails.wb" :readonly="true" /> <el-input :value="singleDetails.wb || '-'" :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="jl：" prop="jl"> <el-form-item label="jl：" prop="jl">
<el-input v-model.trim="singleDetails.jl" :readonly="true" /> <el-input :value="singleDetails.jl || '-'" :readonly="true" />
</el-form-item> </el-form-item>
<el-form-item label="gx：" prop="gx"> <el-form-item label="gx：" prop="gx">
<span style="margin-left: 10px">{{ replace(singleDetails.gx) }}</span> <span style="margin-left: 10px">{{ replace(singleDetails.gx) || '-' }}</span>
</el-form-item> </el-form-item>
<el-form-item label="操作人：" prop="createName"> <el-form-item label="操作人：" prop="createName">
......
src/views/production/gfual/index.vue
View file @ bfee9d41
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form ref="form" :model="form" :rules="rule" label-width="80px"> <div style="width: 80%; margin-left: 80px; padding-left: 8.6%">
<el-row :gutter="40"> <el-form ref="form" :model="form" :rules="rule" label-width="80px">
<el-col :span="12" style="padding-left: 10%;"> <el-row :gutter="40">
<el-form-item label="pn：" style="flex-basis: 50%;" prop="pn"> <el-col :span="12" >
<el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" /> <el-form-item label="pn：" style="flex-basis: 50%;" prop="pn">
</el-form-item> <el-input ref="input1" v-model="form.pn" placeholder="请输入pn" :minlength="3" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(1,$event)" />
</el-col> </el-form-item>
</el-row> </el-col>
<el-row :gutter="40"> </el-row>
<el-col :span="12" style="padding-left: 10%;"> <el-row :gutter="40">
<el-form-item label="lot：" style="flex-basis: 50%;" prop="lot"> <el-col :span="12" >
<el-input ref="input2" v-model="form.lot" placeholder="请输入lot" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" /> <el-form-item label="lot：" style="flex-basis: 50%;" prop="lot">
</el-form-item> <el-input ref="input2" v-model="form.lot" placeholder="请输入lot" style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(2,$event)" />
</el-col> </el-form-item>
</el-row> </el-col>
<el-row :gutter="40"> </el-row>
<el-col :span="12" style="padding-left: 10%;"> <el-row :gutter="40">
<el-form-item label="gx：" style="flex-basis: 50%;" prop="gx"> <el-col :span="8">
<el-select <el-form-item label="gx：" prop="gx">
v-model="form.gx" <el-select
clearable v-model="form.gx"
placeholder="请选择gx" clearable
style="width: 400px" placeholder="请选择gx"
@change="handlePgxChange" style="width: 100%; max-width: 400px;"
> @change="handlePgxChange"
>
<el-option <el-option
v-for="(dict,index) in pissbList" v-for="(dict, index) in pissbList"
:key="index" :key="index"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
...@@ -34,59 +35,129 @@ ...@@ -34,59 +35,129 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="machine：" style="flex-basis: 50%;" prop="machine">
<el-input ref="input4" v-model="form.machine" placeholder="请输入machine" style="width: 400px" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
</el-form-item>
</el-col>
</el-row>
<hr>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="jbcode：" style="flex-basis: 50%;" prop="jbcode">
<el-input ref="input5" v-model="form.jbcode" placeholder="请输入jbcode" :minlength="3" style="width: 800px" :maxlength="100" @keyup.enter.native="handleTab(4, $event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40"> <el-col :span="8">
<el-col :span="8" style="padding-left: 10%;"> <el-form-item label="machine：" prop="machine">
<el-form :model="form" ref="form" :rules="rules" label-width="80px"> <el-input ref="input4" v-model="form.machine" placeholder="请输入machine" style="width: 100%; max-width: 400px;" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
<el-form-item label="jbtype：" prop="jbtype"> </el-form-item>
<el-input v-model="form.jbtype" placeholder="jbtype" :disabled="true" style="width: 200px" /> </el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
</el-form-item>
</el-col>
</el-row>
<hr>
<el-row :gutter="40">
<el-col :span="12" >
<el-form-item label="jbcode：" style="flex-basis: 50%;" prop="jbcode">
<el-input ref="input5" v-model="form.jbcode" placeholder="请输入jbcode" :minlength="3" style="width: 800px" :maxlength="100" @keyup.enter.native="handleTab(4, $event)" />
</el-form-item> </el-form-item>
</el-form> </el-col>
</el-col> </el-row>
<el-row :gutter="0" style="display: flex; width: 60%;">
<el-col :span="8">
<el-form :model="form" ref="form" :rules="rules" label-width="80px">
<el-form-item label="jbtype：" prop="jbtype">
<el-input v-model="form.jbtype" placeholder="jbtype" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form :model="form" ref="form" :rules="rules" label-width="80px"> <el-form :model="form" ref="form" :rules="rules" label-width="80px">
<el-form-item label="jbrank：" prop="jbrank"> <el-form-item label="jbrank：" prop="jbrank">
<el-input v-model="form.jbrank" placeholder="jbrank" :disabled="true" style="width: 200px" /> <el-input v-model="form.jbrank" placeholder="jbrank" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
<el-col :span="8">
<el-form :model="form" ref="form" :rules="rules" label-width="80px">
<el-form-item label="jbLot：" prop="jbLot">
<el-input v-model="form.jbLot" placeholder="jbLot" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" >
<el-form-item label="wbcode：" style="flex-basis: 50%;" prop="wbcode">
<el-input ref="input6" v-model="form.wbcode" placeholder="请输入wbcode" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(5, $event)" />
</el-form-item> </el-form-item>
</el-form> </el-col>
</el-col> </el-row>
<el-col :span="8"> <el-row :gutter="40">
<el-form :model="form" ref="form" :rules="rules" label-width="80px"> <el-col :span="12" >
<el-form-item label="jbLot：" prop="jbLot"> <el-form-item label="wblot：" style="flex-basis: 50%;" prop="wblot">
<el-input v-model="form.jbLot" placeholder="jbLot" :disabled="true" style="width: 200px" /> <el-input ref="input7" v-model="form.wblot" placeholder="请输入wblot" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(6, $event)" />
</el-form-item> </el-form-item>
</el-form> </el-col>
</el-col> </el-row>
</el-row>
<el-row :gutter="40">
</el-form> <el-col :span="12" >
<el-form label-width="80px"> <el-form-item label="jlcod：" style="flex-basis: 50%;" prop="jlcod">
<el-row style="padding-left: 8.7%; padding-top: 1%"> <el-input ref="input8" v-model="form.jlbcod" placeholder="请输入jlbcod" :minlength="3" style="width: 800px" :maxlength="100" @keyup.enter.native="handleTab(7, $event)" />
<el-col :span="12"> </el-form-item>
<el-form-item style="flex-basis: 50%;"> </el-col>
<el-button type="primary" @click="submitForm">保存</el-button> </el-row>
<el-button @click="resetQuery">清空</el-button>
</el-form-item> <el-row :gutter="0" style="display: flex; width: 60%;">
</el-col> <el-col :span="8">
</el-row> <el-form :model="form" ref="form" :rules="rules" label-width="80px">
</el-form> <el-form-item label="jltype：" prop="jltype">
<el-input v-model="form.jbtype" placeholder="jltype" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
<el-col :span="8">
<el-form :model="form" ref="form" :rules="rules" label-width="80px">
<el-form-item label="jllot：" prop="jllot">
<el-input v-model="form.jbrank" placeholder="jllot" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
<el-col :span="8">
<el-form :model="form" ref="form" :rules="rules" label-width="80px">
<el-form-item label="jlbzq：" prop="jlbzq">
<el-input v-model="form.jbLot" placeholder="jlbzq" :disabled="true" style="width: 100%;" />
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" >
<el-form-item label="lockUser：" style="flex-basis: 50%;" prop="lockUser">
<el-input ref="input9" v-model="form.lockUser" placeholder="请输入lockUser" :minlength="3" style="width: 300px" :maxlength="100" @keyup.enter.native="handleTab(8, $event)" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form label-width="80px">
<el-row style="padding-left: 8.7%; padding-top: 1%">
<el-col :span="12">
<el-form-item style="flex-basis: 50%;">
<el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="resetQuery">清空</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div> </div>
</template> </template>
...@@ -157,6 +228,21 @@ export default { ...@@ -157,6 +228,21 @@ export default {
this.isRequired = false this.isRequired = false
} }
}, },
/** 查询按钮操作 */
handleQuery() {
this.form.page = 1
this.getList()
},
/** 查询基础信息列表 */
getList() {
this.loading = true
listBasicInfo(this.queryParams).then(res => {
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.total = res.total
this.basicInfoList = res.rows
this.loading = false
})
},
resetQuery() { resetQuery() {
this.form = { this.form = {
pn: '', pn: '',
......
src/views/production/gxlog/index.vue
View file @ bfee9d41
...@@ -246,8 +246,8 @@ ...@@ -246,8 +246,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="gx： " prop="gx"> <el-form-item label="gx：" prop="gx">
<span>{{ replace(singleDetails.gx) }}</span> <span style="margin-left: 10px">{{ replace(singleDetails.gx) }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
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