src/views/system/user.vue

@@ -1,24 +1,24 @@
 <template>
-    <div>
-        <div class="custom-tree-container">
-            <div class="block-l">
-                <el-card shadow="hover" class="space-vertical">
-                    <el-select v-model="deptAttr" class="full" filterable placeholder="组织架构类型" size="small" @change="handleDeptAttrChange">
-                        <el-option v-for="item in DeptAttrData" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
-                </el-card>
-                <el-card shadow="hover">
-                    <el-tag class="full space-vertical" :closable="selectDeptNode.level!==0" @close="handleCloseDept()">当前所选：{{ selectDeptNode.name }}</el-tag>
-                    <el-tree
-                        ref="selectTree"
-                        :data="DeptTree"
-                        node-key="id"
-                        :indent="deptTreeIndent"
-                        accordion
-                        :expand-on-click-node="expandDeptClick"
-                        :default-expanded-keys="expandedDeptKey"
-                        @node-click="handleDeptNodeClick"
-                    >
+  <div>
+    <div class="custom-tree-container">
+      <div class="block-l">
+        <el-card shadow="hover" class="space-vertical">
+          <el-select v-model="deptAttr" class="full" filterable placeholder="组织架构类型" size="small" @change="handleDeptAttrChange">
+            <el-option v-for="item in DeptAttrData" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-card>
+        <el-card shadow="hover">
+          <el-tag class="full space-vertical" :closable="selectDeptNode.level!==0" @close="handleCloseDept()">当前所选：{{ selectDeptNode.name }}</el-tag>
+          <el-tree
+            ref="selectTree"
+            :data="DeptTree"
+            node-key="id"
+            :indent="deptTreeIndent"
+            accordion
+            :expand-on-click-node="expandDeptClick"
+            :default-expanded-keys="expandedDeptKey"
+            @node-click="handleDeptNodeClick"
+          >
             <span slot-scope="{ node, data }" class="custom-tree-node">
               <span>
                 <i v-if="data.level == 0" class="el-icon-s-home" />
@@ -31,267 +31,281 @@
                 <el-link class="space" type="primary" @click="() => collapseAll()">折叠</el-link>
               </span>
             </span>
-                    </el-tree>
-                </el-card>
+          </el-tree>
+        </el-card>
+      </div>
+      <div class="block-r">
+        <el-row class="handle-box" style="margin-bottom: 10px">
+          <el-col :span="24">
+            <el-input v-model="username" size="small" placeholder="登录名" class="ch-input-size" @keyup.enter.native="handleSearch()" />
+            <el-input v-model="truename" size="small" placeholder="用户名" class="ch-input-size" @keyup.enter.native="handleSearch()" />
+            <el-select v-model="dataRoleId" size="small" filterable clearable placeholder="数据角色" @change="handleSearch()">
+              <el-option v-for="item in DataRole" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            <el-select v-model="postId" size="small" filterable clearable placeholder="岗位" @change="handleSearch()">
+              <el-option v-for="item in PostData" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
+            <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;搜索</el-button>
+            <!--<el-button size="mini" class="ch-button-side" type="primary" :disabled="!currentRow"  @click="assignRole()">角色分配</el-button>-->
+            <el-button size="mini" class="ch-button-side" type="primary" :disabled="SelectUserIds.length===0 || isAdminSelect" @click="resetPassword('',true)">批量重置密码</el-button>
+            <el-button size="mini" class="ch-button ch-button-side" @click="handleAdd()"><i class="el-icon-document-add" />&nbsp;新增</el-button>
+          </el-col>
+        </el-row>
+        <el-row class="handle-box">
+          <el-col :span="24">
+            <el-table
+              ref="multipleTable"
+              v-loading="loading"
+              :data="AllData"
+              highlight-current-row
+              @current-change="handleRowSelectChange"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="60" />
+              <el-table-column label="登录名" prop="username" />
+              <el-table-column label="用户名" prop="truename" />
+              <!--              <el-table-column label="数据角色" prop="dataRoleStr" />-->
+              <el-table-column label="岗位" prop="postStr" />
+              <el-table-column label="顺序号" prop="sequenceNo" header-align="center" align="center" width="80" />
+              <el-table-column label="状态" prop="statusStr" header-align="center" align="center" width="80">
+                <template scope="scope">
+                  <span v-if="scope.row.isLock== '1'" class="p-red">锁定</span>
+                  <el-switch v-if="scope.row.isLock!= '1' && scope.row.id != '1'" v-model="scope.row.status" active-value="1" inactive-value="0" @change="handleStatusSwitch(scope.row)" />
+                </template>
+              </el-table-column>
+              <el-table-column label="最近登录" prop="loginAt" header-align="center" align="center" width="140" />
+              <el-table-column label="操作" header-align="center" align="center" width="100">
+                <template scope="scope">
+                  <el-dropdown class="cp">
+                    <span class="el-dropdown-link">更多操作<i class="el-icon-arrow-down el-icon--right" /></span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item icon="el-icon-user" @click.native="assignUserRole(scope.row)">角色分配</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-edit" @click.native="handleEdit(scope.row)">用户编辑</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-refresh" @click.native="resetPassword(scope.row,false)">重置密码</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-delete p-red" @click.native="handleDel(scope.row,'是否删除该用户？')"><span class="p-red">用户删除</span></el-dropdown-item>
+                      <el-dropdown-item v-if="scope.row.isLock== '1'" icon="el-icon-refresh" @click.native="handleUnLock(scope.row.id)">解除锁定</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="table-page">
+              <el-pagination
+                :current-page.sync="currentPage"
+                :page-size="pageSize"
+                background
+                layout="total, prev, pager, next"
+                :total="allpage"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+              />
             </div>
