diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index afd91e04..2a55d89d 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -468,6 +468,26 @@ > + + + + + + + - + {{ item.name }} - {{item.code}} + {{ item.code }} @@ -729,14 +733,13 @@ export default { this.getResultDetailList(); }, findFromInvList(val) { - let cQuery = { - }; + let cQuery = {}; selectCorpList(cQuery) - .then((response) => { - this.fromInvOptions = response.data || []; - }) - .catch(() => { - }); + .then((response) => { + this.fromInvOptions = response.data || []; + }) + .catch(() => { + }); }, getResultDetailList() { if (isBlank(this.currentRow.billNo)) { diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue index 36a97b55..ed68ed0c 100644 --- a/src/views/inout/DialogSelectRl.vue +++ b/src/views/inout/DialogSelectRl.vue @@ -573,6 +573,7 @@ export default { path: "", }); this.filterQuery = { + udiCode: null, nameCode: null, unitFk: null, page: 1, @@ -582,6 +583,7 @@ export default { }, getList() { this.loading = true; + this.filterQuery.udiCode = this.curRow.code; this.filterQuery.nameCode = this.curRow.nameCode; this.filterQuery.bindRlIds = this.curRow.bindRlIds; this.filterQuery.unitFk = this.fromCorp; @@ -710,10 +712,8 @@ export default { } , bindId(val) { - if (this.curRow.code != null || this.type == 1) { this.$emit("selectBindRl", val); - // this.$emit("closeBindDialog", true); } else { let query = { id: this.curRow.id, diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index 4d20ff2f..2ceb8074 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -150,6 +150,7 @@ :data="thisData" :pId="pId" :purType="1" + :codeArray="codeArray" > diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue index 6e81403f..a9789af1 100644 --- a/src/views/purchase/purApply/purOrderSelectProduct.vue +++ b/src/views/purchase/purApply/purOrderSelectProduct.vue @@ -75,14 +75,14 @@ - + @@ -164,6 +164,10 @@ export default { type: Object, required: true, }, + codeArray: { + type: Object, + required: true, + }, }, data() {