From 14d39ee4fab77642a9ab7c4229407a1a3b0defac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 16:13:20 +0800
Subject: [PATCH] 标准需求优化
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 3 -
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 51 ++++++++++++++-----------
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 56 ++++++++++++++-------------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 9 +++-
4 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d583d02..8c34f98 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -240,6 +240,7 @@
let slotColumnList = [];
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ console.log(formItem)
//灞炴�х爜娈佃鍒�
if (formItem.secType === "codeattrsec") {
this.attrList.push(formItem);
@@ -247,6 +248,7 @@
//绯诲垪鍙疯鍒�
if (formItem.field === "codeStandardEditType") {
if (this.status === "amend") {
+ console.log("formItem-amend",formItem)
formItem.readOnly = true;
}
}
@@ -296,8 +298,8 @@
this.codeattrsecValue = val.value;
return;
}
- //鏄惁绯诲垪-绯诲垪鍙�
- if (val.column.field === "isSeries") {
+ //淇涓�-绯诲垪鍙�
+ if (val.column.field === "reviseSeries") {
if (val.value === "false") {
this.isShow = true;
} else {
@@ -323,7 +325,8 @@
field: formItem.field,
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
- disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false),
+ disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
+ (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 7ddabc7..5ffff04 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -157,7 +157,6 @@
'conditionMap[oid]': this.ids, ...this.exportArrTwo,
limit: -1
}).then(res => {
- // console.log('res',res)
if (res) {
func.downloadFileByBlobHandler(res);
this.escHandler()
@@ -185,7 +184,6 @@
this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop;
});
exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArrTwo, limit: -1}).then(res => {
- // console.log('res',res)
if (res) {
func.downloadFileByBlobHandler(res);
this.escHandler()
@@ -193,7 +191,6 @@
})
} else {
exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => {
- // console.log('res',res)
if (res) {
func.downloadFileByBlobHandler(res);
this.escHandler()
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 3d3ea21..b164fb7 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -99,8 +99,8 @@
</FormTemplateDialog>
<!-- 淇-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'鏁版嵁淇'"
- :visible.sync="amendvisible" status="amend" :selectRow="selectRow"
+ :disabledProp="disabledProp" :selectRow="selectRow" :templateOid="templateOid"
+ :title="'鏁版嵁淇'" :visible.sync="amendvisible" status="amend"
type="add" @submit="amendSumbit"></FormTemplateDialog>
<!-- 鏂板-->
<FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
@@ -111,9 +111,9 @@
</FormTemplateDialog>
<!-- 淇敼-->
<FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
- :disabledProp="disabledProp" :templateOid="templateOid" :title="'淇敼缂栫爜淇℃伅'"
+ :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
+ :title="'淇敼缂栫爜淇℃伅'"
:visible.sync="editvisible"
- :rowOid="rowOid"
type="edit" @submit="EditSumbit"></FormTemplateDialog>
<!-- 鎵归噺缂栬緫-->
<!-- <MasterEditBulk :visible.sync="bulkeditvisible" ></MasterEditBulk>-->
@@ -393,9 +393,9 @@
this.doLayout()
},
watch: {
- isLoading:{
- handler(newval){
- console.log(newval)
+ isLoading: {
+ handler(newval) {
+ // console.log(newval)
}
},
tableHeadDataFateher: {
@@ -500,6 +500,7 @@
}
},
cellStatusFind(lcstatus) {
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -507,7 +508,10 @@
limit: this.page.pageSize,
'conditionMap[lcstatus]': lcstatus
}).then(res => {
- this.tableData = res.data.data
+ // console.log(res)
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
},
//灞曞紑闄勪欢
@@ -563,25 +567,28 @@
if (uniqueFlag === 'importGroupCode') return this.importGroupCode("groupCode")
});
},
- importGroupCode(type){
+ importGroupCode(type) {
this.batchImportData.visible = true
this.batchImportData.type = type
this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
//闆嗗洟鐮佸鍑�
- excelGroupCode(){
+ excelGroupCode() {
this.isLoading = true;
exportGroupCodeExcel({
codeClassifyOid: this.codeClassifyOid,
}).then(res => {
- console.log(res.data)
+ console.log(res)
if (res) {
func.downloadFileByBlobHandler(res);
this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�');
this.isLoading = false;
}
- }).catch(error=>{
- this.$message.error(error);
+ }).catch(error => {
+ console.log(error)
+ if (error) {
+ this.$message.error('璇锋煡鐪嬩笅杞界殑閿欒鏂囦欢锛�');
+ }
this.isLoading = false;
})
},
@@ -624,7 +631,7 @@
}
});
if (foundItem) {
- if(this.selectRow.length >= 1){
+ if (this.selectRow.length >= 1) {
this.$confirm('宸叉湁鍙傜収鏄惁鍙栨秷鍕鹃�夌户缁墽琛岋紵', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -640,7 +647,7 @@
message: '宸插彇娑堝綋鍓嶆搷浣�'
});
});
- }else {
+ } else {
this.amendvisible = true;
}
} else {
@@ -658,9 +665,9 @@
this.$message.warning('褰撳墠閫夋嫨鐨勫垎绫讳笉鏄彾瀛愯妭鐐癸紝涓嶅厑璁告壒閲忕紪杈戯紒')
return;
}
- this.batchImportData.visible = true
- this.batchImportData.type = type
- this.batchImportData.codeClassifyOid = this.codeClassifyOid
+ this.batchImportData.visible = true
+ this.batchImportData.type = type
+ this.batchImportData.codeClassifyOid = this.codeClassifyOid
},
addSaveHandler() {
this.$nextTick(() => {
@@ -1061,10 +1068,7 @@
},
//杈撳叆鍥炶溅鎼滅储
tableFindInp() {
- /*if (this.WupinFindValue.trim() === '') {
- this.$message.warning('杈撳叆鍊间笉鑳戒负绌�')
- return;
- }*/
+ this.isLoading = true;
TableData({
templateOid: this.templateOid,
codeClassifyOid: this.codeClassifyOid,
@@ -1073,7 +1077,8 @@
['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
}).then(res => {
this.tableData = res.data.data;
- // this.page.total = res.data.data.total;
+ this.page.total = res.data.total;
+ this.isLoading = false;
})
}
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 72f90ae..8cbc96c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -2,45 +2,44 @@
<template>
<el-container>
<!-- 宸︿晶鑿滃崟-->
- <el-aside>
+ <el-aside style="width: 20%;">
<basic-container>
- <div>
- <div>
- <div style="display: flex; flex-direction: column;">
- <div style="display: flex;justify-content: space-around">
+ <el-collapse accordion>
+ <el-collapse-item style="padding-left: 3px;">
+ <template slot="title">
+ <div style="display: flex;justify-content: space-around;">
<el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">娣诲姞
</el-button>
<el-button v-if="permissionList.TreeEditStatus" plain size="mini" type="primary" @click="TreeEdit">淇敼
</el-button>
<el-button v-if="permissionList.TreeDelStatus" plain size="mini" type="primary" @click="TreeDel">鍒犻櫎
</el-button>
- </div>
- <div style="display: flex; margin-top: 10px;justify-content: space-around">
<el-button v-if="permissionList.flushedStatus" plain size="mini" type="primary" @click="flushed">鍒锋柊
</el-button>
- <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">鍚敤
- </el-button>
- <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate">
- 鍋滅敤
- </el-button>
</div>
- <div style="display: flex; margin-top: 10px;justify-content: space-around">
- <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary"
- @click.native="ImportExcel">瀵煎叆
- </el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
- @click="ExportExcel">瀵煎嚭
- </el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
- @click="testHandler">娴嬭瘯
- </el-button>
- </div>
+ </template>
+ <div>
+ <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">鍚敤
+ </el-button>
+ <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate">
+ 鍋滅敤
+ </el-button>
+ <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary"
+ @click.native="ImportExcel">瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
+ @click="ExportExcel">瀵煎嚭
+ </el-button>
</div>
- <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
+ <div style="margin-top: 10px;margin-bottom: 10px">
+ <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">娴佹按澶勭悊
+ </el-button>
</div>
- </div>
+ </el-collapse-item>
+ </el-collapse>
+
<!-- 宸︿晶鏍�-->
- <div style="height: calc(100vh - 230px);overflow: auto;">
+ <div style="height: calc(100vh - 194px);overflow: auto;">
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
:defaultExpandAll="false"
:option="Treeoption"
@@ -107,7 +106,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
- </div>
</basic-container>
</el-aside>
<el-main>
@@ -439,6 +437,7 @@
name: "classifyTrees.vue",
data() {
return {
+ activeName: 'first',
masterRow: null,
AddLoading: false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
@@ -885,6 +884,9 @@
created() {
},
methods: {
+ handleTabClick(){
+
+ },
testHandler(){
if(this.nodeClickList.length <=0 ){
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
--
Gitblit v1.9.3