-            <div class="block-r">
-                <el-row class="handle-box" style="margin-bottom: 10px">
-                    <el-col :span="24">
-                        <el-input v-model="username" size="small" placeholder="登录名" class="ch-input-size" @keyup.enter.native="handleSearch()" />
-                        <el-input v-model="truename" size="small" placeholder="用户名" class="ch-input-size" @keyup.enter.native="handleSearch()" />
-                        <el-select v-model="dataRoleId" size="small" filterable clearable placeholder="数据角色" @change="handleSearch()">
-                            <el-option v-for="item in DataRole" :key="item.value" :label="item.label" :value="item.value" />
-                        </el-select>
-                        <el-select v-model="postId" size="small" filterable clearable placeholder="岗位" @change="handleSearch()">
-                            <el-option v-for="item in PostData" :key="item.value" :label="item.label" :value="item.value" />
-                        </el-select>
-                        <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
-                        <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;搜索</el-button>
-                        <!--<el-button size="mini" class="ch-button-side" type="primary" :disabled="!currentRow"  @click="assignRole()">角色分配</el-button>-->
-                        <el-button size="mini" class="ch-button-side" type="primary" :disabled="SelectUserIds.length===0 || isAdminSelect" @click="resetPassword('',true)">批量重置密码</el-button>
-                        <el-button size="mini" class="ch-button ch-button-side" @click="handleAdd()"><i class="el-icon-document-add" />&nbsp;新增</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogVisible"
+      width="1250px"
+      top="30px"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :append-to-body="true"
+      class="statistic_base"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
+      @open="dlgOpen"
+    >
+      <el-form ref="commitForm" :model="form" style="width: 100%;padding: 5px" :rules="commitRules">
+        <el-row>
+          <el-col style="padding-bottom: 10px">
+            <span class="card_title">归属信息</span>
+            <el-card shadow="always" style="padding-top: 10px">
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>所属集团</span></el-col>
+                <el-col :span="7" class="col-input">
+                  <el-form-item>
+                    <el-select v-model="form.groupId" filterable clearable :disabled="isGroupUser">
+                      <el-option
+                        v-for="item in GroupData"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>所属部门</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item prop="selectDepartment">
+                    <el-cascader
+                      v-model="form.selectDepartment"
+                      class="full"
+                      :options="DeptTree"
+                      :props="{ checkStrictly: true }"
+                      clearable
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="4" class="col-txt"><span>上级领导</span></el-col>
+                <el-col :span="7" class="col-input">
+                  <el-form-item>
+                    <el-select v-model="form.leader" placeholder filterable clearable>
+                      <el-option
+                        v-for="item in LeaderData"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>岗位</span></el-col>
+                <el-col :span="8" class="col-input">
+                  <el-form-item>
+                    <el-select v-model="form.posts" placeholder="" multiple filterable @change="initPosition">
+                      <el-option
+                        v-for="item in PostData"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4" class="col-txt"><span>岗位层级</span></el-col>
+                <el-col :span="7" class="col-input">
+                  <el-form-item>
+                    <el-select v-model="form.position" placeholder="请选择" readonly>
+                      <el-option
+                        v-for="item in positionData"
+                        :key="item.id"
+                        :label="item.postLevel"
+                        :value="item.postLevel"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-card>
+            <span class="card_title">用户信息</span>
+            <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+              <el-row>
+                <el-col :span="24">
+                  <el-row>
+                    <el-col :span="4" class="col-txt"><span>登录名</span></el-col>
+                    <el-col :span="7" class="col-input">
+                      <el-form-item prop="username">
+                        <el-input v-model="form.username" :disabled="!isAdd" />
+                      </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row class="handle-box">
-                    <el-col :span="24">
-                        <el-table
-                            ref="multipleTable"
-                            v-loading="loading"
-                            :data="AllData"
-                            highlight-current-row
-                            @current-change="handleRowSelectChange"
-                            @selection-change="handleSelectionChange"
-                        >
-                            <el-table-column type="selection" width="60" />
-                            <el-table-column label="登录名" prop="username" />
-                            <el-table-column label="用户名" prop="truename" />
-                            <!--              <el-table-column label="数据角色" prop="dataRoleStr" />-->
-                            <el-table-column label="岗位" prop="postStr" />
-                            <el-table-column label="顺序号" prop="sequenceNo" header-align="center" align="center" width="80" />
-                            <el-table-column label="状态" prop="statusStr" header-align="center" align="center" width="80">
-                                <template scope="scope">
-                                    <span v-if="scope.row.isLock== '1'" class="p-red">锁定</span>
-                                    <el-switch v-if="scope.row.isLock!= '1' && scope.row.id != '1'" v-model="scope.row.status" active-value="1" inactive-value="0" @change="handleStatusSwitch(scope.row)" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="最近登录" prop="loginAt" header-align="center" align="center" width="140" />
-                            <el-table-column label="操作" header-align="center" align="center" width="100">
-                                <template scope="scope">
-                                    <el-dropdown class="cp">
-                                        <span class="el-dropdown-link">更多操作<i class="el-icon-arrow-down el-icon--right" /></span>
-                                        <el-dropdown-menu slot="dropdown">
-                                            <el-dropdown-item icon="el-icon-user" @click.native="assignUserRole(scope.row)">角色分配</el-dropdown-item>
-                                            <el-dropdown-item icon="el-icon-edit" @click.native="handleEdit(scope.row)">用户编辑</el-dropdown-item>
-                                            <el-dropdown-item icon="el-icon-refresh" @click.native="resetPassword(scope.row,false)">重置密码</el-dropdown-item>
-                                            <el-dropdown-item icon="el-icon-delete p-red" @click.native="handleDel(scope.row,'是否删除该用户？')"><span class="p-red">用户删除</span></el-dropdown-item>
-                                            <el-dropdown-item v-if="scope.row.isLock== '1'" icon="el-icon-refresh" @click.native="handleUnLock(scope.row.id)">解除锁定</el-dropdown-item>
-                                        </el-dropdown-menu>
-                                    </el-dropdown>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        <div class="table-page">
-                            <el-pagination
-                                :current-page.sync="currentPage"
-                                :page-size="pageSize"
-                                background
-                                layout="total, prev, pager, next"
-                                :total="allpage"
-                                @size-change="handleSizeChange"
-                                @current-change="handleCurrentChange"
-                            />
-                        </div>
+                    <el-col :span="4" class="col-txt"><span>员工编号</span></el-col>
+                    <el-col :span="8" class="col-input">
+                      <el-form-item prop="staffCode">
+                        <el-input v-model="form.staffCode" />
+                      </el-form-item>
                     </el-col>
