Browse Source

修改人事板块内容

wangh 1 year ago
parent
commit
64800cfd72

+ 4 - 3
src/components/OP/GroupsTaskAssignment.vue

@@ -38,9 +38,10 @@
             <div style="display: flex;flex-wrap: wrap;">
                 <div v-for="(  item, index  ) in   user  " :key="index"
                     style="margin-left: 5px;width: 200px;margin-top: 10px;">
-                    <el-checkbox :label="item.id" :value="userStr.indexOf(item.id) != -1" border @change="check(item.id)">{{
-                        item.name
-                    }}</el-checkbox>
+                    <el-checkbox :label="item.id" :value="userStr.indexOf(item.id) != -1" border @change="check(item.id)"
+                        style="width: 120px;">{{
+                            item.name
+                        }}</el-checkbox>
                 </div>
             </div>
         </div>

+ 2 - 1
src/components/Resource/OfficialActivities.vue

@@ -7,7 +7,8 @@
                 </div>
                 <div style="display: flex;">
                     <div style="width: 90%;">
-                        <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="delegationSelectChange">
+                        <el-select v-model="DiId" placeholder="团组选择" clearable filterable @change="delegationSelectChange"
+                            style="width: 30%;">
                             <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                 :value="item.id">
                             </el-option>

+ 1 - 1
src/components/Resource/OpAskData.vue

@@ -45,7 +45,7 @@
                 <el-form-item>
                     <div style="margin-left: 60%;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
-                        <router-link to='/home/OfficialActivities'>
+                        <router-link to='/home/AskData'>
                             <el-button>取消</el-button>
                         </router-link>
                     </div>

+ 1 - 1
src/components/Resource/OpInvitationOfficialActivityData.vue

@@ -238,7 +238,7 @@ export default {
     methods: {
         //团组数据
         GetGroupNameList() {
-            var url = "/api/Groups/GetGroupNameList"
+            var url = "/api/Business/GetGroupNameList"
             var that = this
             this.$axios({
                 method: 'post',

+ 4 - 1
src/components/Resource/OpOfficialActivities.vue

@@ -447,12 +447,12 @@ export default {
                         },
                         data: that.OpOfficialActivitiesDto
                     }).then(function (res) {
-
                         if (res.data.code == 200) {
                             that.$message({
                                 message: res.data.msg,
                                 type: 'success'
                             });
+
                             that.loading = true;
                         } else {
                             that.$message.error(res.data.msg);
@@ -619,6 +619,9 @@ export default {
                         message: res.data.msg,
                         type: 'success'
                     });
+                    setTimeout(() => {
+                        that.$router.push('/home/OfficialActivities')
+                    }, 3000);
                 } else {
                     that.$message.error(res.data.msg);
                 }

+ 1 - 3
src/components/system/JobPost.vue

@@ -225,8 +225,6 @@ export default {
                 console.log(res)
 
                 if (res.data.code == 200) {
-
-
                     that.tableDatas = res.data.data;
                     that.tableData = that.tableDatas
                     if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
@@ -393,7 +391,7 @@ export default {
                             that.addData.CompanyId = '';
                             that.addData.DepId = '';
                             that.addData.JobName = ''
-                            that.addData.CreateUserId = this.userId;
+                            that.addData.CreateUserId = that.userId;
                             that.addData.Remark = "";
                             that.jobPost();
                         } else {

+ 1 - 9
src/components/system/User.vue

@@ -169,7 +169,6 @@ export default {
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
             this.currentPage = val;
-
         },
         //部门数据查询
         Department(companyId) {
@@ -187,9 +186,6 @@ export default {
                     CompanyId: companyId
                 }
             }).then(function (res) {
-
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.depData = res.data.data;
                 }
@@ -209,8 +205,6 @@ export default {
                     portType: 1,
                 }
             }).then(function (res) {
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.companyData = res.data.data;
                 }
@@ -244,8 +238,6 @@ export default {
                     DepId: depId
                 }
             }).then(function (res) {
-                console.log(res)
-
                 if (res.data.code == 200) {
                     that.JobData = res.data.data;
                 }
@@ -372,7 +364,7 @@ export default {
         //#endregion
         del(index, row) {
 
-            this.$confirm('此操作将取消订单, 是否继续?', '提示', {
+            this.$confirm('此操作将删除该员工, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'