herenshan112
/
ShutongInterconnectedChemicalCloudPlatform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

兼职显示

qin_14
hreenshan112 10 months ago
parent
c877c955b3
commit
7f0f18c9d3
2 changed files with 409 additions and 350 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/views/hr/archives/basicinformation/orgnexus.vue
  2. 264
      src/views/sysworkflow/lowcodepage/appPage/index.vue

49
src/views/hr/archives/basicinformation/orgnexus.vue
View File

@ -3,44 +3,49 @@
@ 时间: 2023-06-16 10:33:37 @ 时间: 2023-06-16 10:33:37
@ 备注: 行政组织关系 @ 备注: 行政组织关系
--> -->
<script lang='ts' setup> <script lang="ts" setup>
import { peopleAboutOrg } from '@/api/hr/people/type' import { peopleAboutOrg } from "@/api/hr/people/type";
import { getPeopleAboutOrg } from '@/api/hr/people/index' import { getPeopleAboutOrg } from "@/api/hr/people/index";
const props = defineProps({ const props = defineProps({
tabsid: { tabsid: {
type: String, type: String,
default:"1" default: "1",
}, },
usercont: { usercont: {
type: Object, type: Object,
default() { default() {
return {} return {};
} },
} },
}); });
const tableLoading = ref(false) const tableLoading = ref(false);
const postList = ref<peopleAboutOrg[]>([]) const postList = ref<peopleAboutOrg[]>([]);
function getOrgList() { function getOrgList() {
tableLoading.value = true; tableLoading.value = true;
getPeopleAboutOrg({ id: props.usercont.keystr }) getPeopleAboutOrg({ id: props.usercont.keystr })
.then((data) => { .then((data) => {
postList.value = data.data postList.value = data.data;
}) })
.finally(()=>{tableLoading.value = false;}) .finally(() => {
tableLoading.value = false;
});
} }
/** /**
* 监听数据 * 监听数据
*/ */
watch(() => props.tabsid,() => { watch(
() => props.tabsid,
() => {
if (props.tabsid == "3") { if (props.tabsid == "3") {
getOrgList() getOrgList();
} }
}) }
);
onMounted(() => { onMounted(() => {
if (props.tabsid == "3") { if (props.tabsid == "3") {
getOrgList() getOrgList();
} }
}) });
</script> </script>
<template> <template>
<el-table <el-table
@ -58,10 +63,12 @@ function getOrgList(){
</el-table-column> </el-table-column>
<el-table-column label="任职单位" prop="orgallname" /> <el-table-column label="任职单位" prop="orgallname" />
<el-table-column label="任职职务" prop="postname" width="100" align="center" /> <el-table-column label="任职职务" prop="postname" width="100" align="center" />
<el-table-column label="任职起始时间" prop="starttimeing" width="120" align="center" /> <el-table-column
<el-table-column label="任职结束时间" prop="endtimeing" width="120" align="center" /> label="任职起始时间"
prop="starttimeing"
width="120"
align="center"
/>
</el-table> </el-table>
</template> </template>
<style lang='scss' scoped> <style lang="scss" scoped></style>
</style>

264
src/views/sysworkflow/lowcodepage/appPage/index.vue
View File

@ -3,28 +3,27 @@
@ 时间: 2024-04-18 14:08:56 @ 时间: 2024-04-18 14:08:56
@ 备注: 设置自建应用 @ 备注: 设置自建应用
--> -->
<script lang='ts' setup> <script lang="ts" setup>
import { appMenuTreeInfo,appSetInfo } from "@/api/date/type" import { appMenuTreeInfo, appSetInfo } from "@/api/date/type";
import { gainAppEditPsge } from '@/api/DesignForm/requestapi' import { gainAppEditPsge } from "@/api/DesignForm/requestapi";
import { Search } from '@element-plus/icons-vue' import { Search } from "@element-plus/icons-vue";
import SvgIcon from "@/components/SvgIcon/index.vue"; import SvgIcon from "@/components/SvgIcon/index.vue";
import AppMenus from "@/views/sysworkflow/lowcodepage/appPage/appMenus.vue" import AppMenus from "@/views/sysworkflow/lowcodepage/appPage/appMenus.vue";
import AppMenuGroup from "@/views/sysworkflow/lowcodepage/appPage/appMenuGroup.vue" import AppMenuGroup from "@/views/sysworkflow/lowcodepage/appPage/appMenuGroup.vue";
import CreateAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue" import CreateAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue";
import OpenAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue" import OpenAppFormPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue";
import AppSetUp from "@/views/sysworkflow/lowcodepage/appPage/appSetUp/index.vue" import AppSetUp from "@/views/sysworkflow/lowcodepage/appPage/appSetUp/index.vue";
import ReleaseApp from '@/views/sysworkflow/lowcodepage/appPage/releaseApp/index.vue' import ReleaseApp from "@/views/sysworkflow/lowcodepage/appPage/releaseApp/index.vue";
const props = defineProps({ const props = defineProps({
drawerWith: { drawerWith: {
type: Number, type: Number,
default:0 default: 0,
}, },
formKey: { formKey: {
type: String, type: String,
default:"" default: "",
}, },
isShow: { isShow: {
type: Boolean, type: Boolean,
@ -32,59 +31,67 @@ const props = defineProps({
}, },
groupKey: { groupKey: {
type: String, type: String,
default:"" default: "",
}, },
pickAppInfo: { pickAppInfo: {
type: Object, type: Object,
default() { default() {
return {} return {};
} },
} },
}); });
const emits = defineEmits(["update:isShow","update:svgName","refreshPage","accessapp"]); const emits = defineEmits([
const squareUrl = 'https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png' "update:isShow",
const drawerOpenOrClose = ref(false) "update:svgName",
const tabsActive = ref(1) "refreshPage",
const menusTree = ref<appMenuTreeInfo[]>([]) "accessapp",
]);
const squareUrl = "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png";
const drawerOpenOrClose = ref(false);
const tabsActive = ref(1);
const menusTree = ref<appMenuTreeInfo[]>([]);
const appCont = reactive<appSetInfo>({ const appCont = reactive<appSetInfo>({
appKey: "1", appKey: "1",
appName: "未知应用", appName: "未知应用",
appSvg: "", appSvg: "",
state: 1, state: 1,
uuid: "1", uuid: "1",
describe:"" describe: "",
}) });
const menuParentKey = ref<string>("") const menuParentKey = ref<string>("");
const menuGroupShow = ref(false) //添加菜单分组 const menuGroupShow = ref(false); //添加菜单分组
const appPageKey = ref<string>("") //自定义App表单Id const appPageKey = ref<string>(""); //自定义App表单Id
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-04-19 15:47:12 @ 时间: 2024-04-19 15:47:12
@ 功能: 选择选项 @ 功能: 选择选项
*/ */
const handleClick = () =>{} const handleClick = () => {};
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-04-23 09:56:19 @ 时间: 2024-04-23 09:56:19
@ 功能: 关闭 @ 功能: 关闭
*/ */
const closeAppDraw = () => { const closeAppDraw = () => {
emits("update:isShow",false) emits("update:isShow", false);
emits("refreshPage") emits("refreshPage");
tabsActive.value = 1 tabsActive.value = 1;
checkedMenu.value = "" checkedMenu.value = "";
appPageKey.value = "" appPageKey.value = "";
props.formKey="" props.formKey = "";
isNew.value = false isNew.value = false;
} };
onMounted(() => { onMounted(() => {
// gainAppContent() // gainAppContent()
}) });
watch(()=>props.isShow,(val:boolean)=>{ watch(
() => props.isShow,
(val: boolean) => {
if (val) { if (val) {
gainAppContent() gainAppContent();
} }
}) }
);
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-04-23 15:23:31 @ 时间: 2024-04-23 15:23:31
@ -92,19 +99,18 @@ watch(()=>props.isShow,(val:boolean)=>{
*/ */
const gainAppContent = () => { const gainAppContent = () => {
let sendInfo = { let sendInfo = {
id:props.formKey.toString() id: props.formKey.toString(),
} };
gainAppEditPsge(sendInfo) gainAppEditPsge(sendInfo).then((data) => {
.then((data)=>{
// console.log("获取app信息---》",data) // console.log("获取app信息---》",data)
menusTree.value = data.data.menuTree menusTree.value = data.data.menuTree;
appCont.appKey = data.data.appKey; appCont.appKey = data.data.appKey;
appCont.appName = data.data.appName; appCont.appName = data.data.appName;
appCont.appSvg = data.data.appSvg; appCont.appSvg = data.data.appSvg;
appCont.state = data.data.state; appCont.state = data.data.state;
appCont.uuid = data.data.uuid; appCont.uuid = data.data.uuid;
}) });
} };
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ -118,68 +124,77 @@ const addMenu = (key?:string) => {
menuParentKey.value = ""; menuParentKey.value = "";
} }
menuGroupShow.value = true; menuGroupShow.value = true;
} };
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-05-06 11:09:44 @ 时间: 2024-05-06 11:09:44
@ 功能: 创建页面 @ 功能: 创建页面
*/ */
const saveAppFormIsShow = ref(false) const saveAppFormIsShow = ref(false);
const isNew = ref(false) const isNew = ref(false);
const addAppPageForm = (key?: string) => { const addAppPageForm = (key?: string) => {
saveAppFormIsShow.value = true saveAppFormIsShow.value = true;
isNew.value = true isNew.value = true;
// console.log("新建-->") // console.log("新建-->")
} };
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-05-18 09:00:00 @ 时间: 2024-05-18 09:00:00
@ 功能: 操作表单页面 @ 功能: 操作表单页面
*/ */
const checkedMenu = ref<appMenuTreeInfo>("") const checkedMenu = ref<appMenuTreeInfo>("");
const openAppPageForm = (val: appMenuTreeInfo) => { const openAppPageForm = (val: appMenuTreeInfo) => {
checkedMenu.value = val checkedMenu.value = val;
} };
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-05-20 13:27:37 @ 时间: 2024-05-20 13:27:37
@ 功能: 编辑app页面 @ 功能: 编辑app页面
*/ */
const editAppInfo = (id: string) => { const editAppInfo = (id: string) => {
appPageKey.value = id appPageKey.value = id;
saveAppFormIsShow.value = true saveAppFormIsShow.value = true;
isNew.value = false isNew.value = false;
} };
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-05-20 16:20:08 @ 时间: 2024-05-20 16:20:08
@ 功能: 重新初始化app @ 功能: 重新初始化app
*/ */
const openAppPageInit = ref(null) const openAppPageInit = ref(null);
const updataPageInit = () => { const updataPageInit = () => {
openAppPageInit.value.gainAppFormPageInit();
openAppPageInit.value.gainAppFormPageInit() };
} watch(
watch(()=>tabsActive.value,(val:number)=>{ () => tabsActive.value,
(val: number) => {
if (val == 1) { if (val == 1) {
openAppPageInit.value.gainAppFormPageInit() openAppPageInit.value.gainAppFormPageInit();
}
} }
}) );
/** /**
@ 作者: 秦东 @ 作者: 秦东
@ 时间: 2024-06-28 08:46:12 @ 时间: 2024-06-28 08:46:12
@ 功能: 访问前端页面 @ 功能: 访问前端页面
*/ */
const accessRunApp = () => { const accessRunApp = () => {
closeAppDraw() closeAppDraw();
emits("accessapp",props.pickAppInfo) emits("accessapp", props.pickAppInfo);
} };
</script> </script>
<template> <template>
<div class="drawerClass"> <div class="drawerClass">
<el-drawer
<el-drawer v-model="props.isShow" title="设置/编辑自定义表单" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith"> v-model="props.isShow"
title="设置/编辑自定义表单"
:with-header="false"
:close-on-click-modal="false"
:close-on-press-escape="false"
:destroy-on-close="true"
:size="props.drawerWith"
>
<div class="common-layout"> <div class="common-layout">
<el-container> <el-container>
<el-header class="headerBox"> <el-header class="headerBox">
@ -192,15 +207,16 @@ const accessRunApp = () =>{
</el-space> </el-space>
</div> </div>
<div> <div>
<el-tabs v-model="tabsActive" @tab-click="handleClick" :stretch="true" class="tabsMain"> <el-tabs
<el-tab-pane label="① 页面管理" :name="1"> v-model="tabsActive"
</el-tab-pane> @tab-click="handleClick"
<el-tab-pane label="② 集成&自动化" :name="2"> :stretch="true"
</el-tab-pane> class="tabsMain"
<el-tab-pane label="③ 应用设置" :name="3"> >
</el-tab-pane> <el-tab-pane label="① 页面管理" :name="1"> </el-tab-pane>
<el-tab-pane label="④ 应用发布" :name="4"> <el-tab-pane label="② 集成&自动化" :name="2"> </el-tab-pane>
</el-tab-pane> <el-tab-pane label="③ 应用设置" :name="3"> </el-tab-pane>
<el-tab-pane label="④ 应用发布" :name="4"> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div> <div>
@ -222,17 +238,23 @@ const accessRunApp = () =>{
<el-button type="primary" class="fa fa-plus" /> <el-button type="primary" class="fa fa-plus" />
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item @click="addAppPageForm"> <el-dropdown-item @click="addAppPageForm">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-space wrap> <el-space wrap>
<svg-icon style="color: #eebe77;" prefix="icon" icon-class="liuChengBiaoDan" /> <svg-icon
style="color: #eebe77"
prefix="icon"
icon-class="liuChengBiaoDan"
/>
新建页面 新建页面
</el-space> </el-space>
</el-col> </el-col>
<el-col :span="24" style="padding-left:20px; font-size:12px;"> <el-col
数据收集、事件记录<br>任务协同、业务审批 :span="24"
style="padding-left: 20px; font-size: 12px"
>
数据收集、事件记录<br />任务协同、业务审批
</el-col> </el-col>
</el-row> </el-row>
</el-dropdown-item> </el-dropdown-item>
@ -240,11 +262,18 @@ const accessRunApp = () =>{
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-space wrap> <el-space wrap>
<svg-icon style="color: #337ecc;" prefix="icon" icon-class="fenZhu" /> <svg-icon
style="color: #337ecc"
prefix="icon"
icon-class="fenZhu"
/>
新建分组 新建分组
</el-space> </el-space>
</el-col> </el-col>
<el-col :span="24" style="padding-left:20px; font-size:12px;"> <el-col
:span="24"
style="padding-left: 20px; font-size: 12px"
>
应用项目管理 应用项目管理
</el-col> </el-col>
</el-row> </el-row>
@ -255,27 +284,47 @@ const accessRunApp = () =>{
</el-col> </el-col>
</el-row> </el-row>
<el-scrollbar class="scroBox"> <el-scrollbar class="scroBox">
<AppMenus
:form-Key="props.formKey"
v-model:menus-tree="menusTree"
v-model:app-page-key="appPageKey"
:group-key="props.groupKey"
:app-cont="appCont"
:drawer-with="props.drawerWith"
@openAppPageForm="openAppPageForm"
/>
<AppMenus :form-Key="props.formKey" v-model:menus-tree="menusTree" v-model:app-page-key="appPageKey" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" @openAppPageForm="openAppPageForm" /> <CreateAppFormPage
v-if="saveAppFormIsShow"
<CreateAppFormPage v-if="saveAppFormIsShow" v-model:is-show="saveAppFormIsShow" :is-new="isNew" :drawer-with="props.drawerWith" :form-Key="props.formKey" :app-cont="appCont" :group-key="props.groupKey" :menu-id="props.formKey" v-model:app-page-key="appPageKey" @gainSunAppContent="gainAppContent" @updateInit="updataPageInit" /> v-model:is-show="saveAppFormIsShow"
:is-new="isNew"
:drawer-with="props.drawerWith"
:form-Key="props.formKey"
:app-cont="appCont"
:group-key="props.groupKey"
:menu-id="props.formKey"
v-model:app-page-key="appPageKey"
@gainSunAppContent="gainAppContent"
@updateInit="updataPageInit"
/>
</el-scrollbar> </el-scrollbar>
</el-aside> </el-aside>
<el-main class="mainBox"> <el-main class="mainBox">
<el-scrollbar class="scroBox"> <el-scrollbar class="scroBox">
<OpenAppFormPage ref="openAppPageInit" :form-Key="props.formKey" :group-key="props.groupKey" :app-cont="appCont" :drawer-with="props.drawerWith" :menus-info="checkedMenu" @editAppInfo="editAppInfo" /> <OpenAppFormPage
ref="openAppPageInit"
:form-Key="props.formKey"
:group-key="props.groupKey"
:app-cont="appCont"
:drawer-with="props.drawerWith"
:menus-info="checkedMenu"
@editAppInfo="editAppInfo"
/>
</el-scrollbar> </el-scrollbar>
</el-main> </el-main>
</el-container> </el-container>
<el-container v-if="tabsActive == 2"> 集成与自动化 </el-container>
<el-container v-if="tabsActive==2">
集成与自动化
</el-container>
<el-container v-if="tabsActive == 3"> <el-container v-if="tabsActive == 3">
<AppSetUp :app-cont="appCont" :group-key="props.groupKey" /> <AppSetUp :app-cont="appCont" :group-key="props.groupKey" />
</el-container> </el-container>
@ -284,11 +333,16 @@ const accessRunApp = () =>{
</el-container> </el-container>
</el-container> </el-container>
</div> </div>
<AppMenuGroup v-model:is-show="menuGroupShow" :menu-parent-key="menuParentKey" :app-cont="appCont" @updateMenu="gainAppContent" /> <AppMenuGroup
v-model:is-show="menuGroupShow"
:menu-parent-key="menuParentKey"
:app-cont="appCont"
@updateMenu="gainAppContent"
/>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>
<style lang='scss' scoped> <style lang="scss" scoped>
.common-layout { .common-layout {
.el-header { .el-header {
padding-left: 10px; padding-left: 10px;
@ -298,7 +352,7 @@ const accessRunApp = () =>{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #F1F2F3; border-bottom: 1px solid #f1f2f3;
:deep(.el-tabs__nav-wrap::after) { :deep(.el-tabs__nav-wrap::after) {
position: static !important; position: static !important;
} }
@ -309,14 +363,13 @@ const accessRunApp = () =>{
.asideBox { .asideBox {
width: 250px; width: 250px;
border-right: 1px solid #F1F2F3; border-right: 1px solid #f1f2f3;
height: calc(100vh - 40px); height: calc(100vh - 40px);
.asideBoxSearch { .asideBoxSearch {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 10px 10px; padding: 10px 10px;
} }
.scroBox { .scroBox {
height: calc(100vh - 95px); height: calc(100vh - 95px);
@ -352,12 +405,11 @@ const accessRunApp = () =>{
padding: 10px; padding: 10px;
} }
.mainBox { .mainBox {
background-color: #F1F2F3; background-color: #f1f2f3;
padding: 0px; padding: 0px;
.scroBox { .scroBox {
height: calc(100vh - 40px); height: calc(100vh - 40px);
} }
} }
} }
</style> </style>

Write Preview
Loading…
Cancel
Save