fix

README.md

@@ -27,4 +27,9 @@ npm run build:stage
 
 # 构建生产环境
 npm run build:prod
-````
+````
+
+# node-sass 问题
+nodejs版本要与node-sass版本对应当前node-sass版本支持14版本的nodejs
+# yarn安装报错
+yarn config set ignore-engines true

src/views/accounts/account/index.vue

@@ -2,33 +2,42 @@
     <div class="app-container" ref='appFull' style="background: #fff;">
         <el-form :model="queryParams" ref="queryParams" v-show="showSearch" :inline="true">
             <el-form-item>
-                <el-select v-model="queryParams.userId" size="small" placeholder="选择用户" filterable style="width: 140px" clearable>
+                <el-select v-model="queryParams.userId" size="small" placeholder="选择用户" filterable style="width: 140px"
+                    clearable>
                     <el-option v-for="item in userAll" :key="item.id" :label="item.nickName" :value="item.id" />
                 </el-select>
             </el-form-item>
             <el-form-item>
-                <el-select v-model="queryParams.resourceTag" size="small" :disabled="!queryParams.userId" placeholder="角色标签" filterable style="width: 100px" clearable>
-                    <el-option v-for="(item, index) in tagAll" :key="index" :label="item.resourceTag" :value="item.resourceTag" />
+                <el-select v-model="queryParams.resourceTag" size="small" :disabled="!queryParams.userId" placeholder="角色标签"
+                    filterable style="width: 100px" clearable>
+                    <el-option v-for="(item, index) in tagAll" :key="index" :label="item.resourceTag"
+                        :value="item.resourceTag" />
                 </el-select>
             </el-form-item>
             <el-form-item label="" prop="resourceName">
-                <el-input v-model="queryParams.resourceName" placeholder="请输入资源名称" clearable size="small" style="width: 150px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.resourceName" placeholder="请输入资源名称" clearable size="small"
+                    style="width: 150px" @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="" prop="resourceKey">
-                <el-input v-model="queryParams.resourceKey" placeholder="请输入资源标识" clearable size="small" style="width: 150px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.resourceKey" placeholder="请输入资源标识" clearable size="small"
+                    style="width: 150px" @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="" prop="resourceGroupId">
-                <el-select v-model="queryParams.resourceGroupId" placeholder="资源分组" clearable filterable style="width: 140px" size="small">
+                <el-select v-model="queryParams.resourceGroupId" placeholder="资源分组" clearable filterable
+                    style="width: 140px" size="small">
                     <el-option v-for="dict in groupingData" :key="dict.id" :label="dict.groupName" :value="dict.id" />
                 </el-select>
             </el-form-item>
             <el-form-item prop="resourceType">
-                <el-select style="width: 140px" v-model="queryParams.resourceType" placeholder="资源类型" filterable clearable size="small">
-                    <el-option v-for="item in resourceTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                <el-select style="width: 140px" v-model="queryParams.resourceType" placeholder="资源类型" filterable clearable
+                    size="small">
+                    <el-option v-for="item in resourceTypes" :key="item.value" :label="item.label"
+                        :value="item.value"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item prop="resourceType">
-                <el-select v-model="queryParams.businessGroupId" size="small" placeholder="选择项目组" filterable style="width: 140px" clearable>
+                <el-select v-model="queryParams.businessGroupId" size="small" placeholder="选择项目组" filterable
+                    style="width: 140px" clearable>
                     <el-option v-for="item in teamsList" :key="item.id" :label="item.businessGroupName" :value="item.id" />
                 </el-select>
             </el-form-item>
@@ -48,18 +57,13 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table 
-            :data="accountList" 
-            size="mini" 
-            v-loading="loading"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column type="selection" width="50" align="center" fixed="left"/>
-            <el-table-column label="资源名称" prop="resourceName" :show-overflow-tooltip="true" width="120" fixed="left"/>
-            <el-table-column label="资源标识" prop="resourceKey" :show-overflow-tooltip="true" width="150" fixed="left"/>
+        <el-table :data="accountList" size="mini" v-loading="loading" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="50" align="center" fixed="left" />
+            <el-table-column label="资源名称" prop="resourceName" :show-overflow-tooltip="true" width="120" fixed="left" />
+            <el-table-column label="资源标识" prop="resourceKey" :show-overflow-tooltip="true" width="150" fixed="left" />
             <el-table-column label="项目组" prop="businessGroupInfo" width="80" :show-overflow-tooltip="true" align="center">
                 <template slot-scope="scope" v-if="scope.row.businessGroupInfo">
-                    <span>{{scope.row.businessGroupInfo.businessGroupName}}</span>
+                    <span>{{ scope.row.businessGroupInfo.businessGroupName }}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="operUserInfo" width="100" align="center" label="运营">
@@ -76,7 +80,7 @@
                 <template slot-scope="scope" v-if="scope.row.putUserInfo">
                     <el-popover :width="200" trigger="hover" placement="top" :title="scope.row.putUserInfo.nickname">
                         <div style="color: rgb(136, 136, 136); font-size: 13px">
