表单发布关联流程

hc_zhufu
刘妍 1 year ago
parent 1d9a931cb4
commit 08b1941b24

@ -52,8 +52,6 @@
() => props.element,
(newVal) => {
if (newVal.type == 'bpmn:SequenceFlow') {
console.log(props);
const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
if (currentNode) {
node.value = currentNode;

@ -122,7 +122,6 @@
},
pageType: String,
});
console.log(props);
interface dataType {
columns: any;
formRelations: any;

@ -34,7 +34,7 @@
v-model:value="formState.category"
placeholder="请选择"
:options="data.optionsType"
:field-names="{ label: 'itemName', value: 'itemValue' }"
:field-names="{ label: 'itemName', value: 'itemName' }"
/>
</a-form-item>
<a-form-item label="我的任务创建">

@ -183,7 +183,6 @@
pageType: String,
pageView: String,
});
console.log(props);
interface dataType {
columns: any;
formRelations: any;
@ -227,7 +226,6 @@
watch(
() => node.value.formCode,
(newVal) => {
console.log(newVal);
if (newVal) {
getFormList();
getVersions(false);
@ -239,7 +237,6 @@
(newVal) => {
if (newVal.type == 'bpmn:StartEvent') {
const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
console.log(currentNode);
if (currentNode) {
node.value = currentNode;
} else {

@ -455,7 +455,6 @@
watch(
() => props.element,
(newVal) => {
console.log(newVal);
if (newVal.type == 'bpmn:Task') {
const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
if (currentNode) {
@ -510,7 +509,6 @@
node.value.lookUsers = node.value.lookUsers.concat(addData2);
updateWfData('lookUsers');
} else {
console.log(node.value);
let addData = selectData.filter(
(t) => node.value.auditUsers.findIndex((t2) => t2.id == t.id && t2.type == t.type) == -1,
);

@ -30,11 +30,9 @@
const props = defineProps({
id: String,
});
console.log(props);
watch(
() => props.id,
(newVal) => {
console.log(newVal);
getOptions(newVal);
},
);
@ -65,7 +63,6 @@
arr.push(element);
}
});
console.log(arr);
data.options = arr;
}
function handleChange(val, option) {
@ -83,7 +80,6 @@
}
function getForm() {
let rows = data.formData;
console.log(rows);
return rows;
}
defineExpose({

@ -115,7 +115,6 @@
data.tableOpen = true;
}
function tableHandleOk() {
console.log(tableRef.value.getRow());
const obj = tableRef.value.getRow();
formData.value.table = obj[0].name;
handleTableChange(obj[0].name);

@ -13,12 +13,14 @@
</BasicModal>
</template>
<script lang="ts" setup>
import { unref, ref } from 'vue';
import { unref, ref, reactive } from 'vue';
import { FormSchema } from '@/components/Table';
import { BasicModal, useModalInner } from '@/components/Modal';
import { BasicForm, useForm } from '@/components/Form';
import { saveFormsData } from '@/api/formrender/index';
import { useMessage } from '@/hooks/web/useMessage';
import { useUserStore } from '@/store/modules/user';
import { create, saveDraft } from '@/api/sys/WFProcess';
const emit = defineEmits(['success']);
const { createMessage } = useMessage();
@ -29,6 +31,14 @@
const primaryQuery = ref();
const addQuery: any = ref([]);
const formColumns: FormSchema[] = [];
const flowCode = ref('');
const userStore = useUserStore();
const userInfo: any = userStore.getUserInfo;
const formData = reactive({
userId: userInfo.id,
title: '',
});
const [registerModal, { setModalProps, closeModal }] = useModalInner((data: any) => {
console.log('daaaaa', data);
isUpdate.value = !!data?.isUpdate;
@ -45,6 +55,11 @@
}
formColumns.push(item);
});
data.btnList.forEach((element) => {
if (element.prop === 'Add' && element.isWFlow) {
flowCode.value = element.wFlowCode;
}
});
if (!unref(isUpdate) && !unref(isDetail)) {
getTitle.value = '新增';
}
@ -123,8 +138,12 @@
const data = await saveFormsData(params);
if (data) {
setModalProps({ confirmLoading: true });
closeModal();
emit('success');
if (flowCode.value == '') {
closeModal();
} else {
handleCreateFlow(params.pkeyValue);
}
return createMessage.success('操作成功');
} else {
return createMessage.error('操作失败');
@ -133,4 +152,25 @@
setModalProps({ confirmLoading: false });
}
}
async function handleCreateFlow(processId) {
var querys = {
schemeCode: flowCode.value,
userId: formData.userId,
title: formData.title,
processId: processId,
};
const draft = await saveDraft(querys);
if (draft) {
querys.schemeCode = '';
const data = await create(querys);
if (data) {
closeModal();
return createMessage.success('发起流程成功');
} else {
return createMessage.error('发起流程失败');
}
} else {
return createMessage.error('保存草稿失败');
}
}
</script>

@ -57,7 +57,7 @@
const addParamsArr: any = ref([]);
const paramsCode = route.query.code;
const callColumns: BasicColumn[] = [];
const btnList: any = ref([]);
const treeData = ref<TreeItem[]>([]);
const asyncExpandTreeRef = ref<Nullable<TreeActionType>>(null);
const actionList: TreeActionItem[] = [];
@ -184,6 +184,7 @@
tab: config.schemas,
query: query.value,
addParams: addParamsArr.value,
btnList: btnList.value,
});
break;
case 'Edit':
@ -257,7 +258,7 @@
let columnObj = JSON.parse(res.entity.scheme);
let formObj = JSON.parse(res.formScheme.scheme);
paramsId.value = res.formScheme.id;
btnList.value = columnObj.btns;
if (columnObj.table.columns) {
columnObj.table.columns.forEach((item) => {
callColumns.push({

@ -33,7 +33,7 @@
size="small"
v-model:value="record.wFlowCode"
:options="wflist"
:field-names="{ label: 'dbColumnName', value: 'dbColumnName' }"
:field-names="{ label: 'name', value: 'code' }"
/>
</div>
</template>
@ -65,6 +65,7 @@
import { BasicTree } from '@/components/Tree';
// import { IconPicker } from '/@/components/Icon';
import { btns } from './config.data';
import { getLoadPage } from '@/api/sys/WFSchemeInfo';
// props,
const props = defineProps({
@ -90,6 +91,12 @@
{ label: 'error', value: 'error' },
{ label: 'warning', value: 'warning' },
];
const wflist = ref([]);
async function getFlowList() {
const data = await getLoadPage();
console.log(data.items);
wflist.value = data.items;
}
const [btnsTable, { reload }] = useTable({
rowKey: 'id',
@ -125,5 +132,6 @@
onMounted(() => {
fetch();
getFlowList();
});
</script>

@ -110,6 +110,7 @@
tableNames: item.componentProps.dataTable,
};
getOutKeyList(params).then((res: Recordable) => {
console.log(res);
res[0].db_codecolumnsList.forEach((val) => {
if (item.componentProps.fieldName == val.dbColumnName) {
item.csType = val.csType;

@ -38,7 +38,7 @@
}
});
const getTitle = computed(() => (!unref(isUpdate) ? '新增部门' : '编辑部门'));
const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
async function handleSubmit() {
try {

@ -0,0 +1,66 @@
// vite.config.ts
import { defineApplicationConfig } from "file:///E:/%E6%96%B0%E6%9E%B6%E6%9E%84%E9%A1%B9%E7%9B%AE/%E8%B4%A2%E6%BA%90%E4%B8%80%E4%BD%93%E5%8C%96/mian/CaiYuanYiTiHua/internal/vite-config/dist/index.mjs";
var vite_config_default = defineApplicationConfig({
overrides: {
optimizeDeps: {
include: [
"echarts/core",
"echarts/charts",
"echarts/components",
"echarts/renderers",
"qrcode",
"@iconify/iconify",
"ant-design-vue/es/locale/zh_CN",
"ant-design-vue/es/locale/en_US",
"@/../lib/vform/designer.umd.js"
]
},
build: {
/* 其他build生产打包配置省略 */
//...
target: "esnext",
commonjsOptions: {
include: /node_modules|lib/
//这里记得把lib目录加进来否则生产打包会报错
}
},
server: {
proxy: {
"/basic-api": {
target: "http://localhost:3000",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
// only https
// secure: false
},
"/upload": {
target: "http://localhost:3300/upload",
changeOrigin: true,
ws: true,
rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
}
},
warmup: {
clientFiles: ["./index.html", "./src/{views,components}/*"]
}
},
define: {
"process.env": {
BASE_URL: "/"
}
},
css: {
preprocessorOptions: {
less: {
javascriptEnabled: true
}
}
},
plugins: []
}
});
export {
vite_config_default as default
};
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxcdTY1QjBcdTY3QjZcdTY3ODRcdTk4NzlcdTc2RUVcXFxcXHU4RDIyXHU2RTkwXHU0RTAwXHU0RjUzXHU1MzE2XFxcXG1pYW5cXFxcQ2FpWXVhbllpVGlIdWFcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkU6XFxcXFx1NjVCMFx1NjdCNlx1Njc4NFx1OTg3OVx1NzZFRVxcXFxcdThEMjJcdTZFOTBcdTRFMDBcdTRGNTNcdTUzMTZcXFxcbWlhblxcXFxDYWlZdWFuWWlUaUh1YVxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRTovJUU2JTk2JUIwJUU2JTlFJUI2JUU2JTlFJTg0JUU5JUExJUI5JUU3JTlCJUFFLyVFOCVCNCVBMiVFNiVCQSU5MCVFNCVCOCU4MCVFNCVCRCU5MyVFNSU4QyU5Ni9taWFuL0NhaVl1YW5ZaVRpSHVhL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUFwcGxpY2F0aW9uQ29uZmlnKHtcbiAgb3ZlcnJpZGVzOiB7XG4gICAgb3B0aW1pemVEZXBzOiB7XG4gICAgICBpbmNsdWRlOiBbXG4gICAgICAgICdlY2hhcnRzL2NvcmUnLFxuICAgICAgICAnZWNoYXJ0cy9jaGFydHMnLFxuICAgICAgICAnZWNoYXJ0cy9jb21wb25lbnRzJyxcbiAgICAgICAgJ2VjaGFydHMvcmVuZGVyZXJzJyxcbiAgICAgICAgJ3FyY29kZScsXG4gICAgICAgICdAaWNvbmlmeS9pY29uaWZ5JyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS96aF9DTicsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvZW5fVVMnLFxuICAgICAgICAnQC8uLi9saWIvdmZvcm0vZGVzaWduZXIudW1kLmpzJyxcbiAgICAgIF0sXG4gICAgfSxcbiAgICBidWlsZDoge1xuICAgICAgLyogXHU1MTc2XHU0RUQ2YnVpbGRcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTkxNERcdTdGNkVcdTc3MDFcdTc1NjUgKi9cbiAgICAgIC8vLi4uXG4gICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgY29tbW9uanNPcHRpb25zOiB7XG4gICAgICAgIGluY2x1ZGU6IC9ub2RlX21vZHVsZXN8bGliLywgLy9cdThGRDlcdTkxQ0NcdThCQjBcdTVGOTdcdTYyOEFsaWJcdTc2RUVcdTVGNTVcdTUyQTBcdThGREJcdTY3NjVcdUZGMENcdTU0MjZcdTUyMTlcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTRGMUFcdTYyQTVcdTk1MTlcdUZGMDFcdUZGMDFcbiAgICAgIH0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICAgIC8vIG9ubHkgaHR0cHNcbiAgICAgICAgICAvLyBzZWN1cmU6IGZhbHNlXG4gICAgICAgIH0sXG4gICAgICAgICcvdXBsb2FkJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzMwMC91cGxvYWQnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vdXBsb2FkYCksICcnKSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgICB3YXJtdXA6IHtcbiAgICAgICAgY2xpZW50RmlsZXM6IFsnLi9pbmRleC5odG1sJywgJy4vc3JjL3t2aWV3cyxjb21wb25lbnRzfS8qJ10sXG4gICAgICB9LFxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAncHJvY2Vzcy5lbnYnOiB7XG4gICAgICAgIEJBU0VfVVJMOiAnLycsXG4gICAgICB9LFxuICAgIH0sXG4gICAgY3NzOiB7XG4gICAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICAgIGxlc3M6IHtcbiAgICAgICAgICBqYXZhc2NyaXB0RW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgfSxcbiAgICBwbHVnaW5zOiBbXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFrWCxTQUFTLCtCQUErQjtBQUUxWixJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUztBQUFBO0FBQUEsTUFDWDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLE9BQU87QUFBQSxRQUNMLGNBQWM7QUFBQSxVQUNaLFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sYUFBYSxHQUFHLEVBQUU7QUFBQTtBQUFBO0FBQUEsUUFHL0Q7QUFBQSxRQUNBLFdBQVc7QUFBQSxVQUNULFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sVUFBVSxHQUFHLEVBQUU7QUFBQSxRQUM1RDtBQUFBLE1BQ0Y7QUFBQSxNQUNBLFFBQVE7QUFBQSxRQUNOLGFBQWEsQ0FBQyxnQkFBZ0IsNEJBQTRCO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxRQUFRO0FBQUEsTUFDTixlQUFlO0FBQUEsUUFDYixVQUFVO0FBQUEsTUFDWjtBQUFBLElBQ0Y7QUFBQSxJQUNBLEtBQUs7QUFBQSxNQUNILHFCQUFxQjtBQUFBLFFBQ25CLE1BQU07QUFBQSxVQUNKLG1CQUFtQjtBQUFBLFFBQ3JCO0FBQUEsTUFDRjtBQUFBLElBQ0Y7QUFBQSxJQUNBLFNBQVMsQ0FBQztBQUFBLEVBQ1o7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=
Loading…
Cancel
Save