diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index d6fa014..087349a 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -382,6 +382,7 @@ export default {
getBusTypeByInv() {
let query = {
code: this.orderFormData.invCode,
+ busType: 2,//默认只能选择送货单
};
findByInvUser(query)
.then((response) => {
@@ -449,7 +450,7 @@ export default {
this.bizShow = false;
if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
//1.切换往来单位
- if(!this.isSupVesion){
+ if (!this.isSupVesion) {
this.orderFormData.fromCorp = null;
this.findMethod();
}
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index ee0d9ac..9cdd3f9 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -291,13 +291,13 @@
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 0826a7d..77a51a1 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -27,12 +27,14 @@
-
-
+
+
+
+
+
-
-
+
{{ enableMap[scope.row.supplementAll] }}
@@ -120,7 +122,9 @@ export default {
beforeTime: null,
supplementAll: null,
intro: null,
- remark: null
+ remark: null,
+ auditStatus: null,
+ busAuditStatus: null,
},
enableMap: {
true: "全量补单",
@@ -184,18 +188,18 @@ export default {
this.$message.error("原单据类型不能为空！");
return;
}
- if (isBlank(this.inputQuery.action)) {
- this.$message.error("目标单据类型不能为空！")
+ if (isBlank(this.inputQuery.action) && isBlank(this.inputQuery.targetBusAction)) {
+ this.$message.error("目标出入库单与目标业务单不能同时为空！")
return;
}
if (isBlank(this.inputQuery.invCode)) {
this.$message.error("目标所在仓库不能为空！")
return;
}
- if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
- this.$message.error("推移时间不能小于0！");
- return;
- }
+ // if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
+ // this.$message.error("推移时间不能小于0！");
+ // return;
+ // }
if (this.formName === "add") {
let numRegExp = '^[0-9]*$';
@@ -210,7 +214,7 @@ export default {
this.loading = false;
this.cancelDialog();
this.getList();
- }else{
+ } else {
this.$message.error(res.message);
}
}).catch(() => {
@@ -243,7 +247,9 @@ export default {
beforeTime: null,
supplementAll: null,
intro: null,
- remark: null
+ remark: null,
+ auditStatus: null,
+ busAuditStatus: null,
};
this.modifyDialogVisible = true;
},
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 6cea57c..2f52ff2 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -3,7 +3,7 @@
-
+
-
-
-
- {{ item.name }}
- {{ item.action }}
-
-
+
+
+
+
+
@@ -69,9 +64,46 @@
-
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.originName }}
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 草稿
+ 待审核
+ 已审核
+
+
+
+
+
+
+ 草稿
+ 待审核
+ 已审核
+
+
@@ -113,6 +171,7 @@
import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
+import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
export default {
name: "BusTypePreModify",
@@ -130,6 +189,7 @@ export default {
isBuType: true,
},
originBusTypes: [],
+ targetTypes: [],
targetBusTypes: [],
locInvs: [],
fromInvs: [],
@@ -194,6 +254,18 @@ export default {
enable: true
};
getBusTypeListByUser(query).then((res) => {
+ if (res.code === 20000) {
+ this.targetTypes = res.data.list || [];
+ }
+ })
+ },
+
+
+ getTargetChangeType() {
+ let query = {
+ enable: true
+ };
+ getBusTypeChangeList(query).then((res) => {
if (res.code === 20000) {
this.targetBusTypes = res.data.list || [];
}
@@ -227,7 +299,7 @@ export default {
this.getTargetBusType();
} else {
this.inputQuery.action = null;
- this.targetBusTypes = [];
+ this.targetTypes = [];
}
},
},
@@ -235,9 +307,14 @@ export default {
created() {
if (this.inputQuery.originAction == null) {
this.isAdd = true;
+ this.inputQuery.auditStatus = 2;
+ this.inputQuery.busAuditStatus = 2;
} else {
this.getTargetBusType();
}
+
+ this.getTargetChangeType();
+
this.getOriginBusType();
this.getLocInv();
this.getFromInv();