-                        电话：{{ scope.row.putUserInfo.phone }}
+                            电话：{{ scope.row.putUserInfo.phone }}
                         </div>
                         <div slot="reference">{{ scope.row.putUserInfo.nickname }}</div>
                     </el-popover>
@@ -94,16 +98,21 @@
             </el-table-column> -->
             <el-table-column label="资源类型" prop="resourceType" align="center" width="150">
                 <template slot-scope="scope">
-                    <el-tag size="mini" :type="resourceTypes[0].type" v-if="scope.row.resourceType === 0">{{resourceTypes[0].label}}</el-tag>
-                    <el-tag size="mini" :type="resourceTypes[1].type" v-if="scope.row.resourceType === 1">{{resourceTypes[1].label}}</el-tag>
-                    <el-tag size="mini" :type="resourceTypes[2].type" v-if="scope.row.resourceType === 3">{{resourceTypes[2].label}}</el-tag>
-                    <el-tag size="mini" :type="resourceTypes[3].type" v-if="scope.row.resourceType === 10">{{resourceTypes[3].label}}</el-tag>
-                    <el-tag size="mini" :type="resourceTypes[4].type" v-if="scope.row.resourceType === 20">{{resourceTypes[4].label}}</el-tag>
+                    <el-tag size="mini" :type="resourceTypes[0].type"
+                        v-if="scope.row.resourceType === 0">{{ resourceTypes[0].label }}</el-tag>
+                    <el-tag size="mini" :type="resourceTypes[1].type"
+                        v-if="scope.row.resourceType === 1">{{ resourceTypes[1].label }}</el-tag>
+                    <el-tag size="mini" :type="resourceTypes[2].type"
+                        v-if="scope.row.resourceType === 3">{{ resourceTypes[2].label }}</el-tag>
+                    <el-tag size="mini" :type="resourceTypes[3].type"
+                        v-if="scope.row.resourceType === 10">{{ resourceTypes[3].label }}</el-tag>
+                    <el-tag size="mini" :type="resourceTypes[4].type"
+                        v-if="scope.row.resourceType === 20">{{ resourceTypes[4].label }}</el-tag>
                 </template>
             </el-table-column>
             <el-table-column label="所属分组" prop="groupInfo" width="120" align="center">
                 <template slot-scope="scope">
-                    <span v-if="scope.row.groupInfo">{{scope.row.groupInfo.groupName}}</span>
+                    <span v-if="scope.row.groupInfo">{{ scope.row.groupInfo.groupName }}</span>
                     <span v-else></span>
                 </template>
             </el-table-column>
@@ -117,7 +126,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="投放渠道" prop="putChannel" align="center" width="80" />
-            <el-table-column label="期数"  prop="periodInfo" width="100" align="center">
+            <el-table-column label="期数" prop="periodInfo" width="100" align="center">
                 <template slot-scope="scope" v-if="scope.row.periodInfo">
                     <div>
                         {{ scope.row.periodInfo.period }}
@@ -167,7 +176,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column label="创建时间" prop="createTime" width="135"/>
+            <el-table-column label="创建时间" prop="createTime" width="135" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120">
                 <template slot-scope="scope">
                     <!-- <div class="Space"></div> -->
@@ -175,126 +184,138 @@
                         <div>
                             <el-row type="flex" justify="space-between" class="grouping">
                                 <span>移动至</span>
-                                <el-button
-                                    size="mini"
-                                    type="text"
-                                    :icon="gVis ? 'el-icon-close' : 'el-icon-plus'"
-                                    @click="handleGAdd"
-                                >{{gVis ? '取消' : '新增'}}</el-button>
+                                <el-button size="mini" type="text" :icon="gVis ? 'el-icon-close' : 'el-icon-plus'"
+                                    @click="handleGAdd">{{ gVis ? '取消' : '新增' }}</el-button>
                             </el-row>
-                            
+
                             <div v-show="gVis">
                                 <div class="Space"></div>
                                 <el-input placeholder="请输入内容" v-model="groupValue" class="input-with-select" size="mini">
                                     <el-button slot="append" type="primary" @click="handleAddGroup">添加</el-button>
                                 </el-input>
                             </div>
-                            
+
                             <ul class="groupingNames">
                                 <li v-for="gItem in groupingData" :key="gItem.id">
                                     <template v-if="!gItem.isUpdata">
                                         <div class="gnTxt" v-if="scope.row.groupInfo && scope.row.groupInfo.id == gItem.id">
-                                            <span style="color: red">*</span>{{gItem.groupName}}
+                                            <span style="color: red">*</span>{{ gItem.groupName }}
                                         </div>
                                         <div class="gnTxt" v-else>
-                                            {{gItem.groupName}}
+                                            {{ gItem.groupName }}
                                         </div>
