zzyuan
/
gz-att-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序打卡数据

This commit is contained in:
lSun 2024-12-04 18:27:57 +08:00
parent adcdd1d5ad
commit 1a8882edce
6 changed files with 78 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/process/evection/index.vue
View File

@ -76,7 +76,7 @@
</template>
</el-table-column>
<el-table-column label="外出时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
<el-table-column label="出差时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding">
<template slot-scope="scope">

2
src/views/process/leaveReporting/index.vue
View File

@ -76,7 +76,7 @@
</template>
</el-table-column>
<el-table-column label="外出时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
<el-table-column label="休假时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding">
<template slot-scope="scope">

87
src/views/process/orgApply/index.vue
View File

@ -131,7 +131,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="申请人：" prop="userName">
<el-input v-model="form.userName" :readonly="true" />
<el-input v-model="form.userName" disabled />
</el-form-item>
</el-col>
@ -152,20 +152,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="变更后部门:" prop="newOrgId" >
<el-select v-model="form.newOrgId" @change="changDept" :disabled="isView" style="width: 100%">
<el-option
v-for="item in orgList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<treeselect v-model="form.newOrgId" :options="deptOptions" :normalizer="normalizer" placeholder="选择变更后部门" :disabled="isView" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="考勤规则组变更：" prop="isChangeAttGroup">
<el-radio-group v-model="form.isChangeAttGroup">
<el-radio-group v-model="form.isChangeAttGroup" :disabled="isView">
<el-radio
v-for="item in isAgreeList"
:key="item.id"
@ -179,7 +172,7 @@
<el-row v-if="form.isChangeAttGroup == '1'">
<el-col :span="12">
<el-form-item label="变更前规则组：" prop="attGroupName">
<el-input v-model="form.attGroupName" :readonly="true" />
<el-input v-model="form.attGroupName" :disabled="isView" />
</el-form-item>
</el-col>
@ -203,7 +196,8 @@
<el-date-picker
v-model="form.changeEffectiveDate" :clearable="false" :disabled="isView"
type="date" value-format="yyyy-MM-dd" style="width: 100%;"
placeholder="变更生效日期" >
placeholder="变更生效日期"
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
@ -211,7 +205,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注：">
<el-input type="textarea" placeholder="输入内容" v-model="form.remark" maxlength="100" :readonly="isView"></el-input>
<el-input type="textarea" placeholder="输入内容" v-model="form.remark" maxlength="100" :disabled="isView"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -219,7 +213,7 @@
<el-row>
<el-col :span="24" v-if="form.checkOpinion">
<el-form-item label="审批意见：" prop="checkOpinion">
<el-input type="textarea" v-model="form.checkOpinion" maxlength="100" ></el-input>
<el-input type="textarea" v-model="form.checkOpinion" maxlength="100" :disabled="isView"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -237,9 +231,12 @@
listOrg, getOrg, delOrg, addOrg, updateOrg, changeOrgStatus, exportOrg, getPostName,
getAttGroupList,
} from "@/api/process/orgApply";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listDept} from "@/api/system/dept";
export default {
name: "OrgApply",
components: { Treeselect },
data() {
return {
//申请人
@ -306,19 +303,22 @@
isChangeAttGroup:[
{ required: true, message: "是否考勤规则组变更不能为空", trigger: "blur" }
],
attGroupName:[
{ required: true, message: "变更前规则组不能为空", trigger: "blur" }
],
newAttGroup:[
{ required: true, message: "变更后规则组不能为空", trigger: "blur" }
]
},
// 结束日期选择限制
endPickerOptions: {
disabledDate: (v) => {
if(this.form.changeEffectiveDate) {
return v.getTime() < new Date(this.form.changeEffectiveDate).getTime() - 86400000; // - 86400000是否包括当天
}
},
},
// 部门树选项
deptOptions: [],
pickerOptions: {
disabledDate(time) {
// 返回 true 表示禁用这个日期
return time.getTime() < Date.now() - 86400000; // 禁用今天之前的所有日期
}
}
};
},
created() {
@ -401,25 +401,33 @@
getPostName(Id).then(response => {
this.form.postName = response.data.postName;
//变更前部门
console.log(this.$store.state.user.attGroupId)
console.log(this.$store.state.user.attGroupName)
this.form.attGroupId = this.$store.state.user.attGroupId;
this.form.attGroupName = this.$store.state.user.attGroupName;
this.open = true;
this.isView = false;
this.title = "新增";
console.log(this.form.attGroupName)
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "id");
this.open = true;
this.isView = false;
this.title = "新增";
});
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const Id = row.id
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "id");
});
getOrg(Id).then(orgResponse => {
// 更新表单的 org 信息
this.form ={
...orgResponse.data,
newAttGroup:orgResponse.data.newAttGroup?Number(orgResponse.data.newAttGroup):""
};
this.form.attGroupName = orgResponse.data.oldOrgName;
this.form.attGroupName = orgResponse.data.oldAttGroupName;
// 更新视图状态
this.open = true;
this.isView = false;
@ -429,17 +437,21 @@
handleView(row) {
this.reset();
const Id = row.id
listDept().then(response => {
this.deptOptions = this.handleTree(response.data, "id");
});
getOrg(Id).then(orgResponse => {
// 更新表单的 org 信息
this.form ={
...orgResponse.data,
newAttGroup:orgResponse.data.newAttGroup?Number(orgResponse.data.newAttGroup):""
};
this.form.attGroupName = orgResponse.data.oldOrgName;
this.form.attGroupName = orgResponse.data.oldAttGroupName;
// 更新视图状态
this.open = true;
this.isView = true;
this.title = "查看";
});
},
//选择部门
@ -507,6 +519,25 @@
})
},
/** 转换部门数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.orgName,
children: node.children
};
},
}
};
</script>
<style scoped>
.vue-treeselect__option--highlighted {
background-color: initial; /* 或者你想要的任何颜色 */
color: initial; /* 或者你想要的任何颜色 */
}
</style>

