Skip to content

L
lxyl-vue
Commit 9930e2fc authored by 李苏's avatar 李苏 💬
Browse files
Options

前端基础功能调整

parent a29cdc5e
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 53 deletions
src/router/index.js
View file @ 9930e2fc
...@@ -213,6 +213,20 @@ export const powerRoutes = [ ...@@ -213,6 +213,20 @@ export const powerRoutes = [
name: 'cgywh', name: 'cgywh',
path: "cgywh", path: "cgywh",
}, },
{
erpComponent: true,
component: 'jcsj/wl/wlfl/index',
hidden: false,
meta: {
"title": "物料分类",
"icon": "",
"noCache": false,
"link": null,
"mkid": '920011200',
},
name: 'wlfl',
path: "wlfl",
},
{ {
erpComponent: false, erpComponent: false,
component: 'ccgl/jcsj/swlx/index', component: 'ccgl/jcsj/swlx/index',
......
src/views/ccgl/jcsj/cgywh/edit.vue
View file @ 9930e2fc
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
type: 'AuxInput', type: 'AuxInput',
typeConfig: { typeConfig: {
code: 'USER', code: 'USER',
label: 'jhrName', label: 'usersName',
transform: { transform: {
value: 'id', value: 'id',
label: 'username' label: 'username'
......
src/views/ccgl/jcsj/cgywh/index.vue
View file @ 9930e2fc
...@@ -19,18 +19,30 @@ ...@@ -19,18 +19,30 @@
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/jcsj/ckglysz', url: 'lxyl/jcsj/ckglysz',
tableTitle: [{ tableTitle: [
{
title: "货主", title: "货主",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
{
title: "货主编码",
field: "hzCode",
width: 140
},
{ {
title: "物料组", title: "物料组",
field: "wlzName", field: "wlzName",
width: 140 width: 140
},{ },
{
title: "物料组编码",
field: "wlzCode",
width: 140
},
{
title: "负责人", title: "负责人",
field: "fzrName", field: "usersName",
width: 140 width: 140
}, },
{ {
......
src/views/ccgl/jcsj/gwwh/index.vue
View file @ 9930e2fc
...@@ -36,16 +36,16 @@ ...@@ -36,16 +36,16 @@
// field: "stationid", // field: "stationid",
// width: 140 // width: 140
// }, // },
{ // {
title: "工位状态", // title: "工位状态",
field: "status", // field: "status",
width: 140, // width: 140,
"transform": { // "transform": {
"url": "lxyl/jcsj/ugw/init/status", // "url": "lxyl/jcsj/ugw/init/status",
"label": "name", // "label": "name",
"value": "id" // "value": "id"
} // }
}, // },
{ {
title: "工位别名", title: "工位别名",
field: "alias", field: "alias",
......
src/views/ccgl/jcsj/lkrck/index.vue
View file @ 9930e2fc
...@@ -22,14 +22,23 @@ ...@@ -22,14 +22,23 @@
tableTitle: [{ tableTitle: [{
title: "工位", title: "工位",
field: "gwName", field: "gwName",
fieldType: "upper",
width: 140 width: 140
}, },
{
title: "工位编码",
field: "gwCode",
width: 140
},
{ {
title: "货架", title: "货架",
field: "hjName", field: "hjName",
width: 140 width: 140
}, },
{
title: "货架编码",
field: "hjCode",
width: 140
},
// { // {
// title: "状态", // title: "状态",
// field: "zt", // field: "zt",
......
src/views/ccgl/jcsj/wlzwh/edit.vue
View file @ 9930e2fc
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
<RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog width="50%" :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this"> <el-row :gutter="20" :app="this">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" /> <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
</el-row> </el-row>
</el-form> </el-form>
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import { import {
editMixin editMixin
} from 'common' } from 'common'
...@@ -16,27 +17,43 @@ ...@@ -16,27 +17,43 @@
mixins: [editMixin], mixins: [editMixin],
data() { data() {
return { return {
editColItemList: [ editColItemList: [{
{ label: '物料组编码',
label: '物料组编码', prop: 'code',
prop: 'code', span: 12,
span: 12, type: 'input',
type: 'input', required: true,
required:true, },
}, {
{ label: '物料组名称',
label: '物料组名称', prop: 'name',
prop: 'name', span: 12,
span: 12, type: 'input',
type: 'input', required: true,
required:true, },
}, /* 库区*/
{ {
label: '备注', label: '库区',
prop: 'bz', prop: 'kqid',
span: 24, span: 12,
type: 'input' required: true,
}, type: 'AuxInput',
typeConfig: {
isRequest: true,
code: 'KQID',
label: 'kqName',
transform: {
value: 'id',
label: 'name'
}
}
},
{
label: '备注',
prop: 'bz',
span: 24,
type: 'input'
},
] ]
......
src/views/jcsj/wl/wlxx/index.vue
View file @ 9930e2fc
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-row :gutter="20" class="search-row-1"> <el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">条件:</span> <span class="search-span">物料:</span>
<el-input v-model="queryParams.condition"></el-input> <el-input v-model="queryParams.condition"></el-input>
</div> </div>
</el-col> </el-col>
...@@ -113,23 +113,23 @@ ...@@ -113,23 +113,23 @@
{title:"增值税率(%)",field:"zzsl", fieldType:"zzsl", width: 100}, {title:"增值税率(%)",field:"zzsl", fieldType:"zzsl", width: 100},
{title:"批号管理",field:"phgl",width:80,formatter(a,b,v){ {title:"批号管理",field:"phgl",width:80,formatter(a,b,v){
let map={ let map={
Y:'停用', Y:'正常',
N:'正常' N:'停用'
}
return map[v]
}},
{title:"单件管理",field:"djgl",width:80,formatter(a,b,v){
let map={
Y:'停用',
N:'正常'
} }
return map[v] return map[v]
}}, }},
{title:"产品条码规则",field:"coderulename",width:160}, // {title:"单件管理",field:"djgl",width:80,formatter(a,b,v){
{title:"缺省仓库",field:"ckname", width:120}, // let map={
{title:"计划部门",field:"jhbmmc",width:120}, // Y:'停用',
{title:"产品结构号",field:"bomcode", width:120}, // N:'正常'
{title:"工艺路线号",field:"gylxcode", width:120}, // }
// return map[v]
// }},
// {title:"产品条码规则",field:"coderulename",width:160},
// {title:"缺省仓库",field:"ckname", width:120},
// {title:"计划部门",field:"jhbmmc",width:120},
// {title:"产品结构号",field:"bomcode", width:120},
// {title:"工艺路线号",field:"gylxcode", width:120},
{title:"状态",field:"tybz",width:80,formatter(a,b,v){ {title:"状态",field:"tybz",width:80,formatter(a,b,v){
let map={ let map={
Y:'停用', Y:'停用',
......
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