Commit ac245f8c authored by 李苏's avatar 李苏 💬

adjust some function

parent 3e84d37c
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<!-- <el-button @click="zb(ctx.basePage)" size='mini' type="primary">装包</el-button> --> <el-button @click="mpwc(ctx.basePage)" size='mini' type="primary">完成</el-button>
<!-- <el-button @click="cb(ctx.basePage)" size='mini' type="primary">调整</el-button> --> <el-button @click="qxwc(ctx.basePage)" size='mini' type="primary">取消完成</el-button>
</template> </template>
</BasePage> </BasePage>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
/* 手动控制删除 */ /* 手动控制删除 */
delButton: false, delButton: false,
/* 手动控制编辑按钮权限 */ /* 手动控制编辑按钮权限 */
editButton: false, editButton: true,
/* 是否渲染右侧操作按钮 */ /* 是否渲染右侧操作按钮 */
operateButtons: false, operateButtons: false,
/* 是否开启工作流按钮 */ /* 是否开启工作流按钮 */
...@@ -160,6 +160,38 @@ ...@@ -160,6 +160,38 @@
}, },
methods: { methods: {
qxwc(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
this.$post('wms/kcgl/bzdj/cancelComplete',{
id:ctx.singleItem.id
}).then(res=>{
if(res.success){
this.$success('操作成功')
ctx.refresh()
}
})
}else{
this.warning('请选中一条数据')
}
},
mpwc(ctx){
if(ctx.singleItem&&ctx.singleItem.id){
this.$post('wms/kcgl/bzdj/complete',{
id:ctx.singleItem.id
}).then(res=>{
if(res.success){
this.$success('操作成功')
ctx.refresh()
}
})
}else{
this.warning('请选中一条数据')
}
},
getRow(val) { getRow(val) {
this.$emit('getRow', val) this.$emit('getRow', val)
}, },
......
...@@ -11,33 +11,32 @@ ...@@ -11,33 +11,32 @@
</el-row> </el-row>
<div class="editTab"> <div class="editTab">
<editTableForEdit :AuxButton='false' 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"> <template #toolbar="ctx">
<el-button @click="xzkc(ctx.basePage)" size='mini' type="primary">选择库存</el-button> <el-button @click="xzkc(ctx.basePage)" size='mini' type="primary">选择库存</el-button>
<!-- <AuxButton :queryParams="{ <!-- <AuxButton :queryParams="{
ckid:form.ckid ckid:form.ckid
}" rename='选择库存' code='WLKC' @save="savekc" /> --> }" rename='选择库存' code='WLKC' @save="savekc" /> -->
</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>
<!-- editTab数据 --> <!-- editTab数据 -->
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import Kc from './kc.vue' import Kc from './kc.vue'
import { import {
toFixed, toFixed,
doRkdChange doRkdChange
...@@ -50,58 +49,59 @@ ...@@ -50,58 +49,59 @@
export default { export default {
mixins: [editMixin, editMixin_expand], mixins: [editMixin, editMixin_expand],
methods: { methods: {
kcSave(obj){ kcSave(obj) {
let {list}=obj let {
list
} = obj
this.form.ckid=list[0].ckid this.form.ckid = list[0].ckid
this.form.hzid=list[0].hzid this.form.hzid = list[0].hzid
this.form.hzName=list[0].hzName this.form.hzName = list[0].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.bcsl=item.kcsl item.sl = 0
item.lydjid = item.id
delete item.id delete item.id
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item))
}) })
}, },
xzkc(){ xzkc() {
this.showDialog=true 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:{ components: {
Kc Kc
}, },
data() { data() {
return { return {
form:{ form: {
djly:'KC' djly: 'KC'
}, },
DialogWidth: '70vw', DialogWidth: '70vw',
DialogName: '', DialogName: '',
DialogTitle: '选择库存', DialogTitle: '选择库存',
showDialog:false, showDialog: false,
/* 常规edit数据 */ /* 常规edit数据 */
editColItemList: [{ editColItemList: [{
label: '出库单号', label: '出库单号',
...@@ -164,22 +164,22 @@ ...@@ -164,22 +164,22 @@
} }
}, },
{ {
label: '货主', label: '货主',
readonly:true, readonly: true,
prop: 'hzid', prop: 'hzid',
span: 8, span: 8,
required: true, required: true,
type: 'AuxInput', type: 'AuxInput',
typeConfig: { typeConfig: {
isRequest: true, isRequest: true,
code: 'HZID', code: 'HZID',
label: 'hzName', label: 'hzName',
transform: { transform: {
value: 'id', value: 'id',
label: 'name' label: 'name'
} }
} }
}, },
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
field: "sl", field: "sl",
allowEdit: true, allowEdit: true,
type: 'inputNumber', type: 'inputNumber',
width: 200, // width: 200,
blur: toFixed(null), blur: toFixed(null),
}, },
/* 不可编辑*/ /* 不可编辑*/
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
type: 'inputText', type: 'inputText',
allowEdit: false, allowEdit: false,
width: 180, width: 180,
}, },
{ {
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
}, },
data() { data() {
return { return {
power: { power: {
add: false, add: false,
copy: false, copy: false,
...@@ -53,8 +52,8 @@ ...@@ -53,8 +52,8 @@
}, },
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'wms/ckgl/dbck/query/kc', url: 'lxyl/ckgl/cktz/query/kc',
queryUrl:'wms/ckgl/dbck/query/kc', queryUrl:'lxyl/ckgl/cktz/query/kc',
tableTitle: [{ tableTitle: [{
title: "库位", title: "库位",
field: "kwName", field: "kwName",
......
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