-                </el-row>
-            </div>
-        </div>
-        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="1250px" top="30px" :close-on-click-modal="false" :close-on-press-escape="false"  @open="dlgOpen"
-                   :append-to-body="true"
-                   class="statistic_base"
-                   :modal-append-to-body="true"
-                   custom-class="tagdialog">
-            <el-form ref="commitForm" :model="form" style="width: 100%;padding: 5px" :rules="commitRules">
-                <el-row>
-                    <el-col style="padding-bottom: 10px">
-                        <span class="card_title">归属信息</span>
-                        <el-card shadow="always" style="padding-top: 10px">
-                            <el-row>
-                                <el-col :span="4" class="col-txt"><span>所属集团</span></el-col>
-                                <el-col :span="7" class="col-input">
-                                    <el-form-item>
-                                        <el-select v-model="form.groupId" filterable clearable :disabled="isGroupUser">
-                                            <el-option
-                                                v-for="item in GroupData"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value"
-                                            />
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4" class="col-txt"><span>所属部门</span></el-col>
-                                <el-col :span="8" class="col-input">
-                                    <el-form-item prop="selectDepartment">
-                                        <el-cascader
-                                            v-model="form.selectDepartment"
-                                            class="full"
-                                            :options="DeptTree"
-                                            :props="{ checkStrictly: true }"
-                                            clearable
-                                        />
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                            <el-row>
-                                <el-col :span="4" class="col-txt"><span>上级领导</span></el-col>
-                                <el-col :span="7" class="col-input">
-                                    <el-form-item>
-                                        <el-select v-model="form.leader" placeholder filterable clearable>
-                                            <el-option
-                                                v-for="item in LeaderData"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value"
-                                            />
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4" class="col-txt"><span>岗位</span></el-col>
-                                <el-col :span="8" class="col-input">
-                                    <el-form-item>
-                                        <el-select v-model="form.posts" placeholder="" multiple filterable @change="initPosition">
-                                            <el-option
-                                                v-for="item in PostData"
-                                                :key="item.value"
-                                                :label="item.label"
-                                                :value="item.value"
-                                            />
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4" class="col-txt"><span>岗位层级</span></el-col>
-                                <el-col :span="7" class="col-input">
-                                    <el-form-item>
-                                        <el-select v-model="form.position" placeholder="请选择" readonly>
-                                            <el-option
-                                                v-for="item in positionData"
-                                                :key="item.id"
-                                                :label="item.postLevel"
-                                                :value="item.postLevel"
-                                            />
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
-                        </el-card>
-                        <span class="card_title">用户信息</span>
-                        <el-card shadow="always" style="padding: 15px 5px 5px 15px">
-                            <el-row>
-                                <el-col :span="24">
-                                    <el-row>
-                                        <el-col :span="4" class="col-txt"><span>登录名</span></el-col>
-                                        <el-col :span="7" class="col-input">
-                                            <el-form-item prop="username">
-                                                <el-input v-model="form.username" :disabled="!isAdd" />
-                                            </el-form-item>
-                                        </el-col>
-                                        <el-col :span="4" class="col-txt"><span>员工编号</span></el-col>
-                                        <el-col :span="8" class="col-input">
-                                            <el-form-item prop="staffCode">
-                                                <el-input v-model="form.staffCode" />
-                                            </el-form-item>
-                                        </el-col>
-                                    </el-row>
-                                    <el-row>
-                                        <el-col :span="4" class="col-txt"><span>用户名</span></el-col>
-                                        <el-col :span="7" class="col-input">
-                                            <el-form-item>
-                                                <el-input v-model="form.truename" />
-                                            </el-form-item>
-                                        </el-col>
-
-                                        <el-col :span="4" class="col-txt"><span>手机号</span></el-col>
-                                        <el-col :span="8" class="col-input">
-                                            <el-form-item>
-                                                <el-input v-model="form.phone" />
-                                            </el-form-item>
-                                        </el-col>
-                                    </el-row>
-                                    <el-row>
-                                        <el-col :span="4" class="col-txt"><span>性别</span></el-col>
-                                        <el-col :span="7" class="col-input">
-                                            <el-form-item>
-                                                <el-select v-model="form.gender" placeholder="">
-                                                    <el-option
-                                                        v-for="item in dc_data.GENDER"
-                                                        :key="item.value"
-                                                        :label="item.label"
-                                                        :value="item.value"
-                                                    />
-                                                </el-select>
-                                            </el-form-item>
-                                        </el-col>
-                                        <el-col :span="4" class="col-txt"><span>顺序号</span></el-col>
-                                        <el-col :span="8" class="col-input">
-                                            <el-form-item>
-                                                <el-input v-model="form.sequenceNo" />
-                                            </el-form-item>
-                                        </el-col>
-                                    </el-row>
-                                    <el-row>
-                                        <el-col :span="4" class="col-txt"><span>备注</span></el-col>
-                                        <el-col :span="19" class="col-input">
-                                            <el-form-item>
-                                                <el-input v-model="form.comment" type="textarea" :rows="2" />
-                                            </el-form-item>
-                                        </el-col>
-                                    </el-row>
-                                </el-col>
-                            </el-row>
-                        </el-card>
-
+                  </el-row>
+                  <el-row>
+                    <el-col :span="4" class="col-txt"><span>用户名</span></el-col>
+                    <el-col :span="7" class="col-input">
+                      <el-form-item>
+                        <el-input v-model="form.truename" />
+                      </el-form-item>
                     </el-col>
-                </el-row>
-            </el-form>
-            <div slot="footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" :loading="loading" @click.native="checkAndSubmit()">确 定</el-button>
-            </div>
-        </el-dialog>
 
-        <el-dialog :title="dialogRoleTitle" :visible.sync="dialogRoleVisible" width="70%" top="50px" @open="dlgRoleOpen"
-                   :append-to-body="true"
-                   class="statistic_base"
-                   :modal-append-to-body="true"
-                   custom-class="tagdialog">
-            <el-form ref="commitForm1" style="width: 100%;padding: 5px">
-                <el-row>
-                    <el-col style="padding-bottom: 10px">
-                        <span class="card_title">选择菜单角色</span>
-                        <el-card shadow="always" style="padding: 15px 5px 5px 15px">
-                            <el-checkbox-group v-model="SelectMenuRole" style="line-height: 45px;">
-                                <el-checkbox v-for="role in MenuRole" :key="role.id" :label="role.id" border>{{ role.name }}</el-checkbox>
-                            </el-checkbox-group>
-                        </el-card>
+                    <el-col :span="4" class="col-txt"><span>手机号</span></el-col>
+                    <el-col :span="8" class="col-input">
+                      <el-form-item>
+                        <el-input v-model="form.phone" />
+                      </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
-                    <el-col style="padding-bottom: 10px">
-                        <span class="card_title">选择数据角色</span>
-                        <el-card shadow="always" style="padding: 15px 5px 5px 15px">
-                            <el-checkbox-group v-model="SelectDataRole" style="line-height: 45px;">
-                                <el-checkbox v-for="role in DataRole" :key="role.value" :label="role.value" border>{{ role.label }}</el-checkbox>
-                            </el-checkbox-group>
-                        </el-card>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="4" class="col-txt"><span>性别</span></el-col>
+                    <el-col :span="7" class="col-input">
+                      <el-form-item>
+                        <el-select v-model="form.gender" placeholder="">
+                          <el-option
+                            v-for="item in dc_data.GENDER"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          />
+                        </el-select>
+                      </el-form-item>
                     </el-col>
-                </el-row>
-            </el-form>
-            <div slot="footer">
-                <el-button @click="dialogRoleVisible = false">取 消</el-button>
-                <el-button v-preventReClick type="primary" @click="confirmSubmitRole()">确 定</el-button>
-            </div>
-        </el-dialog>
-    </div>
+                    <el-col :span="4" class="col-txt"><span>顺序号</span></el-col>
+                    <el-col :span="8" class="col-input">
+                      <el-form-item>
+                        <el-input v-model="form.sequenceNo" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="4" class="col-txt"><span>备注</span></el-col>
+                    <el-col :span="19" class="col-input">
+                      <el-form-item>
+                        <el-input v-model="form.comment" type="textarea" :rows="2" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-col>
+              </el-row>
+            </el-card>
+
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="loading" @click.native="checkAndSubmit()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="dialogRoleTitle"
+      :visible.sync="dialogRoleVisible"
+      width="70%"
+      top="50px"
+      :append-to-body="true"
+      class="statistic_base"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
+      @open="dlgRoleOpen"
+    >
+      <el-form ref="commitForm1" style="width: 100%;padding: 5px">
+        <el-row>
+          <el-col style="padding-bottom: 10px">
+            <span class="card_title">选择菜单角色</span>
+            <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+              <el-checkbox-group v-model="SelectMenuRole" style="line-height: 45px;">
+                <el-checkbox v-for="role in MenuRole" :key="role.id" :label="role.id" border>{{ role.name }}</el-checkbox>
+              </el-checkbox-group>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col style="padding-bottom: 10px">
+            <span class="card_title">选择数据角色</span>
+            <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+              <el-checkbox-group v-model="SelectDataRole" style="line-height: 45px;">
+                <el-checkbox v-for="role in DataRole" :key="role.value" :label="role.value" border>{{ role.label }}</el-checkbox>
+              </el-checkbox-group>
+            </el-card>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="dialogRoleVisible = false">取 消</el-button>
+        <el-button v-preventReClick type="primary" @click="confirmSubmitRole()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>