-                                        <div class="gnBts gnnone" v-if="!scope.row.groupInfo || scope.row.groupInfo.id != gItem.id"  @click.stop.prevent="editAccountGroup(scope.row.id, gItem.id)">
+                                        <div class="gnBts gnnone"
+                                            v-if="!scope.row.groupInfo || scope.row.groupInfo.id != gItem.id"
+                                            @click.stop.prevent="editAccountGroup(scope.row.id, gItem.id)">
                                             <el-row type="flex" justify="space-around" align="middle" class="bts">
-                                                <el-button size="mini" type="text" icon="el-icon-edit" style="color: #409EFF" @click.stop="handleGUpdata(gItem.id)"></el-button>
+                                                <el-button size="mini" type="text" icon="el-icon-edit"
+                                                    style="color: #409EFF"
+                                                    @click.stop="handleGUpdata(gItem.id)"></el-button>
                                                 <el-popconfirm title="确定删除该分组？" @confirm="handleGroupDel(gItem.id)">
-                                                    <el-button slot="reference" size="mini" type="text" icon="el-icon-delete" style="color: red" @click.stop=""></el-button>
+                                                    <el-button slot="reference" size="mini" type="text"
+                                                        icon="el-icon-delete" style="color: red" @click.stop=""></el-button>
                                                 </el-popconfirm>
                                             </el-row>
                                         </div>
                                     </template>
                                     <template v-else>
-                                        <el-input placeholder="请输入内容" v-model="newGroupName" class="input-with-select" size="mini">
-                                            <el-button slot="append" type="primary" @click="handleGroupEdit(gItem.id, )">修改</el-button>
+                                        <el-input placeholder="请输入内容" v-model="newGroupName" class="input-with-select"
+                                            size="mini">
+                                            <el-button slot="append" type="primary"
+                                                @click="handleGroupEdit(gItem.id,)">修改</el-button>
                                         </el-input>
                                     </template>
                                 </li>
                             </ul>
                         </div>
-                        <el-button size="mini" type="text" icon="el-icon-folder-opened" slot="reference" >分组</el-button>
+                        <el-button size="mini" type="text" icon="el-icon-folder-opened" slot="reference">分组</el-button>
                     </el-popover>
                     <el-dropdown trigger="click" size="mini">
                         <span class="el-dropdown-link">
                             更多<i class="el-icon-arrow-down el-icon--right"></i>
                         </span>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item><change-record v-model="scope.row" :periodList="periodList" :bookCity="bookCity" :bookList="bookList" :teamsList="teamsList" :userAll="userAll" type="acc"/></el-dropdown-item>
-                            <el-dropdown-item><div class="dropdownItem" @click="handleEdit(scope.row)"><i class="el-icon-edit"></i>编辑</div></el-dropdown-item>
-                            <el-dropdown-item><div class="dropdownItem" @click="handleState(scope.row)"><i class="el-icon-s-check"></i> 指派</div></el-dropdown-item>
-                            <el-dropdown-item><cut-book v-model="scope.row" :periodList="periodList" :bookCity="bookCity" :bookList="bookList" @change="getList" :teamsList="teamsList"/></el-dropdown-item>
+                            <el-dropdown-item><change-record v-model="scope.row" :periodList="periodList"
+                                    :bookCity="bookCity" :bookList="bookList" :teamsList="teamsList" :userAll="userAll"
+                                    type="acc" /></el-dropdown-item>
+                            <el-dropdown-item>
+                                <div class="dropdownItem" @click="handleEdit(scope.row)"><i class="el-icon-edit"></i>编辑
+                                </div>
+                            </el-dropdown-item>
+                            <el-dropdown-item>
+                                <div class="dropdownItem" @click="handleState(scope.row)"><i class="el-icon-s-check"></i> 指派
+                                </div>
+                            </el-dropdown-item>
+                            <el-dropdown-item><cut-book v-model="scope.row" :periodList="periodList" :bookCity="bookCity"
+                                    :bookList="bookList" @change="getList" :teamsList="teamsList" /></el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
-                    
+
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
         <!-- 新增 编辑弹窗 -->
-        <el-dialog 
-            :title="isAdd ? '新增资源库' : '编辑资源库'" 
-            :visible.sync="openEdit" 
-            :width="isAdd ? '500px' : '640px'"
-            append-to-body
-            @close="addClose"
-        >
+        <el-dialog :title="isAdd ? '新增资源库' : '编辑资源库'" :visible.sync="openEdit" :width="isAdd ? '500px' : '640px'"
+            append-to-body @close="addClose">
             <el-form :model="queryPlatform" :rules="rules" ref="platForm" label-position="top" :inline="true">
                 <el-form-item label="开始时间" prop="beginTime" style="width: 100%">
-                    <el-date-picker v-model="queryPlatform.beginTime" size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择开始时间" />
+                    <el-date-picker v-model="queryPlatform.beginTime" size="small" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" type="date" placeholder="选择开始时间" />
                 </el-form-item>
                 <el-form-item label="资源名称" prop="resourceName" style="width: 140px">
