From 44e88cb3c7d2f46eb9dbbbdddf0aa3f8a623b6e2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 13 六月 2023 18:59:51 +0800
Subject: [PATCH] 继续完善主题库定义
---
Source/UBCS-WEB/src/components/template/FlowPath.vue | 19 -
Source/UBCS-WEB/src/components/template/Stage.vue | 2
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 21 +-
Source/UBCS-WEB/src/option/user/info.js | 2
Source/UBCS-WEB/src/main.js | 5
Source/UBCS-WEB/vue.config.js | 14
Source/UBCS-WEB/public/src/option/user/info.js | 2
Source/UBCS-WEB/src/api/template/templateAttr.js | 26 ++
Source/UBCS-WEB/src/components/Tree/TemplatePro.vue | 13
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 484 ++++++++++++++++++++++++++++++++----------------
10 files changed, 389 insertions(+), 199 deletions(-)
diff --git a/Source/UBCS-WEB/public/src/option/user/info.js b/Source/UBCS-WEB/public/src/option/user/info.js
index de76103..a664bd1 100644
--- a/Source/UBCS-WEB/public/src/option/user/info.js
+++ b/Source/UBCS-WEB/public/src/option/user/info.js
@@ -45,7 +45,7 @@
}]
},
{
- label: '淇敼瀵嗙爜',
+ label: '',
prop: 'password',
column: [{
label: '鍘熷瘑鐮�',
diff --git a/Source/UBCS-WEB/src/api/template/templateAttr.js b/Source/UBCS-WEB/src/api/template/templateAttr.js
index d58256e..b0d6a1d 100644
--- a/Source/UBCS-WEB/src/api/template/templateAttr.js
+++ b/Source/UBCS-WEB/src/api/template/templateAttr.js
@@ -148,3 +148,29 @@
}
})
}
+// 淇濆瓨鎺ュ彛
+export const batchAddSave = (data) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTempAttrController/batchAddSave',
+ method: 'post',
+ data:data
+ })
+}
+//鍚屾鍒板叾浠栨ā鏉�
+export const copyto = (data) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTempAttrController/copyto',
+ method: 'post',
+ data:data
+ })
+}
+//缂栫爜鐢宠棰勮
+export const getFormDefineByTemplate = (params) =>{
+ return request({
+ url:'/api/ubcs-code/mdmEngineController/getFormDefineByTemplateOid',
+ method: 'get',
+ params:{
+ ...params
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index 0649477..116aa50 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -2,10 +2,15 @@
<basic-container>
<avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <attrCrud :ProData="ProData" :crudOid="crudOid" :crudArray="crudArray" :Formlist="Formlist"></attrCrud>
+ <attrCrud :ProData="ProData" :crudOid="crudOid" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
</span>
- <span v-else-if="type.prop==='tab2'">妯℃澘娴佺▼</span>
- <span v-else-if="type.prop==='tab3'">妯℃澘闃舵</span>
+ <span v-else-if="type.prop==='tab2'">
+ <FlowPath code="8b5e2017-990f-454a-9c39-4c4eeeb57553"></FlowPath>
+
+ </span>
+ <span v-else-if="type.prop==='tab3'">
+<!-- <stage :visible.sync="visibleStage" code="8b5e2017-990f-454a-9c39-4c4eeeb57553"></stage>-->
+ </span>
</basic-container>
</template>
@@ -13,7 +18,7 @@
<script>
export default {
name: "TemplatePro.vue",
- props: ['ProData','crudOid','crudArray','Formlist'],
+ props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'],
data: function () {
return {
type: {},
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 9f9fca4..6f7f758 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,10 +1,10 @@
<template>
<avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"
- @cell-click="handleRowClick" @select="selectHandle">
+ @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">
<template slot="menuLeft">
- <el-button v-if="attrEditVisible == false" size="small" type="primary" @click="busineHandle">锛� 娣诲姞 {{msg}}</el-button>
- <el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��">
- <avue-crud :data="businessData" :option="businessOption">
+ <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" @click="busineHandle">锛� 娣诲姞 {{msg}}</el-button>
+ <el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��" >
+ <avue-crud :data="businessData" :option="businessOption" @select="businessSelect">
<template slot="menuLeft">
<div style="display: flex;">
<el-select>
@@ -18,23 +18,23 @@
</template>
</avue-crud>
<div style="display: flex;justify-content: flex-end;margin-top: 15px">
- <el-button size="small" type="primary">淇濆瓨</el-button>
+ <el-button size="small" type="primary" @click="busineAddHandle">淇濆瓨</el-button>
<el-button size="small" type="primary">鍙栨秷</el-button>
</div>
</el-dialog>
</template>
<!-- 鍏ㄥ睆缂栬緫-->
<template slot="menuLeft">
- <el-button v-if="attrEditVisible == false" size="small" @click="attrEditVisible=true">鍏ㄥ睆缂栬緫</el-button>
- <!-- <el-button @click.native="attrEditVisible=false" size="small">閫�鍑哄叏灞忕紪杈�</el-button>-->
+ <el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle">鍏ㄥ睆缂栬緫</el-button>
+<!-- <el-button v-if="attrFlagChiledren !=false" size="small" plain type="success" @click="escEdit">閫�鍑哄叏灞忕紪杈�</el-button>-->
<el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
- <attrCrud></attrCrud>
+ <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud>
</el-dialog>
</template>
<!-- 缁勫悎瑙勫垯-->
<template slot="menuLeft">
<el-button size="small" @click="isShowformulaEdit=true">缁勫悎瑙勫垯</el-button>
- <formula-editor :visible="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>
+ <formula-editor :visible.sync="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>
</template>
<!-- 楠岃瘉瑙勫垯-->
@@ -83,16 +83,24 @@
</template>
<!-- 灞炴�у垎缁�-->
<template slot="menuLeft">
- <el-button icon="el-icon-menu" size="small" @click="attrVisible=true">灞炴�у垎缁�</el-button>
+ <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
<el-dialog :visible.sync="attrVisible" append-to-body style="width: 800px; left:30vw;top: 10vh ;"
title="杈撳叆鍒嗙粍鐨勫悕绉�">
- <avue-form :option="attrOption"></avue-form>
+ <el-form ref="form" label-width="70px">
+ <el-form-item label="灞炴�у垎缁�">
+ <el-input v-model="attrModel"></el-input>
+ </el-form-item>
+ <div style="display: flex;justify-content: flex-end">
+ <el-button type="primary" @click="attrHandle" size="small">鎻愪氦</el-button>
+ <el-button size="small" @click="attrRemove">娓呯┖</el-button>
+ </div>
+ </el-form>
</el-dialog>
</template>
<!-- 鍒嗙被娉ㄥ叆-->
<template slot="menuLeft">
- <el-button icon="el-icon-magic-stick" size="small" @click="injectVisible=true">鍒嗙被娉ㄥ叆</el-button>
+ <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<el-dialog :visible.sync="injectVisible" append-to-body class="mydialog"
style="width: 1400px; left:14vw ;top: 10vh;" title="鍒嗙被娉ㄥ叆">
<div class="injectBox">
@@ -102,38 +110,63 @@
<br/>4锛氬眰绾у繀椤绘槸澶т簬0鐨勬暣鏁板��
</div>
<div style="padding-top: 15px;padding-left: 35px">
- <avue-form :option="injectOption" @reset-change="injectHandleReset">
- <template slot="menuForm">
- <el-button icon="el-icon-user" @click="injectRemove">鍙栨秷</el-button>
- </template>
- </avue-form>
+ <el-form ref="injectForm" label-width="80px">
+ <el-form-item label="娉ㄥ叆绫诲瀷">
+ <el-radio-group v-model="injectOption.type">
+ <el-radio label="鍒嗙被鍚嶇О"></el-radio>
+ <el-radio label="鍒嗙被浠ｅ彿"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="灞傜骇璁剧疆">
+ <el-radio-group v-model="injectOption.set">
+ <el-radio label="鏈�灏忓眰"></el-radio>
+ <el-radio label="鎸囧畾灞�"></el-radio>
+ <el-input-number v-model="injectOption.injectNum" controls-position="right" :min="0" :max="10" v-if="this.injectOption.set == '鎸囧畾灞�'"></el-input-number>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="鍙慨鏀�">
+ <el-radio-group v-model="injectOption.change">
+ <el-radio label="鏄�"></el-radio>
+ <el-radio label="鍚�"></el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
</div>
+ </div>
+ <div style="display: flex;justify-content: flex-end">
+ <el-button size="small" type="primary" @click="injectAddHandle">纭畾</el-button>
+ <el-button size="small" @click="injectHandleReset">娓呴櫎鍐呭</el-button>
+ <el-button size="small" @click="injectRemove">鍙栨秷</el-button>
</div>
</el-dialog>
</template>
<!-- 鏋氫妇娉ㄥ叆-->
<template slot="menuLeft">
- <el-button size="small" @click="enumVisible=true">鏋氫妇娉ㄥ叆</el-button>
+ <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
<el-dialog :visible.sync="enumVisible" append-to-body title="鏋氫妇娉ㄥ叆">
<!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
<!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
<div>
<el-button icon="el-icon-plus" type="primary" @click="addRow">鏂板</el-button>
- <el-table :data="tableData" style="width: 100%" @cell-click="handleCellClick" @cell-dblclick="dbclick">
+ <el-table :data="tableData" style="width: 100%" @cell-click="handleCellClick" @selection-change="handleSelectionChange">
<!-- 娓叉煋琛ㄦ牸鍒楀強浼犲弬 -->
<el-table-column label="搴忓彿" type="index"></el-table-column>
- <el-table-column label="閫夐」鍊�" prop="name">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column label="閫夐」鍊�" prop="key">
<template slot-scope="{ row }">
<!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <el-input v-if="editingRow === row && editShow == 'name'" v-model="row.name" @blur="saveRow"></el-input>
- <span v-else>{{ row.name }}</span>
+ <el-input v-if="editingRow === row && editShow == 'key'" v-model="row.key" @blur="saveRow"></el-input>
+ <span v-else>{{ row.key }}</span>
</template>
</el-table-column>
- <el-table-column label="閫夐」涓枃鏍囩" prop="age">
+ <el-table-column label="閫夐」涓枃鏍囩" prop="value">
<template slot-scope="{ row }">
<!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <el-input v-if="editingRow === row && editShow == 'age'" v-model="row.age" @blur="saveRow"></el-input>
- <span v-else>{{ row.age }}</span>
+ <el-input v-if="editingRow === row && editShow == 'value'" v-model="row.value" @blur="saveRow"></el-input>
+ <span v-else>{{ row.value }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="120">
@@ -146,7 +179,7 @@
</el-table>
<template>
<div style="display: flex;justify-content: right;margin-top: 15px">
- <el-button type="primary" size="small">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="enumAddHandle">淇濆瓨</el-button>
<el-button size="small" @click="enumVisible=false">鍙栨秷</el-button>
</div>
</template>
@@ -166,7 +199,7 @@
</template>
</avue-crud>
<div style="display: flex ;padding-top: 18px;justify-content: right">
- <el-button size="small" type="primary">纭畾</el-button>
+ <el-button size="small" type="primary" @click="CascadeAddHandle">纭畾</el-button>
<el-button size="small" style="margin-left: 10px" @click="casRemove">娓呴櫎鍐呭</el-button>
<el-button size="small" style="margin-left: 10px" @click="CascadeVisible=false">鍙栨秷</el-button>
</div>
@@ -182,26 +215,71 @@
</template>
<!-- 鍒犻櫎-->
<template slot="menuLeft">
- <el-button size="small">鍒犻櫎</el-button>
+ <el-button size="small" @click="CrudRemove">鍒犻櫎</el-button>
</template>
<!-- 閲嶇疆-->
<template slot="menuLeft">
- <el-button size="small">閲嶇疆</el-button>
+ <el-button size="small" @click="reset">閲嶇疆</el-button>
</template>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
<template slot="menuLeft">
- <el-button size="small" style="margin-top: 10px">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button size="small" style="margin-top: 10px" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ </template>
+<!-- 缂栫爜鐢宠棰勮-->
+ <template slot="menuLeft">
+ <el-button size="small" style="margin-top: 10px" @click="applicationHandle">缂栫爜鐢宠棰勮</el-button>
+ <FormTemplateDialog
+ :visible.sync="addvisible"
+ :type="add"
+ :templateOid="this.crudOid"
+ :codeClassifyOid="this.codeClassifyOid"
+ >
+ </FormTemplateDialog>
</template>
</avue-crud>
</template>
<script>
-import {AttrByBtm,gridCodeClassifyTemplateAttr} from '@/api/template/templateAttr'
+import {AttrByBtm,gridCodeClassifyTemplateAttr,batchAddSave,copyto} from '@/api/template/templateAttr'
export default {
name: "attrCrud .vue",
- props: ['ProData','crudOid','crudArray','Formlist'],
+ // props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'],
+ props:{
+ ProData:{
+ type:Array,
+ },
+ crudOid:{
+ type:String,
+ default:''
+ },
+ crudArray:{
+ type:Array,
+ },
+ Formlist:{
+ type:Array,
+ },
+ codeClassifyOid:{
+ type:String,
+ default:''
+ },
+ attrFlagChiledren:{
+ type:Boolean,
+ default:false
+ },
+ },
data() {
return {
+ attrFlag:false,
+ //缂栫爜鐢宠棰勮option
+ applicationoption:{
+ column:[]
+ },
+ // 缂栫爜鐢宠棰勮data
+ applicationData:[],
+ //涓氬姟绫诲瀷鍗曢�夋暟缁�
+ busineSelectList:[],
+ //涓氬姟绫诲瀷娣诲姞鏁版嵁
+ busineAddList:{},
//琛ㄦ牸鍗曢�夋暟缁�
CrudSelect:[],
//琛ㄦ牸oid
@@ -573,6 +651,8 @@
editShow: "",
//鏋氫妇娉ㄥ叆
enumVisible: false,
+ //鏋氫妇娉ㄥ叆澶氶�変繚瀛樻暟缁�
+ enumRow:[],
// 鍒嗙被娉ㄥ叆寮瑰嚭妗�
injectVisible: false,
// 娣诲姞寮瑰嚭妗�
@@ -581,67 +661,19 @@
rulesVisible: false,
//灞炴�у垎缁勫脊鍑烘
attrVisible: false,
- //灞炴�у垎缁刼ption
- attrOption: {
- column: [
- {
- label: "灞炴�у垎缁�",
- span: 24,
- prop: "attrIN"
- }
- ]
- },
+ //灞炴�у垎缁勮緭鍏ユ
+ attrModel:"",
+ //褰撳墠鍗曢�夋ā鏉垮睘鎬�
+ attrRow:{},
+ //缂栫爜鐢宠棰勮寮瑰嚭妗�
+ addvisible:false,
//鍒嗙被娉ㄥ叆option
injectOption: {
- column: [
- {
- label: "娉ㄥ叆绫诲瀷",
- type: 'radio',
- prop: "injection",
- span: 24,
- value: 0,
- dicData: [
- {
- label: '鍒嗙被鍚嶇О',
- value: 0
- }, {
- label: '鍒嗙被浠ｅ彿',
- value: 1
- },
- ]
- },
- {
- label: "灞傜骇璁剧疆",
- type: 'radio',
- prop: "Level",
- span: 24,
- value: 0,
- dicData: [
- {
- label: '鏈�灏忓眰',
- value: 0
- }, {
- label: '鎸囧畾灞�',
- value: 1
- },
- ]
- },
- {
- label: "鍙慨鏀�",
- type: 'radio',
- prop: "revise",
- value: 0,
- dicData: [
- {
- label: '鏄�',
- value: 0
- }, {
- label: '鍚�',
- value: 1
- },
- ]
- }
- ]
+ type:"鍒嗙被鍚嶇О",
+ set:"鏈�灏忓眰",
+ change:"鏄�",
+ //鍒嗙被娉ㄥ叆璁℃暟鍣�
+ injectNum:0,
},
// 灞炴�ч獙璇佽緭鍏ユ
RulesForm: {
@@ -682,6 +714,8 @@
border: true,
addBtn: false,
menu:false,
+ selection:true,
+ height:500,
column: [
{
label: "灞炴�ц嫳鏂囧悕绉�",
@@ -731,26 +765,6 @@
},
//妯℃澘灞炴��
data: [
- {
- id: "娴嬭瘯涓�",
- name: "娴嬭瘯name1",
- attributegroup: "娴嬭瘯涓�",
- attributeDataTypeText: "娴嬭瘯涓�",
-
- },
- {
- id: "娴嬭瘯浜�",
- name: "娴嬭瘯name2",
- attributegroup: "娴嬭瘯浜�",
- attributeDataTypeText: "娴嬭瘯浜�"
- },
- {
- id: "娴嬭瘯涓�",
- name: "娴嬭瘯name3",
- attributegroup: "娴嬭瘯涓�",
- attributeDataTypeText: "娴嬭瘯涓�",
- keyattrflag: false
- }
],
// 褰撳墠琛�
rowList: [],
@@ -791,7 +805,7 @@
},
{
label: "灞炴�у垎缁�",
- prop: "attributegroup",
+ prop: "attributeGroup",
cell: false,
sortable: true,
width: 125,
@@ -811,101 +825,101 @@
},
{
label: "鍏抽敭灞炴��",
- prop: "keyattrflag",
+ prop: "keyAttrFlag",
cell: false,
type: "switch",
},
{
label: "鏌ヨ灞炴��",
- prop: "queryattrflag",
+ prop: "queryAttrFlag",
cell: false,
},
{
label: "楂樼骇鏌ヨ灞炴��",
- prop: "seniorqueryattrflag",
+ prop: "seniorQueryAttrFlag",
width: 95,
cell: false,
},
{
label: "鐩镐技鏌ヨ灞炴��",
- prop: "samerepeatattrflag",
+ prop: "sameRepeatAttrFlag",
width: 95,
cell: false,
},
{
label: "蹇呰緭",
- prop: "requireflag",
+ prop: "requireFlag",
cell: false,
},
{
label: "琛ㄥ崟鏄剧ず",
- prop: "formdisplayflag",
+ prop: "formDisplayFlag",
cell: false,
},
{
label: "鍒楄〃鏄剧ず",
- prop: "tabledisplayflag",
+ prop: "tableDisplayFlag",
cell: false,
},
{
label: "鍙",
- prop: "readonlyflag",
+ prop: "readonlyFlag",
cell: false,
},
{
label: "鍒楄〃鎺掑簭",
- prop: "sortattrflag",
+ prop: "sortAttrFlag",
cell: false,
},
{
label: "澶氳鏂囨湰",
- prop: "textareaflag",
+ prop: "textareaFlag",
cell: false,
},
{
label: "榛樿鍊�",
- prop: "defaultvalue",
+ prop: "defaultValue",
sortable: true,
cell: false,
width: 95,
},
{
label: "鍓嶇紑",
- prop: "prefixvalue",
+ prop: "prefixValue",
sortable: true,
cell: false,
},
{
label: "鍚庣紑",
- prop: "suffixvalue",
+ prop: "suffixValue",
sortable: true,
cell: false,
},
{
label: "缁勫悎瑙勫垯",
- prop: "componentrule",
+ prop: "componentRule",
sortable: true,
cell: false,
width: 105,
},
{
label: "楠岃瘉瑙勫垯",
- prop: "verifyrule",
+ prop: "verifyRule",
sortable: true,
cell: false,
width: 105,
},
{
label: "鏃堕棿鏍煎紡",
- prop: "codedateformat",
+ prop: "codeDateFormat",
sortable: true,
width: 105,
cell: false,
},
{
label: "鍒嗙被娉ㄥ叆",
- prop: "classifyinvokelevel",
+ prop: "classifyInvokeLevel",
cell: false,
},
{
@@ -942,60 +956,110 @@
},
{
label: "琛ㄥ崟鏄剧ず鏍峰紡",
- prop: "formdisplaystyle",
+ prop: "formDisplayStyle",
width: 105,
cell: false,
},
{
label: "琛ㄦ牸鏄剧ず鏍峰紡",
- prop: "tabledisplaystyle",
+ prop: "tableDisplayStyle",
width: 105,
cell: false,
},
{
label: "琛ㄥ崟瓒呴摼鎺�",
- prop: "formhref",
+ prop: "formHref",
width: 95,
cell: false,
},
{
label: "琛ㄦ牸瓒呴摼鎺�",
- prop: "tablehref",
+ prop: "tableHref",
width: 95,
cell: false,
},
{
label: "琛ㄦ牸鏄剧ずjs",
- prop: "tabledisplayjs",
+ prop: "tableDisplayJs",
width: 95,
cell: false,
},
{
label: "闀垮害",
- prop: "controllength",
+ prop: "controlLength",
cell: false,
},
{
label: "灏忔暟绮惧害",
- prop: "precisionlength",
+ prop: "precisionLength",
cell: false,
},
{
label: "鍙栧�艰寖鍥�",
- prop: "valuearea",
+ prop: "valueArea",
sortable: true,
cell: false,
width: 105,
},
],
+ List:[]
}
}
},
mounted() {
- console.log(this.attrEditVisible)
- console.log(this.ProData)
+ },
+ created() {
+
},
methods: {
+ //灞炴�у垎缁勬寜閽�
+ attrVisibleHandle(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect.length === 1){
+ this.attrVisible=true;
+ }
+ },
+ //灞炴�у垎缁勬彁浜�
+ attrHandle(){
+ this.$set(this.attrRow,'attributeGroup',this.attrModel)
+ this.attrModel=""
+ this.attrVisible=false
+ },
+ //灞炴�у垎缁勬竻绌�
+ attrRemove(){
+ this.attrModel=""
+ },
+ //琛ㄦ牸鏁版嵁
+ CrudRend(){
+ if(this.crudOid != ''){
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
+ this.ProData = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
+ }
+ },
+ //涓氬姟绫诲瀷淇濆瓨
+ busineAddHandle(){
+ if(this.busineSelectList.length>1){
+ this.$message.warning('璇烽�夋嫨涓�鏉′笟鍔＄被鍨嬫暟鎹�')
+ }else {
+ this.$set(this.busineAddList,'classifytemplateoid',this.crudOid)
+ this.$set(this.busineAddList,'oid','')
+ this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
+ console.log(this.busineAddList)
+ this.addVisible=false;
+ console.log('prodata',this.ProData)
+ }
+ },
+ //涓氬姟绫诲瀷鍗曢��
+ businessSelect(selection,row){
+ this.busineSelectList=selection
+ this.busineAddList=row
+ },
// 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
busineHandle(){
if(this.crudArray.length<1){
@@ -1008,36 +1072,42 @@
})
}
},
- // 绾ц仈灞炴��
+ // 绾ц仈灞炴�ф寜閽�
CascadeHandle(){
- if(this.CrudSelect.length >0){
+ if(this.CrudSelect.length >1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect.length === 1){
this.CascadeVisible=true;
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
'conditionMap[oid_notequal]':this.CrudOid
}).then(res=>{
- this.CascadeData=res.data.data
+ this.CascadeData=res.data.data;
})
- }else {
- this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
}
},
//琛ㄦ牸鍗曢��
selectHandle(selection,row){
this.CrudOid=row.oid;
- this.CrudSelect=selection
+ this.CrudSelect=selection;
+ this.attrRow=row;
+ console.log(selection.length)
},
+ //淇濆瓨
addsHandler(){
-
+ batchAddSave(this.ProData).then(res=>{
+ console.log(res)
+ this.$message.success('淇濆瓨鎴愬姛')
+ })
},
- // screenEdit(){
- // debugger
-
- // this.attrEditVisible=true;
- // },
- // outEdit(){
- // debugger
- // this.attrEditVisible=false;
- // },
+ //绾ц仈淇濆瓨
+ CascadeAddHandle(){
+ let CascadeString="";
+ CascadeString=this.attrRow.id+(this.attrRow.name);
+ this.$set(this.attrRow,'parentCode',CascadeString)
+ this.CascadeVisible=false;
+ },
//绾ц仈灞炴�ф竻闄�
casRemove() {
this.selectRow = ""
@@ -1046,14 +1116,13 @@
CascaderowClick(row) {
this.selectRow = row.$index
console.log(row)
- this.$message.success('閫夋嫨搴忓彿' + row.$index)
},
// 鏋氫妇娉ㄥ叆娣诲姞涓�琛岀┖鏁版嵁
addRow() {
- this.tableData.push({
- name: "",
- age: ""
- });
+ this.tableData.push(JSON.parse(JSON.stringify({
+ key: "",
+ value: ""
+ })));
},
// 鏋氫妇娉ㄥ叆鐩戝惉鍗曞厓鏍肩偣鍑讳簨浠跺苟瀛樺偍姝ｅ湪缂栬緫鐨勮
handleCellClick(row, column) {
@@ -1064,6 +1133,31 @@
enumDeleteRow(row) {
console.log(row)
this.tableData.splice(row, 1)
+ },
+ //鏋氫妇娉ㄥ叆鎸夐挳
+ enmuVisHandle(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ }else if(this.CrudSelect.length === 1){
+ this.enumVisible=true;
+ }
+ },
+ //鏋氫妇娉ㄥ叆澶氶�夋
+ handleSelectionChange(row){
+ console.log(row)
+ this.enumRow=JSON.parse(JSON.stringify(row));
+ },
+ //鏋氫妇娉ㄥ叆淇濆瓨
+ enumAddHandle(){
+ console.log(this.enumRow)
+ if(this.enumRow.length<1){
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
+ }else {
+ this.$set(this.attrRow,'enumString',this.enumRow);
+ this.enumVisible=false;
+ }
},
// 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
saveRow() {
@@ -1086,9 +1180,27 @@
rulesExamine() {
},
+ //鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
+ injectBtn(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉挎暟鎹�')
+ }else if(this.CrudSelect.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
+ }else if(this.CrudSelect.length === 1){
+ this.injectVisible=true
+ }
+ },
+ //鍒嗙被娉ㄥ叆淇濆瓨
+ injectAddHandle(){
+ this.$set(this.attrRow,'classifyInvokeLevel',this.injectOption);
+ this.injectVisible=false
+ },
//鍒嗙被娉ㄥ叆娓呯┖
injectHandleReset() {
- console.log("娓呯┖")
+ this.injectOption.type="";
+ this.injectOption.set="";
+ this.injectOption.change="";
+ this.injectOption.injectNum="";
},
// 鍒嗙被娉ㄥ叆鍙栨秷
injectRemove() {
@@ -1128,6 +1240,56 @@
//鍔犱笂done鍏抽棴淇濆瓨鍚庝笉鍙紪杈戠殑鐘舵��
done()
},
+ //琛ㄦ牸鎿嶄綔鏍忓垹闄�
+ CrudRowDel(row){
+ this.ProData.splice(row.$index,1)
+ },
+ //琛ㄦ牸鍒犻櫎
+ CrudRemove(){
+ this.ProData.splice(this.attrRow.$index,1)
+ },
+ //琛ㄦ牸閲嶇疆
+ reset(){
+ this.CrudRend()
+ },
+ //鍚屾鍒板叾浠栨ā鏉�
+ syncHandle(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length === 1){
+ copyto({oid:this.attrRow.oid}).then(res=>{
+ this.$message.success('鍚屾鎴愬姛')
+ })
+ }
+ },
+ //缂栫爜鐢宠棰勮
+ applicationHandle(){
+ this.addvisible=true;
+ console.log('temp',this.crudOid)
+ console.log('code',this.codeClassifyOid)
+ // getFormDefineByTemplate({templateOid:this.crudOid,codeClassifyOid:this.codeClassifyOid}).then(res=>{
+ // console.log(res)
+ // })
+ },
+ //鍏ㄥ睆缂栬緫
+ fullscreenHandle(){
+ if(this.crudArray.length<1){
+ this.$message.warning('璇烽�夋嫨涓�涓ā鏉�')
+ }else {
+ this.attrEditVisible=true;
+ this.attrFlag=true;
+ console.log(this.attrEditVisible)
+ }
+
+ },
+ //閫�鍑哄叏灞忕紪杈�
+ escEdit(){
+ this.attrFlagChiledren=false;
+ this.attrEditVisible=false;
+ console.log(this.attrEditVisible)
+ },
// 鎺掑簭
sortChange(val) {
console.log(val)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 13cd051..9048526 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -169,7 +169,7 @@
</avue-crud>
</basic-container>
- <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist"></templatePro>
+ <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
</span>
</basic-container>
</el-main>
@@ -437,8 +437,14 @@
methods: {
//琛屽崟閫変簨浠�
selectHandle(selection,row){
- this.crudOid=row.oid
- this.crudArray=selection
+ this.crudOid=row.oid;
+ this.crudArray=selection;
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.ProData = res.data.data;
+ console.log(this.ProData)
+ }).catch(res => {
+ this.$message.error(res)
+ })
},
//鍒嗙被鏍戞暟鎹鐞�
getAttr() {
@@ -634,6 +640,7 @@
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
this.nodeClickList = data
console.log(data.oid)
+ this.ProData=[]
try {
await TreeObjcet(data.oid).then(res => {
this.FlagObj = res.data.data
@@ -648,14 +655,6 @@
return item.codeclassifyoid == this.nodeClickList.oid
}
})
- if(this.Formlist.length >0){
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
- this.ProData = res.data.data;
- console.log(this.ProData)
- }).catch(res => {
- this.$message.error(res)
- })
- }
}).catch(res => {
console.log(res)
})
diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index 290afc3..2d7a508 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -1,11 +1,11 @@
<template>
- <el-dialog title="妯℃澘娴佺▼" width="90%" append-to-body="true" :visible.sync="dialogVisible">
+
<avue-crud ref="crud" :table-loading="loading" :data="data" v-model="form" :option="option" :page.sync="page"
:search.sync="search" @on-load="getDataList" @row-save="handleSave" @row-del="handleDelete"
@row-update="handleEdit" @refresh-change="handleRefresh" @size-change="handleSizePage"
@current-change="handleCurrentPage">
</avue-crud>
- </el-dialog>
+
</template>
<script>
@@ -13,11 +13,6 @@
export default {
name: 'FlowPath',
props: {
- // 鏄惁鎵撳紑
- visible: {
- typeof: Boolean,
- default: false
- },
code: {
typeof: String,
required: true,
@@ -25,16 +20,10 @@
}
},
watch: {
- visible(n) {
- this.dialogVisible = n;
- },
- dialogVisible(n) {
- this.$emit('update:visible', n)
- },
},
data() {
return {
- dialogVisible: this.visible,
+
loading: false,
page: {
currentPage: 1,
@@ -214,4 +203,4 @@
},
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/Source/UBCS-WEB/src/components/template/Stage.vue b/Source/UBCS-WEB/src/components/template/Stage.vue
index 0d92984..ef29b0f 100644
--- a/Source/UBCS-WEB/src/components/template/Stage.vue
+++ b/Source/UBCS-WEB/src/components/template/Stage.vue
@@ -256,4 +256,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 297be45..c87fec9 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -48,9 +48,12 @@
import FormTemplateDialog from "@/components/FormTemplate/index"
import linkTypeAdd from "@/views/modeling/LinkTypeAdd"
import MasterTree from "@/components/Master/MasterTree";
+import FlowPath from "@/components/template/FlowPath";
+import Stage from "@/components/template/Stage";
// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
import utilFunc from './util/func'
+import flowPath from "@/views/flow/flowPath";
Vue.prototype.$utilFunc = utilFunc
// 娉ㄥ唽鍏ㄥ眬crud椹卞姩
window.$crudCommon = crudCommon;
@@ -97,6 +100,8 @@
Vue.component('FormTemplateDialog',FormTemplateDialog)
Vue.component('LinkTypeAdd',linkTypeAdd)
Vue.component('MasterTree',MasterTree)
+Vue.component('FlowPath',FlowPath)
+Vue.component('Stage',Stage)
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
diff --git a/Source/UBCS-WEB/src/option/user/info.js b/Source/UBCS-WEB/src/option/user/info.js
index de76103..a664bd1 100644
--- a/Source/UBCS-WEB/src/option/user/info.js
+++ b/Source/UBCS-WEB/src/option/user/info.js
@@ -45,7 +45,7 @@
}]
},
{
- label: '淇敼瀵嗙爜',
+ label: '',
prop: 'password',
column: [{
label: '鍘熷瘑鐮�',
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 7589fbf..e0affab 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,13 +26,17 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
+ // target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- target: 'http://192.168.1.104:37000',
- // target: 'http://192.168.1.63:37000',
- // target: 'http://192.168.3.7:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.46:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
+ // target: 'http://localhost:37000',
+ // target: 'http://192.168.1.63:37000',
+ //target: 'http://192.168.3.7:37000',
+ // target: 'http://dev.vci-tech.com:37000',
+ //target: 'http://192.168.1.51:37000/',
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3