From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 6 ++
Source/UBCS-WEB/src/views/wel/Statistic.vue | 46 ++++++++++++----------
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 27 +++++++++----
Source/UBCS-WEB/src/page/index/top/index.vue | 30 ++++++++++++--
Source/UBCS-WEB/src/api/system/dept.js | 9 +---
Source/UBCS-WEB/src/views/system/user.vue | 2
6 files changed, 78 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/system/dept.js b/Source/UBCS-WEB/src/api/system/dept.js
index 09197b4..8e594f5 100644
--- a/Source/UBCS-WEB/src/api/system/dept.js
+++ b/Source/UBCS-WEB/src/api/system/dept.js
@@ -83,11 +83,8 @@
export const updateUserStatus = (params) => {
return request({
- url: '/api/ubcs-user/user/updateUserStatus ',
- method: 'get',
- params:{
- ...params
- }
+ url: '/api/ubcs-user/updateUserStatus',
+ method: 'post',
+ data: params
})
}
-
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 9907cf6..9ca0d57 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -43,7 +43,7 @@
<el-table-column v-if="tableData.length != 0" fixed type="selection" width="55"></el-table-column>
<el-table-column v-if="tableData.length != 0" fixed label="搴忓彿" type="index" width="55">
</el-table-column>
- <el-table-column v-for="item in CodeArray" v-if="!item.hidden" :label="item.label" :prop="item.prop"
+ <el-table-column v-for="item in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden" :label="item.label" :prop="item.prop"
:show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
align="center">
<template slot-scope="scope">
@@ -61,7 +61,7 @@
:width="item.width"
align="center">
</el-table-column>
- <el-table-column v-for="item in lcstatusArray" v-if="!item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
+ <el-table-column v-for="item in lcstatusArray" v-if=" lcstatusArray.length !== 0 && !item.hidden" label="鐢熷懡鍛ㄦ湡鍊�" prop="lcstatus"
:show-overflow-tooltip="true" :sortable="item.sortable" :width="item.width"
align="center">
<template slot-scope="scope">
@@ -381,14 +381,25 @@
}
})
this.tableHeadFindDatas = newval;
+ console.log('new',newval)
if (!this.isCodeArrayPushed) {
- this.CodeArray.push(newval.find(item => item.prop === 'id'))
- this.isCodeArrayPushed = true
- };
+ if (newval.find(item => item.prop === 'id')) {
+ this.CodeArray.push(newval.find(item => item.prop === 'id'));
+ } else {
+ this.CodeArray.push([]);
+ }
+ console.log('CodeArray', this.CodeArray);
+ this.isCodeArrayPushed = true;
+ }
if (!this.islcstatusPushed) {
- this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'))
- this.islcstatusPushed = true
- };
+ if (newval.find(item => item.prop === 'lcstatus')) {
+ this.lcstatusArray.push(newval.find(item => item.prop === 'lcstatus'));
+ } else {
+ this.lcstatusArray.push([]);
+ }
+ console.log('lcstatusArray', this.lcstatusArray);
+ this.islcstatusPushed = true;
+ }
// console.log('new',newval)
this.WupinFindValue = ''
},
diff --git a/Source/UBCS-WEB/src/page/index/top/index.vue b/Source/UBCS-WEB/src/page/index/top/index.vue
index f445e17..5ba68fe 100644
--- a/Source/UBCS-WEB/src/page/index/top/index.vue
+++ b/Source/UBCS-WEB/src/page/index/top/index.vue
@@ -20,9 +20,11 @@
</div>
<div></div>
<div class="top-bar__right">
- <el-tooltip style="margin-right: 35px">
- <p style="font-size: 20px;line-height: 20px">鏈郴缁熶负闈炴秹瀵嗗簲鐢ㄧ郴缁燂紝绂佹澶勭悊銆佸瓨鍌ㄣ�佷紶杈撴秹瀵嗕俊鎭�</p>
- </el-tooltip>
+ <div class="container">
+ <div class="content">
+ 鏈郴缁熶负闈炴秹瀵嗗簲鐢ㄧ郴缁燂紝绂佹澶勭悊銆佸瓨鍌ㄣ�佷紶杈撴秹瀵嗕俊鎭�
+ </div>
+ </div>
<el-tooltip v-if="showColor"
effect="dark"
:content="$t('navbar.color')"
@@ -105,9 +107,9 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
- <el-tooltip effect="dark" style="margin-left: 15px">
+ <div style="margin-left: 15px">
<p style="font-size: 16px">褰撳墠鐧诲綍鐢ㄦ埛锛歿{storedUsername}}</p>
- </el-tooltip>
+ </div>
<el-dialog title="鐢ㄦ埛淇℃伅閫夋嫨"
append-to-body
:visible.sync="userBox"
@@ -268,4 +270,22 @@
</script>
<style lang="scss" scoped>
+.container {
+ max-width: 100%;
+ padding: 0 20px;
+ margin: 0 auto;
+ box-sizing: border-box;
+}
+
+.content {
+ font-size: 20px;
+ line-height: 20px;
+ margin-right: 35px;
+}
+
+@media screen and (max-width: 768px) {
+ .content {
+ margin-right: 0;
+ }
+}
</style>
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 8fe7297..f26f0cc 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -3382,10 +3382,14 @@
},
// 鏈�澶ф祦姘村彿
maxSerialNum() {
- if (this.selectionList.length === 0) {
+ if (this.selectionList.length <= 0) {
this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欙紒");
return;
}
+ if(this.selectionList.length> 1){
+ this.$message.warning("鍙兘閫夋嫨涓�鏉＄紪鐮佽鍒欙紒");
+ return;
+ }
this.maxSerial.visible = true;
this.maxSerial.ruleOid = this.selectionList[0]["oid"];
},
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index c2adc42..2320aff 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -742,7 +742,7 @@
}
},
created() {
- updateUserStatus({userid:'1702600796324032513',status:'true'}).then(res=>{
+ updateUserStatus({userid:'1702600796324032513',status:true}).then(res=>{
console.log(res)
})
this.selecload()
diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index f9f822f..918d584 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -13,6 +13,7 @@
name: "Statistic",
data(){
return {
+ userId:'',
countByServer:true,
// listMyTask:[]
option: {
@@ -59,7 +60,10 @@
}
},
created() {
- this.getList();
+ this.userId=sessionStorage.userId
+ getList('/api/ubcs-code/mdmCount/getMdmCounts',{id:this.userId}).then(res=>{
+ console.log(res)
+ })
},
computed(){
@@ -77,26 +81,26 @@
handleItemDClick() {
this.$router.push({ path: '/MasterData/items?id=gongyingshang@@name=渚涘簲鍟嗕富鏁版嵁'} );
},
- getList() {
- // debugger
- Object.values(this.option.data).map(record => {
- record.count = record.count || 0;
- if (!this.countByServer) {
- // 鏄墠绔煡璇�
- getList(record.countUrl, {}).then(res => {
- // console.log('res',res)
- if (res.data.data.success) {
- record.count = res.data.data.obj;
- } else {
- record.count = 0;
- }
- });
- }
- return {
- ...record
- };
- });
- },
+ // getList() {
+ // // debugger
+ // Object.values(this.option.data).map(record => {
+ // record.count = record.count || 0;
+ // if (!this.countByServer) {
+ // // 鏄墠绔煡璇�
+ // getList(record.countUrl, {}).then(res => {
+ // // console.log('res',res)
+ // if (res.data.data.success) {
+ // record.count = res.data.data.obj;
+ // } else {
+ // record.count = 0;
+ // }
+ // });
+ // }
+ // return {
+ // ...record
+ // };
+ // });
+ // },
}
}
</script>
--
Gitblit v1.9.3