Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud
This commit is contained in:
dzc committed
commit
e55aadc127
1 file changed
+56
-50
@@ -10,13 +10,19 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="发起时间" prop="taskTime">
|
||||
<el-date-picker type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" v-model="state.queryForm.taskTime" is-range range-separator="To" />
|
||||
<el-date-picker
|
||||
type="datetimerange"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
v-model="state.queryForm.taskTime"
|
||||
is-range
|
||||
range-separator="To"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button icon="search" type="primary" @click="getDataList">
|
||||
{{ $t('common.queryBtn') }}
|
||||
{{ $t("common.queryBtn") }}
|
||||
</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-row>
|
||||
@@ -55,16 +61,18 @@
|
||||
<el-table-column fixed="right" label="操作">
|
||||
<template #default="scope">
|
||||
<el-button type="primary" size="small" link icon="View" @click="deal(scope.row)"> 查看 </el-button>
|
||||
<el-button :disabled="scope.row.status != 1" type="primary" size="small" link icon="VideoPause" @click="stop(scope.row)">
|
||||
<!-- <el-button :disabled="scope.row.status != 1" type="primary" size="small" link icon="VideoPause" @click="stop(scope.row)">
|
||||
终止流程
|
||||
</el-button>
|
||||
|
||||
</el-button> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle"
|
||||
v-bind="state.pagination"></pagination>
|
||||
<pagination
|
||||
@current-change="currentChangeHandle"
|
||||
@size-change="sizeChangeHandle"
|
||||
v-bind="state.pagination"
|
||||
></pagination>
|
||||
<!-- 右侧抽屉-->
|
||||
<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
|
||||
<template #header>
|
||||
@@ -87,67 +95,65 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import FormRender from '/@/views/flow/form/render/FormRender.vue';
|
||||
import FlowNodeFormat from '/@/views/flow/form/tools/FlowNodeFormatData.vue';
|
||||
import {queryMineStarted, stopProcessInstance} from '/@/api/flow/task';
|
||||
import { detail } from '/@/api/flow/processInstance';
|
||||
import { BasicTableProps, useTable } from '/@/hooks/table';
|
||||
import FormRender from "/@/views/flow/form/render/FormRender.vue"
|
||||
import FlowNodeFormat from "/@/views/flow/form/tools/FlowNodeFormatData.vue"
|
||||
import { queryMineStarted, stopProcessInstance } from "/@/api/flow/task"
|
||||
import { detail } from "/@/api/flow/processInstance"
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
|
||||
const rightDrawerVisible = ref(false);
|
||||
const rightDrawerVisible = ref(false)
|
||||
|
||||
const loading = ref(false);
|
||||
const showSearch = ref(true);
|
||||
const queryRef = ref();
|
||||
const loading = ref(false)
|
||||
const showSearch = ref(true)
|
||||
const queryRef = ref()
|
||||
const state: BasicTableProps = reactive<BasicTableProps>({
|
||||
pageList: queryMineStarted,
|
||||
queryForm: {
|
||||
taskTime: undefined,
|
||||
status: 1,
|
||||
},
|
||||
});
|
||||
pageList: queryMineStarted,
|
||||
queryForm: {
|
||||
taskTime: undefined,
|
||||
status: 1,
|
||||
},
|
||||
})
|
||||
|
||||
const { tableStyle ,getDataList, currentChangeHandle,
|
||||
sortChangeHandle,
|
||||
sizeChangeHandle, } = useTable(state);
|
||||
function stop(row) {
|
||||
stopProcessInstance({
|
||||
processInstanceId: row.processInstanceId,
|
||||
}).then((res) => {
|
||||
getDataList();
|
||||
});
|
||||
}
|
||||
const { tableStyle, getDataList, currentChangeHandle, sortChangeHandle, sizeChangeHandle } = useTable(state)
|
||||
// function stop(row) {
|
||||
// stopProcessInstance({
|
||||
// processInstanceId: row.processInstanceId,
|
||||
// }).then((res) => {
|
||||
// getDataList()
|
||||
// })
|
||||
// }
|
||||
|
||||
const currentData = ref();
|
||||
const currentData = ref()
|
||||
/**
|
||||
* 点击开始处理
|
||||
* @param row
|
||||
*/
|
||||
const deal = (row) => {
|
||||
currentData.value = row;
|
||||
currentData.value = row
|
||||
detail({
|
||||
processInstanceId: row.processInstanceId,
|
||||
}).then((res) => {
|
||||
currentOpenFlowForm.value = res.data.formItems;
|
||||
rightDrawerVisible.value = true;
|
||||
});
|
||||
};
|
||||
const currentOpenFlowForm = ref();
|
||||
currentOpenFlowForm.value = res.data.formItems
|
||||
rightDrawerVisible.value = true
|
||||
})
|
||||
}
|
||||
const currentOpenFlowForm = ref()
|
||||
|
||||
// 清空搜索条件
|
||||
const resetQuery = () => {
|
||||
queryRef.value.resetFields();
|
||||
getDataList();
|
||||
};
|
||||
queryRef.value.resetFields()
|
||||
getDataList()
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getDataList();
|
||||
});
|
||||
getDataList()
|
||||
})
|
||||
|
||||
const formValue = computed(() => {
|
||||
const obj = {};
|
||||
for (const item of currentOpenFlowForm.value) {
|
||||
obj[item.id] = item.props.value;
|
||||
const obj = {}
|
||||
for (const item of currentOpenFlowForm.value) {
|
||||
obj[item.id] = item.props.value
|
||||
}
|
||||
return obj;
|
||||
});
|
||||
return obj
|
||||
})
|
||||
</script>
|
||||
Reference in new issue
Block a user