50
src/views/process/orgExam/index.vue
View File

@ -36,17 +36,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['att:org:change:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -120,20 +109,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="申请人：" prop="userName">
<el-input v-model="form.userName" :readonly="true" />
<el-input v-model="form.userName" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="变更前部门:" prop="oldOrgId" >
<el-select v-model="form.oldOrgId" @change="changDept" :disabled="isView" style="width: 100%">
<el-option
v-for="item in orgList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-input v-model="form.oldOrgName" disabled></el-input>
</el-form-item>
</el-col>
@ -141,20 +123,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="变更后部门:" prop="newOrgId" >
<el-select v-model="form.newOrgId" @change="changDept" :disabled="isView" style="width: 100%">
<el-option
v-for="item in orgList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-input v-model="form.newOrgName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="考勤规则组变更：" prop="isChangeAttGroup">
<el-radio-group v-model="form.isChangeAttGroup">
<el-radio-group v-model="form.isChangeAttGroup" disabled>
<el-radio
v-for="item in isAgreeList"
:key="item.id"
@ -168,20 +143,13 @@
<el-row v-if="form.isChangeAttGroup == '1'">
<el-col :span="12">
<el-form-item label="变更前规则组：" prop="attGroupName">
<el-input v-model="form.attGroupName" :readonly="true" />
<el-input v-model="form.oldAttGroupName" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="变更后规则组：" prop="newAttGroup">
<el-select v-model="form.newAttGroup" placeholder="请选择" filterable style="width: 100%;" :disabled="isView">
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-input v-model="form.newAttGroupName" disabled />
</el-form-item>
</el-col>
</el-row>
@ -190,7 +158,7 @@
<el-col :span="12">
<el-form-item label="变更生效日期：" prop="changeEffectiveDate">
<el-date-picker
v-model="form.changeEffectiveDate" :clearable="false" :disabled="isView"
v-model="form.changeEffectiveDate" :clearable="false" disabled
type="date" value-format="yyyy-MM-dd" style="width: 100%;"
placeholder="变更生效日期" >
</el-date-picker>
@ -200,7 +168,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注：">
<el-input type="textarea" placeholder="输入内容" v-model="form.remark" maxlength="100" :readonly="isView"></el-input>
<el-input type="textarea" placeholder="输入内容" v-model="form.remark" maxlength="100" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
@ -208,7 +176,7 @@
<el-row>
<el-col :span="24" v-if="form.checkOpinion">
<el-form-item label="审批意见：" prop="checkOpinion">
<el-input type="textarea" v-model="form.checkOpinion" maxlength="100" ></el-input>
<el-input type="textarea" v-model="form.checkOpinion" maxlength="100" disabled ></el-input>
</el-form-item>
</el-col>
</el-row>

11
src/views/process/wechatEvection/index.vue
View File

@ -16,11 +16,6 @@
<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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -29,8 +24,10 @@
@click="handleExport"
>导出
</el-button>
</el-col>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -61,7 +58,7 @@
</template>
</el-table-column>
<el-table-column label="外出时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
<el-table-column label="出差时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding">
<template slot-scope="scope">

10
src/views/process/wechatLeaveReporting/index.vue
View File

@ -16,11 +16,7 @@
<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>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -29,8 +25,10 @@
@click="handleExport"
>导出
</el-button>
</el-col>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -61,7 +59,7 @@
</template>
</el-table-column>
<el-table-column label="外出时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
<el-table-column label="休假时长(天)" align="center" prop="leaveDuration" :show-overflow-tooltip="true"
width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding">
<template slot-scope="scope">