Skip to content

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

3.6修改

parent 5d51c8f0
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 144 deletions
src/views/ccgl/ckgl/bldj/top/index.vue
View file @ 73559040
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
// } // }
// }, // },
{ {
title: "维护人", title: "责任人",
field: "zrrName", field: "zrrName",
width:160 width:160
}, },
......
src/views/ccgl/ckgl/ckd/top/kc.vue
View file @ 73559040
...@@ -122,7 +122,8 @@ ...@@ -122,7 +122,8 @@
], ],
queryParams: [ queryParams: [
[{ [
{
label: '物料信息', label: '物料信息',
prop: 'wlinfo', prop: 'wlinfo',
span: 6, span: 6,
...@@ -142,7 +143,21 @@ ...@@ -142,7 +143,21 @@
"label": "name" "label": "name"
} }
} }
} },
{
label: '容器编码',
prop: 'rqCode',
span: 6,
type: 'input',
value: ''
},
{
label: '托盘编码',
prop: 'tpCode',
span: 6,
type: 'input',
value: ''
},
] ]
], ],
......
src/views/ccgl/rkgl/rkd/top/edit.vue
View file @ 73559040
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
type: 'AuxInput', type: 'AuxInput',
// required: true, required: true,
typeConfig: { typeConfig: {
isRequest: true, isRequest: true,
code: 'HZID', code: 'HZID',
......
src/views/ccgl/rkgl/sjrw/top/edit.vue
View file @ 73559040
...@@ -11,21 +11,20 @@ ...@@ -11,21 +11,20 @@
</el-row> </el-row>
<div class="editTab"> <div class="editTab">
<editTableForEdit :AuxButton='false' :indexApp='app' :type='type' ref="editTableForEdit" <editTableForEdit :expandTitle='false' :phsxTitle='false' :AuxButton='false' :indexApp='app' :type='type'
:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow' ref="editTableForEdit" :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">
<el-button @click="xzrkqd" size="mini" style="display: inline-block;margin-right: 10px;" <el-button @click="xzrkqd" size="mini" style="display: inline-block;margin-right: 10px;"
type="primary">选择入库清单</el-button> type="primary">选择入库清单</el-button>
</template> </template>
</editTableForEdit> </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>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import { import {
toFixed, toFixed,
doRkdChange doRkdChange
...@@ -42,10 +40,10 @@ ...@@ -42,10 +40,10 @@
editMixin, editMixin,
editMixin_expand editMixin_expand
} from 'common' } from 'common'
import Xzrkqd from './xzrkqd.vue' import Xzrkqd from './xzrkqd.vue'
export default { export default {
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
components:{ components: {
Xzrkqd Xzrkqd
}, },
mounted() { mounted() {
...@@ -53,51 +51,54 @@ ...@@ -53,51 +51,54 @@
// this.form.sjrid=this.userid // this.form.sjrid=this.userid
}, },
methods: { methods: {
getFormDetail(){ getFormDetail() {
if(this.type!='add'){ if (this.type != 'add') {
/* 1.@getFormDetail='getFormDetail' 存在触发时生效 */ /* 1.@getFormDetail='getFormDetail' 存在触发时生效 */
/* 2.适配 EditTableForEdit 组件*/ /* 2.适配 EditTableForEdit 组件*/
/* 当编辑页面打开不是add时查询从表 主动赋值 */ /* 当编辑页面打开不是add时查询从表 主动赋值 */
this.$refs.editTableForEdit.editTableConfig['editTableData']=this.formDetail||[] this.$refs.editTableForEdit.editTableConfig['editTableData'] = this.formDetail || []
}
if(this.type=='copy'){
this.formDetail.forEach(item=>item.kwid='')
}
},
xzrkqdSave(obj){
let {list,row}=obj
if(list&&list[0]&&list[0].kqid){
this.form.kqid=list[0].kqid
} }
this.form.swlxid=row.swlxid if (this.type == 'copy') {
this.form.lydjid=row.id this.formDetail.forEach(item => item.kwid = '')
this.form.ckid=row.ckid }
this.form.rktzDjid=row.djid },
this.form.hzid=row.hzid xzrkqdSave(obj) {
this.form.hzName=row.hzName let {
list,
row
} = obj
if (list && list[0] && list[0].kqid) {
this.form.kqid = list[0].kqid
}
this.form.swlxid = row.swlxid
this.form.lydjid = row.id
this.form.ckid = row.ckid
this.form.rktzDjid = row.djid
this.form.hzid = row.hzid
this.form.hzName = row.hzName
// this.form.ywrq=row.ywrq // this.form.ywrq=row.ywrq
let length = this.formDetail.length let length = this.formDetail.length
this.formDetail.splice(0, length) this.formDetail.splice(0, length)
list.forEach(item => { list.forEach(item => {
item.lydjid = item.id item.lydjid = item.id
item.sjsl=item.yssl item.sjsl = item.yssl
delete item.id delete item.id
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item))
}) })
// 回填上架人 // 回填上架人
this.$post('lxyl/rkgl/sjtz/default/sjr',{ this.$post('lxyl/rkgl/sjtz/default/sjr', {
ckid:row.ckid, ckid: row.ckid,
hzid:list[0].hzid, hzid: list[0].hzid,
wlid:list[0].wlid, wlid: list[0].wlid,
}).then(res=>{ }).then(res => {
if(res.success){ if (res.success) {
this.form.sjrName=res.data.records.username this.form.sjrName = res.data.records.username
this.form.sjrid=res.data.records.id this.form.sjrid = res.data.records.id
} }
}) })
}, },
xzrkqd(){ xzrkqd() {
this.showDialog=true this.showDialog = true
}, },
/* 需要整体row时的回调 */ /* 需要整体row时的回调 */
computedRow(row) { computedRow(row) {
...@@ -108,20 +109,19 @@ ...@@ -108,20 +109,19 @@
}, },
data() { data() {
return { return {
editColItemList2:[ editColItemList2: [{
{
"label": "状态", "label": "状态",
"prop": "zt", "prop": "zt",
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
readonly:true, readonly: true,
"typeConfig": { "typeConfig": {
"src": "wms/rkgl/sjtz/init/zt", "src": "wms/rkgl/sjtz/init/zt",
"match": { "match": {
"value": "id", "value": "id",
"label": "name" "label": "name"
} }
} }
}, },
{ {
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
prop: 'whr', prop: 'whr',
type: 'input', type: 'input',
span: 8, span: 8,
readonly:true, readonly: true,
}, },
{ {
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
prop: 'whsj', prop: 'whsj',
span: 8, span: 8,
type: 'datetime', type: 'datetime',
readonly:true, readonly: true,
value:new Date().getTime() value: new Date().getTime()
} }
], ],
/* dialog*/ /* dialog*/
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
readonly:(this.type=='edit'||this.type=='view')?true:false,
"required": true, "required": true,
"typeConfig": { "typeConfig": {
"src": "jcsj/common/ck/queryCkid", "src": "jcsj/common/ck/queryCkid",
...@@ -171,22 +172,23 @@ ...@@ -171,22 +172,23 @@
} }
}, },
{ {
"label": "库区", "label": "库区",
"prop": "kqid", "prop": "kqid",
"span": 8, "span": 8,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
// "required": true, readonly:(this.type=='edit'||this.type=='view')?true:false,
"typeConfig": { // "required": true,
"src": "wms/jcsj/kq/query", "typeConfig": {
"match": { "src": "wms/jcsj/kq/query",
"value": "id", "match": {
"label": "name" "value": "id",
}, "label": "name"
linkage: true, },
linkParams: ['ckid'] linkage: true,
} linkParams: ['ckid']
}, }
},
{ {
"label": "事务类型", "label": "事务类型",
"prop": "swlxid", "prop": "swlxid",
...@@ -194,6 +196,7 @@ ...@@ -194,6 +196,7 @@
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"required": true, "required": true,
readonly:(this.type=='edit'||this.type=='view')?true:false,
"typeConfig": { "typeConfig": {
"src": "wms/rkgl/sjtz/init/swlx", "src": "wms/rkgl/sjtz/init/swlx",
"match": { "match": {
...@@ -231,38 +234,40 @@ ...@@ -231,38 +234,40 @@
"required": true, "required": true,
type: 'AuxInput', type: 'AuxInput',
typeConfig: { typeConfig: {
code: 'USER', code: 'USER',
label: 'sjrName', label: 'sjrName',
transform: { transform: {
value: 'id', value: 'id',
label: 'username' label: 'username'
} }
}, },
}, },
{ {
label: '货主', label: '货主',
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
type: 'AuxInput', type: 'AuxInput',
typeConfig: { readonly:(this.type=='edit'||this.type=='view')?true:false,
isRequest: true, typeConfig: {
code: 'HZID', isRequest: true,
label: 'hzName', code: 'HZID',
transform: { label: 'hzName',
value: 'id', transform: {
label: 'name' value: 'id',
} label: 'name'
} }
}, }
{ },
label: '来源单据', {
prop: 'rktzDjid', label: '来源单据',
span: 8, prop: 'rktzDjid',
readonly:true, readonly:(this.type=='edit'||this.type=='view')?true:false,
type: 'input', span: 8,
}, readonly: true,
type: 'input',
},
// { // {
// label: '单据来源', // label: '单据来源',
// prop: 'djlyName', // prop: 'djlyName',
...@@ -280,46 +285,46 @@ ...@@ -280,46 +285,46 @@
], ],
/* 从表编辑数据 */ /* 从表编辑数据 */
editTableTitle: [{ editTableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
fieldType: "upper", fieldType: "upper",
width: 140 width: 140
}, },
{ {
title: "物料名称", title: "物料名称",
field: "wlxxName", field: "wlxxName",
width: 140 width: 140
}, },
{ {
title: "物料规格", title: "物料规格",
field: "wlxxGg", field: "wlxxGg",
width: 140 width: 140
}, },
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
width: 180, width: 180,
}, },
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
width: 180 width: 180
}, },
{ {
title: "上架数量", title: "上架数量",
field: "sjsl", field: "sjsl",
width: 100, width: 100,
}, },
{ {
title: "唯一码", title: "唯一码",
field: "packCode", field: "packCode",
width: 240, width: 240,
}, },
{ {
title: "容器", title: "容器",
field: "rqCode", field: "rqCode",
width: 100, width: 100,
}, },
] ]
} }
} }
......
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