sunlupeng il y a 1 an
Parent
commit
0dec0f8bdd

+ 1 - 1
src/api/system/role.js

@@ -67,7 +67,7 @@ export function delRole(roleId) {
 // 导出角色
 export function exportRole(query) {
   return request({
-    url: '/system/role/export',
+    url: '/system/role/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

+ 1 - 1
src/views/login.vue

@@ -210,7 +210,7 @@ export default {
             removePassword()
             removeRememberMe()
           }
-          // setTenantId(1)
+          setTenantId(1)
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
             this.$router.push({path: "/"}).catch(() => {
             });

+ 1 - 1
src/views/oa/renew/detail.vue

@@ -85,7 +85,7 @@
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
           <span class="field-required">*</span>
-          <div class="field-name">转正申请理由</div>
+          <div class="field-name">续签申请理由</div>
         </div>
         <div class="field-component">
           <span :title="form.renewReason">{{ form.renewReason }}</span>

+ 1 - 1
src/views/oa/renew/edit.vue

@@ -37,7 +37,7 @@
           style="width: 100%;">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="转正申请理由" prop="renewReason">
+      <el-form-item label="续签申请理由" prop="renewReason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.renewReason"
           placeholder='申请理由'></el-input>
       </el-form-item>

+ 1 - 1
src/views/personnel/attendance/scheduling/index.vue

@@ -205,7 +205,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.postId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },

+ 7 - 7
src/views/stamp/list/index.vue

@@ -249,7 +249,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 岗位表格数据
+      // 表格数据
       StampList: [],
       // 弹出层标题
       title: "",
@@ -349,7 +349,7 @@ export default {
       this.getEmployee();
       this.singlePeopleOpen = false;
     },
-    /** 查询岗位列表 */
+    /** 查询列表 */
     getList() {
       this.loading = true;
       listStamp(this.queryParams).then(response => {
@@ -392,7 +392,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加岗位";
+      this.title = "添加";
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
@@ -453,7 +453,7 @@ export default {
           }
         }
         this.open = true;
-        this.title = "修改岗位";
+        this.title = "修改";
       });
     },
     /** 详情按钮操作 */
@@ -491,7 +491,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id;
-      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delStamp(ids);
       }).then(() => {
         this.getList();
@@ -501,11 +501,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
         this.exportLoading = true;
         return exportStamp(queryParams);
       }).then(response => {
-        this.$download.excel(response, '岗位数据.xls');
+        this.$download.excel(response, '用印数据.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

+ 1 - 1
src/views/system/role/index.vue

@@ -481,7 +481,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
+      this.$modal.confirm('是否确认导出所有角色数据项?').then(() => {
           this.exportLoading = true;
           return exportRole(queryParams);
         }).then(response => {