From 7b1c7ebb1c20c9c1811d50884b4263923d5731bd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 06 七月 2023 13:56:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/api/modeling/cycle.js | 12 ++++++
Source/UBCS-WEB/src/views/modeling/cycle.vue | 17 +++++++-
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 35 +++++++++--------
3 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/modeling/cycle.js b/Source/UBCS-WEB/src/api/modeling/cycle.js
new file mode 100644
index 0000000..692342a
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/modeling/cycle.js
@@ -0,0 +1,12 @@
+import request from '@/router/axios';
+
+export const getList = (params) => {
+ return request({
+ url: '/api/ubcs-omd/lifeCycle/page',
+ method: 'get',
+ params
+ })
+}
+export default {
+ getList
+}
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 257dd8b..b9f5f3f 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,6 +1,7 @@
<template>
<div>
<div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
+ <el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
<!-- 鍏ㄥ睆缂栬緫-->
@@ -9,16 +10,8 @@
<el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
- <!-- 鍒嗙被娉ㄥ叆-->
- <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
- <!-- 缁勫悎瑙勫垯-->
- <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
- <!-- 鏋氫妇娉ㄥ叆-->
- <el-button size="small" @click="enmuVisHandle">鏋氫妇娉ㄥ叆</el-button>
- <!-- 绾ц仈灞炴��-->
- <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
- <!-- 棰勮鎺掑簭-->
- <el-button size="small" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 鍒嗙被娉ㄥ叆-->
<el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
<!-- 缁勫悎瑙勫垯-->
@@ -28,7 +21,9 @@
<!-- 绾ц仈灞炴��-->
<el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
<!-- 棰勮鎺掑簭-->
- <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ </el-button-group>
+ <el-button-group>
<!-- 淇濆瓨-->
<el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
<!-- 鍒犻櫎-->
@@ -36,7 +31,8 @@
<!-- 閲嶇疆-->
<el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <el-button size="small" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ </el-button-group>
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
@@ -241,6 +237,7 @@
@select="selectHandle"
@selection-change="selectionChange"
v-if="this.crudArrayFlag"
+ ref="referAttrCrud"
>
<el-table-column
type="selection"
@@ -259,8 +256,8 @@
<template slot-scope="{ row }">
<el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' || item.edit == 'select' ||item.edit == 'refer' )" v-model="row[item.prop]"
@blur="saveRows"></el-input>
- <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
- @blur="saveRows"></el-input-number>
+ <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
+ @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
<el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat' && row[item.prop] ==''" @focus="DataChangeHandler">
<el-option label="椁愬巺鍚�" value="1"></el-option>
<el-option label="璁㈠崟鍙�" value="2"></el-option>
@@ -270,7 +267,7 @@
v-if="item.edit === 'switch'" v-model="row[item.prop]" active-value="true"
inactive-value="false">
</el-switch>
- <span v-else >{{ row[item.prop] }}</span>
+ <span v-else>{{ row[item.prop] }}</span>
</template>
</el-table-column>
<el-table-column
@@ -1424,6 +1421,10 @@
this.selectRow = row.$index;
this.selectRowArr=row
},
+ // 鎺掑簭棰勮鎸夐挳
+ orderHandle(){
+ this.$refs.referAttrCrud.sort("orderNum");
+ },
//琛ㄦ牸鍗曢��
selectHandle(selection, row) {
this.attrOid = row.oid;
@@ -1557,7 +1558,9 @@
},
//琛ㄦ牸鍒犻櫎
CrudRemove() {
- this.ProData.splice(this.attrRow.$index, 1)
+ this.attrSelectList.forEach((item)=>{
+ this.ProData.splice(item.$index, 1)
+ })
},
//琛ㄦ牸閲嶇疆
reset() {
diff --git a/Source/UBCS-WEB/src/views/modeling/cycle.vue b/Source/UBCS-WEB/src/views/modeling/cycle.vue
index ef721e2..e0fac23 100644
--- a/Source/UBCS-WEB/src/views/modeling/cycle.vue
+++ b/Source/UBCS-WEB/src/views/modeling/cycle.vue
@@ -1,6 +1,6 @@
<template>
<basic-container class="">
- <avue-crud :data="data" :option="option" @refresh-change="gettableList" :table-loading="loading">
+ <avue-crud :data="data" :option="option" @refresh-change="search" :table-loading="loading">
<template slot-scope="scope" slot="menuLeft">
<el-button
type="primary"
@@ -54,12 +54,17 @@
</template>
<script>
+import API from '@/api/modeling/cycle'
import CycleFlow from "@/components/flow-cycle/flowchartEditor.vue";
export default {
name: "cycle.vue",
components: { CycleFlow },
data() {
return {
+ form: {
+ page: 1,
+ limit: 10
+ },
option: {
border: true,
align: "center",
@@ -152,11 +157,19 @@
rowData: {},
dialogWidth: "50%",
type: "detail",
+ loading: false
};
},
+ created() {
+ this.search()
+ },
methods: {
- gettableList() {
+ search() {
this.loading = true
+ API.getList(this.form).then(res => {
+ this.loading = false
+ this.data = res.data.data
+ })
},
openDialog(type, row) {
if (type === "detail") {
--
Gitblit v1.9.3