sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2023-10-04 21:54:50 +08:00
parent 672638af84
commit 1b0eb695d9
4 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ruoyi-ui/src/views/project/attendance/attendanceDrawer.vue
View File

@ -2,10 +2,18 @@
<div class="project-attendance-data-drawer" v-if="isOpen">
<el-drawer v-if="isOpen" :visible.sync="isOpen" direction="rtl" size="70%" style="padding-left: 20px">
<template slot="title">
<div>{{ title + " 【劳务实名管理-考勤记录】" }}</div>
<div>{{ title + " 【劳务实名管理】" }}</div>
</template>
<div>
<main-index ref="main"></main-index>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="考勤记录" name="first">
<main-index ref="main"></main-index>
</el-tab-pane>
<el-tab-pane label="人员信息" name="second">
<workerIndex ref="workerMain"></workerIndex>
</el-tab-pane>
</el-tabs>
</div>
</el-drawer>
</div>
@ -13,12 +21,15 @@
<script>
import mainIndex from './index.vue'
import workerIndex from '../attendanceWorker/index'
export default {
components:{
mainIndex
mainIndex,
workerIndex
},
data() {
return {
activeName: 'first',
isOpen: false,
title: '',
};
@ -29,14 +40,23 @@ export default {
},
methods: {
show(prj) {
this.prj=prj;
this.activeName='first';
this.title = prj.projectName||""
this.isOpen = true;
setTimeout(()=>{
this.$refs.main.init(prj);
},400);
this.handleClick();
},
handleClick(){
setTimeout(()=>{
if(this.activeName=='first'){
this.$refs.main.init(this.prj);
}else{
this.$refs.workerMain.initMe(this.prj);
}
},400);
}
},
};

21
ruoyi-ui/src/views/project/surProject/index.vue
View File

@ -474,17 +474,12 @@
command="handleStandard"
icon="el-icon-s-grid"
v-hasPermi="['project:projectStandard:list']"
>标准化管理</el-dropdown-item>
<el-dropdown-item
command="handleAttendanceWorker"
icon="el-icon-s-grid"
v-hasPermi="['project:attendanceWorker:list']"
>劳务实名管理</el-dropdown-item>
>标准化管理</el-dropdown-item>
<el-dropdown-item
command="handleAttendanceData"
icon="el-icon-s-grid"
v-hasPermi="['project:attendance:list']"
>劳务实名管理-考勤记录</el-dropdown-item>
>劳务实名管理</el-dropdown-item>
<el-dropdown-item
command="handleDelete"
icon="el-icon-delete"
@ -768,8 +763,7 @@
<costOutputDrawer ref="costOutput"></costOutputDrawer>
<checkDetectionDrawer ref="checkDetection"></checkDetectionDrawer>
<standardDrawer ref="standard"></standardDrawer>
<attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>
<attendanceWorkerDrawer ref="attendanceWorker"></attendanceWorkerDrawer>
<attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>
</div>
</template>
@ -802,7 +796,6 @@ import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue";
import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue";
import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue'
import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue'
import attendanceWorkerDrawer from '@/views/project/attendanceWorker/attendanceWorkerDrawer.vue'
import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
export default {
@ -826,8 +819,7 @@ export default {
costOutputDrawer,
checkDetectionDrawer,
standardDrawer,
attendanceDataDrawer,
attendanceWorkerDrawer
attendanceDataDrawer,
},
dicts: [
"sur_project_xmjd",
@ -1082,10 +1074,7 @@ export default {
break;
case "handleStandard":
this.$refs.standard.show(row);
break;
case "handleAttendanceWorker":
this.$refs.attendanceWorker.show(row);
break;
break;
case "handleAttendanceData":
this.$refs.attendanceData.show(row);
break;

12
ruoyi-ui/src/views/project/surProject/myIndex.vue
View File

@ -150,8 +150,10 @@
icon="el-icon-s-check">今日出勤</el-button>
<el-button type="primary" @click="doPrjCostOutput" v-hasPermi="['project:costOutput:edit']"
icon="el-icon-money">项目成本产值管理</el-button>
<el-button type="primary" @click="doPrjStandard" v-hasPermi="['project:projectStandard:list']"
<el-button type="primary" @click="doPrjStandard" v-hasPermi="['project:projectStandard:list']"
icon="el-icon-s-grid">标准化管理</el-button>
<el-button type="primary" @click="doAttendanceData" v-hasPermi="['project:attendance:list']"
icon="el-icon-s-check">劳务实名管理</el-button>
</div>
@ -162,6 +164,7 @@
<projectUserInfoDrawer ref="prjUser" size="50%" :visible.sync="showPrjUser" :form-data="prj"/>
<costOutputDrawer ref="costOutput"></costOutputDrawer>
<standardDrawer ref="standard"></standardDrawer>
<attendanceDataDrawer ref="attendanceData"></attendanceDataDrawer>
</div>
</template>
@ -175,6 +178,7 @@ import buildNodeDrawer from "../surBuildNode/buildNodeDrawer.vue";
import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue";
import costOutputDrawer from '@/views/project/costOutput/costOutputDrawer.vue'
import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue'
import attendanceDataDrawer from '@/views/project/attendance/attendanceDrawer.vue'
export default {
dicts: [
@ -193,7 +197,8 @@ export default {
attendanceDrawer,
projectUserInfoDrawer,
costOutputDrawer,
standardDrawer
standardDrawer,
attendanceDataDrawer
},
data() {
return {
@ -208,6 +213,9 @@ export default {
this.loadData();
},
methods: {
doAttendanceData(){
this.$refs.attendanceData.show(this.prj);
},
doPrjStandard(){
this.$refs.standard.show(this.prj);
},

4
ruoyi-ui/vue.config.js
View File

@ -41,8 +41,8 @@ module.exports = {
// }
// },
'/jhapi':{
//target: `http://62.234.3.186/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'