From a75ed7b2ec701afa546895653903e9c1f35db2b1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 12:09:51 +0800
Subject: [PATCH] 主数据添加 编码申请添加-ts时间戳bug
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 79 ++++++++++++++++++++++-----------------
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 2 +
Source/UBCS-WEB/src/views/code/codeApply.vue | 12 +-----
3 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 376bd5f..f7a0b3d 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -881,6 +881,8 @@
},
//澧炲姞淇濆瓨
AddSumbit(val) {
+ console.log(val)
+ val.ts = val.ts.toISOString().replace("Z", "");
addSaveCode(val).then(res => {
this.$nextTick(() => {
this.addvisible = false;
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 369da39..847ed74 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -6,11 +6,11 @@
<span v-if="permissionList.busineStatus">
<el-button
v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag && (!checkStatus || crudLCStatus=='Editing' )"
- icon="el-icon-plus" plain size="small" type="primary" @click="busineHandle" >娣诲姞 {{ msg }}
+ icon="el-icon-plus" plain size="small" type="primary" @click="busineHandle">娣诲姞 {{ msg }}
</el-button>
</span>
<!-- 鍏ㄥ睆缂栬緫-->
- <span v-if="permissionList.fullscreenStatus">
+ <span v-if="permissionList.fullscreenStatus">
<el-button
v-if=" attrEditVisible == false && attrFlagChiledren==false && editOpenFlag&&(!checkStatus || crudLCStatus=='Editing')"
icon="el-icon-full-screen" size="small" @click="fullscreenHandle">鍏ㄥ睆缂栬緫
@@ -19,10 +19,10 @@
<span v-if="permissionList.ruleStatus">
<!-- 楠岃瘉瑙勫垯-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing' )&& editOpenFlag" icon="el-icon-info" size="small"
- @click="ruleAddHandler" >楠岃瘉瑙勫垯
+ @click="ruleAddHandler">楠岃瘉瑙勫垯
</el-button>
</span>
- <span v-if="permissionList.attrStatus">
+ <span v-if="permissionList.attrStatus">
<!-- 灞炴�у垎缁�-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-menu" size="small"
@click="attrVisibleHandle">灞炴�у垎缁�
@@ -34,35 +34,38 @@
<!-- 淇濆瓨-->
<el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-check" plain
size="small"
- type="success" @click.prevent="addsHandler" >淇濆瓨
+ type="success" @click.prevent="addsHandler">淇濆瓨
</el-button>
</span>
- <!-- 棰勮鎺掑簭-->
- <el-button icon="el-icon-arrow-down" size="small" @click="orderHandle" v-if="permissionList.orderStatus">棰勮鎺掑簭</el-button>
+ <!-- 棰勮鎺掑簭-->
+ <el-button v-if="permissionList.orderStatus" icon="el-icon-arrow-down" size="small" @click="orderHandle">棰勮鎺掑簭
+ </el-button>
<span v-if="permissionList.removeStatus">
<!-- 鍒犻櫎-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-delete" size="small"
- @click="CrudRemove" >鍒犻櫎
+ @click="CrudRemove">鍒犻櫎
</el-button>
</span>
<!-- 閲嶇疆-->
- <el-button icon="el-icon-refresh-right" size="small" @click="resetHandler" v-if="permissionList.resetStatus">閲嶇疆</el-button>
+ <el-button v-if="permissionList.resetStatus" icon="el-icon-refresh-right" size="small" @click="resetHandler">
+ 閲嶇疆
+ </el-button>
</el-button-group>
<el-button-group>
<span v-if="permissionList.injectStatus"><!-- 鍒嗙被娉ㄥ叆-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-magic-stick"
- size="small" @click="injectBtn" >鍒嗙被娉ㄥ叆
+ size="small" @click="injectBtn">鍒嗙被娉ㄥ叆
</el-button></span>
- <span v-if="permissionList.isShowStatus"> <!-- 缁勫悎瑙勫垯-->
+ <span v-if="permissionList.isShowStatus"> <!-- 缁勫悎瑙勫垯-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-film" size="small"
@click="isShowHandler">缁勫悎瑙勫垯
</el-button></span>
<span v-if="permissionList.enumStatus"> <!-- 鏋氫妇娉ㄥ叆-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-c-scale-to-original"
- size="small" @click="enumVisHandle" >鏋氫妇娉ㄥ叆
+ size="small" @click="enumVisHandle">鏋氫妇娉ㄥ叆
</el-button></span>
- <span v-if="permissionList.cascadStatus">
+ <span v-if="permissionList.cascadStatus">
<!-- 绾ц仈灞炴��-->
<el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-coin" size="small"
@click="CascadeHandle">绾ц仈灞炴��
@@ -72,12 +75,15 @@
<el-button-group>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <el-button icon="el-icon-share" size="small" @click="syncHandle" v-if="permissionList.syncStatus">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button v-if="permissionList.syncStatus" icon="el-icon-share" size="small" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�
+ </el-button>
</el-button-group>
<el-button-group>
<!-- 缂栫爜鐢宠棰勮-->
- <el-button icon="el-icon-view" size="small" style="" @click="applicationHandle" v-if="permissionList.applicationStatus">缂栫爜鐢宠棰勮</el-button>
+ <el-button v-if="permissionList.applicationStatus" icon="el-icon-view" size="small" style=""
+ @click="applicationHandle">缂栫爜鐢宠棰勮
+ </el-button>
</el-button-group>
<!-- 鏄惁寮�鍚紪杈� -->
@@ -317,9 +323,9 @@
<el-table v-if="this.crudArrayFlag"
ref="referAttrCrud"
v-loading="loading"
- border
:data="ProData"
:height="this.tableHeight"
+ border
style="width: 100%"
@select="selectHandle"
@cell-click="handleCellClicks"
@@ -396,6 +402,7 @@
import func from "@/util/func";
import {getCurrentInstance} from "vue";
import {mapGetters} from "vuex";
+
export default {
name: "attrCrud .vue",
props: {
@@ -655,7 +662,7 @@
addBtn: false,
header: false,
align: 'center',
- columnBtn:false,
+ columnBtn: false,
menuAlign: 'center',
column: [{
label: '',
@@ -1192,7 +1199,7 @@
List: [],
option: {
index: false,
- columnBtn:false,
+ columnBtn: false,
border: true,
editBtn: false,
selection: true,
@@ -1544,22 +1551,22 @@
},
computed: {
...mapGetters(["permission"]),
- permissionList(){
- return{
- busineStatus:this.vaildData(this.permission.classifyTree.attr_add,false),
- fullscreenStatus:this.vaildData(this.permission.classifyTree.attr_view_edit,false),
- ruleStatus:this.vaildData(this.permission.classifyTree.attr_rule,false),
- attrStatus:this.vaildData(this.permission.classifyTree.attr_group,false),
- saveStatus:this.vaildData(this.permission.classifyTree.attr_save,false),
- resetStatus:this.vaildData(this.permission.classifyTree.attr_reset,false),
- injectStatus:this.vaildData(this.permission.classifyTree.attr_inject,false),
- isShowStatus:this.vaildData(this.permission.classifyTree.attr_formrule,false),
- enumStatus:this.vaildData(this.permission.classifyTree.attr_enum,false),
- cascadStatus:this.vaildData(this.permission.classifyTree.attr_parentcode,false),
- syncStatus:this.vaildData(this.permission.classifyTree.attr_sync,false),
- applicationStatus:this.vaildData(this.permission.classifyTree.attr_application,false),
- orderStatus:this.vaildData(this.permission.classifyTree.attr_sort,false),
- removeStatus:this.vaildData(this.permission.classifyTree.attr_delete,false),
+ permissionList() {
+ return {
+ busineStatus: this.vaildData(this.permission.classifyTree.attr_add, false),
+ fullscreenStatus: this.vaildData(this.permission.classifyTree.attr_view_edit, false),
+ ruleStatus: this.vaildData(this.permission.classifyTree.attr_rule, false),
+ attrStatus: this.vaildData(this.permission.classifyTree.attr_group, false),
+ saveStatus: this.vaildData(this.permission.classifyTree.attr_save, false),
+ resetStatus: this.vaildData(this.permission.classifyTree.attr_reset, false),
+ injectStatus: this.vaildData(this.permission.classifyTree.attr_inject, false),
+ isShowStatus: this.vaildData(this.permission.classifyTree.attr_formrule, false),
+ enumStatus: this.vaildData(this.permission.classifyTree.attr_enum, false),
+ cascadStatus: this.vaildData(this.permission.classifyTree.attr_parentcode, false),
+ syncStatus: this.vaildData(this.permission.classifyTree.attr_sync, false),
+ applicationStatus: this.vaildData(this.permission.classifyTree.attr_application, false),
+ orderStatus: this.vaildData(this.permission.classifyTree.attr_sort, false),
+ removeStatus: this.vaildData(this.permission.classifyTree.attr_delete, false),
}
},
attrOids() {
@@ -2215,8 +2222,9 @@
<style lang="scss" scoped>
//鍥哄畾鍒楅珮搴�
/deep/ .el-table__fixed {
- height: calc(100vh - 612px)!important;
+ height: calc(100vh - 612px) !important;
}
+
///deep/ .el-table__fixed[v-if='editStyleFlag'] {
// height: calc(100vh - 152px)!important; // 缂栬緫鐘舵�佷笅鐨勯珮搴�
//}
@@ -2229,6 +2237,7 @@
width: 10px;
}
+
// 婊氬姩鏉＄殑婊戝潡
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #ececec;
diff --git a/Source/UBCS-WEB/src/views/code/codeApply.vue b/Source/UBCS-WEB/src/views/code/codeApply.vue
index c9df49d..32ce26e 100644
--- a/Source/UBCS-WEB/src/views/code/codeApply.vue
+++ b/Source/UBCS-WEB/src/views/code/codeApply.vue
@@ -157,15 +157,6 @@
// 杩涜琛ㄥ崟鏍￠獙
const formValidate = await this.$refs.FormTemplate.validate();
if (!formValidate) return;
- let codeValidate = true;
- // 杩涜鐮佸�肩敵璇锋牎楠�
- // if (this.showCodeApply) {
- // codeValidate = await this.$refs.CodeApply.validate();
- // if (!codeValidate) {
- // this.activeName = "codeApply";
- // return false;
- // }
- // }
let resembleQueryList = [];
if (this.showResembleQuery && this.$refs.resembleQueryRef) {
// 杩涜鐩镐技椤规煡璇�
@@ -226,6 +217,7 @@
resForm.codeRuleOid = this.codeRuleOid;
resForm.templateOid = this.templateOid;
// this.$emit("submit", resForm);
+ resForm.ts = resForm.ts.toISOString().replace("Z", "");
addSaveCode(resForm).then(res => {
this.$nextTick(() => {
this.addvisible = false;
@@ -233,7 +225,7 @@
this.onLoad()
})
})
- console.log(resForm)
+ // console.log(resForm)
},
getDefaultValueAndFormValues(form) {
let defaultValue = {};
--
Gitblit v1.9.3