-                    <el-input v-model="queryPlatform.resourceName" placeholder="输入资源名称"/>
+                    <el-input v-model="queryPlatform.resourceName" placeholder="输入资源名称" />
                 </el-form-item>
                 <el-form-item label="资源标识" prop="resourceKey" style="width: 140px">
-                    <el-input v-model="queryPlatform.resourceKey" placeholder="输入资源标识"/>
+                    <el-input v-model="queryPlatform.resourceKey" placeholder="输入资源标识" />
                 </el-form-item>
                 <el-form-item prop="resourceType" label="资源类型" style="width: 140px">
                     <el-select v-model="queryPlatform.resourceType" placeholder="资源类型" filterable clearable size="small">
-                        <el-option
-                            v-for="item in resourceTypes"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
+                        <el-option v-for="item in resourceTypes" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="资源分组" prop="resourceGroupId" style="width: 140px;">
                     <el-select v-model="queryPlatform.resourceGroupId" placeholder="资源分组" clearable filterable size="small">
-                        <el-option v-for="dict in groupingData" :key="dict.id" :label="dict.groupName" :value="dict.id"/>
+                        <el-option v-for="dict in groupingData" :key="dict.id" :label="dict.groupName" :value="dict.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="项目组" prop="businessGroupId" v-if="isAdd">
-                    <el-select v-model="queryPlatform.businessGroupId" size="small" placeholder="选择项目组" filterable style="width: 140px" clearable>
-                        <el-option v-for="item in teamsList" :key="item.id" :label="item.businessGroupName" :value="item.id" />
+                    <el-select v-model="queryPlatform.businessGroupId" size="small" placeholder="选择项目组" filterable
+                        style="width: 140px" clearable>
+                        <el-option v-for="item in teamsList" :key="item.id" :label="item.businessGroupName"
+                            :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="期数" prop="periodId" v-if="isAdd">
-                    <el-select v-model="queryPlatform.periodId" size="small" placeholder="选择期数" filterable style="width: 140px" clearable>
+                    <el-select v-model="queryPlatform.periodId" size="small" placeholder="选择期数" filterable
+                        style="width: 140px" clearable>
                         <el-option v-for="item in periodList" :key="item.id" :label="item.period" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="书城" prop="platformId" v-if="isAdd">
-                    <el-select v-model="queryPlatform.platformId" @change="selectZh" size="small" placeholder="选择书城" filterable style="width: 140px" clearable>
+                    <el-select v-model="queryPlatform.platformId" @change="selectZh" size="small" placeholder="选择书城"
+                        filterable style="width: 140px" clearable>
                         <el-option v-for="item in bookCity" :key="item.id" :label="item.platformName" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="账号" prop="platformAccountId" v-if="isAdd">
-                    <el-select v-model="queryPlatform.platformAccountId" :disabled="!queryPlatform.platformId" size="small" placeholder="选择账号" filterable style="width: 140px" clearable>
+                    <el-select v-model="queryPlatform.platformAccountId" :disabled="!queryPlatform.platformId" size="small"
+                        placeholder="选择账号" filterable style="width: 140px" clearable>
                         <el-option v-for="item in accList" :key="item.id" :label="item.account" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="书" prop="bookId" v-if="isAdd">
-                    <el-select v-model="queryPlatform.bookId" size="small" placeholder="选择书" filterable style="width: 140px" clearable>
+                    <el-select v-model="queryPlatform.bookId" size="small" placeholder="选择书" filterable style="width: 140px"
+                        clearable>
                         <el-option v-for="item in bookList" :key="item.id" :label="item.bookName" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="投放状态" prop="putStatus" v-if="isAdd">
-                    <el-select v-model="queryPlatform.putStatus" size="small" placeholder="选择投放状态" filterable style="width: 140px" clearable>
+                    <el-select v-model="queryPlatform.putStatus" size="small" placeholder="选择投放状态" filterable
+                        style="width: 140px" clearable>
                         <el-option label="待投放" value="wait" />
                         <el-option label="投放中" value="ing" />
                         <el-option label="停投" value="stop" />
@@ -302,12 +323,14 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="投放渠道" prop="putChannel" v-if="isAdd">
-                    <el-select v-model="queryPlatform.putChannel" size="small" placeholder="选择投放渠道" filterable style="width: 140px" clearable>
-                        <el-option :label="item.label" :value="item.value" :key="item.value" v-for="item in channelList"/>
+                    <el-select v-model="queryPlatform.putChannel" size="small" placeholder="选择投放渠道" filterable
+                        style="width: 140px" clearable>
+                        <el-option :label="item.label" :value="item.value" :key="item.value" v-for="item in channelList" />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="充值模板" prop="rechargeTemplate" v-if="isAdd">
-                    <el-input v-model="queryPlatform.rechargeTemplate" size="small" style="width: 140px" placeholder="输入充值模板" />
+                    <el-input v-model="queryPlatform.rechargeTemplate" size="small" style="width: 140px"
+                        placeholder="输入充值模板" />
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
@@ -317,33 +340,22 @@
         </el-dialog>
 
         <!-- 指派 -->
