diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js
index ac37778..3de55e8 100644
--- a/src/api/basic/invWarehouse.js
+++ b/src/api/basic/invWarehouse.js
@@ -151,3 +151,12 @@ export function getThrsysDetail(params) {
params: params
});
}
+
+//替换单据条码
+export function replaceCodes(data) {
+ return axios({
+ url: "/warehouse/inout/replaceCodes",
+ method: "post",
+ data: data
+ })
+}
diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js
index d5269bc..43b4479 100644
--- a/src/api/warehouse/order.js
+++ b/src/api/warehouse/order.js
@@ -214,7 +214,7 @@ export function orderDetail(query) {
method: "get",
params: query
}
- );
+ )
}
export function updateBind(query) {
@@ -333,3 +333,27 @@ export function updateCodeBindSup(query) {
)
}
+export function filterOrderForDelete(params) {
+ return axios({
+ url: "/udiwms/inout/order/filterOrderForDelete",
+ method: "get",
+ params: params
+ });
+}
+
+export function getOrderById(params) {
+ return axios({
+ url: "/udiwms/inout/order/getOrderById",
+ method: "get",
+ params: params
+ })
+}
+
+export function updateOrderInfo(data) {
+ return axios({
+ url: "/udiwms/inout/order/updateOrderInfo",
+ method: "post",
+ data: data
+ })
+}
+
diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js
index 49c29a9..9a06adb 100644
--- a/src/api/warehouse/stockOrder.js
+++ b/src/api/warehouse/stockOrder.js
@@ -255,3 +255,11 @@ export function updateReceiveStatus(params) {
data: params
})
}
+
+export function stockOrderChange(query) {
+ return axios({
+ url: "/udiwms/stock/order/change",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/router/index.js b/src/router/index.js
index 026a5bd..3d1d7c1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,6 +25,7 @@ import userAccountManage from "@/views/userManage/userAccountManage";
//单据
import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch";
import stockOrderSearch from "../views/warehouse/stockOrderSearch";
+import stockOrderDelete from "../views/warehouse/stockOrderDelete";
//往来单位字典
import UnitManage from "@/views/product/UnitManage";
@@ -385,7 +386,15 @@ export const asyncRouterMap = [
meta: {
authRule: ["stock/stockOrderDelSearch"]
}
- }
+ },
+ {
+ path: "stockOrderEdit",
+ component: stockOrderDelete,
+ name: "单据编辑",
+ meta: {
+ authRule: ["stock/stockOrderDelete"]
+ }
+ },
]
},
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index f48d054..28f3361 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -327,7 +327,8 @@ export default {
supplementOrderType: row.supplementOrderType,
checkBalacne: row.checkBalacne,
secCheckBalacne: row.secCheckBalacne,
- defaultUnit: row.defaultUnit
+ defaultUnit: row.defaultUnit,
+ prefix: row.prefix
};
this.modifyDialogVisible = true;
},
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index f845d0c..b014089 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -100,20 +100,32 @@
-
+
+
+
+
+
-
diff --git a/src/views/userManage/register.vue b/src/views/userManage/register.vue
index 874ba77..3c074ca 100644
--- a/src/views/userManage/register.vue
+++ b/src/views/userManage/register.vue
@@ -538,7 +538,6 @@ export default {
},
methods: {
onSubmit(formName) {
- // this.formVisible = true;
this.$refs[formName].validate((valid) => {
if (valid) {
this.loading = true;
@@ -621,9 +620,15 @@ export default {
}, 1000);
},
handleChange(value) {
- this.inputQuery.area =
- CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
- console.log(value + "\n" + this.inputQuery.area);
+ this.inputQuery.area = CodeToText[value[0]];
+ if (CodeToText[value[1]] != null && CodeToText[value[1]] != ""
+ && CodeToText[value[1]] != "undefined") {
+ this.inputQuery.area += CodeToText[value[1]];
+ }
+ if (CodeToText[value[2]] != null && CodeToText[value[2]] != ""
+ && CodeToText[value[2]] != "undefined") {
+ this.inputQuery.area += CodeToText[value[2]];
+ }
this.inputQuery.areaCode = value.toString();
},
copy() {
diff --git a/src/views/warehouse/DialogChangeNewOrder.vue b/src/views/warehouse/DialogChangeNewOrder.vue
new file mode 100644
index 0000000..e329f14
--- /dev/null
+++ b/src/views/warehouse/DialogChangeNewOrder.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+ 生成单据
+
+
+
+
+
+
+ 入库单号：
+
+
+
+
+
+
+
+
+
+ 单据时间：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单据类型：
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 当前仓库：
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 往来信息：
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前分库：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.actDate }}
+
+
+
+
+
+
+ 减一
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+ 取消
+
+
+
+
+
+
+
+ 创建时间：
+
+
+
+
+
+ 审核时间：
+
+
+
+
+
+ 提交
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 全部删除
+ 编辑
+
+
+
+
+
+
+
+
+
+
+ {{ getActionName(scope.row.action) }}
+
+
+
+
+
+ {{ fromTypeMap[scope.row.fromType] }}
+
+
+
+
+
+
+ {{ getStorageName(scope.row.locStorageCode) }}
+
+
+
+
+
+ {{ scope.row.actDate }}
+
+
+
+
+
+ {{ scope.row.auditTime }}
+
+
+
+
+
+ {{ erpCheckStatus[scope.row.contrastStatus] }}
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ errorDetail }}
+
+
+
+
+
+
+ 创建时间：
+
+
+
+
+
+ 审核时间：
+
+
+
+
+
+ 提交
+
+ 取消
+
+
+
+
+