diff --git a/src/api/bpm-boot/sign.ts b/src/api/bpm-boot/sign.ts
new file mode 100644
index 00000000..20fc8c3b
--- /dev/null
+++ b/src/api/bpm-boot/sign.ts
@@ -0,0 +1,63 @@
+import createAxios from '@/utils/request'
+
+import { BPM_BOOT } from '@/utils/constantRequest'
+
+const MAPPING_PATH = BPM_BOOT + '/bpmSign'
+
+/**
+ * 查询流程分类数据
+ */
+export const listSign = (data: any) => {
+ return createAxios({
+ url: MAPPING_PATH + '/list',
+ method: 'POST',
+ data: data
+ })
+}
+
+/**
+ * 新增流程分类
+ */
+export const addSign = (data: any) => {
+ return createAxios({
+ url: MAPPING_PATH + '/add',
+ method: 'POST',
+ data: data
+ })
+}
+
+
+/**
+ * 更新流程分类
+ */
+export const updateSign = (data: any) => {
+ return createAxios({
+ url: MAPPING_PATH + '/update',
+ method: 'POST',
+ data: data
+ })
+}
+
+
+/**
+ * 删除流程分类
+ */
+export const deleteSign = (data: any) => {
+ let ids = [data]
+ return createAxios({
+ url: MAPPING_PATH + '/delete',
+ method: 'POST',
+ data: ids
+ })
+}
+
+/**
+ * 查询所有流程分类
+ */
+export const getSignSimpleList = () => {
+ return createAxios({
+ url: MAPPING_PATH + '/simpleList',
+ method: 'GET'
+ })
+}
+
diff --git a/src/views/pqs/supervise/harmonicSurvey/detail.vue b/src/views/pqs/supervise/harmonicSurvey/detail.vue
new file mode 100644
index 00000000..eb500b69
--- /dev/null
+++ b/src/views/pqs/supervise/harmonicSurvey/detail.vue
@@ -0,0 +1,7 @@
+
+
+ 详细信息回显
+
+
\ No newline at end of file
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index b1c73752..2626f9f8 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/views/system/bpm/category/categoryPopup.vue b/src/views/system/bpm/category/categoryPopup.vue
index 909a68b6..cb64afaa 100644
--- a/src/views/system/bpm/category/categoryPopup.vue
+++ b/src/views/system/bpm/category/categoryPopup.vue
@@ -40,7 +40,6 @@ const tableStore = inject('tableStore') as TableStore
const machineVisible = ref(false)
const title = ref('')
const formRef = ref()
-const regex = /^[+]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/
// 注意不要和表单ref的命名冲突
const form = reactive({
diff --git a/src/views/system/bpm/category/index.vue b/src/views/system/bpm/category/index.vue
index 074e4d6b..eb3fc448 100644
--- a/src/views/system/bpm/category/index.vue
+++ b/src/views/system/bpm/category/index.vue
@@ -28,7 +28,6 @@ import Table from '@/components/table/index.vue'
import TableHeader from '@/components/table/header/index.vue'
import { onMounted, provide, ref } from 'vue'
import { useRouter } from 'vue-router'
-import { deleteSgMachine } from '@/api/advance-boot/sgGroven/sgMachine'
import { ElMessage } from 'element-plus'
import { Plus } from '@element-plus/icons-vue'
import CategoryPopup from '@/views/system/bpm/category/categoryPopup.vue'
@@ -103,7 +102,7 @@ onMounted(() => {
// 加载数据
tableStore.index()
})
-tableStore.table.params.searchValue = ''
+tableStore.table.params.name = ''
provide('tableStore', tableStore)
const add = () => {
diff --git a/src/views/system/bpm/form/index.vue b/src/views/system/bpm/form/index.vue
index b631012b..7e7ee4e4 100644
--- a/src/views/system/bpm/form/index.vue
+++ b/src/views/system/bpm/form/index.vue
@@ -40,7 +40,7 @@ defineOptions({
const formJson = reactive({"widgetList":[],"formConfig":{"modelName":"formData","refName":"vForm","rulesName":"rules","labelWidth":80,"labelPosition":"left","size":"","labelAlign":"label-left-align","cssCode":"","customClass":"","functions":"","layoutType":"PC","jsonVersion":3,"onFormCreated":"","onFormMounted":"","onFormDataChange":"","onFormValidate":""}})
const formData = reactive({})
const optionData = reactive({})
-const vfRenderRef = ref(null)
+const vfRenderRef = ref()
const render = reactive({
visible: false,
title: ''
@@ -91,7 +91,7 @@ const tableStore = new TableStore({
},
{
name: 'update',
- title: '设计',
+ title: '设计表单',
type: 'primary',
icon: 'el-icon-EditPen',
render: 'basicButton',
diff --git a/src/views/system/bpm/model/index.vue b/src/views/system/bpm/model/index.vue
index 6622b685..0ea6bc0e 100644
--- a/src/views/system/bpm/model/index.vue
+++ b/src/views/system/bpm/model/index.vue
@@ -58,7 +58,7 @@ const tableStore = new TableStore({
{ title: '模型标识', field: 'key', width: 160 },
{ title: '模型名称', field: 'name', width: 160 },
{ title: '流程分类', field: 'categoryName', width: 150 },
- { title: '表单信息', field: 'formName', width: 170 },
+ { title: '表单信息', field: 'formName', width: 170, },
{
title: '创建时间',
field: 'createTime',
diff --git a/src/views/system/bpm/model/modelPopup.vue b/src/views/system/bpm/model/modelPopup.vue
index 76b89abb..820ed2e2 100644
--- a/src/views/system/bpm/model/modelPopup.vue
+++ b/src/views/system/bpm/model/modelPopup.vue
@@ -6,20 +6,11 @@
- 流程表单
业务表单
+ 流程表单
-
-
-
-
-->
-
-
+
+
+
+
+
@@ -67,7 +67,11 @@
-
+
+
+
+
+
@@ -88,10 +92,11 @@ import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删
import { getFormSimpleList } from '@/api/bpm-boot/form'
import { getCategorySimpleList } from '@/api/bpm-boot/category'
import { addModel, updateModel } from '@/api/bpm-boot/model'
-
+import { getSignSimpleList } from '@/api/bpm-boot/sign'
//传入type的名称
const categoryList = ref()
+const flowInfo = ref()
const formList = ref()
const title = ref('')
@@ -115,7 +120,7 @@ const formData = reactive({
//form表单校验规则
const rules = {
- key: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
+ key: [{ required: true, message: '流程标识不能为空', trigger: 'change' }],
name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }],
category: [{ required: true, message: '流程分类不能为空', trigger: 'change' }],
formType: [{ required: true, message: '表单类型不能为空', trigger: 'change' }]
@@ -135,6 +140,10 @@ const open = async (text: string, data?: any) => {
await getCategorySimpleList().then(res => {
categoryList.value = res.data
})
+
+ await getSignSimpleList().then(res => {
+ flowInfo.value = res.data
+ })
//默认选中第一个tab
if (data) {
// 表单赋值
@@ -180,6 +189,14 @@ const submit = () => {
}
defineExpose({ open })
+
+const changeSign = (event:any) => {
+ //根据选择的流程标识回显查看路径
+ const path = flowInfo.value.filter(item => item.signKey == event)[0].viewPath
+ formData.formCustomCreatePath = path
+ formData.formCustomViewPath = path
+}
+