diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index d0dd60c..e301a67 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -16,15 +16,15 @@
v-if="curAction.checkWebNew != 2 || viewType !=1"
>立即提交
- 待配货提交
-
+
+
+
+
- 未配货提交
-
+
+
+
+
@@ -235,7 +235,23 @@
editType="1">
-
+
+
+
+
@@ -249,7 +265,7 @@ import {parseTime} from "../../utils/coTools";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import editCodeDialog from "./DialogEditCode";
-
+import selectRlDialog from "./DialogSelectRl";
import codesPanel from "./PanelCreateOrderCodes"
import codeDetailPanel from "./PanelCreateOrderCodeDetail"
import bizDetailPanel from "./PanelCreateOrderBizDetail"
@@ -337,6 +353,7 @@ export default {
{required: true, message: "请选择单据类型", trigger: "change"}
],
},
+ selectRlVisible: false,
isScan: true,
scanText: "扫码录入:",
corpOrderIdDisabled: false,
@@ -367,7 +384,7 @@ export default {
};
},
components: {
- codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
+ codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog, selectRlDialog
},
methods: {
//获取用户仓库列表
@@ -596,6 +613,15 @@ export default {
this.refreshCodesPanel();
this.$message.error(response.message);
this.selectRlTitle = response.message;
+ //判断是出库需要选择供应商的时候把供应商值传过去
+ if (tQuery.selectSupId != null) {
+ this.codeFormData.selectSupId = tQuery.selectSupId
+ } else {
+ this.codeFormData.selectSupId = false
+ }
+ //DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
+ this.codeFormData.key = "key";
+ this.selectRlVisible = true;
} else if (response.code == 503) {
this.curRow = response.data;
this.orderFormData.billNo = this.curRow.orderId;
@@ -854,7 +880,11 @@ export default {
});
},
-
+ selectBindRl(row) {
+ this.selectRlVisible = false;
+ this.orderFormData.relId = row.id;
+ this.addCode();
+ },
getInputFocus(event) {
event.currentTarget.select();
}
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index c9c7d5a..6a0898f 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -585,9 +585,11 @@ 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;
+ this.filterQuery.key = this.curRow.key;
getMutiUdiInfos(this.filterQuery)
.then((response) => {
this.loading = false;
@@ -863,6 +865,13 @@ export default {
components: {}
,
created() {
+ if(this.curRow.selectSupId!=null){
+ if(this.curRow.selectSupId!=false){
+ this.fromCorp=this.curRow.selectSupId
+ }else{
+ this.fromCorp=''
+ }
+ }
this.getList();
}
,