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

合并秦东分支

v5
超级管理员 2 years ago
parent
a880296aff 8ea8d87603
commit
c188d058e6
5 changed files with 300 additions and 111 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. 17
      src/components/DesignForm/public/form/form.vue
  2. 261
      src/views/taskplatform/taskmanagement/drafts.vue
  3. 33
      src/views/taskplatform/taskmanagement/editFlowData.vue
  4. 27
      src/views/taskplatform/taskmanagement/lookFlowInfo.vue
  5. 5
      src/views/taskplatform/taskmanagement/myrequest.vue

17
src/components/DesignForm/public/form/form.vue
View File

@ -955,13 +955,13 @@ const sendDraftSubmit = (type: string, res: any) => {
} }
//提交修改数据 //提交修改数据
const submitEdit = (type: string, res: any) => { const submitEdit = (type: string, res: any) => {
const sendDraftSubmit = props.formData.events?.sendDraftSubmit const submitEdit = props.formData.events?.submitEdit
let notReturn let notReturn
if (typeof sendDraftSubmit === 'function') { if (typeof submitEdit === 'function') {
notReturn = sendDraftSubmit(type, res) notReturn = submitEdit(type, res)
// console.log("notReturn-1-123456->",props.sendDraftSubmit) // console.log("notReturn-1-123456->",props.submitEdit)
} else if (typeof props.sendDraftSubmit === 'function') { } else if (typeof props.submitEdit === 'function') {
notReturn = props.sendDraftSubmit(type, res) notReturn = props.submitEdit(type, res)
// console.log("notReturn--123456->",props.anewSubmit) // console.log("notReturn--123456->",props.anewSubmit)
} }
loading.value = false loading.value = false
@ -969,6 +969,11 @@ const submitEdit = (type: string, res: any) => {
// 有返回false时则不提示 // 有返回false时则不提示
return return
} }
if (type === 'success') {
ElMessage.success(res.msg || '提交成功！')
} else if (type === 'fail') {
ElMessage.error(res.message || '提交失败！')
}
} }
defineExpose({ defineExpose({

261
src/views/taskplatform/taskmanagement/drafts.vue
View File

@ -3,42 +3,50 @@
@ 时间: 2023-11-24 08:10:23 @ 时间: 2023-11-24 08:10:23
@ 备注: 草稿箱 @ 备注: 草稿箱
--> -->
<script lang='ts' setup> <script lang="ts" setup>
import { Delete, Edit, Search, Share, Upload,View } from '@element-plus/icons-vue' import {
import { taskFlowList,delRunFlow } from '@/api/DesignForm/requestapi' Delete,
import { taskflowquery } from '@/api/DesignForm/type' Edit,
Search,
Share,
Upload,
View,
} from "@element-plus/icons-vue";
import { taskFlowList, delRunFlow } from "@/api/DesignForm/requestapi";
import { taskflowquery } from "@/api/DesignForm/type";
import LookAndOperateLogInfo from '@/views/taskplatform/taskmanagement/lookFlowInfo.vue' import LookAndOperateLogInfo from "@/views/taskplatform/taskmanagement/lookFlowInfo.vue";
const selectInfoDr = reactive<taskflowquery>({ const selectInfoDr = reactive<taskflowquery>({
page: 1, page: 1,
pagesize: 20, pagesize: 20,
class: 1, class: 1,
state:1 state: 1,
}) });
const loadingDr = ref(false) const loadingDr = ref(false);
const searckFormRefdr = ref(ElForm); const searckFormRefdr = ref(ElForm);
const totalsdr = ref<number>(0) //总共多少条记录 const totalsdr = ref<number>(0); //总共多少条记录
const taskFlowAryDr = ref<any>([]) //记录数组 const taskFlowAryDr = ref<any>([]); //记录数组
//获取我的请求 //获取我的请求
const getToDoListDr = () => { const getToDoListDr = () => {
loadingDr.value = true loadingDr.value = true;
taskFlowList(selectInfoDr) taskFlowList(selectInfoDr)
.then((data: any) => { .then((data: any) => {
console.log("获取我的请求",data) console.log("获取我的请求", data);
totalsdr.value = data.data.total totalsdr.value = data.data.total;
taskFlowAryDr.value = data.data.list taskFlowAryDr.value = data.data.list;
}) })
.finally(() => { .finally(() => {
loadingDr.value = false loadingDr.value = false;
}) });
} };
//重置表单 //重置表单
const resetQueryDr = () => { const resetQueryDr = () => {
searckFormRefdr.value.resetFields(); searckFormRefdr.value.resetFields();
initDataDr(); initDataDr();
} };
//初始化数据 //初始化数据
<<<<<<< HEAD
const initDataDr = () =>{ const initDataDr = () =>{
selectInfoDr.page = 1; selectInfoDr.page = 1;
selectInfoDr.pagesize = 15; selectInfoDr.pagesize = 15;
@ -50,46 +58,55 @@ onMounted(()=>{
getToDoListDr(); getToDoListDr();
}) })
=======
const initDataDr = () => {
selectInfoDr.page = 1;
selectInfoDr.pagesize = 15;
selectInfoDr.title = "";
selectInfoDr.class = 1;
selectInfoDr.state = 1;
};
onMounted(() => {
getToDoListDr();
});
>>>>>>> v3
/** /**
* 删除工作流 * 删除工作流
*/ */
const delFlowForm = (val: any) => { const delFlowForm = (val: any) => {
ElMessageBox.confirm( ElMessageBox.confirm(
"您确定要删除此内容？一经删除！内容将不可恢复！", "您确定要删除此内容？一经删除！内容将不可恢复！",
'Warning', "Warning",
{ {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning', type: "warning",
} }
) )
.then(() => { .then(() => {
let sendInfo = { let sendInfo = {
id: val.idStr, id: val.idStr,
status: 5 status: 5,
} };
delRunFlow(sendInfo) delRunFlow(sendInfo).then((data) => {
.then((data)=>{
getToDoListDr(); getToDoListDr();
ElMessage({ ElMessage({
message: '删除成功！', message: "删除成功！",
type: 'success' type: "success",
}) });
});
}) })
}) .catch(() => {});
.catch(() => {}) };
const myappbox = ref();
} const darwOpenOrClose = ref(false);
const myappbox = ref() const operState = ref<number>(1); //操作状态 1：新增；2：重新发起；3：申请修改；4：提交审批
const darwOpenOrClose = ref(false)
const operState = ref<number>(1) //操作状态 1：新增；2：重新发起；3：申请修改；4：提交审批
const drawerMyWith = ref<number>(0); //页面宽度 const drawerMyWith = ref<number>(0); //页面宽度
const flowLogInfo = ref<any>() const flowLogInfo = ref<any>();
const versionId = ref<string>() //使用版本 const versionId = ref<string>(); //使用版本
const inFoid = ref<string>() const inFoid = ref<string>();
//编辑表单 //编辑表单
<<<<<<< HEAD
const editFlow = (val:any) => { const editFlow = (val:any) => {
operState.value = 4 operState.value = 4
drawerMyWith.value = myappbox.value?.clientWidth drawerMyWith.value = myappbox.value?.clientWidth
@ -214,25 +231,173 @@ const editFlow = (val:any) => {
@pagination="getToDoListDr" @pagination="getToDoListDr"
/> />
</el-card> </el-card>
=======
const editFlow = (val: any) => {
operState.value = 4;
drawerMyWith.value = myappbox.value?.clientWidth;
flowLogInfo.value = val;
versionId.value = val.version;
darwOpenOrClose.value = true;
inFoid.value = val.idStr;
};
</script>
<template>
<div ref="myappbox" class="app_box">
<div class="app-container">
<div class="search">
<el-form ref="searckFormRefdr" :model="selectInfoDr" :inline="true">
<el-form-item label="任务标题" prop="name">
<el-input
v-model="selectInfoDr.title"
placeholder="请输入任务标题"
clearable
@keyup.enter="searchQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getToDoListDr()"
><i-ep-search />搜索</el-button
>
<el-button @click="resetQueryDr()"><i-ep-refresh />重置</el-button>
</el-form-item>
</el-form>
</div>
<el-card shadow="never">
<el-table
v-loadingDr="loadingDr"
element-loading-dr-text="Loading..."
highlight-current-row
:data="taskFlowAryDr"
border
class="table_box"
>
<el-table-column fixed label="标题" prop="title" width="500" />
<el-table-column label="创建人" prop="creater" width="200">
<template #default="scope">
{{ scope.row.creatorInfo.name }}（<el-text type="info">{{
scope.row.creatorInfo.number
}}</el-text
>）
</template>
</el-table-column>
<el-table-column label="发起日期" prop="startDate" align="center" />
<el-table-column
label="状态"
prop="status"
align="center"
width="220"
>
<template #default="scope">
<el-tag
v-if="scope.row.status == 1"
class="mx-1"
effect="plain"
round
>
草稿
</el-tag>
<el-tag
v-else-if="scope.row.status == 2"
type="danger"
class="mx-1"
effect="plain"
round
>
驳回
</el-tag>
<el-tag
v-else-if="scope.row.status == 3"
type="success"
class="mx-1"
effect="plain"
round
>
审批中
</el-tag>
<el-tag
v-else-if="scope.row.status == 4"
type="info"
class="mx-1"
effect="plain"
round
>
归档
</el-tag>
<el-tag v-else type="info" class="mx-1" effect="plain" round>
删除
</el-tag>
</template>
</el-table-column>
<el-table-column
fixed="right"
align="center"
label="操作"
width="150"
>
<template #default="scope">
<el-button-group>
<el-tooltip
class="box-item"
effect="dark"
content="编辑"
placement="top-end"
>
<el-button
type="warning"
size="small"
class="fa fa-edit"
@click="editFlow(scope.row)"
/>
</el-tooltip>
<el-tooltip
class="box-item"
effect="dark"
content="删除"
placement="top-end"
>
<el-button
type="danger"
size="small"
class="fa fa-trash-o"
@click="delFlowForm(scope.row)"
/>
</el-tooltip>
</el-button-group>
</template>
</el-table-column>
</el-table>
<pagination
v-model:total="totalsdr"
v-model:page="selectInfoDr.page"
v-model:limit="selectInfoDr.pagesize"
@pagination="getToDoListDr"
/>
</el-card>
>>>>>>> v3
<LookAndOperateLogInfo
v-if="darwOpenOrClose"
<LookAndOperateLogInfo v-if="darwOpenOrClose" v-model:isshow="darwOpenOrClose" :flow-log-info="flowLogInfo" :drawer-with="drawerMyWith" :infoid="inFoid" :oper-state="operState" @getmytodolist="getMyToDoList" /> v-model:isshow="darwOpenOrClose"
:flow-log-info="flowLogInfo"
:drawer-with="drawerMyWith"
:infoid="inFoid"
:oper-state="operState"
@getmytodolist="getMyToDoList"
/>
</div> </div>
</div> </div>
</template> </template>
<style lang='scss' scoped> <style lang="scss" scoped>
.app_box { .app_box {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
} }
.box-card { .box-card {
width: 100%; width: 100%;
} }
.table_box { .table_box {
width: 100%; width: 100%;
height: calc(100vh - 308px); height: calc(100vh - 308px);

33
src/views/taskplatform/taskmanagement/editFlowData.vue
View File

@ -53,6 +53,7 @@ const nodeKey = ref<string>('');
const currentProgress = ref<number>(1); const currentProgress = ref<number>(1);
const newLogAry = ref<any>("") const newLogAry = ref<any>("")
const oldLogAry = ref<any>("") const oldLogAry = ref<any>("")
const newDataLen = ref<number>(0);
//表单相关内容 //表单相关内容
const formState = reactive({ const formState = reactive({
formData: { formData: {
@ -116,6 +117,7 @@ const gainFormData = () =>{
newLogAry.value = data.data.newData newLogAry.value = data.data.newData
oldLogAry.value = data.data.oldData oldLogAry.value = data.data.oldData
logistrue.value = data.data.logistrue logistrue.value = data.data.logistrue
newDataLen.value = data.data.newDataLen
}) })
}) })
@ -147,6 +149,15 @@ onMounted(()=>{
flowMap.value = JSON.parse(props.flowLogInfo.flowcont) flowMap.value = JSON.parse(props.flowLogInfo.flowcont)
gainFormData() gainFormData()
}) })
const runstep = ref(null)
//修改完毕
const submitEdit = (type: string,val?:any) => {
// console("修改完毕----->",type,val)
if(type == "success"){
runstep.value.gainRunFlowTask()
drawerBeforeClose();
}
}
</script> </script>
<template> <template>
<el-drawer v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" :before-close="drawerBeforeClose"> <el-drawer v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" :before-close="drawerBeforeClose">
@ -168,10 +179,10 @@ onMounted(()=>{
:close-app-submit="closeAppSubmit" :close-app-submit="closeAppSubmit"
/> />
<el-divider v-if="logistrue" content-position="left">修改记录{{logistrue}}}</el-divider> <el-divider v-if="logistrue" content-position="left">历史记录</el-divider>
<el-timeline> <el-timeline>
<el-timeline-item v-if="newLogAry.length > 0" :timestamp="newLogAry.logTime" placement="top"> <el-timeline-item v-if="newDataLen > 0" :timestamp="newLogAry.logTime" placement="top">
<el-card>
<el-descriptions <el-descriptions
direction="vertical" direction="vertical"
:column="4" :column="4"
@ -185,13 +196,14 @@ onMounted(()=>{
<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4"> <el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
<el-descriptions <el-descriptions
v-for="(itemarys,indexarys) in item"
:key="indexarys"
direction="vertical" direction="vertical"
:column="4" :column="4"
size="24px" size="24px"
border border
> >
<el-descriptions-item v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs"> <el-descriptions-item v-for="(items,indexs) in itemarys" :key="indexs" :label="indexs">
{{ items }} {{ items }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -201,11 +213,11 @@ onMounted(()=>{
</div> </div>
</el-descriptions> </el-descriptions>
</el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top"> <el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top">
<el-card>
<el-descriptions <el-descriptions
direction="vertical" direction="vertical"
:column="4" :column="4"
@ -219,13 +231,14 @@ onMounted(()=>{
<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4"> <el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" span="4">
<el-descriptions <el-descriptions
v-for="(itemarys,indexarys) in item"
:key="indexarys"
direction="vertical" direction="vertical"
:column="4" :column="4"
size="24px" size="24px"
border border
> >
<el-descriptions-item v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs"> <el-descriptions-item v-for="(items,indexs) in itemarys" :key="indexs" :label="indexs">
{{ items }} {{ items }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -234,7 +247,7 @@ onMounted(()=>{
</div> </div>
</el-descriptions> </el-descriptions>
</el-card>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>

27
src/views/taskplatform/taskmanagement/lookFlowInfo.vue
View File

@ -59,6 +59,7 @@ const nodeKey = ref<string>('');
const currentProgress = ref<number>(1); const currentProgress = ref<number>(1);
const newLogAry = ref<any>("") const newLogAry = ref<any>("")
const oldLogAry = ref<any>("") const oldLogAry = ref<any>("")
const newDataLen = ref<number>(0);
//表单相关内容 //表单相关内容
const formState = reactive({ const formState = reactive({
formData: { formData: {
@ -124,7 +125,7 @@ const gainFormData = () =>{
newLogAry.value = data.data.newData newLogAry.value = data.data.newData
oldLogAry.value = data.data.oldData oldLogAry.value = data.data.oldData
logistrue.value = data.data.logistrue logistrue.value = data.data.logistrue
newDataLen.value = data.data.newDataLen
}) })
@ -232,8 +233,8 @@ const beforeSubmit = () =>{}
/> />
<el-divider v-if="logistrue" content-position="left">历史记录</el-divider> <el-divider v-if="logistrue" content-position="left">历史记录</el-divider>
<el-timeline> <el-timeline>
<el-timeline-item v-if="newLogAry.length > 0" :timestamp="newLogAry.logTime" placement="top"> <el-timeline-item v-if="newDataLen > 0" :timestamp="newLogAry.logTime" placement="top">
<el-card>
<el-descriptions <el-descriptions
direction="vertical" direction="vertical"
:column="4" :column="4"
@ -247,13 +248,14 @@ const beforeSubmit = () =>{}
<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" :span="4"> <el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" :span="4">
<el-descriptions <el-descriptions
v-for="(itemarys,indexarys) in item"
:key="indexarys"
direction="vertical" direction="vertical"
:column="4" :column="4"
:size="small" size="24px"
border border
> >
<el-descriptions-item v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs"> <el-descriptions-item v-for="(items,indexs) in itemarys" :key="indexs" :label="indexs">
{{ items }} {{ items }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -263,11 +265,11 @@ const beforeSubmit = () =>{}
</div> </div>
</el-descriptions> </el-descriptions>
</el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top"> <el-timeline-item v-for="itemss in oldLogAry" :key="itemss.id" :timestamp="itemss.logTime" placement="top">
<el-card>
<el-descriptions <el-descriptions
direction="vertical" direction="vertical"
:column="4" :column="4"
@ -281,13 +283,14 @@ const beforeSubmit = () =>{}
<el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" :span="4"> <el-descriptions-item v-if="Array.isArray(item)&&index!='logTime'" :label="index" :span="4">
<el-descriptions <el-descriptions
v-for="(itemarys,indexarys) in item"
:key="indexarys"
direction="vertical" direction="vertical"
:column="4" :column="4"
:size="small" size="24px"
border border
> >
<el-descriptions-item v-for="(items,indexs) in item[0]" :key="indexs" :label="indexs"> <el-descriptions-item v-for="(items,indexs) in itemarys" :key="indexs" :label="indexs">
{{ items }} {{ items }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -296,7 +299,7 @@ const beforeSubmit = () =>{}
</div> </div>
</el-descriptions> </el-descriptions>
</el-card>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>

5
src/views/taskplatform/taskmanagement/myrequest.vue
View File

@ -172,7 +172,10 @@ const retractFlowInfo = (val:any) => {
}) })
.catch(() => {}) .catch(() => {})
} }
<<<<<<< HEAD
=======
>>>>>>> v3
</script> </script>
<template> <template>
<div ref="myappbox" class="app_box"> <div ref="myappbox" class="app_box">
@ -185,7 +188,7 @@ const retractFlowInfo = (val:any) => {
v-model="selectMyInfo.title" v-model="selectMyInfo.title"
placeholder="请输入任务标题" placeholder="请输入任务标题"
clearable clearable
@keyup.enter="searchQuery" @keyup.enter="getMyToDoList"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

Write Preview
Loading…
Cancel
Save