diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index fcccba91..c4ce1211 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -76,7 +76,7 @@
-
+
@@ -85,17 +85,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -110,7 +110,7 @@
-
+
@@ -137,6 +137,10 @@
+
+
+
+
{
- if (rules) {
- if (this.upData != null){
- updateType(this.formData).then(res => {
- if (res.code == 20000) {
- this.closeDialog()
- this.$message.success('更新成功')
- } else {
- this.$message.error('更新失败')
- }
- })
- }else {
- addBusType(this.formData).then(res => {
- if (res.code == 20000) {
- this.$message.success('新增成功')
- this.closeDialog()
- } else {
- this.$message.error('新增失败')
- }
- })
- }
+ this.$refs['dataForm'].validate((rules) => {
+ if (rules) {
+ if (this.upData != null) {
+ updateType(this.formData).then(res => {
+ if (res.code == 20000) {
+ this.closeDialog()
+ this.$message.success('更新成功')
+ } else {
+ this.$message.error('更新失败')
+ }
+ })
+ } else {
+ addBusType(this.formData).then(res => {
+ if (res.code == 20000) {
+ this.$message.success('新增成功')
+ this.closeDialog()
+ } else {
+ this.$message.error('新增失败')
+ }
+ })
}
+ }
- })
+ })
},
hideForm() {
this.closeDialog()
@@ -470,7 +474,7 @@ export default {
if (this.upData != null) {
console.log(this.upData)
this.formData = this.upData
- if (this.formData.invCode != 0){
+ if (this.formData.invCode != 0) {
this.formData.invCode = this.upData.invCode + ''
}
if (this.formData.invCode == 0) {
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 9e36d52e..ea30bd6b 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -445,7 +445,7 @@ export default {
busTypeTotal: 0,
invList: [],
- viewType:1
+ viewType: 1
}
},
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index 1a47a4da..5639cad7 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -292,7 +292,7 @@ export default {
billNo: null,
page: 1,
limit: 10,
- tagStatusList: [0,1,2,4,-1], // 0:原始单据未处理,1:已分配工位待处理;2:处理中;4:处理异常,-1:草稿,挂起状态
+ tagStatusList: [0,1,-1], // 0:原始单据未处理,1:已分配工位待处理;2:处理中;4:处理异常,-1:草稿,挂起状态
// invAlerts:[0,1]
},
defaultSort: {prop: 'createTime', order: 'desc'},