diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
index 2f9004c..41d23d1 100644
--- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
@@ -129,7 +129,7 @@
:close-on-press-escape=true
:before-close="handleCloseSystem"
width="600px">
-
+
@@ -225,6 +225,7 @@
//制度弹框
ModelsetUpDialog: {
+ loading: false,
dialogVisible: false,
systemMethod: 'default',// 文件夹类型,default默认文件夹,custom自定义文件夹(扩展的文件夹类型的建模方法)
systemTitle: '名称录入',// 新建文件夹时自定义标题
@@ -235,6 +236,7 @@
repositoryPathData:"",
method:"",
systemType: '1',
+ category:"",
SystemTypeOptions: [
{
"label" : '制度',
@@ -289,12 +291,13 @@
mounted() {
bus.$on("getisDisabled",data =>{
this.dis=data;
-
});
},
methods: {
initData() {
const that = this;
+ that.loadingText = '加载中';
+ that.loading = true;
if (that.$store.getters.getTeamIdFn && that.$store.getters.getTeamIdFn != '') {
const data = {
url: 'jd',
@@ -549,13 +552,13 @@
//ModelsetUpDialog
createModelsetUp(method) {// 创建文件夹
this.ModelsetUpDialog.systemMethod = method;
+ this.ModelsetUpDialog.systemForm.method = method;
this.ModelsetUpDialog.systemTitle = '名称录入';
this.ModelsetUpDialog.dialogVisible = true;
this.closeCreatePopover();
},
createFolderSave(formName) {// 保存新建的文件夹
- debugger;
const that = this;
that.$refs[formName].validate((valid) => {
if (valid) {
@@ -604,30 +607,47 @@
//
createSystemSave(formName) {// 保存新建的文件夹
const that = this;
+
+
+
that.$refs[formName].validate((valid) => {
if (valid) {
- debugger;
+
const checkdata = {
url:'jd',
data:{
cmd: 'com.actionsoft.apps.coe.pal_pl_repository_designer_checkname',
- title: that.ModelsetUpDialog.systemForm.name
+ title: that.ModelsetUpDialog.systemForm.name,
+ method:that.ModelsetUpDialog.systemForm.method,
}
};
// 查询数据
awsuiAxios.post(checkdata).then(function (ro) {
if (ro.data.result == 'ok') {
+
+ const nodeData = that.$refs.tree.getCurrentNode();
+ const parentId = nodeData.id;
+ const wsId = that.$store.getters.getWsIdFn;
+ const teamId = that.$store.getters.getTeamIdFn;
const data = {
- url:'jd',
- data:{
- cmd: 'com.actionsoft.apps.coe.pal_pl_repository_designer_updatetitle',
- uuid: that.ModelsetUpDialog.systemForm.uuid,
- title: that.ModelsetUpDialog.systemForm.name,
+ url: 'jd',
+ data: {
+ cmd: 'com.actionsoft.apps.coe.pal_processlevel_repository_create_save_Designer',
+ wsId: wsId,
+ teamId: teamId,
+ category: that.ModelsetUpDialog.systemForm.category,
+ method: that.ModelsetUpDialog.systemForm.method,
+ parentId: parentId,
+ container: '_blank',// 模板,暂时不做模板
+ name:that.ModelsetUpDialog.systemForm.name
}
};
// 查询数据
awsuiAxios.post(data).then(function (ro) {
+
if (ro.result == 'ok') {
+ that.ModelsetUpDialog.systemForm.uuid=ro.data.id;
+ that.ModelsetUpDialog.systemForm.parentId=parentId;
const data = {
url:'jd',
data:{
@@ -641,6 +661,7 @@
};
// 查询数据
awsuiAxios.post(data).then(function (ro) {
+
if (ro.result == 'ok') {
that.ModelsetUpDialog.dialogVisible = false;
that.openRepositoryList(that.ModelsetUpDialog.systemForm.parentId);
@@ -656,10 +677,8 @@
console.log(error);
})
- } else {
- that.$message.error(ro.msg);
}
- }).catch(error=>{
+ }).catch(error => {
console.log(error);
})
} else {
@@ -695,43 +714,29 @@
this.securityFileList.push(file);
this.securityType = "create";
this.securityVisible = true;
- }else{
-
- const form = this.ModelsetUpDialog.systemForm;
- form.method = method;
-
+ }else {
const nodeData = that.$refs.tree.getCurrentNode();
-
const parentId = nodeData.id;
- const wsId = that.$store.getters.getWsIdFn;
- const teamId = that.$store.getters.getTeamIdFn;
const data = {
url: 'jd',
data: {
- cmd: 'com.actionsoft.apps.coe.pal_processlevel_repository_create_save',
- wsId: wsId,
- teamId: teamId,
- category: category,
- method: method,
+ cmd: 'com.actionsoft.apps.coe.getArchitecturePath',
parentId: parentId,
- container: '_blank'// 模板,暂时不做模板
+
}
};
// 查询数据
awsuiAxios.post(data).then(function (ro) {
- if (ro.result == 'ok') {
- // 返回id
- that.ModelsetUpDialog.systemForm.repositoryPathData=ro.data.repositoryPathData;
- that.ModelsetUpDialog.systemForm.uuid=ro.data.id;
- that.ModelsetUpDialog.systemForm.parentId=parentId;
- that.createModelsetUp(method);
+ // 返回id
+ that.ModelsetUpDialog.systemForm.repositoryPathData = ro.data.repositoryPathData;
+ that.ModelsetUpDialog.systemForm.parentId = parentId;
+ that.createModelsetUp(method);
-
- }
}).catch(error => {
console.log(error);
})
+
}
},
uploadServer(){