Skip to content

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

1

parent 3ced8ec4
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 220 deletions
src/views/ccgl/kngl/zlhbg/index.vue
View file @ b6e40a2d
...@@ -8,12 +8,9 @@ ...@@ -8,12 +8,9 @@
<div class="bottom flex"> <div class="bottom flex">
<div class="full" > <div class="full" >
<el-tabs class="full" v-model="activeName" > <el-tabs class="full" v-model="activeName" >
<el-tab-pane class="full" label="入库单明细" name="first"> <el-tab-pane class="full" label="明细" name="first">
<Mx ref="mx" class="full" /> <Mx ref="mx" class="full" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane class="full" label="入库清单" name="second">
<Rkqd ref="rkqd" class="full" />
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -26,12 +23,11 @@ ...@@ -26,12 +23,11 @@
<script> <script>
import Top from './top/index.vue' import Top from './top/index.vue'
import Mx from './mx.vue' import Mx from './mx.vue'
import Rkqd from './rkqd.vue'
export default { export default {
components: { components: {
Top, Top,
Mx, Mx,
Rkqd
}, },
data(){ data(){
return{ return{
...@@ -46,10 +42,7 @@ ...@@ -46,10 +42,7 @@
this.$refs.mx.$refs.basePage.$refs['TablePager'].pageQuery({ this.$refs.mx.$refs.basePage.$refs['TablePager'].pageQuery({
setFirstCurrent: true setFirstCurrent: true
}) })
this.$refs.rkqd.$refs.basePage.queryParams.mid = mid
this.$refs.rkqd.$refs.basePage.$refs['TablePager'].pageQuery({
setFirstCurrent: true
})
}, },
......
src/views/ccgl/kngl/zlhbg/rkqd.vue deleted 100644 → 0
View file @ 3ced8ec4
<template>
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full"
style="height: 100%;border-top: 0px;" :autoQuery='false' :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
</template>
</BasePage>
</template>
<script>
export default {
mounted() {
},
data() {
return {
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'wms/rkgl/rktz',
queryUrl: 'wms/rkgl/rktz/query/rkqd',
tableTitle: [{
title: "物料编码",
field: "wlxxCode",
fieldType: "upper",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 140
},
{
title: "物料规格",
field: "wlxxGg",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 120,
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "应收数量",
field: "yssl",
width: 100,
},
{
title: "唯一码",
field: "packCode",
width: 240,
},
{
title: "容器",
field: "rqCode",
width: 100,
},
{
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/dbrk/init/zt",
"label": "name",
"value": "id"
}
}
],
queryParams: [],
}
}
},
methods: {
getRow(val) {
this.$emit('getRow', val)
},
demo(ctx) {
if (ctx.singleItem && ctx.singleItem.id) {
console.log(ctx.singleItem)
} else {
this.$warning('请选中一条数据')
}
}
},
components: {
}
}
</script>
<style>
</style>
src/views/ccgl/kngl/zlhbg/top/edit.vue
View file @ b6e40a2d
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
</editTableForEdit> </editTableForEdit>
</div> </div>
<el-row :gutter="20" :app="this" class="editRow bottomInfo">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
v-for="(item,index) in editColItemList2 " :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 class="bottomInfo" :gutter="20"> <!-- <el-row class="bottomInfo" :gutter="20">
<el-col class="center" :span="12"> <el-col class="center" :span="12">
创建人:{{ 创建人:{{
...@@ -79,56 +72,21 @@ ...@@ -79,56 +72,21 @@
} }
}, },
mounted() { mounted() {
this.$nextTick(()=>{
this.form.whr=this.username
this.form.rkr=this.username
})
}, },
data() { data() {
return { return {
editColItemList2:[
{
"label": "状态",
"prop": "zt",
"span": 8,
"type": "RelSelect",
"value": "",
readonly:true,
"typeConfig": {
"src": "wms/rkgl/rktz/init/zt",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '维护人',
prop: 'whr',
type: 'input',
span: 8,
readonly:true,
},
{
label: '维护时间',
prop: 'whsj',
span: 8,
type: 'datetime',
readonly:true,
value:new Date().getTime()
}
],
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '入库单号', label: '变更单号',
prop: 'djid', prop: 'djid',
span: 8, span: 8,
type: 'input', type: 'input',
}, },
{ {
label: '入库日期', label: '变更日期',
prop: 'ywrq', prop: 'ywrq',
span: 8, span: 8,
type: 'date', type: 'date',
...@@ -136,56 +94,19 @@ ...@@ -136,56 +94,19 @@
"required": true, "required": true,
}, },
{ {
"label": "仓库", "label": "SAP变更类型",
"prop": "ckid", "prop": "bglx",
"span": 8,
"type": "RelSelect",
"value": "",
"required": true,
"typeConfig": {
"src": "jcsj/common/ck/queryCkid",
"match": {
"value": "id",
"label": "name"
}
}
},
{
"label": "事务类型",
"prop": "swlxid",
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "wms/rkgl/rktz/init/swlx", "src": "lxyl/kcgl/zlhbg/init/sapbglx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "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: 'rkr',
span: 8,
type: 'input',
"required": true,
}, },
{ {
label: '备注', label: '备注',
......
src/views/ccgl/rkgl/mpzy/top/edit.vue
View file @ b6e40a2d
...@@ -151,6 +151,13 @@ ...@@ -151,6 +151,13 @@
editColItemList: [ editColItemList: [
/* 入库单 辅助输入 关联入库单*/ /* 入库单 辅助输入 关联入库单*/
{ {
// readonly:()=>{
// if(this.formDetail.length==0){
// return false
// }else{
// return true
// }
// },
label: '入库单', label: '入库单',
"required": true, "required": true,
prop: 'lydjid', prop: 'lydjid',
...@@ -166,7 +173,7 @@ ...@@ -166,7 +173,7 @@
}, },
give(row){ give(row){
for (var key in this.form) { for (var key in this.form) {
key != 'id'&& key != 'djid' && key != 'djly' && (() => { key != 'ywrq'&&key != 'zt'&&key != 'id'&& key != 'djid' && key != 'djly' && (() => {
row[key] && (this.form[key] = row[key]) row[key] && (this.form[key] = row[key])
})() })()
} }
...@@ -193,6 +200,7 @@ ...@@ -193,6 +200,7 @@
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
readonly:true,
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "jcsj/common/ck/queryCkid", "src": "jcsj/common/ck/queryCkid",
...@@ -204,6 +212,7 @@ ...@@ -204,6 +212,7 @@
}, },
{ {
readonly:true,
"label": "事务类型", "label": "事务类型",
"prop": "swlxid", "prop": "swlxid",
"span": 8, "span": 8,
...@@ -219,6 +228,7 @@ ...@@ -219,6 +228,7 @@
} }
}, },
{ {
readonly:true,
"label": "部门", "label": "部门",
"prop": "bmid", "prop": "bmid",
"span": 8, "span": 8,
......
src/views/ccgl/rkgl/mpzy/top/mp.vue
View file @ b6e40a2d
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
label:'packCode', label:'packCode',
value:'packid' value:'packid'
}" :queryParams='{ }" :queryParams='{
id:app.app.singleItem.id id:form.lydjid
}' code='WMSBZGLMXMPZY' :form='form' /> }' code='WMSBZGLMXMPZY' :form='form' />
</div> </div>
</el-col> </el-col>
......
vue.config.js
View file @ b6e40a2d
...@@ -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.111:9080/lxyl`, // target: `http://192.168.30.111: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