chenlei 7 mesiacov pred
rodič
commit
5a6948c76e

+ 9 - 4
src/views/customer/UserList.vue

@@ -112,8 +112,13 @@ function handleSelectChange() {
     getTableData();
 }
 function changeDatePicker(val) {
-    tableQuery.RegisterBeginDate = val[0];
-    tableQuery.RegisterEndDate = val[1];
+    if (!val) {
+        tableQuery.RegisterBeginDate = '';
+        tableQuery.RegisterEndDate = '';
+    } else {
+        tableQuery.RegisterBeginDate = val[0];
+        tableQuery.RegisterEndDate = val[1];
+    }
     getTableData();
 }
 function userDetails(row) {
@@ -180,8 +185,8 @@ async function downloadExcel() {
                     <el-table-column 
                         v-for="column in tableColumns" :key="column.key"
                         :prop="column.key" :label="column.label" :sortable="column.sortable">
-                        <template #default="scope" v-if="column.key === 'AccountStatus'">
-                            <el-tag :type="scope.row[column.key]=== 'Open' ?'success':'info'">{{scope.row[column.key]=== 'Open'?'已开户':'未开户' }}</el-tag>
+                        <template #default="scope" v-if="column.key === 'FollowingGzh'">
+                            <span>{{ scope.row.FollowingGzh ? '是' : '否' }}</span>
                         </template>
                         <template #default="scope" v-else-if="column.key === 'ReadCount'">
                             <span class="ReadCount" @click="Details(scope.row)" v-permission="'user:count'">

+ 5 - 0
src/views/customer/components/ReadDialog.vue

@@ -15,6 +15,11 @@ emits("success")
 
 watch(() => props.show, (newval) => {
   if (newval) {
+    tableQuery.PermissionIds = null
+    tableQuery.ProductType = ''
+    tableQuery.currentPage = 1
+    tableQuery.sortParam = '',
+    tableQuery.sortType = '',
     getTableData()
   }
 })

+ 1 - 1
src/views/products/addSingleList.vue

@@ -26,7 +26,7 @@ const tableColumns = [
         widthsty:100
     },{
         label:'品种',
-        key:'ClickTime',
+        key:'PermissionNames',
         sortable:false,
         align:'center'
     },{