From 100bdd6595cc5c7a447ea6fedd6827f311b37f48 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 04 七月 2023 00:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 201 insertions(+), 22 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 8e1b6a4..1515c8f 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -5,10 +5,10 @@
append-to-body
@close="closeSubmitDialog"
width="70%"
+ style="height: 115vh;"
>
- <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm">
-
- <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true">
+ <el-form ref="form" :model="btmType" show-message="true" inline size="medium" label-suffix=":" class="btmTypeForm" :rules="rules" @resetFields="resetForm" status-icon="true">
+ <el-form-item label="鑻辨枃鍚嶇О" label-width="100px" required="true" prop="id">
<el-input v-model="btmType.id" :prefix-icon="icons.key"></el-input>
</el-form-item>
<el-form-item label="涓枃鍚嶇О" label-width="100px">
@@ -17,14 +17,15 @@
<el-form-item label="鏁版嵁搴撹〃鍚�" label-width="100px">
<el-input v-model="btmType.tableName" :prefix-icon="icons.tableName"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞為鍩�" label-width="100px">
+ <el-form-item label="鎵�灞為鍩�" label-width="100px" prop="domain">
<el-select v-model="btmType.domain" :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.revisionRuleId" :prefix-icon="icons.revisionRule" class="revisionRule">
+ <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>
</el-form-item>
@@ -45,6 +46,7 @@
<el-input v-model="btmType.description"
:prefix-icon="icons.desc"
class="descClass"
+ id="descId"
></el-input>
</el-form-item>
</el-form>
@@ -63,11 +65,11 @@
</avue-crud>
<div slot="footer" class="dialog-footer">
- <el-button @click="submitBtmType">纭畾</el-button>
+ <el-button type="primary" @click="submitBtmType">纭畾</el-button>
<el-button @click="cancleSubmitBtmType">鍙栨秷</el-button>
</div>
-
+<!-- 灞炴�ф睜鐨勯�夋嫨 -->
<el-dialog title="灞炴�ф睜"
:visible="attrRef.visible"
append-to-body
@@ -82,13 +84,37 @@
@on-load="attrRefOnLoad"
@search-change="attrRefSearch"
@selection-change="selectionChange">
- <template slot="name" slot-scope="scope" >
- <el-tag>{{scope}}</el-tag>
+ <template slot="typeValue" slot-scope="scope" >
+ <el-tag>{{scope.row.typeValue}}</el-tag>
</template>
</avue-crud>
<div slot="footer" class="dialog-footer">
<el-button @click="confirmSelectAttr">纭畾</el-button>
<el-button @click="cancleSelectAttr">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+<!-- 鐗堟湰瑙勫垯鐨勫弬鐓� -->
+ <el-dialog title="璇烽�夋嫨鐗堟湰瑙勫垯"
+ :visible.sync="revisionRef.visible"
+ append-to-body
+ width="80%">
+
+ <avue-crud class="revisionRef"
+ :option="revisionRef.option"
+ :data="revisionRef.data"
+ :page.sync="revisionRef.page"
+ ref="revisionRef"
+ @row-click="revisionClick">
+ <template slot="radio"
+ slot-scope="{row}">
+ <el-radio v-model="revisionRef.selectRow"
+ :label="row.$index">
+ </el-radio>
+ </template>
+ </avue-crud>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="confirmRevision">纭畾</el-button>
+ <el-button @click="cancelRevision">鍙栨秷</el-button>
</div>
</el-dialog>
</el-dialog>
@@ -99,6 +125,7 @@
import { add,update } from '@/api/omd/btmType';
import { queryPage } from '@/api/omd/OmdAttribute';
+import { getPage } from '@/api/omd/revisionRule';
export default {
name: 'BusinessAdd',
props: {
@@ -106,6 +133,9 @@
type: Object
},
domainOption:{
+ type: Array
+ },
+ icons: {
type: Array
}
},
@@ -122,6 +152,7 @@
rowKey: 'id',
tabs: true,
menu: false,
+ addBtn:false,
highlightCurrentRow: true,
column: [
{
@@ -143,14 +174,12 @@
{
label: "榛樿鍊�",
prop: "defaultValue",
- cell: 'true',
align: 'center',
cell: true
},
{
label: "璇存槑",
prop: "description",
- cell: 'true',
align: 'center',
cell:true
}
@@ -173,22 +202,25 @@
border: true,
reserveSelection: true,
searchMenuSpan:8,
+ highlightCurrentRow: true,
+ rowKey: 'id',
column: [
{
label: '鑻辨枃鍚嶇О',
- prop: 'key',
+ prop: 'id',
align: 'left',
search: true,
width: 230
}, {
label: '涓枃鍚嶇О',
- prop: 'label',
+ prop: 'name',
align: 'center',
},
{
label: "绫诲瀷",
prop: "typeValue",
- align: 'center'
+ align: 'center',
+ slot: true,
},
{
label: "榛樿鍊�",
@@ -220,27 +252,105 @@
},
data: [],
queryNotIn: null
- }
+ },
+ revisionRef: {
+ visible: false,
+ page: {
+ currentPage:1,
+ pageSize: 10
+ },
+ 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"
+ }
+ ]
+ },
+ },
+ rules: {
+ id: [
+ { required: true, message: '璇疯緭鍏ヤ笟鍔＄被鍨嬬紪鍙�', trigger: 'blur' },
+ { pattern: /^[A-Za-z]+$/, message: '涓氬姟绫诲瀷缂栧彿鍙兘涓鸿嫳鏂�', trigger: 'blur' },
+ { min: 2, max: 15, message: '闀垮害鍦�2鍒�15涓瓧绗�', trigger: 'blur' }
+ ],
+ domain: [
+ { required: true, message: '璇烽�夋嫨鎵�灞為鍩�', trigger: 'blur' }
+ ]
+ },
}
},
created() {
- console.log('123');
+
},
methods: {
+ // 鍏抽棴缁勪欢寮圭獥
closeSubmitDialog(){
this.showSubmitDialog = false;
this.btmType.attributes = [];
this.btmType = {};
this.attrRef.selectData = [];
this.attrRef.queryNotIn = null;
+ this.resetForm();
},
+ // 鍏抽棴灞炴�ф睜鏌ヨ寮圭獥
closeAttrDialog(){
this.attrRef.visible = false;
},
+ // 娣诲姞
rowAdd(){
this.attrRef.visible = true;
this.attrRefOnLoad();
},
+ // 灞炴�ф睜鍔犺浇
attrRefOnLoad(){
queryPage(this.attrRef.key,this.attrRef.queryNotIn,this.attrRef.page.currentPage, this.attrRef.page.pageSize).then(res => {
const data = res.data.data;
@@ -251,37 +361,44 @@
this.$refs.attrRef.refreshTable();
});
},
+ // 灞炴�ф睜妫�绱�
attrRefSearch(form,done){
this.attrRef.key = form.key;
this.attrRefOnLoad();
done();
this.attrRef.key = null;
},
+ // 灞炴�ф睜鍕鹃�変簨浠�
selectionChange(list){
this.attrRef.selectData = list;
},
+ // 纭灞炴�ф睜鍕鹃��
confirmSelectAttr(){
- this.btmType.attributes = [];
+ if(!this.btmType.attributes){
+ this.btmType.attributes = [];
+ }
this.attrRef.queryNotIn = "";
this.attrRef.selectData.forEach(item => {
this.btmType.attributes.push({
- id: item.key,
- name: item.label,
+ id: item.id,
+ name: item.name,
typeValue: item.typeValue,
typeKey: item.typeValue,
- attrDataType : item.typeValue,
+ attrDataType : item.typeKey,
defaultValue: item.defaultValue,
description: item.description,
attributeLength: item.maxLength
});
- this.attrRef.queryNotIn += (item.key + ",")
+ this.attrRef.queryNotIn += (item.id + ",")
});
this.closeAttrDialog();
},
+ // 鍙栨秷灞炴�ф睜鍕鹃��
cancleSelectAttr(){
this.attrRef.selectData = [];
this.closeAttrDialog();
},
+ // 娣诲姞涓氬姟绫诲瀷
submitBtmType(){
console.log(this.btmType);
add(this.btmType,true).then(res => {
@@ -291,28 +408,82 @@
this.$emit('refreshTable');
})
},
+ // 鍙栨秷娣诲姞涓氬姟绫诲瀷
cancleSubmitBtmType(){
this.btmType = {};
this.btmType.attributes = [];
this.showSubmitDialog = false;
},
+ // 鍒锋柊灞炴�у垪琛�
refreshAttrTable(){
this.$nextTick( () => {
this.$refs.attrTable.refreshTable();
})
},
+ //
viewChange(){
},
+ // 鍒楄〃缂栬緫
cellEditClick(cell){
cell.$cellEdit = true;
},
+ // 鍒楄〃缂栬緫淇濆瓨
cellEditSave(row){
this.btmType.attributes[row.$index].name = row.name
this.btmType.attributes[row.$index].defaultValue = row.defaultValue;
this.btmType.attributes[row.$index].description = row.description;
row.$cellEdit = false;
- }
+ },
+ // 鎵撳紑鐗堟湰瑙勫垯鍙傜収
+ async openRevision(){
+ await getPage().then(res => {
+ this.revisionRef.data = res.data.data.records;
+ });
+ this.revisionRef.visible = true;
+ },
+ // 鍏抽棴鐗堟湰瑙勫垯鍙傜収寮圭獥
+ closeRevisionDialog(){
+ this.revisionRef.visible = false;
+ },
+ // 鐗堟湰瑙勫垯鍙傜収鍒楄〃妫�绱�
+ revisionRefSearch(){
+
+ },
+ // 鐗堟湰瑙勫垯閫変腑浜嬩欢
+ revisionChange(){},
+ // 纭閫変腑鐗堟湰瑙勫垯
+ confirmRevision(){
+ this.btmType.revisionFlag = true;
+ this.btmType.revisionRuleId = this.revisionRef.selectData.id;
+ this.btmType.revisionRuleName = this.revisionRef.selectData.name;
+ this.btmType.inputRevisionFlag = false;
+ this.cancelRevision();
+ },
+ // 鍙栨秷閫変腑鐗堟湰瑙勫垯
+ cancelRevision(){
+ this.revisionRef.selectRow = '';
+ this.revisionRef.selectData = {};
+ this.closeRevisionDialog();
+ },
+ // 鐗堟湰瑙勫垯鍗曢��
+ revisionClick(row){
+ this.revisionRef.selectRow = row.$index;
+ this.revisionRef.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');
+ },
+ resetForm(){
+ this.btmType = {};
+ this.$refs.form.resetFields();
+ }
}
}
</script>
@@ -320,6 +491,10 @@
<style>
/* 灞炴�ф睜鍙傜収鍒楄〃 */
.attrRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
+ display: none !important;
+}
+
+.revisionRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu{
display: none !important;
}
@@ -334,4 +509,8 @@
.descClass > .el-input__inner {
width: 57vw
}
+
+#descId {
+ width: 57vw;
+}
</style>
--
Gitblit v1.9.3