From 9a030dbbd1e08845ff133acf5d5f82a21d851f33 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 10 七月 2023 11:21:28 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/modeling/original.vue | 29 ++++--
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 91 ++++++++++++++++++++++
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 79 ++++++++++++-------
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 13 ++
Source/UBCS-WEB/src/views/modeling/originalAdd.vue | 4
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 2
6 files changed, 170 insertions(+), 48 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 137ee2c..75413c2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -23,59 +23,70 @@
<el-button plain size="small" type="primary">鍒锋柊</el-button>
<el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input> -->
- <el-button plain size="small" type="primary" v-for="(item, index) in masterVrBtnList" :key="index"
- @click="handelBtnClick(item)">{{
- item.name }}</el-button>
- <el-input placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�" size="small"
- style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
+
</div>
<el-row style="height: 700px; width: 100%">
- <el-table v-loading="isLoading" :data="tableData" max-height="700" style="" @cell-click="handleCellClick"
- @selection-change="handleSelectionChange" @sort-change="sortChange" v-if="tableData.length != 0">
- <el-table-column fixed type="selection" width="55"> </el-table-column>
+ <div>
+ <el-button v-for="(item, index) in masterVrBtnList" :key="index" plain size="small" type="primary"
+ @click="handelBtnClick(item)">{{
+ item.name
+ }}
+ </el-button>
+ <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+ size="small" style="width: 180px; margin-left: 5px; margin-top: 10px"></el-input>
+ </div>
+ <el-table v-if="tableData.length != 0" v-loading="isLoading" :data="tableData" max-height="700" style=""
+ @cell-click="handleCellClick" @selection-change="handleSelectionChange" @sort-change="sortChange">
+ <el-table-column fixed type="selection" width="55"></el-table-column>
<el-table-column fixed label="搴忓彿" type="index" width="55">
</el-table-column>
- <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :label="item.label" :prop="item.prop"
- :sortable="item.sortable" :formatter="item.formatter"
- :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'" :show-overflow-tooltip="true"
- align="center">
+ <el-table-column v-for="item in this.tableHeadFindData" :key="item.id" :formatter="item.formatter" :label="item.label"
+ :prop="item.prop" :show-overflow-tooltip="true"
+ :sortable="item.sortable"
+ :width="item.label.length >= 4 ? '150' : item.label.length == 3 ? '120' : '90'"
+ align="center">
</el-table-column>
</el-table>
</el-row>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" type="add" :visible.sync="addvisible" @submit="AddSumbit">
+ :disabledProp="disabledProp" :templateOid="templateOid" :visible.sync="addvisible" type="add"
+ @submit="AddSumbit">
</FormTemplateDialog>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" type="edit" :title="'淇敼缂栫爜淇℃伅'"
- :visible.sync="editvisible" @submit="EditSumbit"></FormTemplateDialog>
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :visible.sync="editvisible"
+ type="edit" @submit="EditSumbit"></FormTemplateDialog>
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :type="edit" :title="'宸插彂甯冩暟鎹洿鏀�'"
- :visible.sync="DataVisible"></FormTemplateDialog>
- <set-personnel :visible.sync="visibleFlow" :parameter="this.parameter"></set-personnel>
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'宸插彂甯冩暟鎹洿鏀�'"
+ :type="edit"
+ :visible.sync="DataVisible"></FormTemplateDialog>
+ <set-personnel :parameter="this.parameter" :visible.sync="visibleFlow"></set-personnel>
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
<integration-transfer :data="transferData" :props="transferProps" :visible.sync="dialogPush"
- @save="handelTransferSave"></integration-transfer>
- <ResembleQueryDialog :visible.sync="similarVisible" :templateOid="templateOid" :codeClassifyOid="codeClassifyOid"
- :rowOid="rowOid" :codeRuleOid="this.codeRuleOid"></ResembleQueryDialog>
+ @save="handelTransferSave"></integration-transfer>
+ <ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
+ :templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
</div>
<div class="block" style="display: flex; justify-content: flex-end">
<el-pagination :current-page="page.currentPage" :page-size="page.pageSizes" :page-sizes="page.pageSizes"
- :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
- @current-change="handleCurrentChange">
+ :total="page.total" layout="total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange">
</el-pagination>
</div>
- <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData">
+ <BatchImport v-if="batchImportData.visible" v-bind="batchImportData" :visible.sync="batchImportData.visible">
</BatchImport>
</basic-container>
</template>
<script>
-import { MasterTable, TableData, FindData } from "@/api/GetItem";
-import { listCodeAttributeByClassId } from "@/api/integration/integration.js";
+import {MasterTable, TableData, FindData} from "@/api/GetItem";
+import {listCodeAttributeByClassId} from "@/api/integration/integration.js";
import integrationTransfer from "@/views/integration/integrationTransfer";
import SetPersonnel from "@/components/template/SetPersonnel";
import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
import BatchImport from '@/components/BatchImport'
-import { validatenull } from "@/util/validate";
+import {validatenull} from "@/util/validate";
+
export default {
components: {
integrationTransfer,
@@ -126,6 +137,8 @@
},
data() {
return {
+ //棣栭〉鍙充晶鎼滅储
+ WupinFindValue: "",
//鐩镐技椤规煡璇�
similarVisible: false,
//鍙戝竷
@@ -184,8 +197,10 @@
};
},
computed: {},
- created() { },
- mounted() { },
+ created() {
+ },
+ mounted() {
+ },
activated() {
// this.doLayout();
},
@@ -218,7 +233,9 @@
record.formatter = eval("(" + record.templet + ")");
//function(row,column){return row[column.property]=='true' || row[column.property]=='1'?'鏄�':'鍚�'}
} else if (record.fieldType == "truefalse") {
- record.formatter = function (row, column) { return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�' }
+ record.formatter = function (row, column) {
+ return row[column.property] == 'true' || row[column.property] == '1' ? '鏄�' : '鍚�'
+ }
}
}
})
@@ -261,7 +278,7 @@
this[visible] = true
},
handelBtnClick(event) {
- const { uniqueFlag } = event
+ const {uniqueFlag} = event
this.$nextTick(() => {
if (uniqueFlag === 'CODEADD') return this.addvisible = true
if (uniqueFlag === 'CODEEDIT') return this.editHandler()
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index c111117..e73549b 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1587,8 +1587,6 @@
}else if(column.property == 'verifyRule'){
this.RulesForm.expressionTextt=this.CurrentCell.verifyRule;
this.rulesVisible=true;
- console.log(this.CurrentCell.verifyRule)
- console.log(this.RulesForm.expressionText)
}
},
saveRows() {
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 6c22328..facc6d9 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -78,7 +78,7 @@
</div>
</el-dialog>
<!-- 瀛樺偍鐨勪笟鍔＄被鍨�-->
- <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔＄被鍨嬨�戦�夊彇鍊�" append-to-body>
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
@@ -110,7 +110,7 @@
import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
- props: ['loneTreeNewForm','flag','Editclose'],
+ props: ['loneTreeNewForm','flag','Editclose','TreeFlag'],
data() {
return {
SelectFInd:"",
@@ -288,6 +288,7 @@
labelWidth:128,
focus:this.btmFoucus,
readonly: true,
+ hide:this.TreeFlag,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -327,6 +328,14 @@
},
created() {
},
+ watch:{
+ // TreeFlag:{
+ // handler(newval){
+ // const falg=newval;
+ // this.findObject(this.)
+ // }
+ // }
+ },
methods: {
submits(form,done){
TreeEditSave(this.loneTreeNewForm).then(res=>{
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 55b44b4..106a39c 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -32,6 +32,9 @@
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
</el-form-item>
+ <el-form-item label="涓氬姟绫诲瀷锛�" label-width="150px" v-if="TreeFlag==false">
+ <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
+ </el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
<el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" @focus="Keyfouce"
style="width: 585px"></el-input>
@@ -48,7 +51,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlag"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -266,6 +269,30 @@
</div>
</div>
</el-dialog>
+<!-- 涓氬姟绫诲瀷-->
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�" append-to-body>
+ <template>
+ <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
+ <el-option
+ v-for="item in SelectOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ style="width: 130px">
+ </el-option>
+ </el-select>
+ <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
+ <el-button size="small" type="primary" plain @click="BtmSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ </template>
+ <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
+ <div style="height: 30px">
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.btmtypename}}]</div>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
+ <el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
+ </div>
+ </div>
+ </el-dialog>
</basic-container>
</el-main>
</el-container>
@@ -300,6 +327,8 @@
inject: [, "crudTreeData"],
data() {
return {
+ //鏍戣妭鐐规樉绀洪殣钘�
+ TreeFlag:false,
//缂栫爜瑙勫垯
MasterdialogVisible:false,
masterData:[],
@@ -318,6 +347,12 @@
simData:[],
SimidialogVisible:false,
simSelectList:[],
+ //涓氬姟绫诲瀷
+ btmName:"",
+ btmOid:"",
+ BtmData:[],
+ BtmdialogVisible:false,
+ btmSelectList:[],
masterOption:{
addBtn:false,
index:true,
@@ -780,6 +815,56 @@
this.simData=res.data.records;
})
},
+ //涓氬姟绫诲瀷澶辩劍
+ btmFoucus(){
+ this.BtmdialogVisible=true;
+ this.btmdefaultRend()
+ },
+ //涓氬姟绫诲瀷纭畾
+ btmHandlerClick(){
+ if(this.btmSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.btmSelectList.length<=0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ }else {
+ this.BtmdialogVisible=false;
+ this.btmSelectList=[]
+ this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ }
+ },
+ //涓氬姟绫诲瀷鏌ヨ
+ BtmSelectFindeHandler(){
+ if(this.SelectValue == 'id'){
+ const masterParameter={
+ 'conditionMap[id]':this.SelectFInd
+ }
+ this.btmdefaultRend(masterParameter);
+ this.SelectValue=""
+ this.SelectFInd=""
+ }else if(this.SelectValue == 'name'){
+ const masterParameter={
+ 'conditionMap[name]':this.SelectFInd
+ }
+ this.btmdefaultRend(masterParameter)
+ this.SelectValue=""
+ this.SelectFInd=""
+ }
+ },
+ //涓氬姟绫诲瀷澶氶��
+ btmSelect(row){
+ this.btmSelectList=row;
+ this.btmName=row[0].name;
+ this.btmOid=row[0].oid;
+ },
+ //涓氬姟绫诲瀷鎺ュ彛
+ btmdefaultRend(masterParameter){
+ referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
+ // console.log(res)
+ this.BtmData=res.data.data.records
+ })
+ },
//瀛愪紶鐖�
MasterHandler(val){
this.TreeList=val
@@ -991,6 +1076,10 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
+ console.log('鏍�',data)
+ if(data.parentId == ""){
+ this.TreeFlag=true;
+ }
this.nodeClickList = data
this.ProData=[]
try {
diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 73f81c0..2cfd7c7 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -54,12 +54,12 @@
</template>
{{ itemForm.itemData.typeValue }}
</el-descriptions-item>
- <el-descriptions-item>
+<!-- <el-descriptions-item>
<template slot="label">
鏍囩
</template>
{{ itemForm.itemData.hashtag }}
- </el-descriptions-item>
+ </el-descriptions-item>-->
<el-descriptions-item>
<template slot="label">
榛樿鍊�
@@ -70,7 +70,7 @@
<template slot="label">
鍏佽涓虹┖
</template>
- {{ itemForm.itemData.nullable }}
+ {{ 'true' == itemForm.itemData.nullable ? '鏄�' : '鍚�'}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
@@ -193,12 +193,12 @@
prop: "name",
align: "left",
display: false
- }, {
+ },/* {
label: "鏍囩",
prop: "hashtag",
// hide: true,
display: false
- }, {
+ },*/ {
label: "鏄惁浣跨敤鏋氫妇",
prop: "usingDict",
type: "switch",
@@ -266,7 +266,9 @@
},
addSave() {
this.$refs.originalAdd.showSubmitDialog = true;
- this.$refs.originalAdd.attribute = {};
+ const newAttr = {};
+ newAttr.nullable = true;
+ this.$refs.originalAdd.attribute = newAttr;
},
updateSave(row,index) {
this.selectRow = index;
@@ -282,10 +284,17 @@
// this.refreshChange()
},
deleteSave(row,index) {
- console.log(row);
- remove(row.oid).then(res => {
- this.$message.success("鍒犻櫎鎴愬姛");
- this.refreshChange();
+ this.$confirm("鍒犻櫎鍏冩暟鎹皢鏃犳硶琚仮澶�, 鏄惁缁х画?", "鎻愮ず", {
+ iconClass: 'el-icon-question',
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ showClose: true,
+ type: "warning"
+ }).then(() => {
+ remove(row.oid).then(res => {
+ this.$message.success("鍒犻櫎鎴愬姛");
+ this.refreshChange();
+ });
});
},
onLoad(page, params = {}) {
diff --git a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
index 35dccbd..d15e51b 100644
--- a/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/originalAdd.vue
@@ -17,9 +17,9 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏍囩" label-width="100px">
+<!-- <el-form-item label="鏍囩" label-width="100px">
<el-input v-model="attribute.hashtag"></el-input>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="榛樿鍊�" label-width="100px">
<el-input v-model="attribute.defaultValue"></el-input>
</el-form-item>
--
Gitblit v1.9.3