Skip to content

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

退货url调整

parent 26ca87cd
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 116 deletions
src/views/ccgl/jcsj/hjwh/edit.vue
View file @ 6eff9865
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
{ {
"label": "仓库", "label": "仓库",
"prop": "ckid", "prop": "ckid",
"span": 6, "span": 12,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
......
src/views/ccgl/jcsj/hjwh/index.vue
View file @ 6eff9865
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
title: "编码", title: "编码",
field: "code", field: "code",
fieldType: "upper", fieldType: "upper",
width: 200 width: 120
}, },
{ {
title: "名称", title: "名称",
field: "name", field: "name",
width: 200 width: 160
}, },
// { // {
// title: "上货点X", // title: "上货点X",
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
// field: "xhclName", // field: "xhclName",
// width: 140 // width: 140
// }, // },
{ // {
title: "停用", // title: "停用",
field: "tybz", // field: "tybz",
fieldType: "tybz", // fieldType: "tybz",
width: 200 // width: 200
}, // },
{ {
title: "仓库", title: "仓库",
field: "ckName", field: "ckName",
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
title: "停用日期", title: "停用日期",
field: "tyrq", field: "tyrq",
fieldType: "ftDate", fieldType: "ftDate",
width: 200 // width: 200
}, },
{ {
title: "维护人", title: "维护人",
......
src/views/ccgl/thgl/ckth/mx.vue
View file @ 6eff9865
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/rkthtz/query/detail', url: 'lxyl/rkgl/ckthtz/query/detail',
queryUrl: 'lxyl/rkgl/rkthtz/query/detail', queryUrl: 'lxyl/rkgl/ckthtz/query/detail',
tableTitle: [{ tableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
field: "zt", field: "zt",
width: 120, width: 120,
"transform": { "transform": {
"url": "lxyl/rkgl/rkthtz/init/zt", "url": "lxyl/rkgl/ckthtz/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
......
src/views/ccgl/thgl/ckth/top/edit.vue
View file @ 6eff9865
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
"value": "", "value": "",
readonly: true, readonly: true,
"typeConfig": { "typeConfig": {
"src": "lxyl/rkgl/rkthtz/init/zt", "src": "lxyl/rkgl/ckthtz/init/zt",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "lxyl/rkgl/rkthtz/init/swlx", "src": "lxyl/rkgl/ckthtz/init/swlx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
......
src/views/ccgl/thgl/ckth/top/index.vue
View file @ 6eff9865
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!-- <ImportButton @success="()=>{ <!-- <ImportButton @success="()=>{
ctx.basePage.refresh() ctx.basePage.refresh()
}" :url="'/lxyl/rkgl/rkthtz/import'" /> }" :url="'/lxyl/rkgl/ckthtz/import'" />
<el-button style="margin-left: 10px;" @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button> <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> <el-button @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button>
<el-button @click="sapgz(ctx.basePage)" size='mini' type="primary">SAP过账</el-button> <el-button @click="sapgz(ctx.basePage)" size='mini' type="primary">SAP过账</el-button>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
config: { config: {
queryDetail: true, queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/rkthtz', url: 'lxyl/rkgl/ckthtz',
tableTitle: [{ tableTitle: [{
title: "状态", title: "状态",
field: "zt", field: "zt",
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
align: 'center', align: 'center',
width: 80, width: 80,
"transform": { "transform": {
"url": "lxyl/rkgl/rkthtz/init/zt", "url": "lxyl/rkgl/ckthtz/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
field: "djly", field: "djly",
width: 140, width: 140,
"transform": { "transform": {
"url": "lxyl/rkgl/rkthtz/init/djly", "url": "lxyl/rkgl/ckthtz/init/djly",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
span: 8, span: 8,
type: 'RelSelect', type: 'RelSelect',
typeConfig: { typeConfig: {
src: 'lxyl/rkgl/rkthtz/init/zt' src: 'lxyl/rkgl/ckthtz/init/zt'
} }
}, },
{ {
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
span: 8, span: 8,
type: 'RelSelect', type: 'RelSelect',
typeConfig: { typeConfig: {
src: 'lxyl/rkgl/rkthtz/init/swlx' src: 'lxyl/rkgl/ckthtz/init/swlx'
} }
}, },
{ {
......
src/views/ccgl/thgl/rkth/ckdmx.vue
View file @ 6eff9865
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/ckthtz/query/detail', url: 'lxyl/rkgl/rkthtz/query/detail',
queryUrl: 'lxyl/rkgl/ckthtz/query/detail', queryUrl: 'lxyl/rkgl/rkthtz/query/detail',
tableTitle: [{ tableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
field: "zt", field: "zt",
width: 100, width: 100,
"transform": { "transform": {
"url": "lxyl/rkgl/ckthtz/init/zt", "url": "lxyl/rkgl/rkthtz/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
......
src/views/ccgl/thgl/rkth/top/akck.vue
View file @ 6eff9865
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "lxyl/rkgl/ckthtz/init/swlx", "src": "lxyl/rkgl/rkthtz/init/swlx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
......
src/views/ccgl/thgl/rkth/top/edit.vue
View file @ 6eff9865
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<RelDialog bigTitle detailTable='RKTHTZMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp' <RelDialog bigTitle detailTable='RKTHTZMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
:app='app' :buttonApp='buttonApp'> :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">
<Kc @save='kcSave' v-if="showDialog" :app='this' />
<el-row :gutter="20" :app="this" class="editRow"> <el-row :gutter="20" :app="this" class="editRow">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <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" v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
...@@ -10,15 +11,23 @@ ...@@ -10,15 +11,23 @@
</el-row> </el-row>
<div class="editTab"> <div class="editTab">
<editTableForEdit code='WMSWLXX' :indexApp='app' :type='type' @save='save' ref="editTableForEdit" <editTableForEdit :AuxButton='false' code='WMSWLXX' :indexApp='app' :type='type' @save='save'
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' ref="editTableForEdit" :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
:editTableData="formDetail" /> :editTableData="formDetail">
<template #toolbar="ctx">
<el-button @click="xzkc(ctx.basePage)" size='mini' type="primary">选择库存</el-button>
<!-- <AuxButton :queryParams="{
ckid:form.ckid
}" rename='选择库存' code='WLKC' @save="savekc" /> -->
</template>
</editTableForEdit>
</div> </div>
<el-row :gutter="20" :app="this" class="editRow bottomInfo"> <el-row :gutter="20" :app="this" class="editRow bottomInfo">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <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" 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' :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
:rule="item.rule" />
<!-- 额外数据 --> <!-- 额外数据 -->
</el-row> </el-row>
</el-form> </el-form>
...@@ -27,6 +36,7 @@ ...@@ -27,6 +36,7 @@
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import Kc from './kc.vue'
import { import {
toFixed, toFixed,
doRkdChange doRkdChange
...@@ -39,34 +49,62 @@ ...@@ -39,34 +49,62 @@
export default { export default {
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
methods: { methods: {
kcSave(obj) {
let {
list
} = obj
this.form.ckid = list[0].ckid
this.form.hzid = list[0].hzid
this.form.hzName = list[0].hzName
// this.form.ywrq=row.ywrq
let length = this.formDetail.length
this.formDetail.splice(0, length)
list.forEach(item => {
item.sl = 0
delete item.id
this.formDetail.push(_.cloneDeep(item))
})
},
xzkc() {
this.showDialog = true
},
/* 需要整体row时的回调 */ /* 需要整体row时的回调 */
computedRow(row) { computedRow(row) {
// this.$refs.editTableForEdit.$forceUpdate() // this.$refs.editTableForEdit.$forceUpdate()
}, },
/* 选择list时的回调 */ /* 选择list时的回调 */
save(list) { // save(list) {
list.forEach(item => { // list.forEach(item => {
// 转换并且push // // 转换并且push
item.wlid = item.id // item.wlid = item.id
item.wlxxName = item.name // item.wlxxName = item.name
item.wlxxCode = item.code // item.wlxxCode = item.code
item.wlxxGg = item.gg // item.wlxxGg = item.gg
item.sl = 0 // item.sl = 0
item.xqrq = new Date().getTime() // item.xqrq = new Date().getTime()
delete item.id // delete item.id
this.formDetail.push(_.cloneDeep(item)) // this.formDetail.push(_.cloneDeep(item))
}) // })
} // }
},
components: {
Kc
}, },
data() { data() {
return { return {
form:{ form: {
djly:'M' djly: 'KC'
}, },
DialogWidth: '70vw',
DialogName: '',
DialogTitle: '选择库存',
showDialog: false,
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '单号', label: '出库单号',
prop: 'djid', prop: 'djid',
span: 8, span: 8,
type: 'input', type: 'input',
...@@ -86,6 +124,7 @@ ...@@ -86,6 +124,7 @@
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"required": true, "required": true,
readonly:true,
"typeConfig": { "typeConfig": {
"src": "jcsj/common/ck/queryCkid", "src": "jcsj/common/ck/queryCkid",
"match": { "match": {
...@@ -102,7 +141,7 @@ ...@@ -102,7 +141,7 @@
"value": "", "value": "",
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "lxyl/rkgl/ckthtz/init/swlx", "src": "lxyl/rkgl/rkthtz/init/swlx",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
...@@ -126,6 +165,7 @@ ...@@ -126,6 +165,7 @@
}, },
{ {
label: '货主', label: '货主',
readonly: true,
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
...@@ -162,23 +202,6 @@ ...@@ -162,23 +202,6 @@
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
width: 240, width: 240,
type: 'AuxInput',
typeConfig: {
"code": "MATERIAL",
"label": "wlxxCode",
"transform": {
"value": "code",
"label": "code"
},
give(data) {
this.form.wlid = data.id
this.form.wlxxName = data.name
this.form.wlxxCode = data.code
this.form.wlxxGg = data.gg
}
}
}, },
{ {
title: "物料名称", title: "物料名称",
...@@ -201,53 +224,53 @@ ...@@ -201,53 +224,53 @@
field: "zlh", field: "zlh",
type: 'inputText', type: 'inputText',
width: 180, width: 180,
allowEdit: true allowEdit: false
}, },
{ {
title: "数量", title: "数量",
field: "sl", field: "sl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200, // width: 200,
blur: toFixed(null), blur: toFixed(null),
}, },
/* 不可编辑*/ /* 不可编辑*/
{
title: "库存数量",
field: "kcsl",
width: 200,
},
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
type: 'inputText', type: 'inputText',
allowEdit: false,
width: 180, width: 180,
show: JSON.parse(localStorage.getItem('isPhgl'))
}, },
{ {
title: "库位", title: "库位",
field: "kwid", field: "kwName",
width: 240, width: 240,
type: 'AuxInput',
typeConfig: {
isRequest: false,
"code": "KWWH",
"label": "kwName",
queryParams: (row) => {
return {
ckid: this.form.ckid
}
},
"transform": {
"value": "id",
"label": "name"
}
}, },
show: JSON.parse(localStorage.getItem('isKwgl')), {
title: "容器",
field: "rqCode",
width: 160,
}, },
{ {
title: "备注", title: "唯一码",
field: "bz", field: "packCode",
width: 200, width: 160,
type: 'inputText',
allowEdit: true },
} // {
// title: "备注",
// field: "bz",
// width: 200,
// type: 'inputText',
// allowEdit: true
// }
......
src/views/ccgl/thgl/rkth/top/index.vue
View file @ 6eff9865
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
config: { config: {
queryDetail:true, queryDetail:true,
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/rkgl/ckthtz', url: 'lxyl/rkgl/rkthtz',
tableTitle: [ tableTitle: [
{ {
title: "状态", title: "状态",
field: "zt", field: "zt",
width: 80, width: 80,
"transform": { "transform": {
"url": "lxyl/rkgl/ckthtz/init/zt", "url": "lxyl/rkgl/rkthtz/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
// field: "djly", // field: "djly",
// width: 140, // width: 140,
// "transform": { // "transform": {
// "url": "lxyl/rkgl/ckthtz/init/djly", // "url": "lxyl/rkgl/rkthtz/init/djly",
// "label": "name", // "label": "name",
// "value": "id" // "value": "id"
// } // }
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
// field: "djly", // field: "djly",
// width: 140, // width: 140,
// "transform": { // "transform": {
// "url": "lxyl/rkgl/ckthtz/init/djly", // "url": "lxyl/rkgl/rkthtz/init/djly",
// "label": "name", // "label": "name",
// "value": "id" // "value": "id"
// } // }
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
span: 6, span: 6,
type: 'RelSelect', type: 'RelSelect',
typeConfig: { typeConfig: {
src: 'lxyl/rkgl/ckthtz/init/zt' src: 'lxyl/rkgl/rkthtz/init/zt'
} }
} }
] ]
......
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