diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index e74e9ae2..2f501fd4 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -57,6 +57,7 @@ export function submitAllocateBiz(query) {
});
}
+
export function saveOrderWeb(query) {
return axios({
url: "/warehouse/inout/saveOrderWeb",
@@ -437,6 +438,13 @@ export function getOrderList(params) {
});
}
+export function getOrderFilter(params) {
+ return axios({
+ url: "udiwms/inout/preInorder/filter",
+ method: "get",
+ params: params
+ });
+}
export function updateStatus(query) {
return axios({
@@ -528,3 +536,12 @@ export function orderDetailAdd(params) {
data: params
});
}
+
+export function orderChange(query) {
+ return axios({
+ url: "/udiwms/stock/order/change",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index a54f3106..4e5d9d2b 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -362,6 +362,24 @@
>
+
+
+
+
+
+
+
@@ -387,6 +405,7 @@ import bizDetailPanel from "./PanelCreateOrderBizDetail";
import A from "../../plugins/KeyScaner";
import {findByInvUser} from "@/api/basic/busType";
import {getInvSpaceList} from "@/api/inventory/invSpace";
+import DialogSelectUnit from "./DialogSelectUnit";
export default {
name: "ioCreateOrder",
@@ -437,6 +456,7 @@ export default {
produceDate: null,
expireDate: null,
serialNo: null,
+ relId: null,
},
curInvOptions: [],
@@ -447,7 +467,6 @@ export default {
curPreInInvOptions: [], //预验收仓库
curPreInSpaceOptions: [], //预验收货位
-
curAction: {
corpType: 0,
genUnit: false,
@@ -516,6 +535,7 @@ export default {
bizDetailPanel,
editCodeDialog,
DialogCreateOrderSelect,
+ DialogSelectUnit
},
methods: {
//获取用户仓库列表
@@ -819,9 +839,11 @@ export default {
} else if (response.code == 503) {
this.curRow = response.data;
this.orderFormData.billNo = this.curRow.orderId;
- this.refreshCodesPanel();
+ this.codeFormData.relId = this.curRow.relId,
+ this.refreshCodesPanel();
this.selectUnitTitle = response.message;
this.$message.error(response.message);
+ this.dialogTableVisible = true;
} else if (response.code == 504) {
this.$confirm(response.message, "提示", {
confirmButtonText: "确定",
@@ -1061,22 +1083,9 @@ export default {
this.$router.go(-1);
},
selectSupUnit(row) {
- let query = {
- id: this.curRow.id,
- supId: row.erpId,
- };
- updateCodeBindSup(query)
- .then((response) => {
- if (response.code == 20000) {
- this.$message.success("绑定成功");
- this.orderFormData.id = this.curRow.orderId;
- this.getCodeList();
- } else {
- this.$message.error(response.message);
- }
- })
- .catch(() => {
- });
+ this.dialogTableVisible = false;
+ this.orderFormData.selectSupId = row.erpId;
+ this.addCode();
},
closeCodeDialog() {
this.editOriginCodeVisible = false;
diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue
index 42fe0930..5b2f6331 100644
--- a/src/views/sync/SysUdimsData.vue
+++ b/src/views/sync/SysUdimsData.vue
@@ -25,21 +25,24 @@
重置
查询
-
- 同步单据
-
-
- 同步单据类型
-
- 同步第三方基础数据
-
- 同步用户信息
-
-
+ 同步单据
+
+
+ 同步单据类型
+
+
+ 同步第三方基础数据
+
+ 同步用户信息
+
+ 同步系统设置信息
-
+
@@ -355,15 +358,15 @@ export default {
}
})
},
- uploadData(exportType){
- if(!this.filterQuery.syncTime){
+ uploadData(exportType) {
+ if (!this.filterQuery.syncTime) {
this.$message.error("请选择同步时间");
return false
- }
- let param = {
- exportType : exportType,
- syncTime: this.filterQuery.syncTime
- }
+ }
+ let param = {
+ exportType: exportType,
+ syncTime: this.filterQuery.syncTime
+ }
uploadData(param).then((response) => {
if (response.code == 20000) {
this.filterQuery.page = 1
@@ -371,12 +374,13 @@ export default {
} else {
this.$message.error(response.message);
}
- this.filterQuery.syncTime=null
- setTimeout(()=>{
+ this.filterQuery.syncTime = null
+ setTimeout(() => {
this.getList();
- },666)
+ }, 666)
})
- .catch(() => {});
+ .catch(() => {
+ });
}
},