3/29

src/views/main/Customer/editForm.vue

@@ -11,7 +11,7 @@
   <a-form :form="form" class="CsForm">
     <a-row type="flex" justify="end">
       <a-col :span="1">
-        <a-button type="primary" @click="handleSubmit">
+        <a-button type="primary" @click="handleSubmit" :loading="SaveLoading">
           保存
         </a-button>
       </a-col>
@@ -312,7 +312,8 @@ export default {
       TypeData: [],
       propStringData: [],
       saleUserList: [],
-      bookingServiceItem: []
+      bookingServiceItem: [],
+      SaveLoading: false
     }
   },
   watch: {
@@ -462,6 +463,7 @@ export default {
       this.confirmLoading = true
       validateFields((errors, values) => {
         if (!errors) {
+          this.SaveLoading = true
           for (const key in values) {
             if (typeof values[key] === 'object' && !(values[key] === null)) {
               values[key] = JSON.stringify(values[key])
@@ -489,6 +491,7 @@ export default {
           let Arr = ['sale', 'op', 'doc', 'custservice']
           GetSysUserPage()
             .then(res => {
+              this.SaveLoading = false
               if (res.success) {
                 let saleUserList = res.data
                 Arr.forEach(item => {
@@ -522,6 +525,7 @@ export default {
               }
             })
             .catch(err => {
+              this.SaveLoading = false
               console.log(err)
             })
         } else {

src/views/main/Customer/index.vue

@@ -18,7 +18,16 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="FnGetData">查询</a-button>
+                <a-button
+                  type="primary"
+                  @click="
+                    () => {
+                      queryParam.pageNo = 1
+                      FnGetData()
+                    }
+                  "
+                  >查询</a-button
+                >
                 <a-button style="margin-left: 8px" @click="init">重置</a-button>
                 <a v-if="ColumnsQueryL > 3" @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}

src/views/main/DJYTenantParam/addItemForm.vue

@@ -133,6 +133,14 @@ export default {
     }
   },
   mounted() {
+    this.FnDJYTenantParamGet()
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
+    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
+      this.TenantData = res.data.rows
+    })
+  },
+  methods: {
+    FnDJYTenantParamGet() {
       DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
         this.TypeData = res.data
         let data = []
@@ -154,12 +162,7 @@ export default {
         })
         this.WTypeData = data
       })
-    this.YWData = this.$options.filters['dictData']('tenant_param_group')
-    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
-      this.TenantData = res.data.rows
-    })
     },
-  methods: {
     FnTypeD(data) {
       let Rdata = ''
       this.YWData.forEach(item => {
@@ -191,6 +194,7 @@ export default {
     // 初始化方法
     add(record) {
       this.visible = true
+      this.FnDJYTenantParamGet()
       this.typeData = [
         {
           code: 10,

src/views/main/DJYTenantParam/editItemForm.vue

@@ -133,6 +133,13 @@ export default {
     }
   },
   mounted() {
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
+    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
+      this.TenantData = res.data.rows
+    })
+  },
+  methods: {
+    FnDJYTenantParamGet() {
       DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
         this.TypeData = res.data
         let data = []
@@ -154,12 +161,7 @@ export default {
         })
         this.WTypeData = data
       })
-    this.YWData = this.$options.filters['dictData']('tenant_param_group')
-    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
-      this.TenantData = res.data.rows
-    })
     },
-  methods: {
     FnTypeD(data) {
       let Rdata = ''
       this.YWData.forEach(item => {
@@ -189,6 +191,7 @@ export default {
     },
     // 初始化方法
     edit(record) {
+      this.FnDJYTenantParamGet()
       console.log(record)
       this.FnChangeTypeCode(record.paraCode)
       this.data = record

src/views/main/DJYTenantParam/indexItem.vue

@@ -122,7 +122,8 @@
                 }
               "
             >
-              <vxe-button type="text">删除</vxe-button>
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+              <!-- <vxe-button type="text">删除</vxe-button> -->
             </a-popconfirm>
           </template>
         </vxe-column>