From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java | 4
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 1791 +++++++++++++++++++++++++++++-----------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 155 ++-
Source/UBCS-WEB/src/api/batchImport/index.js | 8
Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue | 135 ++-
Source/UBCS-WEB/src/components/BatchImport/index.vue | 27
Source/UBCS-WEB/src/api/template/templateAttr.js | 26
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 94 -
8 files changed, 1,356 insertions(+), 884 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/batchImport/index.js b/Source/UBCS-WEB/src/api/batchImport/index.js
index 23a4323..f7392a7 100644
--- a/Source/UBCS-WEB/src/api/batchImport/index.js
+++ b/Source/UBCS-WEB/src/api/batchImport/index.js
@@ -45,16 +45,16 @@
params: {redisOid: redisOid + "-class"}
})
}
-// 鑾峰彇鍘嗗彶鏁版嵁姝ｇ‘鏁版嵁
-export const getHistorySuccessTable = (params) => {
+// 鑾峰彇姝ｇ‘鏁版嵁
+export const getSuccessTable = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/gridValidata',
method: 'get',
params: params
})
}
-// 鑾峰彇鍘嗗彶鐩镐技椤�
-export const getHistoryResembleTable = (params) => {
+// 鑾峰彇鐩镐技椤�
+export const getResembleTable = (params) => {
return request({
url: '/api/ubcs-code/mdmEngineController/gridResemble',
method: 'get',
diff --git a/Source/UBCS-WEB/src/api/template/templateAttr.js b/Source/UBCS-WEB/src/api/template/templateAttr.js
index 3072d8e..547389b 100644
--- a/Source/UBCS-WEB/src/api/template/templateAttr.js
+++ b/Source/UBCS-WEB/src/api/template/templateAttr.js
@@ -192,3 +192,29 @@
}
})
}
+
+//鍗囩増
+export const upVersion = (data) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTemplateController/upgrade',
+ method: 'post',
+ data
+ })
+}
+//鍋滅敤澶辨晥
+export const stopLose = (data) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTemplateController/disableData',
+ method: 'post',
+ data
+ })
+}
+// 鍚敤鍙戠増
+export const startRelease = (data) =>{
+ return request({
+ url:'/api/ubcs-code/codeClassifyTemplateController/enableData',
+ method: 'post',
+ data
+ })
+}
+
diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index c25342c..1deb7f5 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -18,7 +18,11 @@
></FormTemplate>
</div> -->
<div class="flex_box">
- <div class="left" :style="{ width: leftWidth + 'px' }" v-show="false">
+ <div
+ class="left"
+ :style="{ width: leftWidth + 'px' }"
+ v-show="type !== 'batchImportApply'"
+ >
<div class="isExpand_box">
<el-link type="primary" @click="hideTree">
<i
@@ -38,6 +42,7 @@
v-show="isExpand"
class="filter_tree"
:data="leftTree"
+ node-key="codeClassifyOid"
default-expand-all
highlight-current
:filter-node-method="filterNode"
@@ -49,7 +54,7 @@
>
</el-tree>
</div>
- <div class="right" :style="{ width: 1280 - leftWidth - 60 + 'px' }">
+ <div class="right" :style="{ width: 1280 - leftWidth - 60 + 'px' }">
<div class="tab_box" style="width: 100%">
<el-tabs
style="width: 100%"
@@ -69,7 +74,7 @@
@selection-change="tab1TableSelectChange"
v-if="cloNamesList.length > 1"
>
- <el-table-column
+ <el-table-column
type="selection"
width="100px"
align="center"
@@ -92,39 +97,41 @@
</el-table>
<div v-else style="height: 400px"></div>
<div>
- <el-table
- border
- :data="currentSelectedResemble"
- style="width: 100%"
- height="200px"
- >
- <el-table-column
- v-for="item in resembleColumList"
- :key="item.field"
- :prop="item.field"
- :label="item.title"
- :minWidth="item.minWidth"
- align="center"
- >
- <template #default="{ row }">
- <span v-if="item.field === 'id'">
- <el-link type="primary" @click="openFormTemlpate(row)">{{
- row[item.field]
- }}</el-link>
- </span>
- <span v-else>
- {{ row[item.field] }}
- </span>
- </template>
- </el-table-column>
- <el-table-column
- v-show="resembleColumList.length > 0"
- prop="rowIndex"
- label="excel琛屾暟"
- align="center"
- ></el-table-column>
- </el-table>
- </div>
+ <el-table
+ border
+ :data="currentSelectedResemble"
+ style="width: 100%"
+ height="200px"
+ >
+ <el-table-column
+ v-for="item in resembleColumList"
+ :key="item.field"
+ :prop="item.field"
+ :label="item.title"
+ :minWidth="item.minWidth"
+ align="center"
+ >
+ <template #default="{ row }">
+ <span v-if="item.field === 'id'">
+ <el-link
+ type="primary"
+ @click="openFormTemlpate(row)"
+ >{{ row[item.field] }}</el-link
+ >
+ </span>
+ <span v-else>
+ {{ row[item.field] }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-show="resembleColumList.length > 0"
+ prop="rowIndex"
+ label="excel琛屾暟"
+ align="center"
+ ></el-table-column>
+ </el-table>
+ </div>
</el-tab-pane>
<el-tab-pane :label="tab2Name" name="tab2">
<el-table border :data="tab2Table" height="600px">
@@ -141,7 +148,6 @@
</el-tab-pane>
</el-tabs>
</div>
-
</div>
</div>
<template #footer>
@@ -164,8 +170,8 @@
<script>
import {
- getHistorySuccessTable,
- getHistoryResembleTable,
+ getSuccessTable,
+ getResembleTable,
getFormTemplate,
getCurretnSelectedRowResemble,
submitHistoryimport,
@@ -203,8 +209,8 @@
type: String,
secDTOList: {
type: Array,
- default: () => ({})
- }
+ default: () => ({}),
+ },
},
computed: {
dialogVisible: {
@@ -220,7 +226,7 @@
return {
isExpand: true,
filterText: "",
- leftWidth: "200",
+ leftWidth: 200,
templateOid: null,
tab1Name: "鐩镐技椤�",
tab2Name: "姝ｇ‘鏁版嵁",
@@ -249,28 +255,29 @@
},
hideTree() {
if (this.isExpand) {
- this.leftWidth = "50";
+ this.leftWidth = 50;
} else {
- this.leftWidth = "200";
+ this.leftWidth = 200;
}
this.isExpand = !this.isExpand;
},
treeNodeClick(data) {
console.log(data);
- this.localCodeClassifyOid = data.codeclassifyoid;
+ this.localCodeClassifyOid = data.codeClassifyOid;
this.cloNamesList = data.cloNamesList;
this.templateOid = data.oid;
- getHistorySuccessTable({
- codeClassifyOid: this.templateOid,
- redisOid: this.redisOid + "-ok",
- }).then((res) => {
- this.tab2Table = res.data.data;
- });
- getHistoryResembleTable({
+ getResembleTable({
codeClassifyOid: this.templateOid,
redisOid: this.redisOid + "-resemble",
}).then((res) => {
this.tab1Table = res.data.data;
+ });
+ // 鑾峰彇姝ｇ‘鏁版嵁
+ getSuccessTable({
+ codeClassifyOid: this.templateOid,
+ redisOid: this.redisOid + "-ok",
+ }).then((res) => {
+ this.tab2Table = res.data.data;
});
getFormTemplate({
templateOid: data.oid,
@@ -300,8 +307,9 @@
},
submit() {
const params = {
- classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,
- improt: this.type === 'historyImport' ? true : false,
+ classifyAttr:
+ this.type === "historyImport" ? this.classifyAttr : undefined,
+ improt: this.type === "historyImport" ? true : false,
codeImprotSaveDatVOList: [
{
Clos: this.cloNamesList.map((item) => item.title),
@@ -332,12 +340,21 @@
immediate: true,
deep: true,
handler(arr) {
- if (arr.length > 0 && this.type === 'batchImportApply') {
- this.treeNodeClick(arr[0])
- this.leftWidth = 0
+ if (arr.length > 0) {
+ this.treeNodeClick(arr[0]);
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(arr[0]["codeClassifyOid"]);
+ });
+ if (this.type === "batchImportApply") {
+ this.leftWidth = 0;
+ } else if (this.type === "batchApplyCode") {
+ this.tab1Name = "鏈夌浉浼奸」鎴栭敊璇暟鎹�";
+ this.tab2Name = "姝ｇ‘鏁版嵁";
+ this.leftWidth = 200;
+ }
}
- }
- }
+ },
+ },
},
};
</script>
diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue
index a1ebae2..c7a1d41 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/index.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue
@@ -144,7 +144,7 @@
return this.currentTypeObj[this.type]["action"];
},
upParams() {
- if (this.type === "historyImport") {
+ if (this.type === "historyImport" || this.type === "batchApplyCode") {
return {
codeClassifyOid: this.codeClassifyOid,
classifyAttr: this.classifyAttr,
@@ -161,11 +161,6 @@
codeClassifyOid: this.codeClassifyOid,
secDTOList: JSON.stringify(this.secDTOList),
...this.codeApplyForm,
- };
- } else if (this.type === "batchApplyCode") {
- return {
- codeClassifyOid: this.codeClassifyOid,
- classifyAttr: this.classifyAttr,
};
}
},
@@ -227,10 +222,10 @@
return Promise.reject(false);
}
if (this.type === "batchImportApply" && this.showCodeApply) {
- // const flag = await this.$refs.CodeApply.validate();
- // if (!flag) {
- // return Promise.reject(false);
- // }
+ const flag = await this.$refs.CodeApply.validate();
+ if (!flag) {
+ return Promise.reject(false);
+ }
}
this.pageLoading = this.$loading({
lock: true,
@@ -271,10 +266,20 @@
this.redisOid = res.data.redisUuid;
importDataShow(res.data.redisUuid).then((res2) => {
this.leftTree = res2.data.data.map((item) => {
- return {
+ if (this.type === 'batchApplyCode') {
+ return {
+ cloNamesList: item.cloNamesList,
+ oid: item.codeTemplateOid,
+ codeClassifyOid: item.codeClassifyOid,
+ name: item.codeRuleVO.name
+ }
+ } else {
+ return {
...item.codeClassifyTemplateVO,
cloNamesList: item.cloNamesList,
+ codeClassifyOid: item.codeClassifyTemplateVO.codeclassifyoid
};
+ }
});
this.showVisible = true;
});
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index e9bffc4..3e8995d 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -3,38 +3,91 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside>
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <basic-container
+ style="height: 85vh; max-height: 155vh; overflow-y: scroll"
+ >
<div>
- <div style="display: flex;justify-content: space-around">
- <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
- <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
- <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
-<!-- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>-->
-<!-- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
- <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
+ <div style="display: flex; justify-content: space-around">
+ <el-button plain size="small" type="primary" @click="TreeAdd"
+ >娣诲姞</el-button
+ >
+ <el-button plain size="small" type="primary" @click="TreeEdit"
+ >淇敼</el-button
+ >
+ <el-button plain size="small" type="primary" @click="TreeDel"
+ >鍒犻櫎</el-button
+ >
+ <!-- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>-->
+ <!-- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
+ <el-button plain size="small" type="primary" @click="flushed"
+ >鍒锋柊</el-button
+ >
</div>
- <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
- </div>
+ <div
+ style="
+ display: flex;
+ justify-content: space-around;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ "
+ ></div>
</div>
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
- <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
- style="width: 1700px;margin: auto">
+ <el-dialog
+ :title="this.TreeFlag ? '娣诲姞鍒嗙被' : '娣诲姞涓婚搴�'"
+ :visible.sync="TreeAddFormVisible"
+ append-to-body
+ style="width: 1700px; margin: auto"
+ >
<el-form :model="TreeAddform" :rules="rules">
- <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" style="display: inline-block" prop="id">
- <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
+ <el-form-item
+ :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' : '涓婚搴撶紪鍙凤細'"
+ label-width="150px"
+ style="display: inline-block"
+ prop="id"
+ >
+ <el-input
+ v-model="TreeAddform.id"
+ autocomplete="off"
+ style="width: 170px"
+ ></el-input>
</el-form-item>
- <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" style="display: inline-block" prop="name">
- <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
+ <el-form-item
+ :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' : '涓婚搴撳悕绉帮細'"
+ label-width="110px"
+ style="display: inline-block"
+ prop="name"
+ >
+ <el-input
+ v-model="TreeAddform.name"
+ autocomplete="off"
+ style="width: 170px"
+ ></el-input>
</el-form-item>
<el-form-item label="鎻忚堪锛�" label-width="150px">
- <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
+ <el-input
+ v-model="TreeAddform.description"
+ autocomplete="off"
+ style="width: 585px"
+ ></el-input>
</el-form-item>
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
- <el-input v-model="TreeAddform.coderuleoidName" readonly autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
+ <el-input
+ v-model="TreeAddform.coderuleoidName"
+ readonly
+ autocomplete="off"
+ style="width: 585px"
+ @focus="CodeFoucus">
+ </el-input>
</el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
- <el-input v-model="TreeAddform.codekeyattrrepeatoidName" readonly autocomplete="off" @focus="Keyfouce"
- style="width: 585px"></el-input>
+ <el-input
+ v-model="TreeAddform.codekeyattrrepeatoidName"
+ readonly
+ autocomplete="off"
+ @focus="Keyfouce"
+ style="width: 585px">
+ </el-input>
</el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeResembleRuleOidName"
@@ -50,193 +103,505 @@
</div>
</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>
+ <el-dialog
+ :visible.sync="TreeEditFormVisible"
+ append-to-body
+ title="淇敼鍒嗙被"
+ >
+ <classifyTreeform
+ ref="childForm"
+ :loneTreeNewForm="TreeList"
+ :nodeList="nodeList"
+ :flag="'edit'"
+ @MasterHandler="MasterHandler"
+ :Editclose="
+ () => {
+ TreeEditFormVisible = false;
+ }
+ "
+ ></classifyTreeform>
</el-dialog>
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
- :option="Treeoption"
- style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px"
- @node-click=" nodeClick"
- @check-change="checkChange"
+ <avue-tree
+ ref="tree"
+ v-model="CloneTreeAvueform"
+ v-loading="loading"
+ :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ style="height: 80.5vh; padding-top: 5px; padding-bottom: 30px"
+ @node-click="nodeClick"
+ @check-change="checkChange"
>
</avue-tree>
</basic-container>
</el-aside>
<el-main>
- <basic-container style="height: 85vh; max-height: 155vh; ">
+ <basic-container style="height: 85vh; max-height: 155vh">
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
- <span v-if="type.prop==='tab1'">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform>
+ <span v-if="type.prop === 'tab1'">
+ <classifyTreeform
+ ref="childForm"
+ :loneTreeNewForm="TreeList"
+ :nodeList="nodeList"
+ :flag="'renonly'"
+ ></classifyTreeform>
</span>
- <span v-else-if="type.prop==='tab2'">
- <basic-container>
- <avue-crud v-model="crudForm" v-loading="FormLoing" :data="this.Formlist" :option="this.crudTreeOption"
- @row-save="CrudRowSave"
- @row-del="CrudRowDel"
- @row-update="CrudRowUpdata"
- :before-close="beforeClose"
- @select="selectHandle"
- >
- <template slot="menuLeft">
- <el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
- <el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
- <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
- <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
- <el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
- <!-- 鏌ヨ瀵硅瘽妗�-->
- <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
- <div>
- <el-button size="small" type="primary" @click="AdvQueries">鏌ヨ</el-button>
- <el-button size="small" type="primary">閲嶇疆</el-button>
- </div>
- <div style="padding-left: 80px;margin-top: 15px;">
- <template v-for="(value, key) in FindSelect">
- <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
- <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
- @change="handleSelectChange(key)">
- <el-option label="妯℃澘缂栧彿" value="0"></el-option>
- <el-option label="妯℃澘鍚嶇О" value="1"></el-option>
- <el-option label="妯℃澘鎻忚堪" value="2"></el-option>
- <el-option label="鐗堟湰鍙�" value="3"></el-option>
- <el-option label="鐘舵��" value="4"></el-option>
- </el-select>
- <el-select v-model="condition[0]" placeholder="璇烽�夋嫨" style="width: 15%">
- <el-option label="鍖呭惈" value="0"></el-option>
- <el-option label="绛変簬" value="1"></el-option>
- </el-select>
- <el-input v-model="QueryArray[key]" style="width: 49%"></el-input>
- <span> <i class="el-icon-delete" style="font-size: 22px;margin-top:8px;margin-left: 10px"/></span>
- </div>
- </template>
- </div>
- </el-dialog>
- <!-- 妯℃澘鍏嬮殕 -->
- <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘">
+ <span v-else-if="type.prop === 'tab2'">
+ <basic-container>
+ <avue-crud
+ v-model="crudForm"
+ v-loading="FormLoing"
+ :data="this.Formlist"
+ :option="this.crudTreeOption"
+ @row-save="CrudRowSave"
+ @row-del="CrudRowDel"
+ @row-update="CrudRowUpdata"
+ :before-close="beforeClose"
+ @select="selectHandle"
+ >
+ <template slot="menuLeft">
+ <el-button
+ plain
+ size="small"
+ type="primary"
+ @click="FindeHanler"
+ >鏌ヨ</el-button
+ >
+ <el-button plain size="small" type="primary" @click="TemRefresh"
+ >鍒锋柊</el-button
+ >
+ <el-button plain size="small" type="primary" @click="Enable"
+ >鍚敤</el-button
+ >
+ <el-button plain size="small" type="primary" @click="Deactivate"
+ >鍋滅敤</el-button
+ >
+ <el-button plain size="small" type="primary" @click="CloneBtn"
+ >浠庡叾瀹冩ā鏉垮厠闅�</el-button
+ >
+ <!-- 鏌ヨ瀵硅瘽妗�-->
+ <el-dialog
+ :visible.sync="FindFormVisible"
+ append-to-body
+ title="楂樼骇鏌ヨ"
+ >
+ <div>
+ <el-button size="small" type="primary" @click="AdvQueries"
+ >鏌ヨ</el-button
+ >
+ <el-button size="small" type="primary">閲嶇疆</el-button>
+ </div>
+ <div style="padding-left: 80px; margin-top: 15px">
+ <template v-for="(value, key) in FindSelect">
+ <div
+ style="
+ display: flex;
+ justify-content: space-around;
+ width: 85%;
+ margin-bottom: 15px;
+ "
+ >
+ <el-select
+ v-model="FindSelect[key]"
+ placeholder="璇烽�夋嫨"
+ style="width: 28%"
+ @change="handleSelectChange(key)"
+ >
+ <el-option label="妯℃澘缂栧彿" value="0"></el-option>
+ <el-option label="妯℃澘鍚嶇О" value="1"></el-option>
+ <el-option label="妯℃澘鎻忚堪" value="2"></el-option>
+ <el-option label="鐗堟湰鍙�" value="3"></el-option>
+ <el-option label="鐘舵��" value="4"></el-option>
+ </el-select>
+ <el-select
+ v-model="condition[0]"
+ placeholder="璇烽�夋嫨"
+ style="width: 15%"
+ >
+ <el-option label="鍖呭惈" value="0"></el-option>
+ <el-option label="绛変簬" value="1"></el-option>
+ </el-select>
+ <el-input
+ v-model="QueryArray[key]"
+ style="width: 49%"
+ ></el-input>
+ <span>
+ <i
+ class="el-icon-delete"
+ style="
+ font-size: 22px;
+ margin-top: 8px;
+ margin-left: 10px;
+ "
+ /></span>
+ </div>
+ </template>
+ </div>
+ </el-dialog>
+ <!-- 妯℃澘鍏嬮殕 -->
+ <el-dialog
+ :visible.sync="CloneVisible"
+ append-to-body
+ title="鍏嬮殕妯℃澘"
+ >
<el-container>
<el-aside width="300px">
- <div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div>
+ <div style="margin-bottom: 5px">
+ <el-tag>涓婚搴撳垎绫�</el-tag>
+ </div>
<!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁-->
- <avue-tree ref="tree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- style="height: 50.5vh;margin-right: 10px"
- @node-click="ClonenodeClick"
- >
- </avue-tree>
+ <avue-tree
+ ref="tree"
+ v-model="TreeAvueform"
+ v-loading="loading"
+ :data="Treedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ style="height: 50.5vh; margin-right: 10px"
+ @node-click="ClonenodeClick"
+ >
+ </avue-tree>
</el-aside>
- <el-container>
- <el-main>
- <div style="padding-left: 10px;height: 50.5vh">
- <div style="margin: 8px 0;display: flex">
- <el-select v-model="Clonevalue" size="small" style="width: 130px;">
- <el-option
- v-for="item in this.CloneSelectOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-container>
+ <el-main>
+ <div style="padding-left: 10px; height: 50.5vh">
+ <div style="margin: 8px 0; display: flex">
+ <el-select
+ v-model="Clonevalue"
+ size="small"
+ style="width: 130px"
+ >
+ <el-option
+ v-for="item in this.CloneSelectOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
- </el-select>
- <el-input v-model="CloneFind" size="small" style="width: 40%;margin-left: 15px" placeholder="杈撳叆鍊煎悗鎸夊洖杞﹁繘琛屾ā绯婃煡璇�"></el-input>
- <el-button size="small" type="primary" plain style="margin-left: 10px" @click="CloneEnterFind" @keyup.enter.native="CloneEnterFind">鏌ヨ</el-button>
- </div>
- <avue-crud v-model="ClonecrudForm" v-loading="FormLoing" :data="this.CloneFormlist"
- :option="this.ClonecrudTreeOption"
- @selection-change="selectionChange"
- ></avue-crud>
- </div>
- </el-main>
- </el-container>
- </el-container >
- <div style="display: flex; justify-content: flex-end; align-items: center;margin-top: 10px" >
- <el-button size="small " type="primary" @click="Clonehandler">纭畾</el-button>
- <el-button size="small" @click="CloneVisible=false" >鍙栨秷</el-button>
- </div>
- <el-dialog
- width="30%"
- title="鍏嬮殕妯℃澘"
- :visible.sync="CloneinnerVisible"
- append-to-body>
- <div>
- <avue-form :option="CloneOption" @submit="Clonesubmit" v-model="CloneModel"></avue-form>
+ </el-select>
+ <el-input
+ v-model="CloneFind"
+ size="small"
+ style="width: 40%; margin-left: 15px"
+ placeholder="杈撳叆鍊煎悗鎸夊洖杞﹁繘琛屾ā绯婃煡璇�"
+ ></el-input>
+ <el-button
+ size="small"
+ type="primary"
+ plain
+ style="margin-left: 10px"
+ @click="CloneEnterFind"
+ @keyup.enter.native="CloneEnterFind"
+ >鏌ヨ</el-button
+ >
+ </div>
+ <avue-crud
+ v-model="ClonecrudForm"
+ v-loading="FormLoing"
+ :data="this.CloneFormlist"
+ :option="this.ClonecrudTreeOption"
+ @selection-change="selectionChange"
+ ></avue-crud>
</div>
- </el-dialog>
+ </el-main>
+ </el-container>
+ </el-container>
+ <div
+ style="
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ margin-top: 10px;
+ "
+ >
+ <el-button
+ size="small "
+ type="primary"
+ @click="Clonehandler"
+ >纭畾</el-button
+ >
+ <el-button size="small" @click="CloneVisible = false"
+ >鍙栨秷</el-button
+ >
+ </div>
+ <el-dialog
+ width="30%"
+ title="鍏嬮殕妯℃澘"
+ :visible.sync="CloneinnerVisible"
+ append-to-body
+ >
+ <div>
+ <avue-form
+ :option="CloneOption"
+ @submit="Clonesubmit"
+ v-model="CloneModel"
+ ></avue-form>
+ </div>
+ </el-dialog>
</el-dialog>
- </template>
- </avue-crud>
-
+ </template>
+ <template #menu="{ size, row }">
+ <el-button
+ v-show="row.lcStatus === 'Released'"
+ @click="upAndStopAndStart(row, 'upVersion')"
+ :loading="row.upVersionLoad"
+ icon="el-icon-upload2"
+ type="text"
+ :size="size"
+ >鍗囩増</el-button
+ >
+ <el-button
+ v-show="row.lcStatus === 'Released'"
+ @click="upAndStopAndStart(row, 'stopLose')"
+ :loading="row.stopLoseLoad"
+ icon="el-icon-circle-close"
+ type="text"
+ :size="size"
+ >鍋滅敤/澶辨晥</el-button
+ >
+ <el-button
+ v-show="['Disabled', 'Editing'].includes(row.lcStatus)"
+ @click="upAndStopAndStart(row, 'startRelease')"
+ :loading="row.startReleaseLoad"
+ icon="el-icon-circle-check"
+ type="text"
+ :size="size"
+ >鍚敤/鍙戝竷</el-button
+ >
+ </template>
+ </avue-crud>
</basic-container>
- <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
+ <templatePro
+ :ProData="this.ProData"
+ :crudOid="this.crudOid"
+ :crudArray="this.crudArray"
+ :Formlist="this.Formlist"
+ :codeClassifyOid="this.codeClassifyOid"
+ ></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
- <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
+ <el-dialog
+ :visible.sync="MasterdialogVisible"
+ title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�"
+ append-to-body
+ >
<template>
- <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
+ <el-select
+ v-model="SelectValue"
+ placeholder="璇烽�夋嫨"
+ style="width: 135px"
+ >
<el-option
v-for="item in SelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
- style="width: 150px">
+ style="width: 150px"
+ >
</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="SelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input
+ style="width: 260px; margin-left: 15px"
+ placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ"
+ v-model="SelectFInd"
+ ></el-input>
+ <el-button
+ size="small"
+ type="primary"
+ plain
+ @click="SelectFindeHandler"
+ style="margin-left: 20px"
+ >鏌ヨ</el-button
+ >
</template>
- <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud
+ :data="masterData"
+ :option="masterOption"
+ @select="masterSelect"
+ ></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.coderuleoidName ==''?'鏈缃��':this.TreeAddform.coderuleoidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
- <el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="
+ display: inline-block;
+ float: left;
+ border: 1px solid #eee;
+ padding: 5px;
+ margin-top: 5px;
+ font-size: 14px;
+ "
+ >
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.coderuleoidName == ""
+ ? "鏈缃��"
+ : this.TreeAddform.coderuleoidName
+ }}]
+ </div>
+ <div
+ style="
+ padding-top: 10px;
+ display: flex;
+ justify-content: flex-end;
+ float: right;
+ overflow: hidden;
+ "
+ >
+ <el-button type="primary" size="small" @click="MasterHandlerClick"
+ >纭畾</el-button
+ >
+ <el-button size="small" @click="MasterdialogVisible = false"
+ >鍙栨秷</el-button
+ >
</div>
</div>
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
- <el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body>
+ <el-dialog
+ :visible.sync="KeydialogVisible"
+ title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�"
+ append-to-body
+ >
<template>
- <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
+ <el-select
+ v-model="SelectValue"
+ placeholder="璇烽�夋嫨"
+ style="width: 135px"
+ >
<el-option
v-for="item in SelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
- style="width: 150px">
+ style="width: 150px"
+ >
</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="KeySelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input
+ style="width: 260px; margin-left: 15px"
+ placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ"
+ v-model="SelectFInd"
+ ></el-input>
+ <el-button
+ size="small"
+ type="primary"
+ plain
+ @click="KeySelectFindeHandler"
+ style="margin-left: 20px"
+ >鏌ヨ</el-button
+ >
</template>
- <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></avue-crud>
+ <avue-crud
+ :data="KeyData"
+ :option="masterOption"
+ @select="KeySelect"
+ ></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.codekeyattrrepeatoidName ==''?'鏈缃��':this.TreeAddform.codekeyattrrepeatoidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
- <el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="
+ display: inline-block;
+ float: left;
+ border: 1px solid #eee;
+ padding: 5px;
+ margin-top: 5px;
+ font-size: 14px;
+ "
+ >
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codekeyattrrepeatoidName == ""
+ ? "鏈缃��"
+ : this.TreeAddform.codekeyattrrepeatoidName
+ }}]
+ </div>
+ <div
+ style="
+ padding-top: 10px;
+ display: flex;
+ justify-content: flex-end;
+ float: right;
+ overflow: hidden;
+ "
+ >
+ <el-button type="primary" size="small" @click="KeyHandlerClick"
+ >纭畾</el-button
+ >
+ <el-button size="small" @click="KeydialogVisible = false"
+ >鍙栨秷</el-button
+ >
</div>
</div>
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
- <el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+ <el-dialog
+ :visible.sync="SimidialogVisible"
+ title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�"
+ append-to-body
+ >
<template>
- <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
+ <el-select
+ v-model="SelectValue"
+ placeholder="璇烽�夋嫨"
+ style="width: 135px"
+ >
<el-option
v-for="item in SelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
- style="width: 150px">
+ style="width: 150px"
+ >
</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="SimSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
+ <el-input
+ style="width: 260px; margin-left: 15px"
+ placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ"
+ v-model="SelectFInd"
+ ></el-input>
+ <el-button
+ size="small"
+ type="primary"
+ plain
+ @click="SimSelectFindeHandler"
+ style="margin-left: 20px"
+ >鏌ヨ</el-button
+ >
</template>
- <avue-crud :data="simData" :option="masterOption" @select="simSelect"></avue-crud>
+ <avue-crud
+ :data="simData"
+ :option="masterOption"
+ @select="simSelect"
+ ></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.codeResembleRuleOidName ==''?'鏈缃��':this.TreeAddform.codeResembleRuleOidName}}]</div>
- <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
- <el-button type="primary" size="small" @click="simHandlerClick">纭畾</el-button>
- <el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
+ <div
+ style="
+ display: inline-block;
+ float: left;
+ border: 1px solid #eee;
+ padding: 5px;
+ margin-top: 5px;
+ font-size: 14px;
+ "
+ >
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeResembleRuleOidName == ""
+ ? "鏈缃��"
+ : this.TreeAddform.codeResembleRuleOidName
+ }}]
+ </div>
+ <div
+ style="
+ padding-top: 10px;
+ display: flex;
+ justify-content: flex-end;
+ float: right;
+ overflow: hidden;
+ "
+ >
+ <el-button type="primary" size="small" @click="simHandlerClick"
+ >纭畾</el-button
+ >
+ <el-button size="small" @click="SimidialogVisible = false"
+ >鍙栨秷</el-button
+ >
</div>
</div>
</el-dialog>
@@ -260,9 +625,12 @@
addSave,
deleteData,
editSave,
- copy
+ copy,
+ upVersion,
+ stopLose,
+ startRelease,
} from "@/api/template/templateAttr";
-import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
+import { defaultReferDataGrid, referDataGrid } from "@/api/MasterData/master";
export default {
name: "classifyTrees.vue",
//浣跨敤inject鎺ユ敹鍙傛暟
@@ -272,75 +640,71 @@
data() {
return {
//缂栫爜瑙勫垯
- MasterdialogVisible:false,
- masterData:[],
- masterSelectList:[],
- masterName:"",
- masterOid:"",
+ MasterdialogVisible: false,
+ masterData: [],
+ masterSelectList: [],
+ masterName: "",
+ masterOid: "",
//鍏抽敭灞炴��
- KeydialogVisible:false,
- KeyName:"",
- KeyOid:"",
- KeyData:[],
- KeySelectLIst:[],
+ KeydialogVisible: false,
+ KeyName: "",
+ KeyOid: "",
+ KeyData: [],
+ KeySelectLIst: [],
//鐩镐技椤�
- simName:"",
- simOid:"",
- simData:[],
- SimidialogVisible:false,
- simSelectList:[],
- masterOption:{
- addBtn:false,
- index:true,
- border:true,
- selection:true,
- menu:false,
- height:380,
- column:[
+ simName: "",
+ simOid: "",
+ simData: [],
+ SimidialogVisible: false,
+ simSelectList: [],
+ masterOption: {
+ addBtn: false,
+ index: true,
+ border: true,
+ selection: true,
+ menu: false,
+ height: 380,
+ column: [
{
- label:'鑻辨枃鍚嶇О',
- prop:'id'
+ label: "鑻辨枃鍚嶇О",
+ prop: "id",
},
{
- label:'涓枃鍚嶇О',
- prop:'name'
+ label: "涓枃鍚嶇О",
+ prop: "name",
},
{
- label:'鎻忚堪',
- prop:'description'
- }
- ]
+ label: "鎻忚堪",
+ prop: "description",
+ },
+ ],
},
- SelectOption:[
+ SelectOption: [
{
- value: 'name',
- label: '涓枃鍚嶇О'
+ value: "name",
+ label: "涓枃鍚嶇О",
},
{
- value: 'id',
- label: '鑻辨枃鍚嶇О'
- }
+ value: "id",
+ label: "鑻辨枃鍚嶇О",
+ },
],
- SelectValue:"",
- SelectFInd:"",
+ SelectValue: "",
+ SelectFInd: "",
rules: {
- id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
- ],
- name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
- ]
+ id: [{ required: true, message: "璇疯緭鍏ュ悕绉�", trigger: "blur" }],
+ name: [{ required: true, message: "璇疯緭鍏ョ紪鍙�", trigger: "blur" }],
},
- addFlag:false,
+ addFlag: false,
// 琛ㄦ牸褰撳墠琛宨d
- crudOid:"",
+ crudOid: "",
//琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
- crudArray:[],
+ crudArray: [],
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
searchTemplate: {
- searchCondition: 'id',
+ searchCondition: "id",
findText: "",
},
@@ -348,14 +712,14 @@
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
CloneVisible: false,
- CloneinnerVisible:false,
+ CloneinnerVisible: false,
//楂樼骇鏌ヨ涓嬫媺妗�
FindSelect: {
id: "0",
name: "1",
description: "2",
revisionValue: "3",
- lcStatus: "4"
+ lcStatus: "4",
},
//楂樼骇鏌ヨ鏉′欢
condition: ["0", "0", "0", "0", "0"],
@@ -367,7 +731,7 @@
name: "",
description: "",
revisionValue: "",
- lcStatus: ""
+ lcStatus: "",
},
//鍋滅敤鍚敤鎺ユ敹鏁扮粍
FlagObj: {},
@@ -377,7 +741,7 @@
TreeAddFormVisible: false,
//褰撳墠鐐瑰嚮椤�
nodeClickList: "",
- ClonenodeClickList:"",
+ ClonenodeClickList: "",
//鍒嗙被鍜屼富棰樺簱鐘舵��
TreeFlag: false,
//鏍戝姞杞�
@@ -394,14 +758,14 @@
//缂栫爜瑙勫垯
coderuleoidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmtypename: ""
+ btmtypename: "",
},
//avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐��
TreeAvueform: {},
//鍏嬮殕鏍�
- CloneTreeAvueform:{},
+ CloneTreeAvueform: {},
Treedata: [],
- CloneTreedata:[],
+ CloneTreedata: [],
Treeoption: {
addBtn: false,
editBtn: false,
@@ -422,48 +786,54 @@
//鍏嬮殕妯℃澘涓嬫媺妗唙alue
Clonevalue: "0",
//鍏嬮殕妯℃澘鎼滅储杈撳叆妗�
- CloneFind:"",
+ CloneFind: "",
//鍏嬮殕妯℃澘涓嬫媺妗嗘暟鎹�
- CloneSelectOptions: [{
- value: '0',
- label: '妯℃澘缂栧彿'
- },
+ CloneSelectOptions: [
{
- value: '1',
- label: '妯℃澘鍚嶇О'
+ value: "0",
+ label: "妯℃澘缂栧彿",
+ },
+ {
+ value: "1",
+ label: "妯℃澘鍚嶇О",
},
],
//鍏嬮殕妯℃澘纭琛ㄥ崟鏁版嵁
- CloneOption:{
- column:[
+ CloneOption: {
+ column: [
{
- label:'妯℃澘缂栧彿',
- prop:'id',
- rules: [{
- required: true,
- message: "璇疯緭鍏ユā鏉跨紪鍙�",
- trigger: "blur"
- }]
- }, {
- label:'妯℃澘鍚嶇О',
- prop:'name',
- rules: [{
- required: true,
- message: "璇疯緭鍏ユā鏉垮悕绉�",
- trigger: "blur"
- }]
+ label: "妯℃澘缂栧彿",
+ prop: "id",
+ rules: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユā鏉跨紪鍙�",
+ trigger: "blur",
+ },
+ ],
},
{
- label:'鎻忚堪',
- prop:'desc',
- type:'textarea',
- span:24
- }
- ]
+ label: "妯℃澘鍚嶇О",
+ prop: "name",
+ rules: [
+ {
+ required: true,
+ message: "璇疯緭鍏ユā鏉垮悕绉�",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "鎻忚堪",
+ prop: "desc",
+ type: "textarea",
+ span: 24,
+ },
+ ],
},
//鍏嬮殕妯℃澘鍙屽悜缁戝畾鏁版嵁
- CloneModel:[],
- CloneSelect:[],
+ CloneModel: [],
+ CloneSelect: [],
//鍏嬮殕妯℃澘option
ClonecrudTreeOption: {
index: true,
@@ -476,7 +846,7 @@
column: [
{
label: "妯℃澘缂栧彿",
- prop: "id"
+ prop: "id",
},
{
label: "妯℃澘鍚嶇О",
@@ -484,269 +854,298 @@
},
{
label: "妯℃澘鎻忚堪",
- prop: "description"
+ prop: "description",
},
{
label: "鐗堟湰鍙�",
prop: "revisionSeq",
- display: false
+ display: false,
},
{
label: "鐘舵��",
prop: "lcStatusText",
- display: false
- }
- ]
+ display: false,
+ },
+ ],
},
//tab鐘舵��
type: {},
//Tab閰嶇疆椤�
tabOption: {
- column: [{
- label: '鍩烘湰淇℃伅',
- prop: 'tab1',
- }, {
- label: '妯℃澘绠＄悊',
- prop: 'tab2',
- }]
+ column: [
+ {
+ label: "鍩烘湰淇℃伅",
+ prop: "tab1",
+ },
+ {
+ label: "妯℃澘绠＄悊",
+ prop: "tab2",
+ },
+ ],
},
//浼犻�掔粰瀛愮粍浠跺姩鎬佹覆鏌撶殑鏁版嵁
TreeList: {},
- codeClassifyOid: ""
- }
+ codeClassifyOid: "",
+ upAndStopAndStartData: {
+ upVersion: {
+ tip: "鏄惁杩涜鍗囩増锛�",
+ typeText: "鍗囩増",
+ funAPi: upVersion,
+ load: 'upVersionLoad'
+ },
+ stopLose: {
+ tip: "妯℃澘鍙湁鍙戝竷鐘舵�佹墠鑳借浣跨敤锛屾槸鍚︾‘瀹氬仠鐢紵",
+ typeText: "鍋滅敤/澶辨晥",
+ funAPi: stopLose,
+ load: 'stopLoseLoad'
+ },
+ startRelease: {
+ tip: "鏄惁纭畾鍚敤/鍙戝竷杩欎釜妯℃澘锛屾ā鏉垮彧鏈夊彂甯冪姸鎬佹墠鑳借浣跨敤锛屾槸鍚︾户缁紵",
+ typeText: "鍚敤/鍙戝竷",
+ funAPi: startRelease,
+ load: 'startReleaseLoad'
+ },
+ },
+ };
},
//tab鏍忛粯璁ゆ槸琛ㄦ牸
mounted() {
this.type = this.tabOption.column[0];
this.getAttr();
},
- computed:{
- crudTreeOption(){
- return{
+ computed: {
+ crudTreeOption() {
+ return {
index: true,
border: true,
- height:180,
- selection:true,
- addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
+ height: 180,
+ selection: true,
+ addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
column: [
{
label: "妯℃澘缂栧彿",
- prop: "id"
+ prop: "id",
},
{
- label:"妯℃澘鍚嶇О",
- prop:"name"
+ label: "妯℃澘鍚嶇О",
+ prop: "name",
},
{
label: "妯℃澘鎻忚堪",
- prop:"description"
+ prop: "description",
},
{
- label:"鐗堟湰鍙�",
- prop:"revisionSeq",
- display:false
+ label: "鐗堟湰鍙�",
+ prop: "revisionSeq",
+ display: false,
},
{
- label:"鐘舵��",
- prop:"lcStatusText",
- display:false
- }
- ]
- }
- }
+ label: "鐘舵��",
+ prop: "lcStatusText",
+ display: false,
+ },
+ ],
+ };
+ },
},
methods: {
//缂栫爜瑙勫垯澶辩劍
- CodeFoucus(){
- this.MasterdialogVisible=true;
- this.MasterdefaultRend()
+ CodeFoucus() {
+ this.MasterdialogVisible = true;
+ this.MasterdefaultRend();
},
//缂栫爜澶氶��
- masterSelect(row){
- if(row.length>0){
- this.masterSelectList=row;
- this.masterName=row[0].name;
- this.masterOid=row[0].oid;
- }
+ masterSelect(row) {
+ if (row.length > 0) {
+ this.masterSelectList = row;
+ this.masterName = row[0].name;
+ this.masterOid = row[0].oid;
+ }
},
//缂栫爜瑙勫垯鏌ヨ
- SelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
+ SelectFindeHandler() {
+ if (this.SelectValue == "id") {
+ const masterParameter = {
+ "conditionMap[id]": this.SelectFInd,
+ };
this.MasterdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue = "";
+ this.SelectFInd = "";
+ } else if (this.SelectValue == "name") {
+ const masterParameter = {
+ "conditionMap[name]": this.SelectFInd,
+ };
+ this.MasterdefaultRend(masterParameter);
+ this.SelectValue = "";
+ this.SelectFInd = "";
}
},
//缂栫爜瑙勫垯纭畾
- MasterHandlerClick(){
- if(this.masterSelectList.length>1){
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.masterSelectList.length<=0){
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.MasterdialogVisible=false;
- this.masterSelectList=[]
- this.$set(this.TreeAddform,'coderuleoidName',this.masterName)
- this.$set(this.TreeAddform,'coderuleOid',this.masterOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
+ MasterHandlerClick() {
+ if (this.masterSelectList.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ } else if (this.masterSelectList.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.MasterdialogVisible = false;
+ this.masterSelectList = [];
+ this.$set(this.TreeAddform, "coderuleoidName", this.masterName);
+ this.$set(this.TreeAddform, "coderuleOid", this.masterOid);
+ this.$emit("MasterHandler", this.loneTreeNewForm);
+ console.log(this.loneTreeNewForm);
}
},
//缂栫爜鎺ュ彛
- MasterdefaultRend(){
+ MasterdefaultRend() {
defaultReferDataGrid({
- referType:'coderule',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Released'
- }).then(res=>{
- this.masterData=res.data.records;
- })
+ referType: "coderule",
+ isMuti: "false",
+ 'conditionMap["lcstatus"]': "Released",
+ }).then((res) => {
+ this.masterData = res.data.records;
+ });
},
- Keyfouce(){
- this.KeydialogVisible=true;
- this.KeydefaultRend()
+ Keyfouce() {
+ this.KeydialogVisible = true;
+ this.KeydefaultRend();
},
//鍏抽敭灞炴�х‘瀹�
- KeyHandlerClick(){
- if(this.KeySelectLIst.length>1){
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.KeySelectLIst.length<=0){
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.KeydialogVisible=false;
- this.KeySelectLIst=[]
- this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
- this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ KeyHandlerClick() {
+ if (this.KeySelectLIst.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ } else if (this.KeySelectLIst.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.KeydialogVisible = false;
+ this.KeySelectLIst = [];
+ this.$set(this.TreeAddform, "codeResembleRuleOidName", this.simName);
+ this.$set(this.TreeAddform, "codeResembleRuleOid", this.simOid);
+ this.$emit("MasterHandler", this.loneTreeNewForm);
}
},
//鍏抽敭灞炴�ф煡璇�
- KeySelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
+ KeySelectFindeHandler() {
+ if (this.SelectValue == "id") {
+ const masterParameter = {
+ "conditionMap[id]": this.SelectFInd,
+ };
this.KeydefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue = "";
+ this.SelectFInd = "";
+ } else if (this.SelectValue == "name") {
+ const masterParameter = {
+ "conditionMap[name]": this.SelectFInd,
+ };
+ this.KeydefaultRend(masterParameter);
+ this.SelectValue = "";
+ this.SelectFInd = "";
}
},
//鍏抽敭灞炴�ф帴鍙�
- KeydefaultRend(){
+ KeydefaultRend() {
defaultReferDataGrid({
- referType:'codekeyattrrepeat',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Enabled'
- }).then(res=>{
- this.KeyData=res.data.records;
- })
+ referType: "codekeyattrrepeat",
+ isMuti: "false",
+ 'conditionMap["lcstatus"]': "Enabled",
+ }).then((res) => {
+ this.KeyData = res.data.records;
+ });
},
// 鍏抽敭澶氶��
- KeySelect(row){
- this.KeySelectLIst=row;
- this.KeyName=row[0].name;
- this.KeyOid=row[0].oid;
+ KeySelect(row) {
+ this.KeySelectLIst = row;
+ this.KeyName = row[0].name;
+ this.KeyOid = row[0].oid;
},
//鍏抽敭澶辩劍
- simFouce(){
- this.SimidialogVisible=true;
- this.simdefaultRend()
+ simFouce() {
+ this.SimidialogVisible = true;
+ this.simdefaultRend();
},
//鐩镐技椤圭‘瀹�
- simHandlerClick(){
- if(this.simSelectList.length>1){
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.simSelectList.length<=0){
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }else {
- this.SimidialogVisible=false;
- this.simSelectList=[]
- this.$set(this.TreeAddform,'codeResembleRuleOidName',this.simName)
- this.$set(this.TreeAddform,'codeResembleRuleOid',this.simOid)
- this.$emit('MasterHandler',this.loneTreeNewForm)
+ simHandlerClick() {
+ if (this.simSelectList.length > 1) {
+ this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�");
+ } else if (this.simSelectList.length <= 0) {
+ this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
+ } else {
+ this.SimidialogVisible = false;
+ this.simSelectList = [];
+ this.$set(this.TreeAddform, "codeResembleRuleOidName", this.simName);
+ this.$set(this.TreeAddform, "codeResembleRuleOid", this.simOid);
+ this.$emit("MasterHandler", this.loneTreeNewForm);
}
},
//鐩镐技椤规煡璇�
- SimSelectFindeHandler(){
- if(this.SelectValue == 'id'){
- const masterParameter={
- 'conditionMap[id]':this.SelectFInd
- }
+ SimSelectFindeHandler() {
+ if (this.SelectValue == "id") {
+ const masterParameter = {
+ "conditionMap[id]": this.SelectFInd,
+ };
this.simdefaultRend(masterParameter);
- this.SelectValue=""
- this.SelectFInd=""
- }else if(this.SelectValue == 'name'){
- const masterParameter={
- 'conditionMap[name]':this.SelectFInd
- }
- this.simdefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue = "";
+ this.SelectFInd = "";
+ } else if (this.SelectValue == "name") {
+ const masterParameter = {
+ "conditionMap[name]": this.SelectFInd,
+ };
+ this.simdefaultRend(masterParameter);
+ this.SelectValue = "";
+ this.SelectFInd = "";
}
},
// 鐩镐技椤瑰閫�
- simSelect(row){
- this.simSelectList=row;
- this.simName=row[0].name;
- this.simOid=row[0].oid;
- console.log('oid',this.oid)
+ simSelect(row) {
+ this.simSelectList = row;
+ this.simName = row[0].name;
+ this.simOid = row[0].oid;
+ console.log("oid", this.oid);
},
//鐩镐技椤归」鎺ュ彛
- simdefaultRend(){
+ simdefaultRend() {
defaultReferDataGrid({
- referType:'coderesemblerule',
- isMuti:'false',
- 'conditionMap["lcstatus"]':'Enabled'
- }).then(res=>{
- this.simData=res.data.records;
- })
+ referType: "coderesemblerule",
+ isMuti: "false",
+ 'conditionMap["lcstatus"]': "Enabled",
+ }).then((res) => {
+ this.simData = res.data.records;
+ });
},
//瀛愪紶鐖�
- MasterHandler(val){
- this.TreeList=val
+ MasterHandler(val) {
+ this.TreeList = val;
},
//琛屽崟閫変簨浠�
- selectHandle(selection,row){
- this.crudOid=row.oid;
- this.crudArray=selection;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
- this.ProData = res.data.data;
- }).catch(res => {
- this.$message.error(res)
+ selectHandle(selection, row) {
+ this.crudOid = row.oid;
+ this.crudArray = selection;
+ gridCodeClassifyTemplateAttr({
+ "conditionMap[classifyTemplateOid]": this.Formlist[0].oid,
})
+ .then((res) => {
+ this.ProData = res.data.data;
+ })
+ .catch((res) => {
+ this.$message.error(res);
+ });
},
//鍒嗙被鏍戞暟鎹鐞�
getAttr() {
- getAtrrList().then(res => {
- this.Treedata = res.data;
- this.CloneTreedata = res.data;
- this.Treedata.forEach(() => {
- for (let i = 0; i < this.Treedata.length; i++) {
- this.Treedata[i].value = i;
- }
+ getAtrrList()
+ .then((res) => {
+ this.Treedata = res.data;
+ this.CloneTreedata = res.data;
+ this.Treedata.forEach(() => {
+ for (let i = 0; i < this.Treedata.length; i++) {
+ this.Treedata[i].value = i;
+ }
+ });
+ //璋冪敤淇敼灞炴�у悕鏂规硶
+ this.ModifyProperties(this.CloneTreedata, "name", "label");
})
- //璋冪敤淇敼灞炴�у悕鏂规硶
- this.ModifyProperties(this.CloneTreedata, 'name', 'label');
- }).catch(res => {
- this.$message.error(res)
- })
+ .catch((res) => {
+ this.$message.error(res);
+ });
},
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
ModifyProperties(obj, oldName, newName) {
@@ -755,7 +1154,7 @@
obj[newName] = obj[key];
delete obj[key];
}
- if (typeof obj[key] === 'object') {
+ if (typeof obj[key] === "object") {
this.ModifyProperties(obj[key], oldName, newName);
}
}
@@ -765,91 +1164,109 @@
this.TreeAddFormVisible = true;
// 鍒ゆ柇褰撳墠鏄惁鏈夌偣鍑诲瓙椤�
if (this.nodeClickList !== "") {
- this.TreeFlag = true
+ this.TreeFlag = true;
}
},
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
- const data = this.TreeAddform
- this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid)
- // console.log('data',data)
- TreeSave(data).then(() => {
- this.$message({
- type: 'success',
- message: '娣诲姞鎴愬姛!'
+ const data = this.TreeAddform;
+ this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
+ // console.log("data", data);
+ TreeSave(data)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "娣诲姞鎴愬姛!",
+ });
+ this.getAttr();
+ this.TreeAddFormVisible = false;
+ this.TreeAddform = "";
+ })
+ .catch((res) => {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
});
- this.getAttr();
- this.TreeAddFormVisible = false
- this.TreeAddform = ""
- }).catch(res => {
- this.$message({
- type: 'warning',
- message: res
- });
- })
},
//鏍戣妭鐐瑰垹闄ゆ寜閽�
TreeDel() {
- this.$confirm('鏄惁鍒犻櫎褰撳墠閫夋嫨鐨勫垎绫伙紝灏嗕細鎶婂瓙鍒嗙被涓�骞跺垹闄わ紝濡傛灉瀛樺湪缂栫爜鏁版嵁灏嗕笉鑳借鍒犻櫎锛屾槸鍚︾户缁紵', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- customClass: 'my-messagebox',
- }).then(() => {
- TreeCheckDel(this.nodeClickList).then(res => {
- if (res.data.data) {
- TreeDel(this.nodeClickList).then(() => {
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- });
- this.getAttr();
- }).catch(res => {
- this.$message({
- type: 'warning',
- message: res
- });
- })
- } else {
- this.$confirm('褰撳墠鏁版嵁鍖呭惈鏈変笅绾ф暟鎹紝瑕佸垹闄ょ殑璇濅細鍜屼笅绾ф暟鎹竴璧峰垹闄わ紝浣犵‘璁ょ户缁�?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
- customClass: 'my-messageboxs',
- }).then(() => {
- TreeDel(this.nodeClickList).then(() => {
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
+ this.$confirm(
+ "鏄惁鍒犻櫎褰撳墠閫夋嫨鐨勫垎绫伙紝灏嗕細鎶婂瓙鍒嗙被涓�骞跺垹闄わ紝濡傛灉瀛樺湪缂栫爜鏁版嵁灏嗕笉鑳借鍒犻櫎锛屾槸鍚︾户缁紵",
+ "鎻愮ず",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ customClass: "my-messagebox",
+ }
+ )
+ .then(() => {
+ TreeCheckDel(this.nodeClickList).then((res) => {
+ if (res.data.data) {
+ TreeDel(this.nodeClickList)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!",
+ });
+ this.getAttr();
+ })
+ .catch((res) => {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
});
- this.getAttr();
- }).catch(res => {
- this.$message({
- type: 'warning',
- message: res
+ } else {
+ this.$confirm(
+ "褰撳墠鏁版嵁鍖呭惈鏈変笅绾ф暟鎹紝瑕佸垹闄ょ殑璇濅細鍜屼笅绾ф暟鎹竴璧峰垹闄わ紝浣犵‘璁ょ户缁�?",
+ "鎻愮ず",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ customClass: "my-messageboxs",
+ }
+ )
+ .then(() => {
+ TreeDel(this.nodeClickList)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!",
+ });
+ this.getAttr();
+ })
+ .catch((res) => {
+ this.$message({
+ type: "warning",
+ message: res,
+ });
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堝垹闄�",
+ });
});
- })
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
- });
- }
+ }
+ });
})
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堝垹闄�",
+ });
});
- });
},
//淇敼鍥炲～
TreeEdit() {
if (this.nodeClickList == "") {
this.$message({
- type: 'warning',
- message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
+ type: "warning",
+ message: "璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!",
});
} else {
this.TreeEditFormVisible = true;
@@ -857,11 +1274,11 @@
},
//鏍戝埛鏂�
flushed() {
- this.loading = true
- this.getAttr()
+ this.loading = true;
+ this.getAttr();
setTimeout(() => {
this.loading = false;
- this.nodeClickList = ""
+ this.nodeClickList = "";
}, 600);
},
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
@@ -869,102 +1286,120 @@
Enable() {
if (this.FlagObj.lcStatus == "Enabled") {
this.$message({
- type: 'warning',
- message: '褰撳墠鍒嗙被涓嶆槸鍋滅敤鐘舵��'
+ type: "warning",
+ message: "褰撳墠鍒嗙被涓嶆槸鍋滅敤鐘舵��",
});
} else {
- this.$confirm('鏄惁灏嗗瓙鍒嗙被涓�骞跺惎鐢紵', '鎻愮ず', {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- TreeEnable(this.nodeClickList).then(() => {
- this.$message({
- type: 'success',
- message: '鍚敤鎴愬姛!'
+ this.$confirm("鏄惁灏嗗瓙鍒嗙被涓�骞跺惎鐢紵", "鎻愮ず", {
+ confirmButtonText: "鏄�",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ TreeEnable(this.nodeClickList).then(() => {
+ this.$message({
+ type: "success",
+ message: "鍚敤鎴愬姛!",
+ });
+ this.getAttr();
});
- this.getAttr()
})
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝惎鐢�'
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堝惎鐢�",
+ });
});
- });
}
},
//鍋滅敤
Deactivate() {
if (this.FlagObj.lcStatus === "Disabled") {
this.$message({
- type: 'warning',
- message: '褰撳墠鍒嗙被涓嶆槸鍚敤鐘舵��!'
+ type: "warning",
+ message: "褰撳墠鍒嗙被涓嶆槸鍚敤鐘舵��!",
});
} else {
- this.$confirm('鏄惁鍋滅敤褰撳墠鍒嗙被锛屽仠鐢ㄥ悗锛屽瓙鍒嗙被涔熷皢涓嶈兘琚娇鐢紝鏄惁缁х画锛�', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- TreeDeactivate(this.nodeClickList).then(() => {
- this.$message({
- type: 'success',
- message: '鍋滅敤鎴愬姛!'
+ this.$confirm(
+ "鏄惁鍋滅敤褰撳墠鍒嗙被锛屽仠鐢ㄥ悗锛屽瓙鍒嗙被涔熷皢涓嶈兘琚娇鐢紝鏄惁缁х画锛�",
+ "鎻愮ず",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ TreeDeactivate(this.nodeClickList).then(() => {
+ this.$message({
+ type: "success",
+ message: "鍋滅敤鎴愬姛!",
+ });
+ this.nodeClickList["flag"] = true;
+ this.getAttr();
});
- this.nodeClickList['flag'] = true;
- this.getAttr()
})
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝仠鐢�'
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堝仠鐢�",
+ });
});
- });
}
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
- this.nodeClickList = data
- this.ProData=[]
+ this.nodeClickList = data;
+ this.ProData = [];
try {
- await TreeObjcet(data.oid).then(res => {
- this.FlagObj = res.data.data
- }).catch(res => {
- this.$message.error(res)
- })
- //妯℃澘绠＄悊琛ㄦ牸鏁版嵁
- await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res => {
- this.Formlist = res.data.data.filter(item => {
- if (item.codeclassifyoid != "") {
- this.codeClassifyOid = item.codeclassifyoid
- return item.codeclassifyoid == this.nodeClickList.oid
- }
+ await TreeObjcet(data.oid)
+ .then((res) => {
+ this.FlagObj = res.data.data;
})
- }).catch(res => {
- this.$message.error(res)
+ .catch((res) => {
+ this.$message.error(res);
+ });
+ //妯℃澘绠＄悊琛ㄦ牸鏁版嵁
+ await gridCodeClassifyTemplate({
+ "conditionMap[codeclassifyoid]": data.oid,
})
+ .then((res) => {
+ this.Formlist = res.data.data.filter((item) => {
+ if (item.codeclassifyoid != "") {
+ this.codeClassifyOid = item.codeclassifyoid;
+ return item.codeclassifyoid == this.nodeClickList.oid;
+ }
+ });
+ })
+ .catch((res) => {
+ this.$message.error(res);
+ });
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
- await getObjectByOid(this.nodeClickList.oid).then(res => {
- this.TreeList = res.data.data;
- }).catch(res => {
- this.$message.error(res)
- })
+ await getObjectByOid(this.nodeClickList.oid)
+ .then((res) => {
+ this.TreeList = res.data.data;
+ })
+ .catch((res) => {
+ this.$message.error(res);
+ });
} catch (error) {
- this.$message.error(error)
+ this.$message.error(error);
}
},
//鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
- async ClonenodeClick(data){
- this.ClonenodeClickList=data;
- await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res=>{
- this.CloneFormlist = res.data.data.filter(item => {
+ async ClonenodeClick(data) {
+ this.ClonenodeClickList = data;
+ await gridCodeClassifyTemplate({
+ "conditionMap[codeclassifyoid]": data.oid,
+ }).then((res) => {
+ this.CloneFormlist = res.data.data.filter((item) => {
if (item.codeclassifyoid != "") {
- this.codeClassifyOid = item.codeclassifyoid
- return item.codeclassifyoid == this.ClonenodeClickList.oid
+ this.codeClassifyOid = item.codeclassifyoid;
+ return item.codeclassifyoid == this.ClonenodeClickList.oid;
}
- })
- })
+ });
+ });
},
//tab鏍忓垏鎹�
handleChange(column) {
@@ -1009,81 +1444,90 @@
// }
// },
AdvQueries() {
- this.FindFormVisible = false
+ this.FindFormVisible = false;
//濡傛灉鍏ㄩ儴涓虹┖ allEmpty涓簍rue
- const allEmpty = Object.values(this.QueryArray).every(value => !value);
+ const allEmpty = Object.values(this.QueryArray).every((value) => !value);
//濡傛灉鍏ㄩ儴涓虹┖锛岀偣鍑绘煡璇㈠嚭鐜版墍鏈夋暟鎹�
if (allEmpty) {
- gridCodeClassifyTemplate().then(res => {
- this.Formlist = res.data.data
- })
+ gridCodeClassifyTemplate().then((res) => {
+ this.Formlist = res.data.data;
+ });
} else {
//榛樿鏄瓑浜�
- gridCodeClassifyFindTemplate({'conditionMap[id]': this.QueryArray.id},
- {'conditionMap[name]': this.QueryArray.name},
- {'conditionMap[description]': this.QueryArray.description},
- {'conditionMap[revisionValue]': this.QueryArray.revisionValue},
- {'conditionMap[lcStatus]': this.QueryArray.lcStatus}
- ).then(res => {
- this.Formlist = res.data.data
- })
+ gridCodeClassifyFindTemplate(
+ { "conditionMap[id]": this.QueryArray.id },
+ { "conditionMap[name]": this.QueryArray.name },
+ { "conditionMap[description]": this.QueryArray.description },
+ { "conditionMap[revisionValue]": this.QueryArray.revisionValue },
+ { "conditionMap[lcStatus]": this.QueryArray.lcStatus }
+ ).then((res) => {
+ this.Formlist = res.data.data;
+ });
}
},
//妯℃澘绠＄悊娓叉煋
CrudRend() {
- gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => {
- this.Formlist = res.data.data
- })
+ gridCodeClassifyTemplate({
+ "conditionMap[codeclassifyoid]": this.nodeClickList.oid,
+ }).then((res) => {
+ this.Formlist = res.data.data;
+ });
},
//妯℃澘绠＄悊琛ㄦ牸娣诲姞
- CrudRowSave(row,done) {
+ CrudRowSave(row, done) {
if (this.nodeClickList.length <= 0) {
this.$message({
- type: 'warning',
- message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
+ type: "warning",
+ message: "璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!",
});
} else {
- this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
- addSave(row).then(() => {
- this.$message({
- type: "success",
- message: "娣诲姞鎴愬姛!"
+ this.$set(row, "codeclassifyoid", this.nodeClickList.oid);
+ addSave(row)
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "娣诲姞鎴愬姛!",
+ });
+ done(row);
+ this.CrudRend();
+ })
+ .catch((res) => {
+ this.$message({
+ type: "info",
+ message: res,
+ });
});
- done(row)
- this.CrudRend()
- }).catch(res => {
- this.$message({
- type: 'info',
- message: res
- });
- })
}
- console.log('123',this.codeClassifyOid)
+ console.log("123", this.codeClassifyOid);
},
//妯℃澘绠＄悊淇敼
- CrudRowUpdata(row,index,done) {
- editSave(row).then(() => {
- this.CrudRend()
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
+ CrudRowUpdata(row, index, done) {
+ editSave(row)
+ .then(() => {
+ this.CrudRend();
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!",
+ });
+ done();
+ })
+ .catch((res) => {
+ this.$message.error(res);
});
- done()
- }).catch(res => {
- this.$message.error(res)
- })
},
//妯℃澘绠＄悊鍒犻櫎
CrudRowDel(row) {
- deleteData(row).then(()=> {
- this.CrudRend()
- }).catch(res => {
- this.$message({
- type: 'info',
- message: res
+ deleteData(row)
+ .then(() => {
+ this.CrudRend();
+ })
+ .catch((res) => {
+ this.$message({
+ type: "info",
+ message: res,
+ });
});
- })
},
//妯℃澘绠＄悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
/*nterFind() {
@@ -1100,96 +1544,120 @@
}
},*/
//鍏嬮殕妯℃澘鏌ヨ
- CloneEnterFind(){
- gridCodeClassifyTemplate().then(res => {
- this.CloneFormlist = res.data.data.filter(item => {
- if(this.Clonevalue == 0){
- return item.id.includes(this.CloneFind)
- }else if(this.Clonevalue == 1){
- return item.name.includes(this.CloneFind)
+ CloneEnterFind() {
+ gridCodeClassifyTemplate().then((res) => {
+ this.CloneFormlist = res.data.data.filter((item) => {
+ if (this.Clonevalue == 0) {
+ return item.id.includes(this.CloneFind);
+ } else if (this.Clonevalue == 1) {
+ return item.name.includes(this.CloneFind);
}
- })
- })
+ });
+ });
},
// 鏌ヨ
- FindeHanler(){
- if(this.nodeClickList != ""){
- this.FindFormVisible=true
- }else {
- this.$message.warning('璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�')
+ FindeHanler() {
+ if (this.nodeClickList != "") {
+ this.FindFormVisible = true;
+ } else {
+ this.$message.warning("璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�");
}
},
//鍏嬮殕妯℃澘閫夋嫨纭畾
- Clonehandler(){
- if(this.CloneSelect.length <= 0){
+ Clonehandler() {
+ if (this.CloneSelect.length <= 0) {
this.$message({
- type: 'warning',
- message: '璇烽�夋嫨瑕佸厠闅嗙殑妯℃澘!'
+ type: "warning",
+ message: "璇烽�夋嫨瑕佸厠闅嗙殑妯℃澘!",
});
- }else if(this.CloneSelect.length >1){
+ } else if (this.CloneSelect.length > 1) {
this.$message({
- type: 'warning',
- message: '鍙兘閫夋嫨涓�鏉℃暟鎹�!'
+ type: "warning",
+ message: "鍙兘閫夋嫨涓�鏉℃暟鎹�!",
});
} else {
- this.CloneinnerVisible=true;
-
+ this.CloneinnerVisible = true;
}
},
//鐐瑰嚮浠庡叾瀹冩ā鏉垮厠闅�
- CloneBtn(){
- if(this.nodeClickList.length <= 0){
+ CloneBtn() {
+ if (this.nodeClickList.length <= 0) {
this.$message({
- type: 'warning',
- message: '璇峰厛浠嶽涓婚搴撳垎绫汇�戞爲涓婇�夋嫨涓�鏉℃暟鎹�!'
+ type: "warning",
+ message: "璇峰厛浠嶽涓婚搴撳垎绫汇�戞爲涓婇�夋嫨涓�鏉℃暟鎹�!",
});
- }else {
- this.CloneVisible=true;
+ } else {
+ this.CloneVisible = true;
}
},
//鍏嬮殕妯℃澘鍗曢�夋鏀瑰彉
- selectionChange(row){
- this.CloneSelect=row;
+ selectionChange(row) {
+ this.CloneSelect = row;
//鍙屽悜缁戝畾锛屾彁浜よ〃鍗曡緭鍏ユ鍥炲～涓婂綋鍓嶉�夋嫨鐨勬暟鎹�
- this.CloneModel.id=row[0].id;
- this.CloneModel.name=row[0].name;
+ this.CloneModel.id = row[0].id;
+ this.CloneModel.name = row[0].name;
//杩欓噷鏈夌偣缁曪紝CloneSelect鏄垜閫夋嫨妗嗛�夋嫨鐨勬暟鎹�傜瓑浜巘his.nodeClickList.oid鏄洜涓猴紝鍏嬮殕妯℃澘浼犻�掓暟鎹鎶婂綋鍓嶉�夋嫨鏍戠殑oid浼犻�掔粰鍚庣銆傝�屼笉鏄綋鍓嶈鍏嬮殕妯℃澘鐨刼id
- this.CloneSelect[0].codeclassifyoid=this.nodeClickList.oid
+ this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
},
//鍏嬮殕琛ㄥ崟鎻愪氦
- Clonesubmit(row,done){
+ Clonesubmit(row, done) {
//閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
- this.CloneSelect[0].id=this.CloneModel.id;
- this.CloneSelect[0].name=this.CloneModel.name;
- copy(this.CloneSelect[0]).then(()=>{
- //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
- this.CloneinnerVisible=false
- this.CloneVisible=false
- this.$message.success("澶嶅埗鎴愬姛")
- this.CrudRend()
- done(row)
- }).catch(res=>{
- done(res)
- })
+ this.CloneSelect[0].id = this.CloneModel.id;
+ this.CloneSelect[0].name = this.CloneModel.name;
+ copy(this.CloneSelect[0])
+ .then(() => {
+ //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
+ this.CloneinnerVisible = false;
+ this.CloneVisible = false;
+ this.$message.success("澶嶅埗鎴愬姛");
+ this.CrudRend();
+ done(row);
+ })
+ .catch((res) => {
+ done(res);
+ });
},
//鍒锋柊
TemRefresh() {
- this.FormLoing = true
+ this.FormLoing = true;
if (this.nodeClickList.oid != "") {
- gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => {
- this.Formlist = res.data.data.filter(item => {
- return item.codeclassifyoid == this.nodeClickList.oid
- })
- })
+ gridCodeClassifyTemplate({
+ "conditionMap[codeclassifyoid]": this.nodeClickList.oid,
+ }).then((res) => {
+ this.Formlist = res.data.data.filter((item) => {
+ return item.codeclassifyoid == this.nodeClickList.oid;
+ });
+ });
} else {
- this.FormLoing = true
+ this.FormLoing = true;
}
setTimeout(() => {
- this.FormLoing = false
+ this.FormLoing = false;
}, 600);
},
- }
-}
+ upAndStopAndStart(row, type) {
+ this.$confirm(this.upAndStopAndStartData[type]["tip"], "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }).then(() => {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], true)
+ const { ts, oid } = row;
+ this.upAndStopAndStartData[type]['funAPi']({ ts, oid }).then((res) => {
+ if (res.data.code === 200) {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], false)
+ this.TemRefresh();
+ this.$message.success(
+ this.upAndStopAndStartData[type]["typeText"] + "鎴愬姛锛�"
+ );
+ }
+ }).catch(() => {
+ this.$set(row, this.upAndStopAndStartData[type]["load"], false)
+ });
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
@@ -1210,5 +1678,4 @@
.my-messageboxs {
width: 500px;
}
-
</style>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
index 6972315..c3de44d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
@@ -245,7 +245,7 @@
* @return
*/
@PostMapping( "/enableData")
- public R enable( CodeClassifyTemplateDTO codeClstemplateDTO) {
+ public R enable(@RequestBody CodeClassifyTemplateDTO codeClstemplateDTO) {
return plCodeClstemplateService.updateLcStatus(codeClstemplateDTO.getOid(), CodeClassifyTemplateLC.RELEASED.getValue());
}
@@ -255,7 +255,7 @@
* @return
*/
@PostMapping( "/disableData")
- public R disableData( CodeClassifyTemplateDTO codeClassifyDTO) {
+ public R disableData(@RequestBody CodeClassifyTemplateDTO codeClassifyDTO) {
return plCodeClstemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.DISABLED.getValue());
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index ba96f1b..9b73f3e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -487,30 +487,30 @@
}
//闇�瑕佹柊澧炵殑鍗囩骇妯℃澘
-// ClientBusinessObject clientBusinessObject_template = boService.selectCBOByOid(codeClassifyDTO.getOid(), "codeclstemplate");
CodeClassifyTemplate codeCls_template = baseMapper.selectById(templateOldOid);
CodeClassifyTemplate codeCls_template_insert = new CodeClassifyTemplate();
-// ClientBusinessObject clientBusinessObject_template_insert = null;
-// try {
-// clientBusinessObject_template_insert = clientBusinessObjectOperation.reviseBusinessObject(clientBusinessObject_template, "");
codeCls_template_insert.setOid(VciBaseUtil.getPk());
codeCls_template_insert.setRevisionOid(VciBaseUtil.getPk());
codeCls_template_insert.setNameOid(codeCls_template.getNameOid());
codeCls_template_insert.setBtmname(codeCls_template.getBtmname());
codeCls_template_insert.setLastR(String.valueOf(1));
- codeCls_template_insert.setFirstR(String.valueOf(0));
+ codeCls_template_insert.setFirstR(String.valueOf(1));
codeCls_template_insert.setFirstV(String.valueOf(1));
codeCls_template_insert.setLastV(String.valueOf(1));
codeCls_template_insert.setCreator(AuthUtil.getUser().getUserName());
codeCls_template_insert.setCreateTime(new Date());
+ codeCls_template_insert.setTs(new Date());
codeCls_template_insert.setLastModifier(AuthUtil.getUser().getUserName());
codeCls_template_insert.setLastModifyTime(new Date());
codeCls_template_insert.setRevisionRule(codeCls_template.getRevisionRule());
codeCls_template_insert.setVersionRule(codeCls_template.getVersionRule());
+ codeCls_template_insert.setBtmTypeId(codeCls_template.getBtmTypeId());
+ codeCls_template_insert.setBtmTypeName(codeCls_template.getBtmTypeName());
+ codeCls_template_insert.setCodeClassifyOid(codeCls_template.getCodeClassifyOid());
+ codeCls_template_insert.setCodeClassifyOidName(codeCls_template.getCodeClassifyOidName());
Map rvObj = baseMapper.getNextRevision(codeCls_template.getNameOid());
codeCls_template_insert.setRevisionSeq(Integer.parseInt(rvObj.get("REVISIONSEQ").toString()));
codeCls_template_insert.setRevisionValue(rvObj.get("REVISIONVAL").toString());
-// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
codeCls_template_insert.setVersionSeq(Integer.parseInt(rvObj.get("VERSIONSEQ").toString()));
codeCls_template_insert.setVersionValue(rvObj.get("VERSIONVAL").toString());
codeCls_template_insert.setLctid(codeCls_template.getLctid());
@@ -519,35 +519,18 @@
codeCls_template_insert.setName(codeCls_template.getName());
codeCls_template_insert.setDescription(codeCls_template.getDescription());
codeCls_template_insert.setOwner(AuthUtil.getUser().getUserName());
-// codeCls_template_insert.setCheckinBy(userName);
codeCls_template_insert.setCopyFromVersion(codeCls_template.getOid());
-// }catch (VCIError e){
-// e.printStackTrace();
-// logger.error("===============>鍒嗙被妯℃澘-鍗囩増澶嶅埗鍑洪敊oid锛� "+templateOldOid+",mes"+e.error_message);
-// return BaseResult.error("鍗囩増鍑洪敊");
-// }
int insertCount = baseMapper.insert(codeCls_template_insert);
-// CodeClstemplateEntity codeClassifyTemplateDO = new CodeClstemplateEntity();
-// BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,codeClassifyTemplateDO);
-// WebUtil.copyValueToObjectFromCbos(clientBusinessObject_template_insert,codeClassifyTemplateDO);
- //modify by weidy@2022-2-27
- //鍗囩増鍚庝笉鑳戒娇鐢╥nsert鏂规硶锛屽洜涓洪偅涓案杩滄槸鏂板涓�鏉℃暟鎹紝
- //涓婃柟鍏堜粠dto杞粰do锛岀劧鍚庢妸鍗囩増鐨勫垵濮嬪寲鐨勫睘鎬ф嫹璐濈粰do锛屾渶鍚庡啀浠巇o鎷疯礉鍒癱bo涓�
-// WebUtil.copyValueToCboFromObj(clientBusinessObject_template_insert,codeClassifyTemplateDO);
//鍗囩増杩囧悗鐨勬ā鏉縪id
String templateNewOid = codeCls_template_insert.getOid();
//闇�瑕佸鍒剁殑妯℃澘灞炴��
//鏌ヨ鑰佹ā鏉夸笅杈圭殑鎵�鏈夊睘鎬э紝璧嬪�兼柊妯℃澘oid
-// VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);
Map<String,Object> condition = new HashMap<>(1);
condition.put("classifyTemplateOid",templateOldOid);
List<CodeClassifyTemplateAttr> codeClstempattrEntities = codeClstempattrMapper.selectByMap(condition);
-// List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
for (CodeClassifyTemplateAttr codeClassifyTemplateAttrDO :codeClstempattrEntities){
-// String attrOid = VciBaseUtil.getPk();
- codeClassifyTemplateAttrDO.setOid(null);
+ codeClassifyTemplateAttrDO.setOid(VciBaseUtil.getPk());
codeClassifyTemplateAttrDO.setClassifyTemplateOid(templateNewOid);
codeClstempattrMapper.insert(codeClassifyTemplateAttrDO);
}
@@ -563,54 +546,23 @@
//澶嶅埗妯℃澘鎸夐挳
List<CodeClassifyTemplateButton> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
- //涓�璧蜂繚瀛樻暟鎹�
-// WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- //淇濆瓨妯℃澘鈥斺��
-// BatchCBO batchCBOTemplate = new BatchCBO();
- //batchCBO淇濆瓨鐨勬椂鍊欐病鏈夎兘澶熻嚜鍔╱pdate婧愭暟鎹殑isLastR
- //batchCBOTemplate.getCreateCbos().add(clientBusinessObject_template_insert);
- //浣跨敤saveRevisionBuisnessObject鍙互瑙ｅ喅杩欎釜闂锛岃繖閲屽厛鏆傛椂鎵ц涓ゆ淇濆瓨
-// try {
-// clientBusinessObjectOperation.saveRevisionBuinessObject(clientBusinessObject_template_insert);
-// } catch (VCIError vciError) {
-// throw new VciBaseException("鍗囩増淇濆瓨鍑洪敊浜�",new String[0],vciError);
-// }
- // end --modify by lihang @20220408
- //codeClassifyTemplateMapper.insert(codeClassifyTemplateDO);
- //淇濆瓨妯℃澘灞炴��
-// if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOList)){
-// BatchCBO batchCBOTemplateAttr = codeClassifyTemplateAttrDaoI.batchInsert(codeClassifyTemplateAttrDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateAttr);
-// }
-//
-// //淇濆瓨妯℃澘娴佺▼
-// if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
-// BatchCBO batchCBOTemplateProcessAttr = codeClassifyProcessTempDaoI.batchInsert(codeClassifyProcessTempDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateProcessAttr);
-// }
-// //妯℃澘闃舵
-// if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
-// BatchCBO batchCBOTemplatePhaseAttr = codeTemplatePhaseDaoI.batchInsert(codeClassifyPhaseDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttr);
-// }
-//
-// //妯℃澘闃舵灞炴��
-// if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
-// BatchCBO batchCBOTemplatePhaseAttrAttr = codePhaseAttrDaoI.batchInsert(codePhaseAttrDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttrAttr);
-// }
-//
-// //妯℃澘鎸夐挳
-// if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
-// BatchCBO batchCBOTemplateButtonAttr = codeClassifyTemplateButtonDaoI.batchInsert(codeClassifyTemplateButtonDOList);
-// batchCBOTemplate.copyFromOther(batchCBOTemplateButtonAttr);
-// }
-//
-// WebUtil.setPersistence(true);//鎵ц淇濆瓨
-//
-// boService.persistenceBatch(batchCBOTemplate);//涓�璧锋墽琛屼繚瀛�
+ //淇濆瓨妯℃澘娴佺▼
+ if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
+ codeClsflowtempServiceImpl.saveBatch(codeClassifyProcessTempDOList);
+ }
+ //妯℃澘闃舵
+ if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
+ codeTempphaseServiceImpl.saveBatch(codeClassifyPhaseDOList);
+ }
-// return BaseResult.success("鍗囩増鎴愬姛锛�");
+ //妯℃澘闃舵灞炴��
+ if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
+ codePhaseattrServiceImpl.saveBatch(codePhaseAttrDOList);
+ }
+// //妯℃澘鎸夐挳
+ if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
+ codeTempbuttonServiceImpl.saveBatch(codeClassifyTemplateButtonDOList);
+ }
return R.success("鍗囩増鎴愬姛锛�");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 97ddf3e..3fb88ff 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -362,10 +362,10 @@
// 鍥炴敹闇�瑕佷笟鍔℃暟鎹垹闄�
if (CodeDefaultLC.TASK_BACK.getValue().equals(baseModelDTO.getLcStatus())) {
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(baseModelDTO.getBtmname()));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
- commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(), VciBaseUtil.toInSql(baseModelDTO.getOid()));
} else {
for (BaseModel baseModel : baseModels) {
baseModel.setLcStatus(baseModelDTO.getLcStatus());
@@ -646,9 +646,9 @@
// final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmtypeid()));
// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
final String[] sql = {"select count(*) from " + listR.getData().get(0).getTableName() + " t where 1 = 1 "};
conditionMap.forEach((key, value) -> {
sql[0] += " and " + key + " = " + value;
@@ -1599,9 +1599,9 @@
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referVO.getReferType()));
// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
String referTable = listR.getData().get(0).getTableName();
// String referTable = "pl_code_classify";
String referTableNick = attrVO.getId() + "0";
@@ -1698,9 +1698,9 @@
}
// String tableName = VciBaseUtil.getTableName(btmType);
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
// String referTable = VciBaseUtil.getTableName(referVO.getReferType());
String tableName = listR.getData().get(0).getTableName();
String sql = "select " + selectFieldList.stream().map(s -> (s.contains(".") ? s : ("t." + s))).collect(Collectors.joining(","))
@@ -1875,7 +1875,7 @@
// String selectKey = referFieldMap.get(key);
// return getSqlByValue(selectKey, value, null, btmType);
// } else {
- return getSqlByValue(key, value, attrVOMap, btmType);
+ return getSqlByValue(key, value, attrVOMap, btmType);
// }
}
}
@@ -1930,7 +1930,7 @@
}
if (field.contains(".") && attrVOMap != null && attrVOMap.containsKey(field.split("\\.")[0].toLowerCase(Locale.ROOT))) {
//鏄弬鐓�
- return "'" + value + "'";
+ return "'" + value + "'";
} else {
return value;
}
@@ -1954,13 +1954,13 @@
|| VciFieldTypeEnum.VTInteger.equals(fieldTypeEnum)) {
return value;
} else {
- return "'" + value + "'";
+ return "'" + value + "'";
}
} else {
if ((value.startsWith("(") && value.endsWith(")")) || (value.startsWith("'") && value.endsWith("'"))) {
return value;
}
- return "'" + value + "'";
+ return "'" + value + "'";
}
}
@@ -2239,9 +2239,9 @@
// baseMapper.deleteBatchIds(cboList);
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getCurrentClassifyVO().getBtmtypeid()));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
commonsMapper.deleteByTaleAndOid(listR.getData().get(0).getTableName(),
"'" + (StringUtils.join(cboList.stream().map(BaseModel::getOid).collect(Collectors.toSet()), "','")) + "'");
// );
@@ -2445,27 +2445,27 @@
*/
@Override
public R markDataPassing(String oid, String btmName, Boolean pass) {
- VciBaseUtil.alertNotNull(oid, "涓氬姟鏁版嵁涓婚敭", btmName, "涓氬姟绫诲瀷", pass, "鏍囪绫诲瀷");
- boolean flag = true;
- try {
- List<BaseModel> datas = selectByTypeAndOid(btmName, oid);
- if (datas.size() == 0) {
- return R.fail(DATA_OID_NOT_EXIST);
- }
- datas.stream().forEach(data->data.getData().put("PASSING",String.valueOf(pass)));
- R r = updateBatchByBaseModel(btmName, datas);
- if(!r.isSuccess()){
- flag = false;
- }
- } catch (Exception e) {
- flag = false;
- e.printStackTrace();
- }
- if (flag) {
- return R.success("鏍囪鎴愬姛锛�");
- } else {
- return R.fail("鏍囪澶辫触锛�");
- }
+ VciBaseUtil.alertNotNull(oid, "涓氬姟鏁版嵁涓婚敭", btmName, "涓氬姟绫诲瀷", pass, "鏍囪绫诲瀷");
+ boolean flag = true;
+ try {
+ List<BaseModel> datas = selectByTypeAndOid(btmName, oid);
+ if (datas.size() == 0) {
+ return R.fail(DATA_OID_NOT_EXIST);
+ }
+ datas.stream().forEach(data -> data.getData().put("PASSING", String.valueOf(pass)));
+ R r = updateBatchByBaseModel(btmName, datas);
+ if (!r.isSuccess()) {
+ flag = false;
+ }
+ } catch (Exception e) {
+ flag = false;
+ e.printStackTrace();
+ }
+ if (flag) {
+ return R.success("鏍囪鎴愬姛锛�");
+ } else {
+ return R.fail("鏍囪澶辫触锛�");
+ }
}
/**
@@ -2777,18 +2777,18 @@
}
List<String> oidList = VciBaseUtil.str2List(conditionMap.get("oid"));
- List<BaseModel> cbos = selectByTypeAndOid(btmType,conditionMap.get("oid"));
+ List<BaseModel> cbos = selectByTypeAndOid(btmType, conditionMap.get("oid"));
if (CollectionUtils.isEmpty(cbos)) {
throw new VciBaseException("鏈壘鍒颁笟鍔℃暟鎹�");
}
- BaseModel cbo = cbos.get(0);
+ BaseModel cbo = cbos.get(0);
String templateOid = cbo.getData().get("CODETEMPLATEOID");
QueryWrapper<CodeClassifyTemplate> codeClassifyTemplateWrapper = new QueryWrapper<>();
codeClassifyTemplateWrapper.eq("oid", templateOid);
List<CodeClassifyTemplate> templateDOList = templateService.list(codeClassifyTemplateWrapper);
- QueryWrapper<CodeClassifyTemplateAttr> codeClassifyTemplateAttrWrapper = new QueryWrapper<>();
+ QueryWrapper<CodeClassifyTemplateAttr> codeClassifyTemplateAttrWrapper = new QueryWrapper<>();
codeClassifyTemplateAttrWrapper.eq("CLASSIFYTEMPLATEOID", templateOid);
List<CodeClassifyTemplateAttr> attrDOList = codeClassifyTemplateAttrService.list(codeClassifyTemplateAttrWrapper);
@@ -3176,9 +3176,9 @@
public Integer insertBatchByType(String btmType, List<BaseModel> baseModels) {
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
List<Map<String, String>> maps = new ArrayList<>();
baseModels.stream().forEach(model -> {
@@ -3203,9 +3203,9 @@
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
//鏌ヨ鏁版嵁
List<Map> maps = commonsMapper.selectBySql("select * from " + listR.getData().get(0).getTableName() + " where oid in ("
+ VciBaseUtil.toInSql(oids.toString()) + ")");
@@ -3261,9 +3261,9 @@
*/
public BaseModel createBaseModel(String boName) {
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(boName));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
String userName = String.valueOf(AuthUtil.getUser().getUserId());
BaseModel bo = new BaseModel();
// bo.setOid(VciBaseUtil.getPk());
@@ -3331,9 +3331,9 @@
public R updateBatchByBaseModel(String btmType, List<BaseModel> baseModels) {
//浣跨敤浼犲叆鐨勪笟鍔＄被鍨嬫煡璇㈣〃
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
List<Map<String, String>> maps = new ArrayList<>();
@@ -3361,17 +3361,17 @@
* @return 鍒楄〃鏁版嵁
*/
@Override
- public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException{
- //checkReferConfig(referConfigVO);
+ public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException {
+ //checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
- if (allAttributeByBtmId.getCode() != 200) {
- throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
- }
- if (Func.isEmpty(allAttributeByBtmId.getData())) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
- BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
+ if (allAttributeByBtmId.getCode() != 200) {
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
+ }
+ if (Func.isEmpty(allAttributeByBtmId.getData())) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
/**
* 鍔犱笂鏌ヨ鏈�鏂扮増娆�
*/
@@ -3388,10 +3388,10 @@
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
if (listR.getCode() != 200) {
- throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg():"涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
+ throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
}
if (listR.getData().isEmpty()) {
- throw new VciBaseException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg():"浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ throw new VciBaseException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
}
String namesql = "";
if (StringUtils.isNotBlank(baseQueryObject.getConditionMap().get("name"))) {
@@ -3411,13 +3411,18 @@
if (StringUtils.isNotBlank(baseQueryObject.getConditionMap().get("lcstatus"))) {
lcstatusSql = "lcstatus =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lcstatus"));
}
+ String where = "";
+
+ if (StringUtils.isNotBlank(codesql) || StringUtils.isNotBlank(lcstatusSql) || StringUtils.isNotBlank(namesql)) {
+ where="where ";
+ }
String num1 = baseQueryObject.getPage() * baseQueryObject.getLimit() + "";
String num2 = ((baseQueryObject.getPage()) - 1) * baseQueryObject.getLimit() + 1 + "";
List<Map> maps = commonsMapper.selectBySql("select * from ( select rownum rn, t.* from (select * from " + listR.getData().get(0).getTableName() + SPACE
+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
- + " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and":" where") + SPACE
+ + " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and": where) + SPACE
+ lcstatusSql + namesql + codesql + ") t where rownum <=" + num1 + ") where rn >=" + num2
);
List<BaseModel> baseModels = new ArrayList<>();
@@ -3461,12 +3466,12 @@
}
int total = commonsMapper.queryCountBySql("select count(*) from " + listR.getData().get(0).getTableName() + SPACE
+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
- + "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and":" where") + SPACE
+ + "and lastv = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())) + " and" : where) + SPACE
+ lcstatusSql + namesql + codesql
);
- IPage<BaseModel> objectDataGrid = new Page<>();
+ IPage<BaseModel> objectDataGrid = new Page<>();
objectDataGrid.setPages(baseQueryObject.getPage());
- objectDataGrid.setCurrent(baseQueryObject.getPage());
+ objectDataGrid.setCurrent(baseQueryObject.getPage());
objectDataGrid.setRecords(baseModels);
objectDataGrid.setSize(baseQueryObject.getLimit());
objectDataGrid.setTotal(total);
@@ -3598,10 +3603,10 @@
toBo.setVersionRule(fromBo.getVersionRule());
// RevisionValueObject rvObj = this.getNextRevision(fromBo.getBtmName(), fromBo.getNameoid(), item.revRuleName, item.revInput, revisionVal);
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(fromBo.getBtmname()));
- if (!listR.isSuccess() || listR.getData().size() == 0) {
- throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
- }
- Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
+ if (!listR.isSuccess() || listR.getData().size() == 0) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ Map<String, Object> nextRevision = commonsMapper.getNextRevision(listR.getData().get(0).getTableName(), fromBo.getNameOid());
toBo.setRevisionSeq(Integer.parseInt(nextRevision.get("REVISIONSEQ").toString()));
toBo.setRevisionValue(nextRevision.get("REVISIONVAL").toString());
// VersionValueObject versionObj = this.getVersionValue(item.verRuleName);
--
Gitblit v1.9.3