Skip to content

严立 / framework-flow

Go to a project
Commit 5b24dfc3 by 黄燕娟
Options

feat:接口联调

parent fa7175ac
Inline Side-by-side
Showing with 826 additions and 692 deletions
.env.development
...@@ -3,4 +3,5 @@ VUE_APP_MODE = 'development' ...@@ -3,4 +3,5 @@ VUE_APP_MODE = 'development'
# Jeeplus快速开发平台/开发环境 # Jeeplus快速开发平台/开发环境
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/'
VUE_APP_SERVER_URL = 'http://rapidplatform.meiqicloud.com/' VUE_APP_SERVER_URL = 'http://rapidplatform.meiqicloud.com/'
.env.pre
...@@ -4,5 +4,6 @@ VUE_APP_BASE_API = '/api' ...@@ -4,5 +4,6 @@ VUE_APP_BASE_API = '/api'
#Jeeplus快速开发平台/后台地址 #Jeeplus快速开发平台/后台地址
#VUE_APP_SERVER_URL = 'http://szpastest.tianma.cn/api' #VUE_APP_SERVER_URL = 'http://szpastest.tianma.cn/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/'
VUE_APP_SERVER_URL = 'http://172.16.100.28/api' VUE_APP_SERVER_URL = 'http://172.16.100.28/api'
.env.production
# 生产环境配置 # 生产环境配置
VUE_APP_MODE = 'production' VUE_APP_MODE = 'production'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/'
VUE_APP_SERVER_URL = ''http://172.16.100.29/api' VUE_APP_SERVER_URL = ''http://172.16.100.29/api'
.env.stage
# 开发环境配置 # 开发环境配置
VUE_APP_MODE = 'stage' VUE_APP_MODE = 'stage'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/'
VUE_APP_SERVER_URL = 'https://sz-tianma-test.meiqicloud.com/api' VUE_APP_SERVER_URL = 'https://sz-tianma-test.meiqicloud.com/api'
\ No newline at end of file
.env.test
# 开发环境配置 # 开发环境配置
VUE_APP_MODE = 'test' VUE_APP_MODE = 'test'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
VITE_AXIOS_API_PRIMARY = 'http://rapidplatform.meiqicloud.com/'
VUE_APP_SERVER_URL = 'http://sz-tianma.meiqicloud.com/api' VUE_APP_SERVER_URL = 'http://sz-tianma.meiqicloud.com/api'
src/api/org.js
...@@ -3,64 +3,64 @@ import request from '@/api/request.js' ...@@ -3,64 +3,64 @@ import request from '@/api/request.js'
// 查询组织架构树 // 查询组织架构树
export function getOrgTree(param) { export function getOrgTree(param) {
return request({ return request({
url: 'oa/org/tree', url: 'a/sys/office/tree',
method: 'get', method: 'post',
params: param data: param
}) })
} }
// 查询系统角色 // 查询系统角色
export function getRole() { export function getRole() {
return request({ return request({
url: 'oa/org/role', url: 'oa/org/role',
method: 'get' method: 'get'
}) })
} }
// 搜索人员 // 搜索人员
export function getUserByName(param) { export function getUserByName(param) {
return request({ return request({
url: 'oa/org/tree/user/search', url: 'oa/org/tree/user/search',
method: 'get', method: 'get',
params: param params: param
}) })
} }
// 搜索人员 // 搜索人员
export function getUserDepts(userId) { export function getUserDepts(userId) {
return request({ return request({
url: `oa/org/user/${userId}/dept`, url: `oa/org/user/${userId}/dept`,
method: 'get' method: 'get'
}) })
} }
// 获取审批代理人 // 获取审批代理人
export function getUserAgent() { export function getUserAgent() {
return request({ return request({
url: `oa/org/user/agent`, url: `oa/org/user/agent`,
method: 'get' method: 'get'
}) })
} }
// 获取审批代理人 // 获取审批代理人
export function setUserAgent(params) { export function setUserAgent(params) {
return request({ return request({
url: `oa/org/user/agent`, url: `oa/org/user/agent`,
method: 'put', method: 'put',
data: params data: params
}) })
} }
// 获取审批代理人 // 获取审批代理人
export function cancelUserAgent() { export function cancelUserAgent() {
return request({ return request({
url: `oa/org/user/agent`, url: `oa/org/user/agent`,
method: 'delete' method: 'delete'
}) })
} }
export default { export default {
getOrgTree, getUserByName, getRole, getOrgTree, getUserByName, getRole,
getUserDepts, getUserAgent, setUserAgent, cancelUserAgent getUserDepts, getUserAgent, setUserAgent, cancelUserAgent
} }
src/api/process.js
import request from '@/api/request.js' import request from '@/api/request.js'
import {syncRequest} from './request.js' import { syncRequest } from './request.js'
/** /**
* *
...@@ -9,12 +9,12 @@ import {syncRequest} from './request.js' ...@@ -9,12 +9,12 @@ import {syncRequest} from './request.js'
* @param skipEmpty 是否跳过空部门 * @param skipEmpty 是否跳过空部门
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getUserLeader(level, deptId, skipEmpty){ export function getUserLeader(level, deptId, skipEmpty) {
return request({ return request({
url: `wflow/process/step/leader/level`, url: `wflow/process/step/leader/level`,
method: 'get', method: 'get',
params: {level: level, deptId: deptId, skipEmpty: skipEmpty} params: { level: level, deptId: deptId, skipEmpty: skipEmpty }
}) })
} }
/** /**
...@@ -23,36 +23,36 @@ export function getUserLeader(level, deptId, skipEmpty){ ...@@ -23,36 +23,36 @@ export function getUserLeader(level, deptId, skipEmpty){
* @param deptId 部门ID * @param deptId 部门ID
* @param skipEmpty 是否跳过空部门 * @param skipEmpty 是否跳过空部门
*/ */
export function getUserLeaders(maxLevel, deptId, skipEmpty){ export function getUserLeaders(maxLevel, deptId, skipEmpty) {
return request({ return request({
url: `wflow/process/step/leader/to/level`, url: `wflow/process/step/leader/to/level`,
method: 'get', method: 'get',
params: {maxLevel: maxLevel, deptId: deptId, skipEmpty: skipEmpty} params: { maxLevel: maxLevel, deptId: deptId, skipEmpty: skipEmpty }
}) })
} }
/** /**
* 获取指定系统角色的所有人员 * 获取指定系统角色的所有人员
* @param roles * @param roles
*/ */
export function getUsersByRoles(roles){ export function getUsersByRoles(roles) {
return request({ return request({
url: `wflow/process/step/userByRoles`, url: `wflow/process/step/userByRoles`,
method: 'post', method: 'post',
data: roles data: roles
}) })
} }
/** /**
* 查询所有部门主管 * 查询所有部门主管
* @param deptIds 部门ID * @param deptIds 部门ID
*/ */
export function getLeaderByDepts(deptIds){ export function getLeaderByDepts(deptIds) {
return request({ return request({
url: `wflow/process/step/deptLeader`, url: `wflow/process/step/deptLeader`,
method: 'post', method: 'post',
data: deptIds data: deptIds
}) })
} }
/** /**
...@@ -60,66 +60,66 @@ export function getLeaderByDepts(deptIds){ ...@@ -60,66 +60,66 @@ export function getLeaderByDepts(deptIds){
* @param userId 该人员ID * @param userId 该人员ID
* @param depts 部门 List * @param depts 部门 List
*/ */
export function userInDepts(userId, depts){ export function userInDepts(userId, depts) {
let result = false let result = false
syncRequest({ syncRequest({
url: `/wflow/process/step/user/${userId}/belong/depts`, url: `/wflow/process/step/user/${userId}/belong/depts`,
method: 'POST', method: 'POST',
data: depts, data: depts,
type: 'json', type: 'json',
success: res => { success: res => {
result = res result = res
} }
}) })
return result return result
} }
export function getNewVerProcess(code){ export function getNewVerProcess(code) {
return request({ return request({
url: `wflow/process/model/${code}`, url: `wflow/process/model/${code}`,
method: 'get' method: 'get'
}) })
} }
export function saveProcess(params){ export function saveProcess(params) {
return request({ return request({
url: `wflow/process/model/save/`, url: `wflow/process/model/save`,
method: 'post', method: 'post',
data: params data: params
}) })
} }
export function deployProcess(code){ export function deployProcess(code) {
return request({ return request({
url: `wflow/process/model/deploy/${code}`, url: `wflow/process/model/deploy/${code}`,
method: 'post' method: 'post'
}) })
} }
export function getCustomPrintConfig(instanceId){ export function getCustomPrintConfig(instanceId) {
return request({ return request({
url: `wflow/process/model/customPrint/${instanceId}`, url: `wflow/process/model/customPrint/${instanceId}`,
method: 'get' method: 'get'
}) })
} }
export function delProcessInst(instanceId){ export function delProcessInst(instanceId) {
return request({ return request({
url: `wflow/process/instance/${instanceId}`, url: `wflow/process/instance/${instanceId}`,
method: 'delete' method: 'delete'
}) })
} }
export function startProcess(code, params){ export function startProcess(code, params) {
return request({ return request({
url: `wflow/process/start/${code}`, url: `wflow/process/start/${code}`,
method: 'post', method: 'post',
data: params data: params
}) })
} }
export default { export default {
getUserLeader, getUserLeaders, getUsersByRoles, userInDepts, getUserLeader, getUserLeaders, getUsersByRoles, userInDepts,
deployProcess, saveProcess, getNewVerProcess, getCustomPrintConfig, deployProcess, saveProcess, getNewVerProcess, getCustomPrintConfig,
getLeaderByDepts, delProcessInst getLeaderByDepts, delProcessInst
} }
src/api/sys.js
...@@ -11,7 +11,7 @@ export function login(userId) { ...@@ -11,7 +11,7 @@ export function login(userId) {
// 用户 分页信息 // 用户 分页信息
export function userPage(params) { export function userPage(params) {
return request({ return request({
url: `/sys/user/page`, url: `/a/sys/user/page`,
method: 'post', method: 'post',
data: params data: params
}) })
......
src/assets/global.css
...@@ -40,6 +40,6 @@ body{ ...@@ -40,6 +40,6 @@ body{
} }
.card-page-box{ .card-page-box{
background: #fff; background: #fff;
height: 100vh; /* height: 100vh; */
padding: 10px; padding: 10px;
} }
\ No newline at end of file
src/components/deptSelect/index.vue 0 → 100644
<template>
<w-dialog
v-if="visible"
:border="false"
closeFree
width="880px"
@ok="selectOk"
title="选择部门"
v-model="visible"
>
<div>
<el-input
placeholder="输入关键字进行过滤"
v-model="filterText"
size="small"
@input="$refs.tree.filter(filterText)"
/>
<div class="tree-box" v-loading="loading">
<el-tree
:default-checked-keys="defaultValue"
class="mt-15"
show-checkbox
:data="treeOptions"
:props="{
value: 'id',
label: 'name',
children: 'children',
}"
:default-expand-all="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
:check-strictly="false"
:default-expanded-keys="[treeOptions.length && treeOptions[0].id]"
>
</el-tree>
</div>
</div>
</w-dialog>
</template>
<script>
import { getOrgTree } from "@/api/org";
export default {
data() {
return {
visible: false,
filterText: "",
treeOptions: [],
orgType: "",
defaultValue: [],
loading: false,
};
},
mounted() {},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.orgName.indexOf(value) !== -1;
},
open(select) {
this.defaultValue = select.map((item) => {
return item.id;
});
this.visible = true;
this.getTree();
},
getTree() {
this.loading = true;
getOrgTree({}).then((res) => {
console.log(444, res);
this.loading = false;
this.treeOptions = res.data;
});
},
onSearchType(val) {},
selectOk() {
let list = this.$refs.tree.getCheckedNodes();
let select = list.map((item) => {
return {
type: "dept",
id: item.id,
name: item.name,
};
});
this.visible = false;
this.$emit("ok", select);
},
},
};
</script>
<style scoped lang="less">
.tree-box {
height: 60vh;
overflow: auto;
}
.form-item-box {
margin: 10px 0;
display: flex;
align-items: center;
}
</style>
src/components/userTable/index.vue
...@@ -183,9 +183,9 @@ export default { ...@@ -183,9 +183,9 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
userPage({ userPage({
page: this.page.current, pageNo: this.page.current,
limit: this.page.size, pageSize: this.page.size,
data: { search: {
...this.formInline, ...this.formInline,
...this.params, ...this.params,
...this.selectData, ...this.selectData,
......
src/utils/common.js
...@@ -56,7 +56,7 @@ export function getObjType(obj) { ...@@ -56,7 +56,7 @@ export function getObjType(obj) {
} }
export function goBack() { export function goBack() {
let from = sessionStorage.getItem("from"); let from = localStorage.getItem("from");
console.log('from', from) console.log('from', from)
if (from && from !== "null") { if (from && from !== "null") {
sessionStorage.removeItem("from"); sessionStorage.removeItem("from");
......
src/views/admin/FormProcessDesign.vue
...@@ -234,127 +234,127 @@ export default { ...@@ -234,127 +234,127 @@ export default {
}, },
remark: "", remark: "",
}; };
if (this.$route.query.business === "40") { // if (this.$route.query.business === "40") {
loadForm.formItems = [ // loadForm.formItems = [
{ // {
id: "field2432601004816", // id: "field2432601004816",
icon: "el-icon-folder-opened", // icon: "el-icon-folder-opened",
name: "FileUpload", // name: "FileUpload",
props: { // props: {
maxSize: 100, // maxSize: 100,
onlyRead: false, // onlyRead: false,
required: true, // required: true,
fileTypes: [], // fileTypes: [],
maxNumber: 10, // maxNumber: 10,
enablePrint: true, // enablePrint: true,
type: "fixed", // type: "fixed",
keyLabel: "recoverFile", // keyLabel: "recoverFile",
}, // },
title: "复线方案", // title: "复线方案",
value: [], // value: [],
valueType: "Array", // valueType: "Array",
}, // },
{ // {
id: "field5044001009715", // id: "field5044001009715",
icon: "el-icon-edit", // icon: "el-icon-edit",
name: "NumberInput", // name: "NumberInput",
props: { // props: {
required: true, // required: true,
type: "fixed", // type: "fixed",
keyLabel: "stopDuration", // keyLabel: "stopDuration",
precision: 2, // precision: 2,
}, // },
title: "停线时长(小时)", // title: "停线时长(小时)",
value: "", // value: "",
valueType: "Number", // valueType: "Number",
}, // },
{ // {
id: "field9375301007398", // id: "field9375301007398",
icon: "el-icon-edit", // icon: "el-icon-edit",
name: "RadioGroup", // name: "RadioGroup",
props: { // props: {
required: true, // required: true,
type: "fixed", // type: "fixed",
keyLabel: "stopStatus", // keyLabel: "stopStatus",
}, // },
title: "是否停线", // title: "是否停线",
value: "", // value: "",
valueType: "String", // valueType: "String",
}, // },
{ // {
id: "field8369098565280", // id: "field8369098565280",
icon: "el-icon-edit", // icon: "el-icon-edit",
name: "SelectInputApi", // name: "SelectInputApi",
props: { // props: {
apiType: "category", // apiType: "category",
labelKey: "name", // labelKey: "name",
required: true, // required: true,
searchText: "name", // searchText: "name",
queryParams: { firstStatus: "1" }, // queryParams: { firstStatus: "1" },
type: "fixed", // type: "fixed",
keyLabel: "firstCategoryId", // keyLabel: "firstCategoryId",
linkageSonId: "field3965098570981", // linkageSonId: "field3965098570981",
}, // },
title: "异常一级分类", // title: "异常一级分类",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: "Object", // valueType: "Object",
}, // },
{ // {
id: "field3965098570981", // id: "field3965098570981",
icon: "el-icon-edit", // icon: "el-icon-edit",
name: "SelectInputApi", // name: "SelectInputApi",
props: { // props: {
apiType: "category", // apiType: "category",
labelKey: "name", // labelKey: "name",
required: true, // required: true,
searchText: "name", // searchText: "name",
queryParams: { // queryParams: {
firstStatus: "0", // firstStatus: "0",
linkageId: "field8369098565280", // linkageId: "field8369098565280",
}, // },
type: "fixed", // type: "fixed",
keyLabel: "secondCategoryId", // keyLabel: "secondCategoryId",
isDisabledLinkage: true, // isDisabledLinkage: true,
isDisabledLinkageSelect: true, // isDisabledLinkageSelect: true,
isLinkage: true, // isLinkage: true,
}, // },
title: "异常二级分类", // title: "异常二级分类",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: "Object", // valueType: "Object",
}, // },
{ // {
id: "field4387030350208", // id: "field4387030350208",
title: "异常处理说明", // title: "异常处理说明",
name: "ExceptionHandlingInstructions", // name: "ExceptionHandlingInstructions",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "", remark: "" }, // value: { id: "", label: "", remark: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
queryParams: { linkageId: "field3965098570981" }, // queryParams: { linkageId: "field3965098570981" },
isDisabledLinkage: true, // isDisabledLinkage: true,
isDisabledLinkageSelect: true, // isDisabledLinkageSelect: true,
isLinkage: true, // isLinkage: true,
secondCategoryFieldId: "field3965098570981", // secondCategoryFieldId: "field3965098570981",
}, // },
}, // },
{ // {
id: "field9155398572607", // id: "field9155398572607",
icon: "el-icon-edit", // icon: "el-icon-edit",
name: "SelectInputApi", // name: "SelectInputApi",
props: { // props: {
apiType: "grade", // apiType: "grade",
labelKey: "grade", // labelKey: "grade",
required: true, // required: true,
searchText: "grade", // searchText: "grade",
type: "fixed", // type: "fixed",
keyLabel: "gradeId", // keyLabel: "gradeId",
}, // },
title: "异常等级", // title: "异常等级",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: "Object", // valueType: "Object",
}, // },
]; // ];
} // }
this.$store.commit("loadForm", loadForm); this.$store.commit("loadForm", loadForm);
}, },
......
src/views/admin/LayoutHeader.vue
...@@ -123,18 +123,6 @@ export default { ...@@ -123,18 +123,6 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(() => { }).then(() => {
//this.$store.commit('clearTemplate')
// let from = sessionStorage.getItem("from");
// if (from && from !== "null") {
// sessionStorage.removeItem("from");
// // type==="back" 关闭弹窗
// window.parent.postMessage(
// { text: "子页面发消息给父页面", type: "back", from: from },
// "*"
// );
// } else {
// this.$router.go(-1);
// }
goBack(); goBack();
}); });
}, },
......
src/views/admin/layout/process/DefaultNodeProps.js
...@@ -41,6 +41,7 @@ export const APPROVAL_PROPS = { ...@@ -41,6 +41,7 @@ export const APPROVAL_PROPS = {
type: 'TO_END', //驳回规则 TO_END TO_NODE TO_BEFORE type: 'TO_END', //驳回规则 TO_END TO_NODE TO_BEFORE
target: '' //驳回到指定ID的节点 target: '' //驳回到指定ID的节点
}, },
dept: [],
operationPerm: { operationPerm: {
agree: { alisa: '同意', show: true }, agree: { alisa: '同意', show: true },
refuse: { alisa: '拒绝', show: true }, refuse: { alisa: '拒绝', show: true },
......
src/views/common/form/ComponentsConfigExport.js
...@@ -196,20 +196,20 @@ export const baseComponents = [ ...@@ -196,20 +196,20 @@ export const baseComponents = [
options: [], options: [],
}, },
}, },
// { {
// title: "部门选择", title: "部门选择",
// name: "DeptPicker", name: "DeptPicker",
// icon: "iconfont icon-map-site", icon: "iconfont icon-map-site",
// value: [], value: [],
// valueType: ValueType.dept, valueType: ValueType.dept,
// props: { props: {
// required: false, required: false,
// enablePrint: true, enablePrint: true,
// multiple: false, multiple: false,
// expansion: false, expansion: false,
// options: [], options: [],
// }, },
// }, },
{ {
title: "评分", title: "评分",
name: "Score", name: "Score",
...@@ -240,369 +240,369 @@ export const baseComponents = [ ...@@ -240,369 +240,369 @@ export const baseComponents = [
}, },
], ],
}, },
{ // {
name: "定制组件", // name: "定制组件",
components: [ // components: [
{ // {
title: "物料型号", // title: "物料型号",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: "", // value: "",
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
apiType: "material", // apiType: "material",
required: false, // required: false,
valueKey: "matMaterialId", // valueKey: "matMaterialId",
labelKey: "materialSeries", // labelKey: "materialSeries",
searchText: "materialSeries", // searchText: "materialSeries",
}, // },
}, // },
{ // {
title: "产品型号", // title: "产品型号",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
apiType: "product", // apiType: "product",
required: false, // required: false,
labelKey: "series", // labelKey: "series",
searchText: "series", // searchText: "series",
}, // },
}, // },
{ // {
title: "站点", // title: "站点",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
apiType: "station", // apiType: "station",
required: false, // required: false,
labelKey: "name", // labelKey: "name",
searchText: "name", // searchText: "name",
}, // },
}, // },
{ // {
title: "工序段", // title: "工序段",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
apiType: "procedureSection", // apiType: "procedureSection",
required: false, // required: false,
labelKey: "name", // labelKey: "name",
searchText: "name", // searchText: "name",
queryParams: {}, // queryParams: {},
}, // },
}, // },
{ // {
title: "工序", // title: "工序",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "" }, // value: { id: "", label: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
apiType: "procedure", // apiType: "procedure",
required: false, // required: false,
labelKey: "name", // labelKey: "name",
searchText: "name", // searchText: "name",
queryParams: {}, // queryParams: {},
}, // },
}, // },
{ // {
title: "不良项目", // title: "不良项目",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "", feedbackStandard: "", stopStandard: "" }, // value: { id: "", label: "", feedbackStandard: "", stopStandard: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
showRemark: true, // showRemark: true,
showRemarkKeys: [ // showRemarkKeys: [
{ // {
label: "反馈标准：", // label: "反馈标准：",
value: "feedbackStandard", // value: "feedbackStandard",
}, // },
{ // {
label: "停线标准： ", // label: "停线标准： ",
value: "stopStandard", // value: "stopStandard",
}, // },
], // ],
apiType: "undesirableItem", // apiType: "undesirableItem",
required: false, // required: false,
labelKey: "name", // labelKey: "name",
searchText: "name", // searchText: "name",
queryParams: {}, // queryParams: {},
}, // },
}, // },
// { // // {
// title: "不良项备注", // // title: "不良项备注",
// name: "BadRemarks", // // name: "BadRemarks",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: {id: '', label: '', remark: '',}, // // value: {id: '', label: '', remark: '',},
// valueType: ValueType.object, // // valueType: ValueType.object,
// props: { // // props: {
// showRemark: true, // // showRemark: true,
// showRemarkKeys: [{ // // showRemarkKeys: [{
// label: '', // // label: '',
// value: 'remark' // // value: 'remark'
// }], // // }],
// apiType: 'incomeMaterial', // // apiType: 'incomeMaterial',
// required: false, // // required: false,
// labelKey: 'name', // // labelKey: 'name',
// searchText: 'name', // // searchText: 'name',
// queryParams: {} // // queryParams: {}
// }, // // },
// }, // // },
{ // {
title: "原材料异常分类", // title: "原材料异常分类",
name: "SelectInputApi", // name: "SelectInputApi",
icon: "el-icon-edit", // icon: "el-icon-edit",
value: { id: "", label: "", remark: "" }, // value: { id: "", label: "", remark: "" },
valueType: ValueType.object, // valueType: ValueType.object,
props: { // props: {
showRemark: true, // showRemark: true,
showRemarkKeys: [ // showRemarkKeys: [
{ // {
label: "", // label: "",
value: "remark", // value: "remark",
}, // },
], // ],
apiType: "incomeMaterial", // apiType: "incomeMaterial",
required: false, // required: false,
labelKey: "name", // labelKey: "name",
searchText: "name", // searchText: "name",
}, // },
}, // },
// { // // {
// title: "异常处理说明", // // title: "异常处理说明",
// name: "ExceptionHandlingInstructions", // // name: "ExceptionHandlingInstructions",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: {id: '', label: '', remark: '',}, // // value: {id: '', label: '', remark: '',},
// valueType: ValueType.object, // // valueType: ValueType.object,
// props: { // // props: {
// queryParams: {linkageId: 'field3965098570981'}, // // queryParams: {linkageId: 'field3965098570981'},
// isDisabledLinkage: true, // // isDisabledLinkage: true,
// isDisabledLinkageSelect: true, // // isDisabledLinkageSelect: true,
// isLinkage: true, // // isLinkage: true,
// }, // // },
// }, // // },
// { // // {
// title: "异常一级分类", // // title: "异常一级分类",
// name: "SelectInputApi", // // name: "SelectInputApi",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: { id: '', label: '' }, // // value: { id: '', label: '' },
// valueType: ValueType.object, // // valueType: ValueType.object,
// props: { // // props: {
// apiType: 'category', // // apiType: 'category',
// required: true, // // required: true,
// labelKey: 'name', // // labelKey: 'name',
// searchText: 'name', // // searchText: 'name',
// queryParams: { // // queryParams: {
// firstStatus: '1', // // firstStatus: '1',
// }, // // },
// type: 'fixed', // // type: 'fixed',
// keyLabel: 'firstCategoryId' // // keyLabel: 'firstCategoryId'
// }, // // },
// }, // // },
// { // // {
// title: "异常二级分类", // // title: "异常二级分类",
// name: "SelectInputApi", // // name: "SelectInputApi",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: { id: '', label: '' }, // // value: { id: '', label: '' },
// valueType: ValueType.object, // // valueType: ValueType.object,
// props: { // // props: {
// apiType: 'category', // // apiType: 'category',
// required: true, // // required: true,
// labelKey: 'name', // // labelKey: 'name',
// searchText: 'name', // // searchText: 'name',
// queryParams: { // // queryParams: {
// firstStatus: '0' // // firstStatus: '0'
// }, // // },
// type: 'fixed', // // type: 'fixed',
// keyLabel: 'secondCategoryId' // // keyLabel: 'secondCategoryId'
// }, // // },
// }, // // },
// { // // {
// title: "异常等级", // // title: "异常等级",
// name: "SelectInputApi", // // name: "SelectInputApi",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: { id: '', label: '' }, // // value: { id: '', label: '' },
// valueType: ValueType.object, // // valueType: ValueType.object,
// props: { // // props: {
// apiType: 'grade', // // apiType: 'grade',
// required: true, // // required: true,
// labelKey: 'grade', // // labelKey: 'grade',
// searchText: 'grade', // // searchText: 'grade',
// type: 'fixed', // // type: 'fixed',
// keyLabel: 'gradeId' // // keyLabel: 'gradeId'
// }, // // },
// }, // // },
// { // // {
// title: "是否停线", // // title: "是否停线",
// name: "RadioGroup", // // name: "RadioGroup",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: '', // // value: '',
// valueType: ValueType.string, // // valueType: ValueType.string,
// props: { // // props: {
// required: true, // // required: true,
// type: "fixed", // // type: "fixed",
// keyLabel: "stopStatus" // // keyLabel: "stopStatus"
// }, // // },
// }, // // },
// { // // {
// title: "停线时长(小时)", // // title: "停线时长(小时)",
// name: "NumberInput", // // name: "NumberInput",
// icon: "el-icon-edit", // // icon: "el-icon-edit",
// value: '', // // value: '',
// valueType: ValueType.number, // // valueType: ValueType.number,
// props: { // // props: {
// required: false, // // required: false,
// type: 'fixed', // // type: 'fixed',
// keyLabel: "stopDuration" // // keyLabel: "stopDuration"
// }, // // },
// }, // // },
// { // // {
// title: "复线方案", // // title: "复线方案",
// name: "FileUpload", // // name: "FileUpload",
// icon: "el-icon-folder-opened", // // icon: "el-icon-folder-opened",
// value: [], // // value: [],
// valueType: ValueType.array, // // valueType: ValueType.array,
// props: { // // props: {
// required: false, // // required: false,
// enablePrint: true, // // enablePrint: true,
// onlyRead: false, //是否只读，false只能在线预览，true可以下载 // // onlyRead: false, //是否只读，false只能在线预览，true可以下载
// maxSize: 100, //文件最大大小MB // // maxSize: 100, //文件最大大小MB
// maxNumber: 10, //最大上传数量 // // maxNumber: 10, //最大上传数量
// fileTypes: [], //限制文件上传类型 // // fileTypes: [], //限制文件上传类型
// type: 'fixed', // // type: 'fixed',
// keyLabel: "recoverFile", // // keyLabel: "recoverFile",
// }, // // },
// }, // // },
], // ],
}, // },
{ // {
name: "扩展组件", // name: "扩展组件",
components: [ // components: [
// { // {
// title: "明细表", // title: "明细表",
// name: "TableList", // name: "TableList",
// icon: "el-icon-tickets", // icon: "el-icon-tickets",
// value: [], // value: [],
// valueType: ValueType.array, // valueType: ValueType.array,
// props: { // props: {
// required: false, // required: false,
// enablePrint: true, // enablePrint: true,
// showBorder: true, // showBorder: true,
// rowLayout: true, // rowLayout: true,
// showSummary: false, // showSummary: false,
// summaryColumns: [], // summaryColumns: [],
// maxSize: 0, //最大条数，为0则不限制 // maxSize: 0, //最大条数，为0则不限制
// columns: [], //列设置 // columns: [], //列设置
// }, // },
// }, // },
// { // {
// title: "地理位置", // title: "地理位置",
// name: "Location", // name: "Location",
// icon: "el-icon-map-location", // icon: "el-icon-map-location",
// value: undefined, // value: undefined,
// valueType: ValueType.object, // valueType: ValueType.object,
// props: { // props: {
// required: false, // required: false,
// enablePrint: true, // enablePrint: true,
// enableEdit: false, // enableEdit: false,
// }, // },
// }, // },
// { // {
// title: "省市区", // title: "省市区",
// name: "Provinces", // name: "Provinces",
// icon: "el-icon-place", // icon: "el-icon-place",
// value: "", // value: "",
// valueType: ValueType.string, // valueType: ValueType.string,
// props: { // props: {
// required: false, // required: false,
// enablePrint: true, // enablePrint: true,
// level: 3, // level: 3,
// }, // },
// }, // },
// { // {
// title: "签名", // title: "签名",
// name: "SignPanel", // name: "SignPanel",
// icon: "el-icon-edit", // icon: "el-icon-edit",
// value: "", // value: "",
// valueType: ValueType.string, // valueType: ValueType.string,
// props: { // props: {
// required: false, // required: false,
// enablePrint: true, // enablePrint: true,
// thickness: 2, // thickness: 2,
// color: "#000000", // color: "#000000",
// }, // },
// }, // },
// { // {
// title: "流程关联", // title: "流程关联",
// name: "ProcessIndex", // name: "ProcessIndex",
// icon: "el-icon-link", // icon: "el-icon-link",
// value: [], // value: [],
// valueType: ValueType.array, // valueType: ValueType.array,
// props: { // props: {
// required: false, // required: false,
// enablePrint: false, // enablePrint: false,
// processCode: null, // processCode: null,
// }, // },
// }, // },
// { // {
// title: "计算公式", // title: "计算公式",
// name: "CalcFormula", // name: "CalcFormula",
// icon: "el-icon-mobile", // icon: "el-icon-mobile",
// value: [], // value: [],
// valueType: ValueType.number, // valueType: ValueType.number,
// props: { // props: {
// precision: 0, // precision: 0,
// required: false, // required: false,
// enablePrint: false, // enablePrint: false,
// isPlus: false, // isPlus: false,
// jsCode: "", // jsCode: "",
// explain: [], // explain: [],
// }, // },
// }, // },
// { // {
// title: "网页iframe", // title: "网页iframe",
// name: "WebIframe", // name: "WebIframe",
// icon: "el-icon-tickets", // icon: "el-icon-tickets",
// value: "", // value: "",
// valueType: ValueType.string, // valueType: ValueType.string,
// props: { // props: {
// required: false, // required: false,
// enablePrint: false, // enablePrint: false,
// url: "", // url: "",
// height: 200, // height: 200,
// }, // },
// }, // },
// { // {
// title: "Vue容器", // title: "Vue容器",
// name: "VueContainer", // name: "VueContainer",
// icon: "el-icon-mobile", // icon: "el-icon-mobile",
// value: "", // value: "",
// valueType: ValueType.string, // valueType: ValueType.string,
// props: { // props: {
// required: false, // required: false,
// enablePrint: false, // enablePrint: false,
// template: null, // template: null,
// cpStyle: null, // cpStyle: null,
// cpJs: null, // cpJs: null,
// }, // },
// }, // },
], // ],
}, // },
]; ];
export default { export default {
......
src/views/common/process/config/ApprovalNodeConfig.vue
...@@ -17,6 +17,17 @@ ...@@ -17,6 +17,17 @@
> >
<org-items v-model="nodeProps.assignedUser" /> <org-items v-model="nodeProps.assignedUser" />
</div> </div>
<div v-else-if="nodeProps.assignedType === 'DEPT'">
<el-button
size="mini"
icon="el-icon-plus"
type="primary"
@click="selectDept"
round
>选择部门</el-button
>
<org-items v-model="nodeProps.dept" />
</div>
<div v-else-if="nodeProps.assignedType === 'USER_GROUP'"> <div v-else-if="nodeProps.assignedType === 'USER_GROUP'">
<el-button <el-button
icon="el-icon-plus" icon="el-icon-plus"
...@@ -294,6 +305,7 @@ ...@@ -294,6 +305,7 @@
@ok="selected" @ok="selected"
/> />
<UserTable ref="userPicker" @ok="onConfirmUser" /> <UserTable ref="userPicker" @ok="onConfirmUser" />
<DeptSelect ref="deptPicker" @ok="onConfirmDept" />
<UserGroupTable ref="userGroupPicker" @ok="onConfirmUser" /> <UserGroupTable ref="userGroupPicker" @ok="onConfirmUser" />
</div> </div>
</template> </template>
...@@ -303,9 +315,10 @@ import OrgPicker from "@/components/common/OrgPicker"; ...@@ -303,9 +315,10 @@ import OrgPicker from "@/components/common/OrgPicker";
import OrgItems from "../OrgItems"; import OrgItems from "../OrgItems";
import UserTable from "@/components/userTable"; import UserTable from "@/components/userTable";
import UserGroupTable from "@/components/userGroupTable"; import UserGroupTable from "@/components/userGroupTable";
import DeptSelect from "@/components/deptSelect";
export default { export default {
name: "ApprovalNodeConfig", name: "ApprovalNodeConfig",
components: { OrgPicker, OrgItems, UserTable, UserGroupTable }, components: { OrgPicker, OrgItems, UserTable, UserGroupTable, DeptSelect },
props: { props: {
config: { config: {
type: Object, type: Object,
...@@ -321,16 +334,17 @@ export default { ...@@ -321,16 +334,17 @@ export default {
orgPickerType: "user", orgPickerType: "user",
approvalTypes: [ approvalTypes: [
{ name: "指定人员", type: "ASSIGN_USER" }, { name: "指定人员", type: "ASSIGN_USER" },
{ name: "指定用户组", type: "USER_GROUP" }, { name: "指定部门", type: "DEPT" },
// { name: "发起人自选", type: "SELF_SELECT" }, { name: "发起人自选", type: "SELF_SELECT" },
// { name: "发起人自己", type: "SELF" }, { name: "发起人自己", type: "SELF" },
// { name: "部门主管", type: "LEADER" }, { name: "部门主管", type: "LEADER" },
// { name: "多级部门主管", type: "LEADER_TOP" }, { name: "多级部门主管", type: "LEADER_TOP" },
// { name: "指定部门的主管", type: "ASSIGN_LEADER" }, // { name: "指定部门的主管", type: "ASSIGN_LEADER" },
// { name: "系统角色", type: "ROLE" }, // { name: "系统角色", type: "ROLE" },
// { name: "表单内联系人", type: "FORM_USER" }, // { name: "表单内联系人", type: "FORM_USER" },
// { name: "表单内部门主管", type: "FORM_DEPT" }, // { name: "表单内部门主管", type: "FORM_DEPT" },
// { name: "系统(自动拒绝)", type: "REFUSE" }, { name: "系统(自动拒绝)", type: "REFUSE" },
// { name: "指定用户组", type: "USER_GROUP" },
], ],
}; };
}, },
...@@ -341,12 +355,12 @@ export default { ...@@ -341,12 +355,12 @@ export default {
select() { select() {
return this.config.assignedUser || []; return this.config.assignedUser || [];
}, },
selectDept() { // selectDept() {
if (!this.config.assignedDept) { // if (!this.config.assignedDept) {
this.$set(this.config, "assignedDept", []); // this.$set(this.config, "assignedDept", []);
} // }
return this.config.assignedDept; // return this.config.assignedDept;
}, // },
userForms() { userForms() {
let userForm = []; let userForm = [];
this.loadFormItemPicker( this.loadFormItemPicker(
...@@ -426,10 +440,6 @@ export default { ...@@ -426,10 +440,6 @@ export default {
}); });
}, },
selectUser() { selectUser() {
// this.orgPickerSelected = this.select;
// this.orgPickerType = "user";
// console.log("选择 " + this.orgPickerType);
// this.$refs.orgPicker.show();
this.orgPickerSelected = this.config.assignedUser; this.orgPickerSelected = this.config.assignedUser;
this.$refs.userPicker.open({}, this.orgPickerSelected); this.$refs.userPicker.open({}, this.orgPickerSelected);
}, },
...@@ -437,18 +447,21 @@ export default { ...@@ -437,18 +447,21 @@ export default {
this.orgPickerSelected = this.config.userGroups; this.orgPickerSelected = this.config.userGroups;
this.$refs.userGroupPicker.open({}, this.orgPickerSelected); this.$refs.userGroupPicker.open({}, this.orgPickerSelected);
}, },
selectDept() {
this.orgPickerSelected = this.config.dept || []; //
this.$refs.deptPicker.open(this.config.dept);
console.log(3333, this.orgPickerSelected);
},
selectOrgDept() { selectOrgDept() {
this.orgPickerSelected = this.selectDept; this.orgPickerSelected = this.selectDept;
this.orgPickerType = "dept"; this.orgPickerType = "dept";
console.log("选择 " + this.orgPickerType); console.log("选择 " + this.orgPickerType);
this.$refs.orgPicker.show(); this.$refs.orgPicker.show();
}, },
selectNoSetUser() { selectNoSetUser() {
// this.orgPickerSelected = this.config.nobody.assignedUser;
// this.orgPickerType = "user";
// this.$refs.orgPicker.show();
this.orgPickerSelected = this.config.nobody.assignedUser; this.orgPickerSelected = this.config.nobody.assignedUser;
this.$refs.userGroupPicker.open({}, this.orgPickerSelected); this.$refs.userPicker.open({}, this.orgPickerSelected);
}, },
selectRole() { selectRole() {
this.orgPickerType = "role"; this.orgPickerType = "role";
...@@ -473,6 +486,13 @@ export default { ...@@ -473,6 +486,13 @@ export default {
}); });
}); });
}, },
onConfirmDept(select) {
this.orgPickerSelected.length = 0;
select.forEach((val) => {
this.orgPickerSelected.push(val);
});
this.orgPickerSelected = select;
},
}, },
}; };
</script> </script>
......
vue.config.js
...@@ -2,69 +2,84 @@ const path = require("path"); ...@@ -2,69 +2,84 @@ const path = require("path");
const MonacoEditorPlugin = require("monaco-editor-webpack-plugin"); const MonacoEditorPlugin = require("monaco-editor-webpack-plugin");
console.log( console.log(
'当前环境>>:', '当前环境>>:',
process.env.VUE_APP_MODE, process.env.VUE_APP_MODE,
process.env.VUE_APP_MODE === "development" ? "./" : "/workflow" process.env.VUE_APP_MODE === "development" ? "./" : "/workflow"
); );
module.exports = { module.exports = {
publicPath: process.env.VUE_APP_MODE === "development" ? "./" : "/workflow", publicPath: process.env.VUE_APP_MODE === "development" ? "./" : "/workflow",
lintOnSave: false, lintOnSave: false,
outputDir: "dist", outputDir: "dist",
// 开发环境显示报错位置 生产环境设置为false减少打包体积 // 开发环境显示报错位置 生产环境设置为false减少打包体积
productionSourceMap: false, productionSourceMap: false,
runtimeCompiler: true, //开启运行时编译 runtimeCompiler: true, //开启运行时编译
devServer: { devServer: {
port: 8080, port: 8080,
disableHostCheck: true, disableHostCheck: true,
proxy: { proxy: {
"/api": { "/api": {
target: "http://sz-tianma.meiqicloud.com/api", target: process.env.VITE_AXIOS_API_PRIMARY,
// target: 'http://192.168.110.114:8888', // target: 'http://192.168.110.114:8888',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/api": "", "^/api": "",
},
},
}, },
},
}, },
}, chainWebpack(config) {
chainWebpack(config) { config.plugins.delete("preload");
config.plugins.delete("preload"); config.plugins.delete("prefetch");
config.plugins.delete("prefetch");
},
configureWebpack: {
plugins: [
new MonacoEditorPlugin({
languages: ["javascript", "html", "css", "json"],
}),
],
},
pluginOptions: {
"style-resources-loader": {
preProcessor: "less",
patterns: [
// 全局变量路径，不能使用路径别名
path.resolve(__dirname, "./src/assets/theme.less"),
],
}, },
}, configureWebpack: {
css: { plugins: [
loaderOptions: { new MonacoEditorPlugin({
less: { languages: ["javascript", "html", "css", "json"],
// 若 less-loader 版本小于 6.0，请移除 lessOptions 这一级，直接配置选项。 }),
lessOptions: { ],
modifyVars: { module: {
// 直接覆盖变量 rules: [
"text-color": "#111", {
"border-color": "#eee", test: /\.(js|mjs)$/,
// 或者可以通过 less 文件覆盖（文件路径为绝对路径） include: process.cwd(),
hack: `true; @import "src/assets/theme.less";`, exclude: /node_modules/,
}, use: {
loader: 'babel-loader',
options: {
plugins: ['@babel/plugin-proposal-optional-chaining'],
},
},
},
],
},
},
pluginOptions: {
"style-resources-loader": {
preProcessor: "less",
patterns: [
// 全局变量路径，不能使用路径别名
path.resolve(__dirname, "./src/assets/theme.less"),
],
},
},
css: {
loaderOptions: {
less: {
// 若 less-loader 版本小于 6.0，请移除 lessOptions 这一级，直接配置选项。
lessOptions: {
modifyVars: {
// 直接覆盖变量
"text-color": "#111",
"border-color": "#eee",
// 或者可以通过 less 文件覆盖（文件路径为绝对路径）
hack: `true; @import "src/assets/theme.less";`,
},
},
},
sass: {
data:
'@import "src/assets/element/variable.scss";@import "src/assets/element/rewrite.scss";',
},
}, },
},
sass: {
data:
'@import "src/assets/element/variable.scss";@import "src/assets/element/rewrite.scss";',
},
}, },
},
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment