From 54e14bff397221b5b0d64720f77217f4d34ebf98 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 09:50:53 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 274 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 249 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 50a2502..651e7cc 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -19,21 +19,32 @@
<el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
</el-form-item>
<el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain" class="domainSelect">
- <el-select v-model="btmType.bizDomain" :prefix-icon="icons.domain">
+ <el-select placeholder="璇烽�夋嫨棰嗗煙" v-model="btmType.bizDomain" :prefix-icon="icons.domain">
<el-option v-for="item in domainOption"
:label="item.label" :value="item.value" :key="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐗堟湰瑙勫垯" label-width="100px">
- <el-input v-model="btmType.revisionRuleName" :prefix-icon="icons.revisionRule" class="revisionRule"
- @focus="openRevision" clearable @clear="clearRevision">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.revisionRuleName"
+ :prefix-icon="icons.revisionRule"
+ class="revisionRule"
+ @focus="openRevision"
+ clearable
+ @clear="clearRevision"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
<el-form-item label="鐢熷懡鍛ㄦ湡" label-width="100px">
- <el-input v-model="btmType.lifeCycleId" :prefix-icon="icons.lifeCycle">
- <i slot="suffix" class="el-input__icon el-icon-search"></i>
+ <el-input v-model="btmType.lifeCycleName"
+ :prefix-icon="icons.lifeCycle"
+ class="lifeCycle"
+ @focus="openLifeCycle"
+ clearable
+ @clear="clearLifeCycle"
+ :suffix-icon="icons.referType"
+ placeholder="璇烽�夋嫨锛岀暀绌哄垯涓嶈繘琛岀鐞�">
</el-input>
</el-form-item>
<div>
@@ -118,7 +129,10 @@
:data="revisionRef.data"
:page.sync="revisionRef.page"
ref="revisionRef"
- @row-click="revisionClick">
+ @row-click="revisionClick"
+ v-loading="revisionRef.loading"
+ @search-change="searchRevisionRule"
+ @search-reset="clearSearchRevisionRule">
<template slot="radio"
slot-scope="{row}">
<el-radio v-model="revisionRef.selectRow"
@@ -131,7 +145,37 @@
<el-button @click="cancelRevision">鍙栨秷</el-button>
</div>
</el-dialog>
+
+ <!-- 鐢熷懡鍛ㄦ湡鐨勫弬鐓� -->
+ <el-dialog title="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
+ :visible.sync="lifeCycleRef.visible"
+ append-to-body
+ width="80%">
+
+ <avue-crud class="lifeCycleRef"
+ :option="lifeCycleRef.option"
+ :data="lifeCycleRef.data"
+ :page.sync="lifeCycleRef.page"
+ ref="lifeCycleRef"
+ @row-click="lifeCycleClick"
+ v-loading="lifeCycleRef.loading"
+ @search-change="searchLifeCycle"
+ @search-reset="clearSearchLifeCycle">
+ <template slot="radio"
+ slot-scope="{row}">
+ <el-radio v-model="lifeCycleRef.selectRow"
+ :label="row.$index">
+ </el-radio>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmLifeCycle">纭畾</el-button>
+ <el-button @click="cancelLifeCycle">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
</el-dialog>
+
+
</template>
@@ -140,6 +184,7 @@
import {add, update} from '@/api/omd/btmType';
import {queryPage} from '@/api/omd/OmdAttribute';
import {getPage} from '@/api/omd/revisionRule';
+import {getList} from '@/api/modeling/cycle';
export default {
name: 'BusinessAdd',
@@ -287,6 +332,71 @@
currentPage: 1,
pageSize: 10
},
+ loading: false,
+ selectRow: '',
+ searchKey: null,
+ option: {
+ height: 360,
+ addBtn: false,
+ refreshBtn: false,
+ columnBtn: false,
+ menu: false,
+ border: true,
+ reserveSelection: true,
+ searchMenuSpan: 8,
+ searchShowBtn: false,
+ highlightCurrentRow: true,
+ column: [{
+ label: '閫夋嫨',
+ prop: 'radio',
+ width: 60,
+ hide: false
+ },
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id',
+ search: true
+ },
+ {
+ label: "涓枃鍚嶇О",
+ prop: "name",
+ search: true,
+ },
+ {
+ label: "璺宠穬瀛楃",
+ prop: "skipCode"
+ },
+ {
+ label: "鍒濆鍊�",
+ prop: "startCode"
+ },
+ {
+ label: "姝ラ暱",
+ prop: "serialStep"
+ },
+ {
+ label: "鍓嶇紑",
+ prop: "prefixCode"
+ },
+ {
+ label: "鍚庣紑",
+ prop: "suffixCode"
+ },
+ {
+ label: "鎻忚堪",
+ prop: "description",
+ type: "textarea"
+ }
+ ]
+ },
+ },
+ lifeCycleRef: {
+ visible: false,
+ page: {
+ currentPage: 1,
+ pageSize: 10
+ },
+ loading: false,
selectRow: '',
searchKey: null,
option: {
@@ -506,22 +616,48 @@
row.$cellEdit = false;
},
// 鎵撳紑鐗堟湰瑙勫垯鍙傜収
- async openRevision() {
- await getPage().then(res => {
+ openRevision() {
+ this.revisionRef.visible = true;
+ this.revisionRuleOnLoad();
+ },
+ // 鐗堟湰鍙傜収鍒楄〃鐨勯粯璁ゆ煡璇㈡柟娉�
+ revisionRuleOnLoad(){
+ this.revisionRef.loading = true;
+ getPage().then(res => {
this.revisionRef.data = res.data.data.records;
});
- this.revisionRef.visible = true;
+ setTimeout(() => {
+ this.revisionRef.loading = false;
+ }, 600)
+ this.$nextTick(() => {
+ this.$refs.revisionRef.refreshTable();
+ });
+ },
+ // 鎵撳紑鐗堟湰瑙勫垯鍙傜収
+ openLifeCycle() {
+ this.lifeCycleRef.visible = true;
+ this.lifeCycleOnLoad();
+ },
+ // 鐢熷懡鍛ㄦ湡鍒楄〃鐨勯粯璁ゆ煡璇㈡柟娉�
+ lifeCycleOnLoad(){
+ this.lifeCycleRef.loading = true;
+ getList().then(res => {
+ this.lifeCycleRef.data = res.data.data.records;
+ });
+ setTimeout(() => {
+ this.lifeCycleRef.loading = false;
+ }, 600)
+ this.$nextTick(() => {
+ this.$refs.lifeCycleRef.refreshTable();
+ });
},
// 鍏抽棴鐗堟湰瑙勫垯鍙傜収寮圭獥
closeRevisionDialog() {
this.revisionRef.visible = false;
},
- // 鐗堟湰瑙勫垯鍙傜収鍒楄〃妫�绱�
- revisionRefSearch() {
-
- },
- // 鐗堟湰瑙勫垯閫変腑浜嬩欢
- revisionChange() {
+ // 鍏抽棴鐢熷懡鍛ㄦ湡鍙傜収寮圭獥
+ closeLifeCycleDialog() {
+ this.lifeCycleRef.visible = false;
},
// 纭閫変腑鐗堟湰瑙勫垯
confirmRevision() {
@@ -531,11 +667,24 @@
this.btmType.inputRevisionFlag = false;
this.cancelRevision();
},
+ // 纭閫変腑鐢熷懡鍛ㄦ湡
+ confirmLifeCycle() {
+ this.btmType.lifeCycleFlag = true;
+ this.btmType.lifeCycleId = this.lifeCycleRef.selectData.id;
+ this.btmType.lifeCycleName = this.lifeCycleRef.selectData.name;
+ this.cancelLifeCycle();
+ },
// 鍙栨秷閫変腑鐗堟湰瑙勫垯
cancelRevision() {
this.revisionRef.selectRow = '';
this.revisionRef.selectData = {};
this.closeRevisionDialog();
+ },
+ // 鍙栨秷閫変腑鐢熷懡鍛ㄦ湡
+ cancelLifeCycle() {
+ this.lifeCycleRef.selectRow = '';
+ this.lifeCycleRef.selectData = {};
+ this.closeLifeCycleDialog();
},
// 鐗堟湰瑙勫垯鍗曢��
revisionClick(row) {
@@ -545,15 +694,90 @@
name: row.name,
};
},
+ // 鐢熷懡鍛ㄦ湡鍗曢��
+ lifeCycleClick(row) {
+ this.lifeCycleRef.selectRow = row.$index;
+ this.lifeCycleRef.selectData = {
+ id: row.id,
+ name: row.name,
+ };
+ },
+ // 鍙栨秷鐗堟湰瑙勫垯
clearRevision() {
this.$delete(this.btmType, 'revisionFlag');
this.$delete(this.btmType, 'revisionRuleId');
this.$delete(this.btmType, 'revisionRuleName');
this.$delete(this.btmType, 'inputRevisionFlag');
},
+ // 鍙栨秷鐢熷懡鍛ㄦ湡
+ clearLifeCycle() {
+ this.$delete(this.btmType, 'lifeCycleFlag');
+ this.$delete(this.btmType, 'lifeCycleId');
+ this.$delete(this.btmType, 'lifeCycleName');
+ },
+ // 琛ㄥ崟閲嶇疆
resetForm() {
this.btmType = {};
this.$refs.form.resetFields();
+ },
+ /**
+ * 鎼滅储鐗堟湰瑙勫垯
+ * @param params 鎼滅储妗嗚緭鍏ュ�� {id: '',name: ''} 鐩存帴鑾峰彇灏辫
+ * @param done 鎵ц瀹屾垚鍚庣殑鍥炶皟
+ */
+ searchRevisionRule(params,done){
+ let condition = {};
+ if (params.id){
+ condition['id_like'] = params.id;
+ }
+ if (params.name){
+ condition['name_like'] = params.name;
+ }
+ this.revisionRef.loading = true;
+ getPage(this.revisionRef.page.currentPage,this.revisionRef.page.pageSize,condition).then(res => {
+ this.revisionRef.data = res.data.data.records;
+ });
+ setTimeout(() => {
+ done();
+ this.revisionRef.loading = false;
+ }, 600);
+ this.$nextTick(() => {
+ this.$refs.revisionRef.refreshTable();
+ });
+ },
+ /**
+ * 鎼滅储鐢熷懡鍛ㄦ湡
+ * @param params 鎼滅储妗嗚緭鍏ュ��
+ * @param done 鎵ц瀹屾垚鍚庣殑鍥炶皟
+ */
+ searchLifeCycle(params,done){
+ let condition = {};
+ if (params.id){
+ condition['id_like'] = params.id;
+ }
+ if (params.name){
+ condition['name_like'] = params.name;
+ }
+ this.lifeCycleRef.loading = true;
+ getList(this.lifeCycleRef.page.currentPage,this.lifeCycleRef.page.pageSize,condition).then(res => {
+ this.lifeCycleRef.data = res.data.data.records;
+ });
+ setTimeout(() => {
+ done();
+ this.lifeCycleRef.loading = false;
+ }, 600);
+ this.$nextTick(() => {
+ this.$refs.lifeCycleRef.refreshTable();
+ });
+ },
+ // 鍙栨秷鐗堟湰瑙勫垯鎼滅储
+ clearSearchRevisionRule(item){
+ this.revisionRuleOnLoad();
+ },
+ // 鍙栨秷鐢熷懡鍛ㄦ湡鎼滅储
+ clearSearchLifeCycle(item){
+ this.lifeCycleOnLoad();
+ console.log(item);
}
}
}
@@ -569,27 +793,27 @@
display: none !important;
}
+.lifeCycleRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu {
+ display: none !important;
+}
+
.btmTypeForm > .el-form-item > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.domainSelect > .el-form-item__content > .el-select > .el-input > .el-input__inner {
- width: 200px;
+ width: 260px;
}
.viewFlag {
- width: 305px;
+ width: 360px;
}
.viewInput > .el-form-item__content > .el-input > .el-input__inner {
- width: 200px;
+ width: 630px;
}
.descClass > .el-input__inner {
- width: 57vw
-}
-
-#descId {
- width: 57vw;
+ width: 1000px;
}
</style>
--
Gitblit v1.9.3