-        <el-dialog 
-            title="指派用户" 
-            :visible.sync="openEditType" 
-            width="450px"
-            append-to-body
-        >
-            <el-form label-width="80px" label-position="top" ref="platFormTimeType" :model="timeData" :rules="rulesTimeType">
+        <el-dialog title="指派用户" :visible.sync="openEditType" width="450px" append-to-body>
+            <el-form label-width="80px" label-position="top" ref="platFormTimeType" :model="timeData"
+                :rules="rulesTimeType">
                 <el-form-item label="开始时间(修改运营和投手后必选)" prop="beginTime">
-                    <el-date-picker
-                        v-model="timeData.beginTime"
-                        type="date"
-                        format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd"
+                    <el-date-picker v-model="timeData.beginTime" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
                         placeholder="选择开始时间">
                     </el-date-picker>
                 </el-form-item>
             </el-form>
-            <el-form :model="item" :rules="rulesType" ref="platFormType" label-width="80px" label-position="top" v-for="(item, index) in queryPlatformType" :key="index">
+            <el-form :model="item" :rules="rulesType" ref="platFormType" label-width="80px" label-position="top"
+                v-for="(item, index) in queryPlatformType" :key="index">
                 <el-row :gutter="20">
                     <el-col :span="14">
-                        <el-form-item label="用户" prop="userId" >
+                        <el-form-item label="用户" prop="userId">
                             <el-select v-model="item.userId" placeholder="请选择" filterable style="width: 100%" clearable>
-                                <el-option
-                                    v-for="item in userAll"
-                                    :key="item.id"
-                                    :label="item.nickName"
-                                    :value="item.id">
+                                <el-option v-for="item in userAll" :key="item.id" :label="item.nickName" :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -351,10 +363,7 @@
                     <el-col :span="6">
                         <el-form-item label="角色标签" prop="resourceTag">
                             <el-select v-model="item.resourceTag" placeholder="角色标签" filterable clearable>
-                                <el-option
-                                    v-for="(item1, index1) in tagAll"
-                                    :key="index1"
-                                    :label="item1.resourceTag"
+                                <el-option v-for="(item1, index1) in tagAll" :key="index1" :label="item1.resourceTag"
                                     :value="item1.resourceTag">
                                 </el-option>
                             </el-select>
@@ -385,32 +394,24 @@
                     </el-col> -->
                     <el-col :span="2">
                         <div style="margin-top: 42px">
-                            <el-button @click.prevent="removeResource(index)" type="text" icon="el-icon-delete" style="color: red; margin-left: 10px"></el-button>
+                            <el-button @click.prevent="removeResource(index)" type="text" icon="el-icon-delete"
+                                style="color: red; margin-left: 10px"></el-button>
                         </div>
                     </el-col>
                 </el-row>
             </el-form>
             <el-button type="text" icon="el-icon-plus" @click="addResource">新增用户</el-button>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="queryPlatformType = [];openEditType = false">取 消</el-button>
+                <el-button @click="queryPlatformType = []; openEditType = false">取 消</el-button>
                 <el-button type="primary" @click="submitState('platFormType')">确 定</el-button>
             </span>
         </el-dialog>
 
         <!-- 公众号导入对话框 -->
         <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-            <el-upload
-                ref="upload"
-                :limit="1"
-                accept=".xlsx, .xls"
-                :headers="upload.headers"
-                :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                :disabled="upload.isUploading"
-                :on-progress="handleFileUploadProgress"
-                :on-success="handleFileSuccess"
-                :auto-upload="false"
-                drag
-            >
+            <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">
                     将文件拖到此处，或
@@ -432,9 +433,11 @@
 </template>
 
 <script>
-import { getResourceList, addResource,
+import {
+    getResourceList, addResource,
     editResource, addGroup, getGroupAllList, refreshCache,
-    delGroup, editGroup, editAccountGroup, assignResourceUser, getRoleAll } from "@/api/accounts/account";
+    delGroup, editGroup, editAccountGroup, assignResourceUser, getRoleAll
+} from "@/api/accounts/account";
 import { allUser } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { Copy } from "@/utils";
@@ -494,11 +497,11 @@ export default {
                 }
             ],
             resourceTypes: [
-                {label: '公众号', value: 0, type: 'success'},
-                {label: '小程序', value: 1, type: 'danger'},
-                {label: '企业微信', value: 3, type: 'info'},
-                {label: '快应用', value: 10, type: 'warning'},
-                {label: '头条账号', value: 20, type: ''}
+                { label: '公众号', value: 0, type: 'success' },
+                { label: '小程序', value: 1, type: 'danger' },
+                { label: '企业微信', value: 3, type: 'info' },
+                { label: '快应用', value: 10, type: 'warning' },
+                { label: '头条账号', value: 20, type: '' }
             ],
             // 编辑弹窗
             openEdit: false,
