diff --git a/src/role.js b/src/role.js
index 6b9e809..4e8b212 100644
--- a/src/role.js
+++ b/src/role.js
@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
})
.catch(() => {
store.dispatch("fedLogout").then(() => {
- Message.error("验证失败,请重新登录");
+ Message.error("登录失效,请重新登录");
let redirect = to.fullPath;
store.dispatch("loginOut").then(() => {
next({
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 9c4ee9d..d999d46 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -42,7 +42,7 @@ service.interceptors.response.use(
if (data.code) {
if (data.code === 2) {
store.dispatch("fedLogout").then(() => {
- Message.error("验证失败,请重新登录");
+ Message.error("登录失效,请重新登录");
router.push({
path: "/login",
query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来
diff --git a/src/utils/axios2.js b/src/utils/axios2.js
index 65cde7c..d2f020e 100644
--- a/src/utils/axios2.js
+++ b/src/utils/axios2.js
@@ -21,7 +21,7 @@ service.interceptors.response.use(
if (data.code) {
if (data.code === 2) {
store.dispatch("fedLogout").then(() => {
- Message.error("验证失败,请重新登录");
+ Message.error("登录失效,请重新登录");
router.push({
path: "/login",
query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来
diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
index d8ec7b8..3ce65d3 100644
--- a/src/views/basic/UdiRlDetailDialog.vue
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -393,7 +393,7 @@ export default {
methods: {
getThirdSysDetail() {
let query = {
- id: this.editQuery.id,
+ id: this.editQuery.rlId,
};
thirdSysDetail(query)
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index 2da8d2e..c7c0c09 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -135,6 +135,22 @@
+
+
+
+
+
+
+
+
+
+ 允许无库存出库
+
+
+
+
+
@@ -380,7 +396,21 @@ export default {
page: 1,
limit: 10,
},
- formData: {},
+ formData: {
+
+ noInvOut: false,
+ locStorageCode: null,
+ invWarehouseCode: null,
+ fromSubInvCode: null,
+ billNo: null,
+ billdate: "",
+ customerId: store.getters.customerId,
+ billType: "",
+ type: null,
+ corpName: "",
+ corpId: "",
+
+ },
formRules: {
corpName: [
{required: true, message: "请输入供应商", trigger: "blur"}
@@ -1061,13 +1091,16 @@ export default {
this.invChange();
} else {
this.formData = {
+ billNo: null,
billdate: "",
- corpName: store.getters.companyName,
customerId: store.getters.customerId,
- // billType: "deliveryNote",
billType: "",
- type: "1",
- // type: "",
+ type: "2",
+ corpName: "",
+ corpId: "",
+ noInvOut: "",
+ locStorageCode: store.getters.locInvCode,
+ invWarehouseCode: store.getters.locSubInvCode,
};
this.iCount = 0;
this.orderEditor = false;
diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue
index f9e08c1..f4bab3a 100644
--- a/src/views/inout/DialogSelectErpOrder.vue
+++ b/src/views/inout/DialogSelectErpOrder.vue
@@ -115,25 +115,30 @@
>
-
+
+
diff --git a/src/views/inout/DialogSelectUnit.vue b/src/views/inout/DialogSelectUnit.vue
index 95d7fd3..1a42a90 100644
--- a/src/views/inout/DialogSelectUnit.vue
+++ b/src/views/inout/DialogSelectUnit.vue
@@ -90,15 +90,15 @@ export default {
},
methods: {
getUnitList() {
- this.loading = true;
- getBasicUnitMaintains(this.unitquery)
- .then((response) => {
- this.loading = false;
- this.unitlist = response.data.page.list || [];
- })
- .catch(() => {
- this.loading = false;
- });
+ // this.loading = true;
+ // getBasicUnitMaintains(this.unitquery)
+ // .then((response) => {
+ // this.loading = false;
+ // this.unitlist = response.data.page.list || [];
+ // })
+ // .catch(() => {
+ // this.loading = false;
+ // });
},
getUnitListByCode(row) {
let query = {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 650f7d2..c0d8102 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -589,9 +589,9 @@ export default {
},
closeCodeDialog() {
//编辑完，获取编辑之后的条码
- this.getCodeList();
this.editCodeVisible = false;
this.editOriginCodeVisible = false;
+ this.getCodeList();
},
editCode(row) {
this.codeDetail = row;
diff --git a/src/views/inout/errorCode.vue b/src/views/inout/errorCode.vue
index 67f6042..be99e6a 100644
--- a/src/views/inout/errorCode.vue
+++ b/src/views/inout/errorCode.vue
@@ -355,6 +355,7 @@ export default {
},
closeCodeDialog() {
this.editCodeVisible = false;
+ this.getCodeList();
},
editCode(row) {
this.codeDetail = row;