From 2bea732496b4f5051233ed94e206160992351596 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 11:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue | 14
Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue | 303 +++++++++++++++++++++
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 16
Source/plt-web/plt-web-ui/src/views/processTemplate/customType/index.vue | 202 ++++++++++++++
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue | 3
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue | 12
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 5
Source/plt-web/plt-web-ui/src/api/processTemplate/type.js | 31 ++
Source/plt-web/plt-web-ui/src/api/processTemplate/define.js | 52 +++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue | 103 +++---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 13
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 16
16 files changed, 693 insertions(+), 93 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js b/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js
new file mode 100644
index 0000000..4945e45
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/api/processTemplate/define.js
@@ -0,0 +1,52 @@
+import request from '@/router/axios';
+
+// 鍒楄〃鏌ヨ
+export function getProcessTempList(params) {
+ return request({
+ url: "/api/pvolumesController/getPvolumesPage",
+ method: "get",
+ params
+ });
+}
+export function saveProcessTemp(params) {
+ return request({
+ url: "/api/pvolumesController/savePvolume",
+ method: "post",
+ data: params
+ });
+}
+export function updateProcessTemp(params) {
+ return request({
+ url: "/api/pvolumesController/updatePvolume",
+ method: "post",
+ data: params
+ });
+}
+export function deleteProcessTemp(params) {
+ return request({
+ url: "/api/pvolumesController/deletePvolume",
+ method: "delete",
+ params
+ })
+}
+// 瀵煎嚭
+export function download (params) {
+ return request({
+ url: '/api/webEnumController/exportEnumTypes',
+ method: 'get',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ responseType: 'blob',
+ params
+ })
+}
+
+// 涓嬭浇瀵煎叆妯℃澘
+export function downloadTemplate (params) {
+ return request({
+ url: '/api/webEnumController/downloadEnumTemplate',
+ method: 'get',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ responseType: 'blob',
+ params
+ })
+}
diff --git a/Source/plt-web/plt-web-ui/src/api/processTemplate/type.js b/Source/plt-web/plt-web-ui/src/api/processTemplate/type.js
new file mode 100644
index 0000000..6f1abe2
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/api/processTemplate/type.js
@@ -0,0 +1,31 @@
+import request from '@/router/axios';
+
+// 鍒楄〃鏌ヨ
+export function getTypeList(params) {
+ return request({
+ url: "/api/pvolumesController/getPvolumesPage",
+ method: "get",
+ params
+ });
+}
+export function saveType(params) {
+ return request({
+ url: "/api/pvolumesController/savePvolume",
+ method: "post",
+ data: params
+ });
+}
+export function updateType(params) {
+ return request({
+ url: "/api/pvolumesController/updatePvolume",
+ method: "post",
+ data: params
+ });
+}
+export function deleteType(params) {
+ return request({
+ url: "/api/pvolumesController/deletePvolume",
+ method: "delete",
+ params
+ })
+}
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
index 166830c..d09d91f 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
@@ -1,6 +1,6 @@
<template>
<!--鍔ㄦ�佹ā鏉�-->
- <avue-form ref="form" :option="option" v-model="form" v-loading="loading">
+ <avue-form ref="basicform" :option="option" v-model="form" v-loading="loading">
<template v-for="item in allColumn" :slot="item.prop+ ''">
<vciWebRefer
v-if="item.type === 'refer'"
@@ -326,7 +326,7 @@
// 琛ㄥ崟鏍￠獙
validate(done) {
return new Promise((resolve) => {
- this.$refs.form.validate((valid,fields) => {
+ this.$refs.basicform.validate((valid,fields) => {
done(valid,fields);
if (valid) {
resolve(true);
@@ -339,19 +339,19 @@
});
},
resetFields(){
- this.$refs.form.resetFields()
+ this.$refs.basicform.resetFields()
},
clearValidate(props){
- this.$refs.form.clearValidate(props)
+ this.$refs.basicform.clearValidate(props)
},
updateDic(prop,data){
- this.$refs.form.updateDic(prop,data)
+ this.$refs.basicform.updateDic(prop,data)
},
dicInit(){
- this.$refs.form.dicInit()
+ this.$refs.basicform.dicInit()
},
getPropRef(){
- this.$refs.form.getPropRef()
+ this.$refs.basicform.getPropRef()
}
},
};
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index 95d0ec0..3f57118 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -516,8 +516,8 @@
</el-form>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
- <el-button @click="addEscHandler">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addEscHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
<!--瀵煎叆 -->
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index c010a36..d6f2c2e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -319,8 +319,8 @@
</avue-crud>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -350,8 +350,8 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
- <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogAttrClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -394,8 +394,8 @@
:table-loading="conCheckLoading">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="repairClickHandler">淇� 澶�</el-button>
- <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="repairClickHandler">淇� 澶�</el-button>
+ <el-button size="small" @click="conCheckVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -459,8 +459,8 @@
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
- <el-button @click="indexDialogClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
+ <el-button size="small" @click="indexDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index 1c8e48f..87ba040 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -114,8 +114,8 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index f36555c..285f5bc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -294,8 +294,8 @@
</avue-crud>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addDialogClose">鍙� 娑�</el-button>
</span>
<!-- 灞炴�ф睜鍒楄〃 -->
@@ -324,8 +324,8 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
- <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogAttrClose">鍙� 娑�</el-button>
</span>
</el-dialog>
</el-dialog>
@@ -345,8 +345,8 @@
:table-loading="conCheckLoading">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="repairClickHandler">淇� 澶�</el-button>
+ <el-button size="small" @click="conCheckVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="repairClickHandler">淇� 澶�</el-button>
</span>
</el-dialog>
@@ -372,8 +372,8 @@
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="bizTypeAddHandler">纭� 瀹�</el-button>
- <el-button @click="bizTypeVisible = false">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="bizTypeAddHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="bizTypeVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
index 8253787..714041e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
@@ -97,8 +97,8 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
+ <el-button size="small" type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="visibleCloseHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
index df7697a..2acc434 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
@@ -295,7 +295,6 @@
this.$refs.form.validate((valid) => {
if (valid) {
const formData = this.initFormData();
- console.log(formData)
btmSave(formData).then(res => {
if (res.data.success) {
this.$message.success("淇濆瓨鎴愬姛");
@@ -365,7 +364,7 @@
this.orderFieldList.unshift({
id: data.row.orderField
});
- this.tableFormOption.column[0].dicData = this.orderFieldList
+ this.$refs.tableForm.updateDic('orderField',this.orderFieldList);
},
//鑾峰彇鎺掑簭璁剧疆涓墍鏈夋帓搴忓瓧娈�
getAllAttr() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index e1c0044..f49918d 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -143,7 +143,16 @@
}, {
label: '鍙嶅悜',
value: 'opposite'
- }]
+ }],
+ control: (val, form) => {
+ const dicData=this.getDicData(val);
+ this.form.btmType=dicData[0].value
+ return {
+ btmType: {
+ dicData: dicData
+ }
+ };
+ }
},{
label: '涓氬姟绫诲瀷',
prop: 'btmType',
@@ -155,7 +164,14 @@
message: "璇烽�夋嫨涓氬姟绫诲瀷",
trigger: "blur"
}],
- dicData: []
+ dicData: [],
+ change: ({ value, column, item, dic }) => {
+ this.form.btmType=value;
+ if(value){
+ this.getAllAttr();
+ this.getTemp(value,false);
+ }
+ },
}, {
label: '鐗堟湰鐗堟',
prop: 'version',
@@ -315,54 +331,7 @@
};
},
- watch: {
- //鏂瑰悜
- 'form.direction': {
- handler(val) {
- if(val=='positive'){
- //姝ｅ悜
- const dicData=this.treeData.btmItemsTo.map(item=>{
- return {
- label: item,
- value: item
- }
- })
- dicData.push({
- label: '鎵�鏈夌被鍨�',
- value: '*'
- })
- this.$refs.form.updateDic('btmType', dicData);
- this.form.btmType=dicData[0].value
- this.getAllAttr();
- }else if(val=='opposite'){
- //鍙嶅悜
- const dicData=this.treeData.btmItemsFrom.map(item=>{
- return {
- label: item,
- value: item
- }
- })
- dicData.push({
- label: '鎵�鏈夌被鍨�',
- value: '*'
- })
- this.$refs.form.updateDic('btmType', dicData);
- this.form.btmType=dicData[0].value
- this.getAllAttr();
- }
- },
- immediate: true,
- },
- //涓氬姟绫诲瀷
- 'form.btmType': {
- handler(val) {
- if(val && val!='*'){
- this.getTemp(val,false);
- }
- },
- immediate: true,
- }
- },
+ watch: {},
methods: {
openDialog(btmName, title, mode, data) {
this.dialog.title = title;
@@ -384,6 +353,9 @@
this.queryCondition=this.selectData.queryTemplate.condition;
this.queryTree=this.selectData.tree;
this.form.levelFlag=this.selectData.levelFlag;
+
+ const dicData=this.getDicData(this.form.direction);
+ this.formItems[2].dicData=dicData;
} else {
this.form.direction='positive';
this.selectData = {};
@@ -393,10 +365,39 @@
connector:'骞朵笖',
child:[]
};
+ const dicData=this.getDicData(this.form.direction);
+ this.formItems[2].dicData=dicData;
+ this.form.btmType=dicData[0].value;
}
this.dialog.showDialog = true;
this.treeOption.defaultExpandedKeys=[data.treeData.label]
this.getTemp(data.treeData.label, true)
+ },
+ //鑾峰彇涓氬姟绫诲瀷涓嬫媺鏁版嵁
+ getDicData(directionVal){
+ let dicData=[];
+ if(directionVal=='positive'){
+ //姝ｅ悜
+ dicData=this.treeData.btmItemsTo.map(item=>{
+ return {
+ label: item,
+ value: item
+ }
+ })
+ }else if(directionVal=='opposite'){
+ //鍙嶅悜
+ dicData=this.treeData.btmItemsFrom.map(item=>{
+ return {
+ label: item,
+ value: item
+ }
+ })
+ }
+ dicData.push({
+ label: '鎵�鏈夌被鍨�',
+ value: '*'
+ })
+ return dicData;
},
cancelDialog() {
this.dialog.loading = false;
@@ -497,7 +498,7 @@
this.orderFieldList.unshift({
id: data.row.orderField
});
- this.tableFormOption.column[0].dicData= this.orderFieldList
+ this.$refs.tableForm.updateDic('orderField',this.orderFieldList);
},
//鑾峰彇鎺掑簭璁剧疆涓墍鏈夋帓搴忓瓧娈�
getAllAttr() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index 73a0c21..f03a5b9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -49,11 +49,11 @@
@node-click="nodeClick"></avue-tree>
</div>
<div v-if="!readOnly" style="text-align: right;margin-top: 10px;">
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="addHandler">澧炲姞閫昏緫</el-button>
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="editHandler">淇敼鏉′欢</el-button>
- <el-button v-if="radioForm==1" plain size="mini" type="primary" @click="delHandler">鍒犻櫎</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="addHandler">澧炲姞閫昏緫</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="editHandler">淇敼鏉′欢</el-button>
+ <el-button v-show="radioForm==1" plain size="mini" type="primary" @click="delHandler">鍒犻櫎</el-button>
<el-button plain size="mini" type="primary" @click="queryHandler">鏌ヨ</el-button>
- <el-button plain size="mini" type="primary" @click="">鍙栨秷</el-button>
+ <!--<el-button plain size="mini" type="primary" @click="">鍙栨秷</el-button>-->
</div>
<!--淇敼鏉′欢-->
@@ -155,7 +155,6 @@
<script>
import basicOption from "@/util/basic-option";
import {getAllQTs} from "@/api/queryTemplate/queryDefine";
-import {getCriteria} from "@/api/queryTemplate/linkTypeQuery";
import {dateFormat} from "@/util/date"
export default {
@@ -506,7 +505,9 @@
}
},
created() {
- this.getTemp();
+ if (!this.readOnly) {
+ this.getTemp();
+ }
},
methods: {
// 鎷栨嫿鍒版椂
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
index af91b00..b3519cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/index.vue
@@ -141,7 +141,11 @@
prop: 'btmType',
width: 130,
formatter:function (row, value) {
- return row.queryTemplate.btmType;
+ if (row.queryTemplate.btmType == '*') {
+ return '鎵�鏈夌被鍨�'
+ } else {
+ return row.queryTemplate.btmType;
+ }
}
}, {
label: '鐗堟湰鐗堟',
@@ -164,7 +168,11 @@
prop: 'queryISLeaf',
width: 120,
formatter:function (row, value) {
- return row.queryTemplate.queryISLeaf
+ if(row.queryTemplate.queryISLeaf=='false' || row.queryTemplate.queryISLeaf==false){
+ return '鍚�'
+ }else{
+ return '鏄�'
+ }
}
}, {
label: '瀛愯妭鐐瑰眰娆℃暟',
diff --git a/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue
new file mode 100644
index 0000000..b8a8c09
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/processTemplate/customDefine/index.vue
@@ -0,0 +1,303 @@
+<template>
+ <!--娴佺▼妯℃澘瀹氫箟-->
+ <basic-container>
+ <div>
+ 娴佺▼鍒嗙被锛�
+ <el-select v-model="tempType" :clearable="true" placeholder="璇烽�夋嫨" size="small"
+ style="width: 300px;margin-right: 20px;"
+ @change="tempTypeChange">
+ <el-option
+ v-for="item in tempTypeData"
+ :key="item.oid"
+ :label="item.name"
+ :value="item.oid">
+ </el-option>
+ </el-select>
+ 娴佺▼妯℃澘鍚嶇О锛�
+ <el-input size="small" v-model="tempName" style="width: 300px;margin-right: 10px;"></el-input>
+ <el-button icon="el-icon-search" plain size="small" style="margin-right: 40px;" type="primary"
+ @click="searchData">
+ 鏌ヨ
+ </el-button>
+ </div>
+ <div>
+ <el-main>
+ <avue-crud
+ ref="userCrud"
+ :data="tableData"
+ :option="option"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="getTableList"
+ @selection-change="selectionChange"
+ @row-click="rowClickHandler"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addHandler">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 澧炲姞
+ </el-button>
+ <el-button v-if="permissionList.downloadImportTemplateBtn" class="button-custom-icon" plain size="small"
+ type="primary" @click="downloadTemplateHandler">
+ <icon-show :name="permissionList.downloadImportTemplateBtn.source"></icon-show>
+ 涓嬭浇瀵煎叆妯℃澘
+ </el-button>
+ <el-button v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="uploadHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="downloadHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
+
+ <template slot="menu" slot-scope="scope">
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="editBtnClick(scope.row)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click="rowDeleteHandler(scope.row)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button size="small" type="text" @click.stop="stopUserHandler(scope.row)">
+ <span v-if="scope.row.status === 0 && permissionList.stopBtn" style="color: #fa3434;display: flex">
+ <icon-show :name="permissionList.stopBtn.source"></icon-show>
+ 鍋滅敤
+ </span>
+ <span v-if="scope.row.status === 1 && permissionList.actionBtn" style="color: #55b61d;display: flex">
+ <icon-show :name="permissionList.actionBtn.source"></icon-show>
+ 鍚敤
+ </span>
+ </el-button>
+ </template>
+
+ </avue-crud>
+ <!-- 鍒涘缓缂栬緫鑷畾涔夊璇濇 -->
+ <el-dialog
+ v-dialogDrag
+ v-loading="dialogLoading"
+ :title="dialogType === 'add' ? ' 鍒涘缓' : '缂栬緫'"
+ :visible.sync="dialogVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ width="1000px"
+ @close="dialogClose"
+ >
+ <span slot="footer" class="dialog-footer">
+ <el-button size="small" type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="dialogVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
+ </el-main>
+
+ <el-aside width="35%">
+ <div></div>
+ </el-aside>
+ </div>
+ </basic-container>
+</template>
+
+<script>
+import {mapGetters} from "vuex";
+import basicOption from "@/util/basic-option";
+import {getTypeList} from "@/api/processTemplate/type";
+import {getProcessTempList,saveProcessTemp,updateProcessTemp,deleteProcessTemp,downloadTemplate,download} from "@/api/processTemplate/define";
+import func from "@/util/func";
+
+export default {
+ name: "index",
+ data(){
+ return {
+ tempType:'',
+ tempName:'',
+ tempTypeData:[],
+ form:{},
+ tableLoading: false,
+ tableData: [],
+ currentRow:null,
+ selectionList: [],
+ }
+ },
+ computed: {
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
+ editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
+ exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
+ importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
+ downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ stopBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ actionBtn: this.vaildData(this.permission[this.$route.query.id].UNFREZE, false),
+ };
+ },
+ option(){
+ return {
+ ...basicOption,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
+ calcHeight: -60,
+ align:'left',
+ headerAlign:'center',
+ menuWidth:160,
+ dialogMenuPosition: 'right',
+ dialogWidth:600,
+ column: [
+ {
+ label: '娴佺▼妯℃澘鍚嶇О',
+ prop: 'name'
+ },{
+ label: '鐗堟湰',
+ prop: 'desc'
+ },{
+ label: '鐘舵��',
+ prop: 'status'
+ }]
+ }
+ }
+ },
+ created() {
+ getTypeList().then(res => {
+ this.tempTypeData = res.data.data;
+ })
+ },
+ methods:{
+ getTableList(){
+ this.tableLoading = true;
+ getProcessTempList({tempType:this.tempType,tempName:this.tempName}).then(res => {
+ this.tableData = res.data.data;
+ this.tableLoading = false;
+ })
+ },
+ //娴佺▼鍒嗙被閫夋嫨
+ tempTypeChange(val){
+ this.getTableList();
+ },
+ searchData(){
+ this.getTableList();
+ },
+ // 鏂板
+ saveHandler(row, done, loading) {
+ saveProcessTemp(row).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ done();
+ }
+ }).catch(err => {
+ loading()
+ });
+ },
+
+ handleEdit(row,index){
+ this.$refs.crud.rowEdit(row, index);
+ },
+
+ // 缂栬緫
+ updateHandler(row, index, done, loading) {
+ updateProcessTemp(row).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ done()
+ }
+ }).catch(err => {
+ loading()
+ });
+ },
+
+ // 鍒犻櫎
+ handleDel(row,index) {
+ let params = {
+ ids: row.id
+ }
+
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鏁版嵁鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteProcessTemp(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+ },
+
+ //閫夋嫨鐨勮
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+
+ // 琛屽崟閫�
+ rowClickHandler(row) {
+ func.rowClickHandler(
+ row,
+ this.$refs.crud,
+ this.lastIndex,
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectionList = [row];
+ }
+ );
+ },
+
+ // 瀵煎嚭
+ downloadHandler() {
+ if (this.selectionList.length <= 0) {
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹繘琛屽鍑�');
+ return;
+ }
+
+ download({enumNames: this.ids}).then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('瀵煎嚭鎴愬姛');
+ }).catch(err => {
+ })
+ },
+
+ // 涓嬭浇瀵煎叆妯℃澘
+ downloadTemplateHandler() {
+ downloadTemplate().then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.$message.success('涓嬭浇鎴愬姛');
+ }).catch(err => {
+ })
+ },
+
+ //瀵煎叆
+ uploadHandler() {
+ this.$refs.upload.visible = true;
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/processTemplate/customType/index.vue b/Source/plt-web/plt-web-ui/src/views/processTemplate/customType/index.vue
new file mode 100644
index 0000000..8c4b080
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/processTemplate/customType/index.vue
@@ -0,0 +1,202 @@
+<template>
+ <!--娴佺▼妯℃澘鍒嗙被-->
+ <basic-container>
+ <avue-crud
+ ref="crud"
+ v-model="form"
+ :data="tableData"
+ :option="option"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="getTableList"
+ @row-save="rowSaveHandler"
+ @row-update="rowUpdateHandler"
+ @row-click="rowClickHandler"
+ @selection-change="selectionChange"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button v-if="permissionList.addBtn" class="button-custom-icon" size="small" type="primary"
+ @click="$refs.crud.rowAdd()">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂� 澧�
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
+ <template slot="menu" slot-scope="{ row, index }">
+ <el-button
+ v-if="permissionList.editBtn"
+ size="small"
+ type="text"
+ @click="handleEdit(row, index)"
+ >
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button
+ v-if="permissionList.delBtn"
+ size="small"
+ type="text"
+ @click="handleDel(row, index)"
+ >
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {mapGetters} from "vuex";
+import basicOption from "@/util/basic-option";
+import {getTypeList, saveType, updateType, deleteType} from "@/api/processTemplate/type";
+import func from "@/util/func";
+
+export default {
+ name: "index",
+ data: function () {
+ return {
+ form:{},
+ tableLoading: false,
+ tableData: [],
+ currentRow:null,
+ selectionList: [],
+ }
+ },
+ computed: {
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission[this.$route.query.id].ADD, false),
+ delBtn: this.vaildData(this.permission[this.$route.query.id].DELETE, false),
+ editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
+ };
+ },
+ option(){
+ return {
+ ...basicOption,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
+ calcHeight: -60,
+ align:'left',
+ headerAlign:'center',
+ menuWidth:160,
+ dialogMenuPosition: 'right',
+ dialogWidth:600,
+ column: [
+ {
+ label: '鍒嗙被鍚嶇О',
+ prop: 'name',
+ span: 24,
+ rules: [{ required: true, message: '璇疯緭鍏ュ垎绫诲悕绉�', trigger: 'blur' }]
+ },{
+ label: '鎻忚堪',
+ prop: 'desc',
+ span: 24,
+ type:'textarea'
+ }]
+ }
+ }
+ },
+ methods: {
+ // 琛ㄦ牸璇锋眰
+ getTableList() {
+ this.tableLoading = true;
+ getTypeList().then(res => {
+ this.tableData = res.data.data;
+ this.tableLoading = false;
+ })
+ },
+
+ // 鏂板
+ rowSaveHandler(row, done, loading) {
+ saveType(row).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ done();
+ }
+ }).catch(err => {
+ loading()
+ });
+ },
+
+ handleEdit(row,index){
+ this.$refs.crud.rowEdit(row, index);
+ },
+
+ // 缂栬緫
+ rowUpdateHandler(row, index, done, loading) {
+ updateType(row).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ done()
+ }
+ }).catch(err => {
+ loading()
+ });
+ },
+
+ // 鍒犻櫎
+ handleDel(row,index) {
+ let params = {
+ ids: row.id
+ }
+
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鐨勫垎绫诲悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteType(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTableList();
+ }
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
+ },
+
+ //閫夋嫨鐨勮
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+
+ // 琛屽崟閫�
+ rowClickHandler(row) {
+ func.rowClickHandler(
+ row,
+ this.$refs.crud,
+ this.lastIndex,
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectionList = [row];
+ }
+ );
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index f7244e7..70157fc 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -564,7 +564,9 @@
let node = this.currentClickNode.parent;
node.loaded = false;
node.expand();
- this.$refs.tree.setCurrentNode(this.currentClickNode);
+ this.$nextTick(()=>{
+ this.$refs.tree.setCurrentKey(this.currentClickNode.data.id);
+ });
} else {
this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
}
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index d59ee86..8bb7e72 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -294,7 +294,6 @@
methods: {
// 鏍戣鐐瑰嚮
nodeClick(row, node) {
- console.log(row.childType);
this.form = {...row};
this.nodeRow = {...row};
this.currentClickNode = node;
@@ -553,7 +552,9 @@
let node = this.currentClickNode.parent;
node.loaded = false;
node.expand();
- this.$refs.tree.setCurrentNode(this.currentClickNode);
+ this.$nextTick(()=>{
+ this.$refs.tree.setCurrentKey(this.currentClickNode.data.id);
+ });
} else {
this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
}
--
Gitblit v1.9.3