提交代码

唐耀东

2022-07-16 4ef06d948899e393515bd62819f4f773766f9449

 src/views/system/user/index.vue

@@ -64,18 +64,18 @@
              />
            </el-select>
          </el-form-item>
          <el-form-item label="创建时间">
            <el-date-picker
              v-model="dateRange"
              size="small"
              style="width: 240px"
              value-format="yyyy-MM-dd"
              type="daterange"
              range-separator="-"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
          <!--<el-form-item label="创建时间">-->
            <!--<el-date-picker-->
              <!--v-model="dateRange"-->
              <!--size="small"-->
              <!--style="width: 240px"-->
              <!--value-format="yyyy-MM-dd"-->
              <!--type="daterange"-->
              <!--range-separator="-"-->
              <!--start-placeholder="开始日期"-->
              <!--end-placeholder="结束日期"-->
            <!--&gt;</el-date-picker>-->
          <!--</el-form-item>-->
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -141,9 +141,9 @@
        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户账户" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
          <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
          <el-table-column label="所在部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
            <template slot-scope="scope">
@@ -179,6 +179,7 @@
                size="mini"
                type="text"
                icon="el-icon-delete"
                class="del-btn"
                @click="handleDelete(scope.row)"
                v-hasPermi="['system:user:remove']"
              >删除</el-button>
@@ -208,12 +209,12 @@
    </el-row>

    <!-- 添加或修改用户配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-row>
          <el-col :span="12">
            <el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
            <el-form-item v-if="form.userId == undefined" label="用户账户" prop="userName">
              <el-input v-model="form.userName" placeholder="请输入用户账户" maxlength="30" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -316,7 +317,7 @@
            <el-form-item label="入职时间">
              <el-date-picker
                v-model="form.entryTime"
                type="datetime"
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="选择入职时间">
              </el-date-picker>
@@ -333,10 +334,10 @@
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    </Dialog>

    <!-- 用户导入对话框 -->
    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
    <Dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
      <el-upload
        ref="upload"
        :limit="1"
@@ -363,7 +364,7 @@
        <el-button type="primary" @click="submitFileForm">确 定</el-button>
        <el-button @click="upload.open = false">取 消</el-button>
      </div>
    </el-dialog>
    </Dialog>
  </div>
</template>

@@ -499,6 +500,9 @@
        ],
        deptId: [
          { required: true, message: "所在部门不能为空", trigger: "blur" }
        ],
        remarks: [
          {max: 128, message: '最多输入128个字符', trigger: 'blur' }
        ]
      }
    };
@@ -677,7 +681,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const userIds = row.userId || this.ids;
      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除？').then(function() {
        return delUser(userIds);
      }).then(() => {
        this.getList();