src/views/workflow/components/myProcess/applyAgainPayment.vue

@@ -103,7 +103,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="申请金额（小写）" prop="applyPayMoney">
-                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @change="swapper(formData.applyPayMoney)" />
+                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @input="swapper(formData.applyPayMoney)" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -265,8 +265,23 @@ export default {
     },
     methods: {
         handlePictureRemove(file, fileUrlList) {
-            var index = fileUrlList.indexOf(file)
-            fileUrlList.splice(index, 1)
+            // var index = fileUrlList.indexOf(file)
+            // fileUrlList.splice(index, 1)
+
+            console.log('删除22------------',file,fileUrlList)
+
+            for (let i = 0; i < fileUrlList.length; i++) {
+                if (fileUrlList[i].name == file.name) {
+                    var index = i
+                }
+            }
+            this.$nextTick((e) => {
+                this.formData.fileUrlList.splice(index, 1)
+            })
+            const formDataFileUrlList = JSON.parse(JSON.stringify(this.formData.fileUrlList))
+            this.formData.fileUrlList = []
+            this.formData.fileUrlList = formDataFileUrlList
+            this.$forceUpdate()
         },
         uploadFile: function(param) {
             const _this = this
@@ -277,14 +292,14 @@ export default {
         swapper(n) {
             // console.log('ddd',n)
             if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)) { return '数据非法' }
-            var unit = '千百拾亿千百拾万千百拾元角分'; var str = ''
+            var unit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var str = ''
             n += '00'
             var p = n.indexOf('.')
             if (p >= 0) { n = n.substring(0, p) + n.substr(p + 1, 2) }
             unit = unit.substr(unit.length - n.length)
             for (var i = 0; i < n.length; i++) { str += '零壹贰叁肆伍陆柒捌玖'.charAt(n.charAt(i)) + unit.charAt(i) }
-            // console.log('end',str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
-            this.formData.applyPayMoneyUppercase = str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
+            // console.log('end',str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
+            this.formData.applyPayMoneyUppercase = str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
 
             // console.log('end',this.formData.applyPayMoneyUppercase)
             this.$forceUpdate()

src/views/workflow/components/myProcess/applyPayment.vue

@@ -106,7 +106,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="申请金额（小写）" prop="applyPayMoney">
-                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @change="swapper(formData.applyPayMoney)" />
+                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @input="swapper(formData.applyPayMoney)" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -504,14 +504,14 @@ export default {
         swapper(n) {
             // console.log('ddd',n)
             if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)) { return '数据非法' }
-            var unit = '千百拾亿千百拾万千百拾元角分'; var str = ''
+            var unit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var str = ''
             n += '00'
             var p = n.indexOf('.')
             if (p >= 0) { n = n.substring(0, p) + n.substr(p + 1, 2) }
             unit = unit.substr(unit.length - n.length)
             for (var i = 0; i < n.length; i++) { str += '零壹贰叁肆伍陆柒捌玖'.charAt(n.charAt(i)) + unit.charAt(i) }
-            // console.log('end',str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
-            this.formData.applyPayMoneyUppercase = str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
+            // console.log('end',str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
+            this.formData.applyPayMoneyUppercase = str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
 
             // console.log('end',this.formData.applyPayMoneyUppercase)
             this.$forceUpdate()

src/views/workflow/components/myProcess/applyPaymentConfirm.vue

@@ -101,7 +101,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="申请金额（小写）" prop="applyPayMoney">
-                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @change="swapper(formData.applyPayMoney)" />
+                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @input="swapper(formData.applyPayMoney)" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -373,14 +373,14 @@ export default {
         swapper(n) {
             // console.log('ddd',n)
             if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)) { return '数据非法' }
-            var unit = '千百拾亿千百拾万千百拾元角分'; var str = ''
+            var unit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var str = ''
             n += '00'
             var p = n.indexOf('.')
             if (p >= 0) { n = n.substring(0, p) + n.substr(p + 1, 2) }
             unit = unit.substr(unit.length - n.length)
             for (var i = 0; i < n.length; i++) { str += '零壹贰叁肆伍陆柒捌玖'.charAt(n.charAt(i)) + unit.charAt(i) }
-            // console.log('end',str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
-            this.formData.applyPayMoneyUppercase = str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
+            // console.log('end',str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
+            this.formData.applyPayMoneyUppercase = str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
 
             // console.log('end',this.formData.applyPayMoneyUppercase)
             this.$forceUpdate()

src/views/workflow/components/myProcess/applyPaymentDetail.vue

@@ -103,7 +103,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="申请金额（小写）" prop="applyPayMoney">
-                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @change="swapper(formData.applyPayMoney)" />
+                    <el-input v-model="formData.applyPayMoney" oninput="value=value.replace(/[^\d.]/g,'')" placeholder="请填写" @input="swapper(formData.applyPayMoney)" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -319,14 +319,14 @@ export default {
         swapper(n) {
             // console.log('ddd',n)
             if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)) { return '数据非法' }
-            var unit = '千百拾亿千百拾万千百拾元角分'; var str = ''
+            var unit = '仟佰拾亿仟佰拾万仟佰拾元角分'; var str = ''
             n += '00'
             var p = n.indexOf('.')
             if (p >= 0) { n = n.substring(0, p) + n.substr(p + 1, 2) }
             unit = unit.substr(unit.length - n.length)
             for (var i = 0; i < n.length; i++) { str += '零壹贰叁肆伍陆柒捌玖'.charAt(n.charAt(i)) + unit.charAt(i) }
-            // console.log('end',str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
-            this.formData.applyPayMoneyUppercase = str.replace(/零(千|百|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
+            // console.log('end',str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整'))
+            this.formData.applyPayMoneyUppercase = str.replace(/零(仟|佰|拾|角)/g, '零').replace(/(零)+/g, '零').replace(/零(万|亿|元)/g, '$1').replace(/(亿)万|壹(拾)/g, '$1$2').replace(/^元零?|零分/g, '').replace(/元$/g, '元整')
 
             // console.log('end',this.formData.applyPayMoneyUppercase)
             this.$forceUpdate()