Skip to content

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

1

parent 787c540a
Show whitespace changes
Inline Side-by-side
Showing with 889 additions and 28 deletions
src/router/index.js
View file @ ee5d2f98
...@@ -421,7 +421,22 @@ export const powerRoutes = [ ...@@ -421,7 +421,22 @@ export const powerRoutes = [
redirect: 'ckd', redirect: 'ckd',
name: 'ckgl', name: 'ckgl',
path: "ckgl", path: "ckgl",
children: [{ children: [
{
// erpComponent: true,
component: 'ccgl/ckgl/ckdj/index',
hidden: false,
meta: {
"title": "出库登记",
"icon": "",
"noCache": false,
"link": null,
"mkid": 920040900,
},
name: 'ckdj',
path: "ckdj",
},
{
// erpComponent: true, // erpComponent: true,
component: 'ccgl/ckgl/ckd/index', component: 'ccgl/ckgl/ckd/index',
hidden: false, hidden: false,
...@@ -764,18 +779,32 @@ export const powerRoutes = [ ...@@ -764,18 +779,32 @@ export const powerRoutes = [
path: "rqcx", path: "rqcx",
}, },
{ {
component: 'ccgl/cxfx/kwxq/index', component: 'ccgl/cxfx/sfhzcx/index',
hidden: false, hidden: false,
meta: { meta: {
"title": "库位状态", "title": "收发汇总查询",
"icon": "", "icon": "",
"noCache": false, "noCache": false,
"link": null, "link": null,
"mkid": 920190400, "mkid": 920190400,
}, },
name: 'kwzt', name: 'sfhzcx',
path: "kwzt", path: "sfhzcx",
} },
{
component: 'ccgl/cxfx/pcxxcx/index',
hidden: false,
meta: {
"title": "批次信息查询",
"icon": "",
"noCache": false,
"link": null,
"mkid": 920192000,
},
name: 'pcxxcx',
path: "pcxxcx",
},
......
src/views/ccgl/ckgl/ckdj/dialog.vue 0 → 100644
View file @ ee5d2f98
<template>
<DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;">
DialogTitle:'新增',
showDialog:false,
</div>
<div slot="reFooter" class="refooter" >
<span slot="footer" class="dialog-footer" >
<el-button @click="app.showDialog=false">取 消</el-button>
<el-button type="primary" @click="save()">保 存</el-button>
</span>
</div>
</DefaultDialog>
</template>
<script>
export default {
props: {
app: {
type: Object,
default: ()=>{
return {}
}
}
},
async mounted() {
},
data() {
return {
}
},
methods: {
}
}
</script>
<style scoped>
</style>
src/views/ccgl/ckgl/ckdj/edit.vue 0 → 100644
View file @ ee5d2f98
<template>
<RelDialog bigTitle detailTable='KCSW' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'>
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this" class="editRow">
<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>
<div class="editTab">
<editTableForEdit :AuxButton='false' :indexApp='app' :type='type' @save='save' ref="editTableForEdit" code='LLCKD'
rename='选择领料出库单' :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
:editTableData="formDetail">
</editTableForEdit>
</div>
<el-row class="bottomInfo" :gutter="20">
<el-col class="center" :span="12">
创建人:{{
form.cjr||localUser
}}
</el-col>
<el-col class="center" :span="12">
创建时间:{{
$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
}}
</el-col>
</el-row>
</el-form>
<!-- editTab数据 -->
</RelDialog>
</template>
<script>
import {
toFixed,
digit,
doRkdChange
} from 'common/src/utils/blur.js'
import {
editMixin,
editMixin_expand
} from 'common'
export default {
computed: {
ywrq() {
return this.form.ywrq
},
},
watch: {
ywrq(val) {
this.formDetail.forEach(item => item.ckrq = val)
}
},
mixins: [editMixin, editMixin_expand],
methods: {
/* 需要整体row时的回调 */
computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate()
},
/* 选择list时的回调 */
async save(list) {
if (list.length != 1) {
this.$warning('最多选择一条数据')
return
}
/* 清空数据 */
while (this.formDetail.length > 0) {
this.formDetail.shift();
}
Object.keys(this.form).forEach(key => {
if (key != 'id' && key != 'djid') {
this.form[key] = list[0][key] || this.form[key]
} else if (key == 'djid') {
this.form['lldjid'] = list[0][key]
}
})
let res = await this.$post('kc/llckdj/queryllckmx', {
mid: list[0].id
})
let records = res.data.records || 0
records.forEach(item => {
item.lydjid = item.id
delete item.id
delete item.mid
item.cksl = item.yfsl || 0
this.formDetail.push(_.cloneDeep(item))
})
}
},
mounted() {},
data() {
return {
form: {
djlx: 'LLCK'
},
/* 常规edit数据 */
editColItemList: [{
label: '领料单号',
prop: 'lldjid',
span: 8,
type: 'input',
"required": true,
},
{
label: '出库单号',
prop: 'djid',
span: 8,
type: 'input',
// "required": true,
},
{
label: '出库日期',
prop: 'ywrq',
span: 8,
type: 'date',
value: new Date().getTime(),
"required": true,
},
{
"label": "仓库",
"prop": "ckid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
},
change: (row) => {
this.form.bgy = row.bgy
}
}
},
{
"label": "事务类型",
"prop": "swlxid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "kc/llck/init/swlx",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "领料部门",
"prop": "bmid",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/bm/query",
"match": {
"value": "id",
"label": "bmmc"
}
}
},
{
label: '领料人',
prop: 'llr',
// readonly:true,
span: 8,
type: 'input',
"required": true
},
{
label: '保管员',
prop: 'bgy',
span: 8,
type: 'input',
"required": true
},
{
label: '备注',
prop: 'bz',
span: 24,
type: 'input',
},
],
/* 从表编辑数据 */
editTableTitle: [{
title: "序号",
field: "xh",
width: 50,
align: "center"
},
{
title: "物料编号",
field: "wlcode",
width: 240,
},
{
title: "物料名称",
field: "wlmc",
width: 160
},
{
title: "规格",
field: "gg",
width: 140
},
{
title: "出库数量",
field: "cksl",
allowEdit: true,
type: 'inputNumber',
width: 200,
blur: toFixed(null),
},
{
title: "应发数量",
field: "yfsl"
},
{
title: "计量单位",
field: "jldwname",
width: 100,
allowEdit: false
},
{
title: "物料批号",
field: "wlph",
type: 'inputText',
width: 200,
show: JSON.parse(localStorage.getItem('isPhgl'))
},
{
show: JSON.parse(localStorage.getItem('isKwgl')),
title: "库位",
field: "kwid",
width: 240,
type: 'AuxInput',
typeConfig: {
isRequest: false,
"code": "KWWH",
"label": "kwName",
queryParams: (row) => {
return {
ckid: this.form.ckid
}
},
"transform": {
"value": "id",
"label": "name"
}
}
},
{
title: "备注",
field: "bz",
width: 200,
type: 'inputText',
allowEdit: true,
}
]
}
}
}
</script>
<style lang="scss" scoped>
@import url("~common/src/assets/styles/editDetail.scss");
</style>
src/views/ccgl/ckgl/ckdj/index.vue 0 → 100644
View file @ ee5d2f98
<template>
<BasePage :power="power"
:addRename='`选择领料单出库`' class="min_full" :config="config" >
<template #dialog="ctx" >
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx" >
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">示例按钮</el-button> -->
</template>
</BasePage>
</template>
<script>
import Edit from './edit.vue'
export default{
data(){
return{
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config:{
queryDetail: true,
/* 基本配置*/
url:'wms/ckgl/ckdj',
tableTitle: [
{"title": "出库单号", "field": "djid", "width": 140},
{"title": "出库日期", "field": "ywrq", fieldType: 'ftDate'},
{"title": "仓库", "field": "ckName", "width": 140},
{"title": "事务类型", "field": "swlxName", "width": 100},
{"title": "部门", "field": "bmName", "width": 130},
{"title": "经手人", "field": "jsr", "width": 120},
{"title": "保管员", "field": "bgy", "width": 120},
{"title": "领料单号", "field": "lldjid", "width": 140},
{"title": "备注", "field": "bz", "width": 220},
{"title": "维护人", "field": "whr"},
{"title": "维护时间", "field": "whsj", fieldType: 'ftDateTime'}
],
queryParams:[
[{
label: '出库日期',
startProp: "ywrqb",
endProp: "ywrqe",
span: 12,
type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
endValue: new Date().getTime(),
},
{
label: '出库单号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
{
"label": "仓库",
"prop": "ckid",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
}
]
],
/* 默认启停用 */
}
}
},
methods: {
/* 示例*/
// demo(basePage){
// }
},
components:{
Edit
}
}
</script>
<style>
</style>
src/views/ccgl/cxfx/pcxxcx/index.vue 0 → 100644
View file @ ee5d2f98
<template>
<BasePage ref="basePage" :power='power' class="min_full" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">示例按钮</el-button> -->
</template>
</BasePage>
</template>
<script>
export default {
data() {
return {
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'kc/wlph',
tableTitle: [
{
title: "物料编码",
field: "wlxxCode",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 140
},
{
title: "物料规格",
field: "wlxxGg",
width: 140
}
],
queryParams: [
[{
label: '物料信息',
prop: 'wlxxInfo',
span: 6,
type: 'input',
},
{
label: '物料批号',
prop: 'wlph',
span: 6,
type: 'input',
}
]
],
/* 默认启停用 */
showqt: false,
}
}
},
mounted() {
this.$post('jcsj/common/wlphsx/query',{}).then(res=>{
if(res.success){
console.log('wlphsx',res)
res.data.records.forEach(item=>{
let show=false
if(item.show=='Y'){
show=true
}else{
show=false
}
let pitem={
prop:item.field,
width:item.width||200,
label:item.name,
show:show
}
/* 解决页面复杂渲染过长导致偶尔Dom获取不到 */
setTimeout(()=>{
this.$refs.basePage.$refs.TablePager.newGridList.push(pitem)
},800)
})
}
})
},
methods: {
/* 示例*/
// demo(basePage){
// }
},
components: {
// Edit
}
}
</script>
<style>
</style>
src/views/ccgl/cxfx/sfhzcx/index.vue 0 → 100644
View file @ ee5d2f98
<template>
<BasePage ref="basePage" :power='power' class="min_full" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">示例按钮</el-button> -->
</template>
</BasePage>
</template>
<script>
export default {
data() {
return {
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'wms/cxfx/sfhzcx',
tableTitle: [{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "物料编码",
field: "wlxxCode",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 160
},
{
title: "规格",
field: "wlxxGg",
width: 140
},
{
title: "库位",
field: "kwName",
width: 140
},
{
title: "货主",
field: "hzName",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "计量单位",
field: "jldwname",
width: 80
},
{title: "期初结存数量（辅）", field: "fqcjcsl", width: 140, fieldType: 'float'},
{title: "本期入库数量（辅）", field: "fbqrksl", width: 140, fieldType: 'float'},
{title: "本期出库数量（辅）", field: "fbqcksl", width: 140, fieldType: 'float'},
],
queryParams: [
[{
label: '日期',
startProp: "start",
endProp: "end",
span: 8,
type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
endValue: new Date().getTime(),
},
{
"label": "仓库",
"prop": "ckid",
"span": 8,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "物料信息",
"prop": "wlxxInfo",
"span": 8,
"type": "input",
"value": "",
},
],
[
// {
// "label": "查询方式",
// "prop": "cxdx",
// "span": 8,
// "type": "RelSelect",
// "value": "",
// "typeConfig": {
// "src": "wms/cxfx/sfhzcx/cxfs/init",
// "match": {
// "value": "id",
// "label": "name"
// }
// },
// },
{
"label": "查询方式",
"prop": "cxdx",
"span": 8,
"type": "RelSelect",
"value": "",
"typeConfig": {
'hasValue':true,
'clearable':false,
"src": "wms/cxfx/sfhzcx/cxfs/init",
"match": {
"value": "id",
"label": "name"
},
onChange:(v)=>{
if(v){
let list=[]
if( v.id=="ck,wl"){
list=['wlph','zlh']
}else if(v.id=="wl,ph") {
list=['ckName','zlh']
}else if(v.id=="ck") {
list=['wlxxCode','wlxxName','wlph','jldwname','wlxxGg','zlh']
}else if(v.id=="wl") {
list=['ckName','wlph','zlh']
}
/* */
this.$refs.basePage.$refs.TablePager.newGridList.forEach(item=>{
if( list.includes(item.prop) ){
item.show=false
}else{
item.show=true
}
})
console.log(this.$refs.basePage.$refs.TablePager.newGridList)
// let tabList=
}
}
},
},
{
"label": "物料批号",
"prop": "wlph",
"span": 8,
"type": "input",
"value": "",
},
{
"label": "货主",
"prop": "hzInfo",
"span": 8,
"type": "input",
"value": "",
},
]
],
/* 默认启停用 */
}
}
},
methods: {
/* 示例*/
// demo(basePage){
// }
},
components: {
}
}
</script>
<style>
</style>
src/views/ccgl/rkgl/rkd/top/edit.vue
View file @ ee5d2f98
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</el-row> </el-row>
<div class="editTab"> <div class="editTab">
<editTableForEdit :indexApp='app' code='WMSWLXX' :type='type' @save='save' ref="editTableForEdit" <editTableForEdit :phsxTitle='false' :indexApp='app' code='WMSWLXX' :type='type' @save='save' ref="editTableForEdit"
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
:editTableData="formDetail"> :editTableData="formDetail">
<template v-if="type!='view'" #toolbar="ctx"> <template v-if="type!='view'" #toolbar="ctx">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<script> <script>
import { import {
toFixed, toFixed,
doRkdChange doLxwmsrkd
} from 'common/src/utils/blur.js' } from 'common/src/utils/blur.js'
import { import {
editMixin, editMixin,
...@@ -176,13 +176,6 @@ ...@@ -176,13 +176,6 @@
} }
} }
}, },
// {
// label: '入库人',
// prop: 'rkr',
// span: 8,
// type: 'input',
// "required": true,
// },
{ {
label: '货主', label: '货主',
prop: 'hzid', prop: 'hzid',
...@@ -261,7 +254,7 @@ ...@@ -261,7 +254,7 @@
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
type: 'inputText', type: 'inputInt',
width: 200, width: 200,
// show: JSON.parse(localStorage.getItem('isPhgl')) // show: JSON.parse(localStorage.getItem('isPhgl'))
}, },
...@@ -308,6 +301,36 @@ ...@@ -308,6 +301,36 @@
// }, // },
// show: JSON.parse(localStorage.getItem('isKwgl')), // show: JSON.parse(localStorage.getItem('isKwgl')),
// }, // },
{
title: "生产日期",
field: "wlphScrq",
type: 'inputDate',
width: 120,
allowEdit: true,
blur: toFixed(null),
change: row => doLxwmsrkd(row, 'wlphScrq')
},
{
title: "过期日期",
field: "wlphGqrq",
type: 'inputDate',
width: 120,
allowEdit: true
},
{
title: "检验日期",
field: "wlphJyrq",
type: 'inputDate',
width: 120,
allowEdit: true
},
{
title: "入库日期",
field: "wlphRkrq",
type: 'inputDate',
width: 120,
allowEdit: false
},
{ {
title: "备注", title: "备注",
field: "bz", field: "bz",
......
src/views/ccgl/rkgl/rkd/top/index.vue
View file @ ee5d2f98
...@@ -4,10 +4,12 @@ ...@@ -4,10 +4,12 @@
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">直接入库</el-button> -->
<ImportButton @success="()=>{ <ImportButton @success="()=>{
ctx.basePage.refresh() ctx.basePage.refresh()
}" :url="'/lxyl/rkgl/rktz/import'" /> }" :url="'/lxyl/rkgl/rktz/import'" />
<el-button style="margin-left: 10px;" @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button>
<el-button @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button>
</template> </template>
</BasePage> </BasePage>
...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
field: "gzzt", field: "gzzt",
width: 100, width: 100,
"transform": { "transform": {
"url": "lxyl/rkgl/rktz/init/gzzt", "url": "lxyl/common/init/gzzt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -185,6 +187,49 @@ ...@@ -185,6 +187,49 @@
methods: { methods: {
getRow(val){ getRow(val){
this.$emit('getRow',val) this.$emit('getRow',val)
},
qr(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
this.$confirm('是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res=>{
this.$post('lxyl/rkgl/rktz/confirm',{
id:ctx.singleItem.id
}).then(res=>{
if(res.success){
this.$success('操作成功')
ctx.refresh()
}
})
})
}else{
this.$warning('请选中一条数据进行操作')
}
},
qxqr(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
this.$confirm('是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res=>{
this.$post('lxyl/rkgl/rktz/unconfirm',{
id:ctx.singleItem.id
}).then(res=>{
if(res.success){
this.$success('操作成功')
ctx.refresh()
}
})
})
}else{
this.$warning('请选中一条数据进行操作')
}
} }
}, },
components: { components: {
......
src/views/ccgl/rkgl/rkdj/index.vue
View file @ ee5d2f98
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
field: "gzzt", field: "gzzt",
width: 100, width: 100,
"transform": { "transform": {
"url": "wms/rkgl/rkdj/init/gzzt", "url": "lxyl/common/init/gzzt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
......
vue.config.js
View file @ ee5d2f98
...@@ -39,8 +39,8 @@ module.exports = { ...@@ -39,8 +39,8 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.30.254:18080/dmg`, // target: `http://192.168.30.254:18080/dmg`,
// target: `http://192.168.30.254:28084/erp`, // target: `http://192.168.30.254:28084/erp`,
// target: `http://192.168.30.104:9080/lxyl`, target: `http://192.168.30.100:9080/lxyl`,
target: `http://localhost:9080/lxyl`, // target: `http://localhost:9080/lxyl`,
// target:'http://192.168.30.105:9081/erp', // target:'http://192.168.30.105:9081/erp',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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