Merge branch 'dev'

src/hooks/promotion/index.js

@@ -4,8 +4,10 @@
  * @returns boolean true 可编辑/删除，false 不可编辑/删除
  */
 export const checkPlanExpire = (row) => {
+  // 1. 计划日期已经 1 小时后，不可编辑/删除
   const date = new Date()
   const rowDate = new Date(row.clockInTime)
   rowDate.setHours(rowDate.getHours() + 1)
+  // 2. 计划状态已经开始了，不可编辑/删除
   return !(rowDate < date || row.planStatus === 1)
 }
\ No newline at end of file

src/mobile/views/promotion/plan/index/index.vue

@@ -25,6 +25,7 @@
               v-model="item.checked"
               shape="square" />
             <van-cell :title="item.storeName"
+              :class="{'plan-deleted': query.isDeleted}"
               @click="clickDetail(item)">
               <template #label>
                 <p class="employee">{{ item.employeeName }}</p>
@@ -38,7 +39,7 @@
               </template>
             </van-cell>
             <template #right
-              v-if="!showSelect">
+              v-if="!showSelect && !query.isDeleted">
               <van-button square
                 type="success"
                 text="编辑"
@@ -226,6 +227,7 @@ onMounted(async () => {
 // 长按出现全选功能
 const showSelect = ref(false)
 const onLongPress = () => {
+  if (query.isDeleted) return // 已删除
   showSelect.value = true
 }
 
@@ -349,6 +351,9 @@ onUnmounted(() => {
             }
 
             .van-cell {
+              &.plan-deleted{
+                background-color: rgb(235,235,235);
+              }
 
               .van-cell__label {
                 font-size: 14px !important;

src/mobile/views/promotion/plan/index/planSearch.vue

@@ -220,6 +220,11 @@ defineExpose({
       width: 60%;
     }
 
+    /* 计划状态 */
+    .van-radio:nth-child(n+2){
+      margin-top: 20px;
+    }
+
     .reset-btn {
       margin-top: 20px;
     }

src/views/system/config/index.vue

@@ -12,7 +12,7 @@
             placeholder="请输入参数名称"
             clearable
             style="width: 240px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="参数键名"
           prop="configKey">
@@ -20,14 +20,15 @@
             placeholder="请输入参数键名"
             clearable
             style="width: 240px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="系统内置"
           prop="configType">
           <el-select v-model="queryParams.configType"
             placeholder="系统内置"
             clearable
-            style="width: 240px">
+            style="width: 240px"
+            @change="handleQuery">
             <el-option v-for="dict in sys_yes_no"
               :key="dict.value"
               :label="dict.label"
@@ -41,12 +42,10 @@
             type="daterange"
             range-separator="-"
             start-placeholder="开始日期"
-            end-placeholder="结束日期"></el-date-picker>
+            end-placeholder="结束日期"
+            @change="handleQuery"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-            icon="Search"
-            @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh"
             @click="resetQuery">重置</el-button>
         </el-form-item>

src/views/system/dict/index.vue

@@ -8,7 +8,7 @@
                placeholder="请输入字典名称"
                clearable
                style="width: 240px"
-               @keyup.enter="handleQuery"
+               @input="handleQuery"
             />
          </el-form-item>
          <el-form-item label="字典类型" prop="dictType">
@@ -17,7 +17,7 @@
                placeholder="请输入字典类型"
                clearable
                style="width: 240px"
-               @keyup.enter="handleQuery"
+               @input="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
@@ -26,7 +26,7 @@
                placeholder="字典状态"
                clearable
                style="width: 240px"
-            >
+               @change="handleQuery">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -43,10 +43,10 @@
                range-separator="-"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
+               @change="handleQuery"
             ></el-date-picker>
          </el-form-item>
          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
       </el-form>

src/views/system/menu/index.vue

@@ -11,14 +11,15 @@
             placeholder="请输入菜单名称"
             clearable
             style="width: 200px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="状态"
           prop="status">
           <el-select v-model="queryParams.status"
             placeholder="菜单状态"
             clearable
-            style="width: 200px">
+            style="width: 200px"
+            @change="handleQuery">
             <el-option v-for="dict in sys_normal_disable"
               :key="dict.value"
               :label="dict.label"
@@ -26,9 +27,6 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-            icon="Search"
-            @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh"
             @click="resetQuery">重置</el-button>
         </el-form-item>

src/views/system/notice/index.vue

@@ -11,7 +11,7 @@
             placeholder="请输入公告标题"
             clearable
             style="width: 200px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="操作人员"
           prop="createBy">
@@ -19,14 +19,15 @@
             placeholder="请输入操作人员"
             clearable
             style="width: 200px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="类型"
           prop="noticeType">
           <el-select v-model="queryParams.noticeType"
             placeholder="公告类型"
             clearable
-            style="width: 200px">
+            style="width: 200px"
+            @change="handleQuery">
             <el-option v-for="dict in sys_notice_type"
               :key="dict.value"
               :label="dict.label"
@@ -34,9 +35,6 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-            icon="Search"
-            @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh"
             @click="resetQuery">重置</el-button>
         </el-form-item>

src/views/system/post/index.vue

@@ -11,7 +11,7 @@
             placeholder="请输入岗位编码"
             clearable
             style="width: 200px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="岗位名称"
           prop="postName">
@@ -19,14 +19,15 @@
             placeholder="请输入岗位名称"
             clearable
             style="width: 200px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="状态"
           prop="status">
           <el-select v-model="queryParams.status"
             placeholder="岗位状态"
             clearable
-            style="width: 200px">
+            style="width: 200px"
+            @change="handleQuery">
             <el-option v-for="dict in sys_normal_disable"
               :key="dict.value"
               :label="dict.label"
@@ -34,9 +35,6 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-            icon="Search"
-            @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh"
             @click="resetQuery">重置</el-button>
         </el-form-item>

src/views/system/role/authUser.vue

@@ -9,7 +9,7 @@
                placeholder="请输入用户名称"
                clearable
                style="width: 240px"
-               @keyup.enter="handleQuery"
+               @input="handleQuery"
             />
          </el-form-item>
          <el-form-item label="手机号码" prop="phonenumber">
@@ -18,11 +18,10 @@
                placeholder="请输入手机号码"
                clearable
                style="width: 240px"
-               @keyup.enter="handleQuery"
+               @input="handleQuery"
             />
          </el-form-item>
          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
       </el-form>
@@ -120,8 +119,8 @@ const queryParams = reactive({
 function getList() {
   loading.value = true;
   allocatedUserList(queryParams).then(response => {
-    userList.value = response.rows;
-    total.value = response.total;
+    userList.value = response.data.rows;
+    total.value = response.data.total;
     loading.value = false;
   });
 }

src/views/system/role/index.vue

@@ -12,7 +12,7 @@
             placeholder="请输入角色名称"
             clearable
             style="width: 240px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="权限字符"
           prop="roleKey">
@@ -20,14 +20,15 @@
             placeholder="请输入权限字符"
             clearable
             style="width: 240px"
-            @keyup.enter="handleQuery" />
+            @input="handleQuery" />
         </el-form-item>
         <el-form-item label="状态"
           prop="status">
           <el-select v-model="queryParams.status"
             placeholder="角色状态"
             clearable
-            style="width: 240px">
+            style="width: 240px"
+            @change="handleQuery">
             <el-option v-for="dict in sys_normal_disable"
               :key="dict.value"
               :label="dict.label"
@@ -41,12 +42,10 @@
             type="daterange"
             range-separator="-"
             start-placeholder="开始日期"
-            end-placeholder="结束日期"></el-date-picker>
+            end-placeholder="结束日期"
+            @change="handleQuery"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-            icon="Search"
-            @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh"
             @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -647,7 +646,7 @@
 <style scoped
   lang="scss">
   .el-tree {
-    height: 210px;
+    height: 310px;
     overflow-y: scroll;
 
     /* 灰色滚动条背景 */

src/views/system/user/index.vue

@@ -20,13 +20,13 @@
           :inline="true"
           v-show="showSearch"
           label-width="68px">
-          <el-form-item label="用户名称"
+          <el-form-item label="用户工号"
             prop="userName">
             <el-input v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入用户工号"
               clearable
               style="width: 240px"
-              @keyup.enter="handleQuery" />
+              @input="handleQuery" />
           </el-form-item>
           <el-form-item label="手机号码"
             prop="phonenumber">
@@ -34,14 +34,15 @@
               placeholder="请输入手机号码"
               clearable
               style="width: 240px"
-              @keyup.enter="handleQuery" />
+              @input="handleQuery" />
           </el-form-item>
           <el-form-item label="状态"
             prop="status">
             <el-select v-model="queryParams.status"
               placeholder="用户状态"
               clearable
-              style="width: 240px">
+              style="width: 240px"
+              @change="handleQuery">
               <el-option v-for="dict in sys_normal_disable"
                 :key="dict.value"
                 :label="dict.label"
@@ -55,12 +56,10 @@
               type="daterange"
               range-separator="-"
               start-placeholder="开始日期"
-              end-placeholder="结束日期"></el-date-picker>
+              end-placeholder="结束日期"
+              @change="handleQuery"></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary"
-              icon="Search"
-              @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh"
               @click="resetQuery">重置</el-button>
           </el-form-item>
@@ -119,7 +118,7 @@
             prop="userId"
             v-if="columns[0].visible"
             align="left" />
-          <el-table-column label="用户名称"
+          <el-table-column label="用户工号"
             key="userName"
             prop="userName"
             v-if="columns[1].visible"
@@ -129,11 +128,11 @@
             prop="nickName"
             v-if="columns[2].visible"
             align="left" />
-          <el-table-column label="部门"
+          <!-- <el-table-column label="部门"
             key="deptName"
             prop="dept.deptName"
             v-if="columns[3].visible"
-            align="left" />
+            align="left" /> -->
           <el-table-column label="手机号码"
             key="phonenumber"
             prop="phonenumber"
@@ -311,6 +310,10 @@
           <el-col :span="12">
             <el-form-item label="角色"
               prop="roleId">
+              <!--   multiple
+                clearable
+                collapse-tags
+                collapse-tags-tooltip -->
               <el-select v-model="form.roleId"
                 placeholder="请选择">
                 <el-option v-for="item in roleOptions"
@@ -689,7 +692,7 @@
       status: "0",
       remark: undefined,
       postId: null,
-      roleId: null,
+      roleId: [],
       proStatus: false, // 促销权限
       privilegeId: undefined,
       workCityList: [] // 工作城市
@@ -736,7 +739,7 @@
       // 促销权限 0 开 1 关
       response.data.proStatus = response.data.proStatus == 1 || response.data.proStatus == undefined ? false : true;
       // 后台空角色不知道为啥返回 0 不是 null
-      response.data.roleId = response.data.roleId == 0 ? null : response.data.roleId;
+      response.data.roleId = response.data.roleId == 0 ? [] : response.data.roleId;
       form.value = response.data;
       postOptions.value = response.posts;
       roleOptions.value = response.roles;
@@ -771,7 +774,7 @@
         }
 
         // 同步促销角色权限，给另外一个系统
-        const ress = await openPromotionSystemAPI({
+         await openPromotionSystemAPI({
           loginName: form.value.userName,
           privilegeId: form.value.privilegeId,
           status: form.value.proStatus