Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/views/enterpriseManagement/index.vue

@@ -193,7 +193,9 @@ export default {
         status: undefined,
       },
       // 表单参数
-      form: {},
+      form: {
+        dateRange:[],
+      },
       // 表单校验
       rules: {
         contactPhone: [
@@ -302,7 +304,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        dateRange: undefined,
+        dateRange: [],
         id: undefined,
         tenantId: undefined,
         contactUserName: undefined,
@@ -312,7 +314,7 @@ export default {
         accountCount: undefined,
         status: "0",
       };
-      this.resetForm("form");
+      // this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -321,7 +323,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
+      this.form.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -364,7 +366,7 @@ export default {
       const id = row.id;
       this.getpack();
       getTenant(id).then(response => {
-        this.form = response.data;
+        this.form = {...this.form,...response.data};
         this.form.dateRange = [response.data.startTime, response.data.expireTime];
         this.open = true;
         this.title = this.disabled == true ? '查看企业' : "修改企业";