diff --git a/src/views/product/UnitManage.vue b/src/views/product/UnitManage.vue
index 32ad2a3..5d557e0 100644
--- a/src/views/product/UnitManage.vue
+++ b/src/views/product/UnitManage.vue
@@ -144,7 +144,8 @@
地址
-
+
@@ -230,9 +231,8 @@ export default {
},
editQuery: {
- unitId: null,
- thirdId: null,
name: null,
+ thirdId: null,
creditNo: null,
pinyinCode: null,
contact: null,
@@ -302,12 +302,6 @@ export default {
};
this.getList();
},
- // 刷新表单
- resetForm() {
- this.$nextTick(() => {
- this.$refs['editQuery'].resetFields();
- });
- },
search() {
this.query.page = 1;
this.getList();
@@ -372,9 +366,17 @@ export default {
handleAddClick() {
this.editType = 0;
this.editDialogVisible = true;
- this.resetForm();
- var timestamp3 = new Date().getTime();
- this.editQuery.unitId = timestamp3;
+ this.editQuery = {
+ name: null,
+ thirdId: null,
+ creditNo: null,
+ pinyinCode: null,
+ contact: null,
+ mobile: null,
+ corpType: null,
+ addr: null,
+ unitId: new Date().getTime()
+ };
},
change() {
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 890eb7c..4a4be12 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -341,7 +341,15 @@ export default {
resetForm() {
this.$nextTick(() => {
if (this.formName === "add") {
- this.$refs["dataForm"].resetFields();
+ this.formData = {
+ userName: null,
+ employeeName: null,
+ passWord: null,
+ checkPassword: null,
+ comments: null,
+ userFlag: 1,
+ roles: null
+ };
}
this.$refs["dataForm"].clearValidate();
});
diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue
index 5946299..8ed1cb3 100644
--- a/src/views/warehouse/codeReplace.vue
+++ b/src/views/warehouse/codeReplace.vue
@@ -157,17 +157,6 @@
-
- 审核时间:
-
-
-
-
提交
@@ -222,7 +211,14 @@
},
actDate: null,
auditTime: null,
- editOrderVisible: false
+ editOrderVisible: false,
+ pickerOptions: {
+ disabledDate: time => {
+ let endDate = new Date().getTime();
+ let nowDate = new Date(time).getTime();
+ return (nowDate > endDate);
+ }
+ }
};
},
components: {
@@ -332,21 +328,18 @@
});
},
updateOrderInfo() {
- if (this.actDate === null || this.auditTime === null) {
- this.$message.warning("创建时间和审核时间不能为空");
- return;
- } else if (this.actDate > this.auditTime) {
- this.$message.warning("请检查创建时间和审核时间是否正确");
+ if (this.actDate === null || this.actDate === undefined) {
+ this.$message.warning("创建时间不能为空");
return;
}
let data = {
actDate: this.actDate,
- auditTime: this.auditTime,
- orderIds: [this.query.corpOrderId]
+ orderIds: [this.query.orderId]
};
updateOrderInfo(data).then((res) => {
if (res.code === 20000) {
this.$message.success("修改成功");
+ this.getCodeList();
}
}).catch((error) => {
});
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index 724a6eb..cabd374 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -339,6 +339,7 @@ export default {
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
+ this.query.code = null;
// 加载表格数据
this.getCodeList();
diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue
index 0a460c5..8476d1b 100644
--- a/src/views/warehouse/ioErrorOrder.vue
+++ b/src/views/warehouse/ioErrorOrder.vue
@@ -146,13 +146,13 @@
>
-
+
查询
@@ -347,8 +347,11 @@ export default {
}).catch((error) => {
});
},
- getUnitList() {
+ getUnitList(page) {
this.loading = true;
+ if (page != null) {
+ this.unitquery.page = 1;
+ }
unitListBykey(this.unitquery)
.then((response) => {
this.loading = false;
diff --git a/src/views/warehouse/stockOrderDelete.vue b/src/views/warehouse/stockOrderDelete.vue
index 2bf373f..b5c5a70 100644
--- a/src/views/warehouse/stockOrderDelete.vue
+++ b/src/views/warehouse/stockOrderDelete.vue
@@ -232,7 +232,7 @@
limit: 10
},
detailQuery: {
- orderIdFk: "",
+ orderId: null,
page: 1,
limit: 20
},
@@ -354,7 +354,6 @@
getOrderDetailList(row) {
if (this.$isNotBlank(row)) {
this.detailQuery.orderId = row.orderId;
- this.detailQuery.orderIdFk = row.orderId;
}
this.detailLoading = true;
orderDetail(this.detailQuery)