@@ -539,9 +542,9 @@ export default {
                 ]
             },
             state: [
-                {label: 1, value: '投放中'},
-                {label: 2, value: '停投'},
-                {label: 3, value: '已注销'}
+                { label: 1, value: '投放中' },
+                { label: 2, value: '停投' },
+                { label: 3, value: '已注销' }
             ],
             // 所有资源角色标签
             tagAll: [],
@@ -562,7 +565,7 @@ export default {
             },
         }
     },
-    mounted(){
+    mounted() {
         this.total = this.accountList.length
         window.addEventListener('storage', this.listener)
     },
@@ -631,7 +634,7 @@ export default {
         /** 刷新缓存 */
         handleRefresh() {
             refreshCache().then(res => {
-                if(res.data) {
+                if (res.data) {
                     this.msgSuccess('刷新成功');
                 }
             })
@@ -657,21 +660,21 @@ export default {
         /** 分组拉取 */
         handlePullHide() {
             this.gVis = false
-            this.groupingData = this.groupingData.map((gitem)=>{
+            this.groupingData = this.groupingData.map((gitem) => {
                 return { ...gitem, isUpdata: false }
             })
         },
         /** 分组新增 */
-        handleGAdd(){
+        handleGAdd() {
             this.gVis = !this.gVis
         },
         /** 分组修改 */
-        handleGUpdata(id){
-            this.groupingData = this.groupingData.map((gitem)=>{
-                if(id === gitem.id){
+        handleGUpdata(id) {
+            this.groupingData = this.groupingData.map((gitem) => {
+                if (id === gitem.id) {
                     this.newGroupName = gitem.groupName
                     return { ...gitem, isUpdata: true }
-                }else{
+                } else {
                     return { ...gitem, isUpdata: false }
                 }
             })
@@ -682,7 +685,7 @@ export default {
             let { id, resourceKey, resourceName, bookId, rechargeTemplate, putChannel, putStatus, platformAccountId, platformId, resourceType, resourceGroupId, businessGroupId, periodId } = value
             this.$nextTick(() => {
                 this.queryPlatform = Object.assign({}, {
-                    id, 
+                    id,
                     resourceKey,
                     resourceName,
                     resourceType,
@@ -716,7 +719,7 @@ export default {
             this.getList()
         },
         /** 状态修改 */
-        handleState(value){
+        handleState(value) {
             if (value.userRelationList && value.userRelationList.length > 0) {
                 this.queryPlatformType = value.userRelationList.map(item => {
                     return {
@@ -756,9 +759,12 @@ export default {
         submit(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
-                    if(this.isAdd){
-                        addResource(this.queryPlatform).then(response => {
-                            if(response.data){
+                    let params = this.queryPlatform
+                    params.resourceName = params.resourceName.replace(/\s/, '')
+                    params.resourceKey = params.resourceKey.replace(/\s/, '')
+                    if (this.isAdd) {
+                        addResource(params).then(response => {
+                            if (response.data) {
                                 this.msgSuccess("新增成功");
                                 this.resetForm("platForm");
                                 this.openEdit = false
@@ -766,9 +772,9 @@ export default {
                             }
                             this.addClose()
                         })
-                    }else{
-                        editResource(this.queryPlatform).then(response => {
-                            if(response.data){
+                    } else {
+                        editResource(params).then(response => {
+                            if (response.data) {
                                 this.msgSuccess("修改成功");
                                 this.resetForm("platForm");
                                 this.openEdit = false
@@ -784,7 +790,7 @@ export default {
         },
         /** 状态提交 */
         submitState(formName) {
-            
+
             this.$refs['platFormTimeType'].validate((valid) => {
                 if (valid) {
                     let state = this.$refs[formName].map(async item => {
@@ -792,9 +798,9 @@ export default {
                     })
 
                     Promise.all(state).then(res => {
-                        if(res.every(item => item)) {
+                        if (res.every(item => item)) {
                             assignResourceUser({ resourceId: this.resourceId, beginTime: this.timeData.beginTime, relationList: this.queryPlatformType }).then(response => {
-                                if(response.data){
+                                if (response.data) {
                                     this.msgSuccess("指派成功");
                                     // this.resetForm(formName);
                                     this.queryPlatformType = []
@@ -807,7 +813,7 @@ export default {
                     })
                 }
             })
-            
+
         },
         stateHandle(ref) {
             return new Promise((resolve) => {
@@ -819,7 +825,7 @@ export default {
             this.delIds = selection.map((item) => item.id)
         },
         /** 时间转换 */
-        parserTime(time){
+        parserTime(time) {
             const d = new Date(time)
             const resDate = d.getFullYear() + '-' + this.p((d.getMonth() + 1)) + '-' + this.p(d.getDate())
             return resDate
@@ -829,18 +835,18 @@ export default {
         },
         /** 关闭弹窗调用 */
         addClose() {
-            if(!this.isAdd){
+            if (!this.isAdd) {
                 this.queryPlatform = {}
             }
         },
         /** 分组新政 */
         handleAddGroup() {
-            if(this.groupValue === ''){
+            if (this.groupValue === '') {
                 this.$message.error('请输入分组');
                 return
             }
-            addGroup({groupName: this.groupValue}).then(response => {
-                if(response.data){
+            addGroup({ groupName: this.groupValue }).then(response => {
+                if (response.data) {
                     this.getGroupList()
                     this.msgSuccess("新增成功");
                     this.groupValue = ''
@@ -852,36 +858,36 @@ export default {
         getGroupList() {
             getGroupAllList().then(response => {
                 this.groupingData = response.data.map((item) => {
-                    return {...item, isUpdata: false}
+                    return { ...item, isUpdata: false }
                 })
             })
         },
         /** 删除分组 */
-        handleGroupDel(id){
+        handleGroupDel(id) {
             delGroup(id).then(response => {
-                if(response.data){
+                if (response.data) {
                     this.msgSuccess("删除成功");
                     this.getGroupList()
                 }
             })
         },
         /** 修改分组 */
-        handleGroupEdit(id){
-            if(this.newGroupName === ''){
+        handleGroupEdit(id) {
+            if (this.newGroupName === '') {
                 this.$message.error('请输入要修改的分组名字');
                 return
             }
             editGroup({ id, groupName: this.newGroupName }).then(response => {
-                if(response.data){
+                if (response.data) {
                     this.getGroupList()
                     this.msgSuccess("修改成功");
                 }
             })
         },
         /** 修改公众号分组 */
-        editAccountGroup(id, resourceGroupId){
-            editAccountGroup({id, resourceGroupId}).then(response => {
-                if(response.data){
+        editAccountGroup(id, resourceGroupId) {
+            editAccountGroup({ id, resourceGroupId }).then(response => {
+                if (response.data) {
                     this.getList()
                     this.msgSuccess("设置成功");
                 }
@@ -915,161 +921,188 @@ export default {
             this.$refs.upload.submit();
         },
         /** 复制 */
-        Copy(value){
+        Copy(value) {
             Copy(value)
         }
     }
 }
 </script>
 <style lang="scss">
-    .el-table {
-        .warning-row {
-            background: oldlace;
-        }
-        .danger-row {
-            background: rgb(253, 187, 187);
-        }
-        .info-row {
-            background: #909399;
-        }
+.el-table {
+    .warning-row {
+        background: oldlace;
     }
 
-    .el-table 
-    .el-drawer__header span:focus {
-        outline: 0;
+    .danger-row {
+        background: rgb(253, 187, 187);
     }
-    .Space{
-        width: 10px;
-        display: inline-block;
-    }
-    .my_padding{
-        margin: 0 10px 10px 10px;
+
+    .info-row {
+        background: #909399;
     }
-    .verticalCenter{
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        margin-left: 5px;
-        &>div.child{
-            color: rgb(136, 136, 136); 
-            font-size: 13px;
-            &>span{
-                color: #606266;
-            }
-        }
-        .font12{
-            font-size: 12px;
+}
+
+.el-table .el-drawer__header span:focus {
+    outline: 0;
+}
+
+.Space {
+    width: 10px;
+    display: inline-block;
+}
+
+.my_padding {
+    margin: 0 10px 10px 10px;
+}
+
+.verticalCenter {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin-left: 5px;
+
+    &>div.child {
+        color: rgb(136, 136, 136);
+        font-size: 13px;
+
+        &>span {
+            color: #606266;
         }
     }
-    .copy{
-        color: #409EFF;
-        margin-left: 5px;
-        cursor: pointer;
-    }
-    .elli{
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        span{
-            flex: 1;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            white-space: nowrap;
-        }
+
+    .font12 {
+        font-size: 12px;
     }
-    .myElli{
-        overflow:hidden;
-        text-overflow:ellipsis;
+}
+
+.copy {
+    color: #409EFF;
+    margin-left: 5px;
+    cursor: pointer;
+}
+
+.elli {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    span {
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
         white-space: nowrap;
     }
-    .grouping{
-        span{
-            font-size: 12px;
-        }
-        button{
-            padding: 0;
-        }
+}
+
+.myElli {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.grouping {
+    span {
+        font-size: 12px;
     }
-    .groupingNames{
+
+    button {
         padding: 0;
-        li{
-            list-style: none;
-            padding: 5px 2px;
-            box-sizing: border-box;
-            position: relative;
-            cursor: pointer;
-            .gnnone{
-                display: none;
-            }
-            .gnTxt{
-                overflow: hidden;
-                text-overflow:ellipsis;
-                white-space: nowrap;
-            }
-            .gnBts{
-                width: 100%;
-                height: 100%;
+    }
+}
+
+.groupingNames {
+    padding: 0;
+
+    li {
+        list-style: none;
+        padding: 5px 2px;
+        box-sizing: border-box;
+        position: relative;
+        cursor: pointer;
+
+        .gnnone {
+            display: none;
+        }
+
+        .gnTxt {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .gnBts {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+
+            .bts {
                 position: absolute;
                 top: 0;
-                left: 0;
-                .bts{
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    height: 100%;
-                    width: 50px;
-                    padding-right: 10px;
-                }
-            }
-            &:hover .gnnone{
-                display: block;
-                background-color: rgba(211, 211, 211, .5);
-                border-radius: 2px;
-            }
-            i{
-                cursor: pointer;
+                right: 0;
+                height: 100%;
+                width: 50px;
+                padding-right: 10px;
             }
-            
-            
         }
-        
+
+        &:hover .gnnone {
+            display: block;
+            background-color: rgba(211, 211, 211, .5);
+            border-radius: 2px;
+        }
+
+        i {
+            cursor: pointer;
+        }
+
+
     }
-    .custom {
-        width: 75% !important;
+
+}
+
+.custom {
+    width: 75% !important;
+}
+
+.cut {
+    padding: 0 10px;
+    box-sizing: border-box;
+
+    .button {
+        margin-bottom: 10px;
+    }
+
+    .el-table .cell {
+        line-height: normal;
     }
-    .cut {
-        padding: 0 10px;
-        box-sizing: border-box;
 
-        .button {
+    ul {
+        padding-left: 0;
+
+        .sumitInfo {
+            // margin-top: 20px;
+            font-weight: 600;
             margin-bottom: 10px;
-        }
-        .el-table .cell {
-            line-height: normal;
-        }
-        ul {
-            padding-left: 0;
-            .sumitInfo {
-                // margin-top: 20px;
-                font-weight: 600;
-                margin-bottom: 10px;
 
-                .button {
-                    margin-left: 20px;
-                }
+            .button {
+                margin-left: 20px;
             }
         }
     }
-    .el-dropdown-link {
-        cursor: pointer;
-        color: #409EFF;
-        font-size: 12px;
-        margin-left: 10px;
-    }
-    .dropdownItem {
-        cursor: pointer;
-        color: #409EFF;
-        font-size: 12px;
-        padding: 4px 0;
-    }
-</style>
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409EFF;
+    font-size: 12px;
+    margin-left: 10px;
+}
+
+.dropdownItem {
+    cursor: pointer;
+    color: #409EFF;
+    font-size: 12px;
+    padding: 4px 0;
+}</style>

src/views/accounts/account/use.vue

@@ -362,7 +362,7 @@
         <el-form-item label="投放渠道" prop="putChannel" v-if="isAdd">
           <el-select v-model="queryPlatform.putChannel" size="small" placeholder="选择投放渠道" filterable style="width: 140px"
             clearable>
-            <el-option :label="item.label" :value="item.value" :key="item.value" v-for="item in channelList"/>
+            <el-option :label="item.label" :value="item.value" :key="item.value" v-for="item in channelList" />
           </el-select>
         </el-form-item>
         <el-form-item label="充值模板" prop="rechargeTemplate" v-if="isAdd">
@@ -818,7 +818,8 @@ export default {
             authTimeout = this.parserTime(authTimeout);
             params.authTimeout = authTimeout
           }
-
+          params.nickName = params.nickName.replace(/\s/, '')
+          params.appid = params.appid.replace(/\s/, '')
           if (this.isAdd) {
             console.log(params)
             addAccount(params).then(res => {

src/views/accounts/corpWechat/mailList.vue

@@ -4,10 +4,10 @@
             <el-row :gutter="10" class="mb8" align="middle">
                 <el-col :span="1.5">
                     <el-input v-model="queryParams.name" placeholder="企微号名称" clearable size="small" style="width: 140px"
-                        @keyup.enter.native="getList" />
+                        @keyup.enter.native="handleQuery" />
                 </el-col>
                 <el-col :span="1.5"><el-button type="cyan" icon="el-icon-search" size="mini"
-                        @click="getList">搜索</el-button></el-col>
+                        @click="handleQuery">搜索</el-button></el-col>
                 <el-col :span="1.5"><el-button size="mini" type="primary" icon="el-icon-sort"
                         :disabled="corpUserIds.length === 0"
                         @click="handlePut({ corpUserIds: corpUserIds })">批量指派</el-button></el-col>
@@ -75,11 +75,11 @@
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="openSys = false; assignUSerData = {}">取 消</el-button>
-                <el-button type="primary" @click=" assignUSerSubmit ">确 定</el-button>
+                <el-button type="primary" @click="assignUSerSubmit">确 定</el-button>
             </span>
         </el-dialog>
-        <changeRecord :visible=" recordShow " :recordData=" recordData " :userAll=" userAll "
-            @close=" recordShow = false; recordData = {} " />
+        <changeRecord :visible="recordShow" :recordData="recordData" :userAll="userAll"
+            @close=" recordShow = false; recordData = {}" />
     </div>
 </template>
 
@@ -143,6 +143,16 @@ export default {
         },
     },
     methods: {
+        /** 搜索 */
+        handleQuery() {
+            this.queryParams = {
+                ...this.queryParams,
+                pageNum: 1
+            }
+            this.$nextTick(() => {
+                this.getList()
+            })
+		},
         handleSelectionChange(selection) {
             this.corpUserIds = selection.map((item) => item.corpUserId)
         },