From 8343c82dcfd2f1ce67e234a77af9ad4ae7a3533f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 04 七月 2023 17:56:26 +0800
Subject: [PATCH] 主题库bug
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 4 +-
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 15 -------
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 9 +++-
Source/UBCS-WEB/vue.config.js | 4 +-
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 4 --
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 52 ++++++++++++-------------
6 files changed, 36 insertions(+), 52 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 21a5b5f..6cafeb2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -64,17 +64,6 @@
:show-overflow-tooltip="true"
align="center"
>
- <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
- <!-- <template slot-scope="{ row }">-->
- <!-- <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
- <!-- <span v-else>{{row[item.prop]}}</span>-->
- <!-- <el-switch-->
- <!-- v-if="editShow === 'true'"-->
- <!-- v-model="row[item.prop]"-->
- <!-- active-color="#13ce66"-->
- <!-- inactive-color="#ff4949">-->
- <!-- </el-switch>-->
- <!-- </template>-->
</el-table-column>
</el-table>
</el-row>
@@ -307,9 +296,6 @@
},
// 鍙戝竷
setHandler() {
- console.log("1111");
- console.log("鐖�", this.parameter);
-
if (this.selectRow.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
} else {
@@ -453,6 +439,7 @@
row.forEach((item) => {
this.parameter.ids.push(item.oid);
});
+ console.log( ' this.parameter.ids',this.parameter.ids)
},
//缂栬緫
editHandler() {
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 68cdd6c..bedf452 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,9 +1,6 @@
<template>
-
- <!-- <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"-->
- <!-- @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">-->
<div>
- <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArray.length>=1">
+ <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary"
@click="busineHandle">锛� 娣诲姞 {{ msg }}
@@ -37,7 +34,6 @@
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
-
</div>
<!-- 寮圭獥-->
<div>
@@ -203,7 +199,7 @@
</el-dialog>
<!-- 鍏ㄥ睆缂栬緫-->
<el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
- <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud>
+ <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
</el-dialog>
<!-- 缁勫悎瑙勫垯-->
<formula-editor :systemVariableTableData="systemVariableTableData"
@@ -236,8 +232,7 @@
style="width: 100%"
@cell-click="handleCellClicks"
@select="selectHandle"
- v-if="this.crudArray.length>=1"
-
+ v-if="this.crudArrayFlag"
>
<el-table-column
type="selection"
@@ -286,7 +281,6 @@
export default {
name: "attrCrud .vue",
- // props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'],
props: {
ProData: {
type: Array,
@@ -309,10 +303,29 @@
type: Boolean,
default: false
},
-
+ crudArrayFlag:{
+ type: Boolean,
+ default: false
+ }
+ },
+ watch:{
+ crudArray:{
+ handler(newval,oldval){
+ if(newval != undefined){
+ if(newval.length>=1){
+ this.crudArrayFlag=true
+ }else{
+ this.crudArrayFlag=false
+ }
+ }
+ },
+ deep:true,
+ immediate:true
+ }
},
data() {
return {
+ crudArrayFlag:false,
editingRows: null,
editShows:"",
attrFlag: false,
@@ -1169,21 +1182,10 @@
methods: {
formAttr(row, column) {
console.log(row,column)
- // if (column.property === "keyAttrFlag"
- // ||column.property === "queryAttrFlag"
- // ||column.property === "seniorQueryAttrFlag"
- // ||column.property === "sameRepeatAttrFlag"
- // ||column.property === "requireFlag"
- // ||column.property === "formDisplayFlag"
- // ||column.property === "tableDisplayFlag"
- // ||column.property === "sortAttrFlag") {
- // return row[column.property] =='true'? "鏄�" : "鍚�";
- // }
- // return row[column.property];
},
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
- this.formatBoolean()
+
if (this.CrudSelect.length > 1) {
this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
} else if (this.CrudSelect < 1) {
@@ -1230,14 +1232,10 @@
},
// 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
busineHandle() {
- if (this.crudArray.length < 1) {
- this.$message.error('璇烽�夋嫨涓�鏉℃ā鏉�')
- } else {
this.addVisible = true;
AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
this.businessData = res.data.data;
})
- }
},
// 绾ц仈灞炴�ф寜閽�
CascadeHandle() {
@@ -1264,7 +1262,7 @@
},
//淇濆瓨
addsHandler() {
- batchAddSave(JSON.parse(JSON.stringify(this.ProData).replace(/classifyTemplateOid/g,"classifytemplateoid"))).then(res => {
+ batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
this.$message.success('淇濆瓨鎴愬姛')
})
},
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index a95f7dd..6ab294c 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -791,8 +791,7 @@
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
} else {
- let codeClassifyOid = this.codeClassifyOid
- this.$set(row, "codeclassifyoid", codeClassifyOid)
+ this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
addSave(row).then(() => {
this.$message({
type: "success",
@@ -807,6 +806,7 @@
});
})
}
+ console.log('123',this.codeClassifyOid)
},
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index a0e23bf..f637e5f 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -90,7 +90,12 @@
},
deep:true,
immediate:true
- }
+ },
+ parameter:{
+ handler(newval,oldval){
+ console.log('瀛�',newval)
+ }
+ }
},
data() {
return {
@@ -112,8 +117,6 @@
},
mounted() {
- // this.apiInit()
- // this.apiDict()
console.log('---',this.parameter)
},
created() {
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 4968fdf..b4d93d0 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -37,8 +37,6 @@
handler(newval,oldval){
this.BuinessOids=newval;
this.BuinseseRend()
- console.log(newval)
- console.log(this.BuinessOids)
},
deep:true
}
@@ -48,8 +46,6 @@
mounted() {
},
methods:{
- HandlerRend(){
- },
BuinseseRend(){
businese({
btmType:'wupin',
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..4124c7c 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,8 +26,8 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- target: 'http://localhost:37000',
- // target: 'http://192.168.1.51:37000',
+ // target: 'http://localhost:37000',
+ target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
--
Gitblit v1.9.3