diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js
index 72704968..3809ffd5 100644
--- a/src/api/basic/busType.js
+++ b/src/api/basic/busType.js
@@ -82,6 +82,7 @@ export function getBusTypeListByUser(params) {
params: params
});
}
+
export function filterUnUse(params) {
return axios({
url: "/udiwms/localBusType/filterUnUse",
@@ -100,3 +101,21 @@ export function findByInvUser(query) {
}
+export function findChangeOrigin(query) {
+ return axios({
+ url: "/udiwms/busType/change/origin",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function findChangeTarget(query) {
+ return axios({
+ url: "/udiwms/busType/change/target",
+ method: "get",
+ params: query
+ });
+}
+
+
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 3f15795d..01a048b3 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -117,8 +117,8 @@
-
-
+
+
@@ -1156,7 +1156,7 @@ export default {
if (this.inputQuery.corpType != 2) { //往来类型非供应商时，采购方式未无
this.inputQuery.actionType = 0;
- this.inputQuery.spUse = false;
+ this.inputQuery.spUse = 0;
}
},
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index af6e15b5..68872732 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -148,7 +148,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
草稿
待核对
-
-
-
-
-
+
+
+
+
+
@@ -108,7 +119,7 @@
生成业务单
-
+
-import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
+import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil";
import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
@@ -202,6 +213,13 @@ export default {
trigger: "blur"
}
],
+ supplementAll: [
+ {
+ required: true,
+ message: "补单方式不能为空",
+ trigger: "blur"
+ }
+ ],
// invCode: [
// {
// required: true,
@@ -235,7 +253,7 @@ export default {
let query = {
enable: true
};
- getBusTypeList(query).then((res) => {
+ findChangeOrigin(query).then((res) => {
if (res.code === 20000) {
this.originBusTypes = res.data.list || [];
}
@@ -246,7 +264,7 @@ export default {
let query = {
enable: true
};
- getBusTypeList(query).then((res) => {
+ findChangeTarget(query).then((res) => {
if (res.code === 20000) {
this.targetTypes = res.data.list || [];
}
@@ -300,8 +318,9 @@ export default {
created() {
if (this.inputQuery.originAction == null) {
this.isAdd = true;
- // this.inputQuery.auditStatus = 2;
- // this.inputQuery.busAuditStatus = 2;
+ this.inputQuery.createType = 1;
+ this.inputQuery.auditStatus = 1;
+ this.inputQuery.busAuditStatus = 1;
} else {
this.getTargetBusType();
}