From dd6e3927104fd3451749e811316ff5b0da687cc4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 03 八月 2023 16:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 64 ++++++++++++++++++++++++++++---
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 15 ++++---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 13 ++++--
3 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index c839623..7771e5c 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -448,7 +448,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Released'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍙戝竷鎴愬姛')
this.onLoad()
@@ -479,10 +479,10 @@
if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) {
this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
showMessage = false;
- } else if (this.selectRow.length >= 1 && !hasEditing && showMessage) {
+ } else if (this.selectRow.length > 1 && !hasEditing && showMessage) {
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
showMessage = false;
- } else if (this.selectRow.length > 1 && hasEditing && showMessage) {
+ } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
processTS({templateId: this.templateOid, buttonTypeKey: 'PUBLIC'}).then(res => {
if (res.data.records != [] && res.data.data.records.length != 0) {
this.userName = localStorage.getItem("username");
@@ -500,7 +500,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Disabled'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Disabled'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍋滅敤鎴愬姛')
this.onLoad()
@@ -515,7 +515,7 @@
}
}
});
- } else {
+ } else if(this.selectRow.length == 1 && !hasEditing && showMessage ) {
this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼')
}
});
@@ -551,7 +551,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'Released'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'Released'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍚敤鎴愬姛')
this.onLoad()
@@ -608,7 +608,7 @@
type: 'warning'
}).then(() => {
const oid = this.selectRow.map(obj => obj.oid).join(",");
- changeStatus({oid: oid, btmname: this.result, lcStatus: 'TakeBack'}).then(res => {
+ changeStatus({oid: oid, btmname: this.selectRow[0].btmname, lcStatus: 'TakeBack'}).then(res => {
if (res.data.code == 200) {
this.$message.success('鍥炴敹鎴愬姛')
this.onLoad()
@@ -774,6 +774,7 @@
//澶氶��
handleSelectionChange(list) {
this.selectRow = list;
+ console.log(this.selectRow)
this.parameter.ids = [];
list.forEach((item) => {
this.parameter.ids.push(item.oid);
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5c1747a..66a96d4 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -332,6 +332,7 @@
<script>
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
import {getList} from "@/api/refer/table";
+import func from "@/util/func";
export default {
name: "attrCrud .vue",
@@ -1686,14 +1687,63 @@
},
//淇濆瓨
addsHandler(event) {
- batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
- this.$message.success('淇濆瓨鎴愬姛')
- this.editOpenFlag=false;
- // 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
- this.$emit('editCloseChildren')
- }).catch(()=>{
- this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
+ this.$refs.referAttrCrud.sort("orderNum");
+ var ischeck = true;
+ console.log(this.ProData)
+ this.ProData.forEach((item,index)=>{
+ if((item.requireFlag && item.requireFlag.toString()=='true') && (item.readOnlyFlag && item.readOnlyFlag.toString()=='true')){
+ this.$message.warning(item.name+"("+item.id+")蹇呰緭鐨勫睘鎬т笉鑳芥槸鍙");
+ console.log(item)
+ ischeck=false;
+ return;
+ }
+ var num=0;
+ if(item.componentRule){
+ //缁勫悎瑙勫垯
+ num++
+ }
+ if(item.enumString || item.enumId){
+ //鏋氫妇
+ num++
+ }
+ if(item.referConfig || item.referBtmId){
+ //鍙傜収
+ num++
+ }
+ if(item.codeDateFormat){
+ //鏃堕棿鏍煎紡
+ num++
+ }
+ if(item.classifyInvokeLevel){
+ //鍒嗙被娉ㄥ叆
+ num++
+ }
+ if(num>1 && ischeck){
+ this.$message({
+ showClose: true,
+ message: item.name+"("+item.id+") 灞炴�у彧鑳芥槸缁勫悎瑙勫垯锛屾灇涓撅紝鍙傜収锛屾椂闂存牸寮忥紝鍒嗙被娉ㄥ叆涓殑涓�绉�",
+ type: 'warning'
+ });
+ ischeck=false;
+ return;
+ }
})
+ if(!ischeck){
+ return ;
+ }
+ // 鏂板嚱鏁扮敤浜庢墽琛宐atchAddSave鏂规硶
+ const executeBatchAddSave = () => {
+ batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.editOpenFlag=false;
+ // 璋冪敤鐖剁粍浠朵慨鏀规寜閽姸鎬�
+ this.$emit('editCloseChildren')
+ }).catch(()=>{
+ this.$message.warning('淇濆瓨澶辫触锛岃鏌ョ湅鎺у埗鍙拌緭鍑猴紒')
+ });
+ }
+ // 鎵�鏈塱f鏉′欢鍜岄�昏緫閫氳繃鍚庤皟鐢╡xecuteBatchAddSave鍑芥暟
+ executeBatchAddSave();
},
//琛ㄦ牸琛岀紪杈�
handleCellClicks(row, column) {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index d43a421..7ca191b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -24,7 +24,7 @@
</div>
</div>
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
- <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" append-to-body
+ <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :before-close="TreeEscHandler" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" 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">
@@ -52,7 +52,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="TreeAddFormVisible = false">鍙� 娑�</el-button>
+ <el-button @click="TreeEscHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -354,10 +354,10 @@
inject: ["crudTreeData"],
data() {
return {
- masterRow:0,
+ masterRow:null,
AddLoading:false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
- requestCount:0,
+ requestCount:null,
//瀵煎叆鐘舵�佹
ThemeImportVisible:false,
selectRow:'',
@@ -1042,6 +1042,11 @@
loading.close();
}
},
+ //鏍戣妭鐐瑰彇娑堜簨浠�
+ TreeEscHandler(){
+ this.TreeAddform={};
+ this.TreeAddFormVisible=false
+ },
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
const data = this.TreeAddform;
--
Gitblit v1.9.3