Skip to content

T
template_vue
Commit 2b7b65a6 authored by jack_liu's avatar jack_liu
Browse files
Options

Merge branch 'project9-8' of http://gitlab.91isoft.com:90/yangshuo/template_vue into project9-8

parents 2c442f86 9ff340bb
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 62 deletions
src/views/production/barcodegeneration/index.vue
View file @ 2b7b65a6
......@@ -78,12 +78,12 @@
{{ scope.row.jbrank || '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="createName" :show-overflow-tooltip="true">
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="创建日期" prop="createDate" :show-overflow-tooltip="true">
<el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
</template>
......@@ -155,12 +155,12 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建人：" prop="createName">
<el-form-item label="操作人：" prop="createName">
<el-input v-model.trim="singleDetails.createName" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label=" 创建时间：" prop="createDate">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
......@@ -168,29 +168,17 @@
</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="jbcode" prop="jbcode">
<el-input ref="input1" v-model.trim="form.jbcode" :maxlength="30" placeholder="请输入jbcode" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12" style="padding-left: 10%;">
<el-form-item label="jblot" prop="jblot">
<el-input ref="input2" v-model.trim="form.jblot" :maxlength="30" placeholder="请输入jblot" @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-row>
<el-form-item label="jbcode" prop="jbcode">
<el-input ref="input1" v-model.trim="form.jbcode" :maxlength="30" placeholder="请输入jbcode" @keyup.enter.native="handelTab(1,$event)" />
</el-form-item>
<el-form-item label="jblot" prop="jblot">
<el-input ref="input2" v-model.trim="form.jblot" :maxlength="30" placeholder="请输入jblot" @keyup.enter.native="handelTab(2,$event)" />
</el-form-item>
<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-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
......
src/views/production/craftsmanship/index.vue
View file @ 2b7b65a6
......@@ -86,12 +86,12 @@
{{ scope.row.gx || '-' }}
</template>
</el-table-column>
<el-table-column label="创建人" prop="createName" :show-overflow-tooltip="true">
<el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="创建日期" prop="createDate" :show-overflow-tooltip="true">
<el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
</template>
......@@ -151,52 +151,52 @@
@pagination="getList"
/>
<!-- TODO: 详情 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="55%" append-to-body>
<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="8">
<el-col :span="12">
<el-form-item label="jxpn：" prop="jxpn">
<el-input v-model.trim="singleDetails.jxpn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<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="8">
<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="8">
<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="8">
<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="8">
<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="8">
<el-form-item label="创建人：" prop="createName">
<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="8">
<el-form-item label=" 创建时间：" prop="createDate">
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
......@@ -238,8 +238,22 @@
</el-col>
<el-col :span="12">
<el-form-item label="gx" prop="gx">
<el-input ref="input6" v-model.trim="form.gx" :maxlength="30" placeholder="请输入gx" @keyup.enter.native="handelTab(6,$event)" />
<el-select
v-model="form.pgx"
clearable
placeholder="请选择gx"
style="width: 325px"
@change="handlePgxChange"
>
<el-option
v-for="(dict,index) in pissbList"
:key="index"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -428,6 +442,17 @@ 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 = {
......
src/views/production/gxlog/index.vue
View file @ 2b7b65a6
......@@ -47,7 +47,7 @@
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-search" size="small" @click="handleQuery">查询</el-button>
<el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<div style="float: right">
<!-- <div style="float: right">
<el-form-item>
<el-button
style="padding: 8px 7px;"
......@@ -57,7 +57,7 @@
@click="handleAdd"
>新增</el-button>
</el-form-item>
</div>
</div> -->
</el-form>
<!-- 分割线 -->
<div class="placeholder" />
......@@ -86,11 +86,11 @@
{{ scope.row.jbcode || '-' }}
</template>
</el-table-column>
<el-table-column label="jbrank" prop="jbrank" :show-overflow-tooltip="true">
<!-- <el-table-column label="jbrank" prop="jbrank" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.jbrank || '-' }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="gx" prop="gx" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.gx || '-' }}
......@@ -113,12 +113,12 @@
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<el-button
<!-- <el-button
size="mini"
type="text"
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
>修改</el-button> -->
<el-button
size="mini"
type="text"
......@@ -166,83 +166,83 @@
@pagination="getList"
/>
<!-- TODO: 详情 -->
<el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="60%" append-to-body>
<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="8">
<el-col :span="12">
<el-form-item label="pn：" prop="pn">
<el-input v-model.trim="singleDetails.pn" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="ptype：" prop="ptype">
<el-input v-model.trim="singleDetails.ptype" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="lot：" prop="lot">
<el-input v-model.trim="singleDetails.lot" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<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="8">
<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="8">
<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="8">
<el-col :span="12">
<el-form-item label="jblot：" prop="jblot">
<el-input v-model.trim="singleDetails.jblot" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="wbcode：" prop="wbcode">
<el-input v-model.trim="singleDetails.wbcode" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="jlname：" prop="jlname">
<el-input v-model.trim="singleDetails.jlname" :readonly="true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="jllot：" prop="jllot">
<el-input v-model.trim="singleDetails.jllot" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="12">
<el-form-item label="wblot：" prop="wblot">
<el-input v-model.trim="singleDetails.wblot" :readonly="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建人：" prop="createName">
<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="8">
<el-form-item label=" 创建时间：" prop="createDate">
<el-col :span="12">
<el-form-item label=" 操作时间：" prop="createDate">
<el-input v-model.trim="singleDetails.createDate" :readonly="true" />
</el-form-item>
</el-col>
......
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