From 775b2e486ebcbcd2cdff1b5d1f08c817012f10f5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 13 Feb 2023 09:40:55 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/device/phoneRegisterManage.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/system/device/phoneRegisterManage.vue b/src/views/system/device/phoneRegisterManage.vue
index eae3255c..e45b4826 100644
--- a/src/views/system/device/phoneRegisterManage.vue
+++ b/src/views/system/device/phoneRegisterManage.vue
@@ -259,6 +259,7 @@ export default {
},
onSubmit() {
+ this.filterQuery.page=1;
this.getList();
},
closeDialogVisible(){
From 224b6320bc89ddc63264eca5c10bd0568ee9ebde Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 13 Feb 2023 10:34:01 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/param/busTypePreModify.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index c9f94032..53f02b1f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -54,7 +54,7 @@
-
From 4c62b03bbcf2e58baefe3c212e389fbb59f4e12d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 13 Feb 2023 10:39:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/param/busTypePreModify.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 53f02b1f..9293ab94 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -230,6 +230,7 @@ export default {
}
this.getOriginBusType();
this.getLocInv();
+ this.getFromInv();
}
}
From 4b134770444e6165df57611efebe43bec7e588f2 Mon Sep 17 00:00:00 2001
From: x_z
Date: Mon, 13 Feb 2023 13:43:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E7=AD=89=E9=A1=B5=E9=9D=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/dept/authDept.vue | 1 +
src/views/system/dept/invWarehouse.vue | 7 -------
src/views/system/param/busTypePre.vue | 22 +++++++++------------
src/views/system/param/busTypePreModify.vue | 22 +++++++++++++++------
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 943f114e..5b88f104 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -542,6 +542,7 @@ export default {
this.formVisible = false;
// 刷新表单
this.$refs["dataForm"].resetFields();
+ this.getList();
},
deleteDialog(row) {
this.$confirm("是否删除该部门?", "提示", {
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 7605e5b0..817816fb 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,13 +9,6 @@
placeholder="仓库名称"
>
-
-
-
-
-
-
-
重置
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 7f9ca058..0487efae 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -6,12 +6,14 @@
@@ -128,10 +130,9 @@ export default {
loading: false,
formMap: {
add: "新增单据流转设置",
- update: "编辑单据流转设置",
+ edit: "编辑单据流转设置",
},
formName: null,
-
};
},
@@ -178,7 +179,6 @@ export default {
this.filterQuery.page = val;
this.getList();
},
-
onAddSubmit() {
if (isBlank(this.inputQuery.originAction)) {
this.$message.error("原单据类型不能为空！");
@@ -192,10 +192,10 @@ export default {
this.$message.error("目标所在仓库不能为空！")
return;
}
- // if (isBlank(this.inputQuery.defaultInvCode)) {
- // this.$message.error("目标往来仓库不能为空");
- // return;
- // }
+ if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
+ this.$message.error("推移时间不能小于0！");
+ return;
+ }
if (this.formName === "add") {
let numRegExp = '^[0-9]*$';
@@ -210,13 +210,8 @@ export default {
this.loading = false;
this.cancelDialog();
this.getList();
- } else {
- this.$message.error(res.message);
}
- }).catch((error) => {
- this.loading = false;
- this.$message.error(error.message);
- this.cancelDialog();
+ }).catch(() => {
});
} else {
updateBusTypePre(this.inputQuery).then((res) => {
@@ -252,6 +247,7 @@ export default {
},
handleModifyClick(row) {
+ this.formName = 'edit';
this.inputQuery = row;
this.modifyDialogVisible = true;
},
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 9293ab94..6cea57ca 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -74,8 +74,12 @@
+ type="number"
+ placeholder="请输入内容"
+ v-model="inputQuery.beforeTime"
+ onkeyup="this.value=this.value.replace(/\D/g,'')"
+ onafterpaste="this.value=this.value.replace(/\D/g,'')"
+ >
@@ -107,7 +111,8 @@