From b378b9b97a1119deeeab23f9f0c192426d01cee5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 17:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 5 +
Source/UBCS-WEB/src/views/docking/loge.vue | 8 +
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 1
Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue | 147 ++++++------------------------------
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 47 ++++++++++-
Source/UBCS-WEB/src/api/docking/loge.js | 4
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2
Source/UBCS-WEB/src/views/docking/task.vue | 5 +
8 files changed, 86 insertions(+), 133 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/docking/loge.js b/Source/UBCS-WEB/src/api/docking/loge.js
index 3b758e6..4553623 100644
--- a/Source/UBCS-WEB/src/api/docking/loge.js
+++ b/Source/UBCS-WEB/src/api/docking/loge.js
@@ -1,13 +1,13 @@
import request from '@/router/axios';
-export const getList = (page, size, params) => {
+export const getList = (page, limit, params) => {
return request({
url: '/api/ubcs-code/dockingManagement/gridLoge',
method: 'get',
params: {
...params,
page,
- size
+ limit
}
})
}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 9de85e8..4eb070b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -221,7 +221,7 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+ (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 652907c..0b17c75 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -60,7 +60,7 @@
<!-- 鍏敤妯″潡-->
<!-- 杈撳叆鍐呭-->
<el-form-item size="small" v-if="shouldShowInput">
- <el-input v-model="formInline.text" placeholder="璇疯緭鍏ュ唴瀹�" @keyup.enter.native="SaveHandler"></el-input>
+ <el-input v-model="formInline.text" placeholder="鎸変笅鍥炶溅閿繘琛屾煡璇紒" @keyup.enter.native="SaveHandler"></el-input>
</el-form-item>
<!-- 鏌ヨ鎸夐挳-->
<el-form-item size="small" v-if="shouldShowButton">
@@ -117,13 +117,50 @@
},
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
- getList(this.page.currentPage, this.page.pageSize, { [`conditionMap['${name}_like']`]: this.formInline.text}).then(res => {
+ getList(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
console.log(res);
});
},
- handleSearch(){
- let formattedDate = this.$moment(this.formInline.Date).format('YYYY-M-D');
- console.log('formattedDate',formattedDate);
+ handleSearch() {
+ const { type, typeFlag, stateFlag, stateTaskDataFlag, dateFlag, lastDateFlag ,sendTypeFlga} = this.status;
+ const { currentPage, pageSize } = this.page;
+ const { cut, state, stateTask, Date, lastDate, taskCut } = this.formInline;
+ const requestParams = {};
+ // 闆嗘垚鏃ュ織绫诲瀷
+ if (type === 'loge' && typeFlag) {
+ requestParams['conditionMap[type_like]'] = cut;
+ }
+ // 闆嗘垚鏃ュ織鏄惁鎴愬姛
+ if (type === 'loge' && stateFlag) {
+ requestParams['conditionMap[interfaceStatus_like]'] = state;
+ }
+ // 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� 闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟
+ if ((type === 'task' || type === 'data') && stateTaskDataFlag) {
+ requestParams['conditionMap[sendFlag_like]'] = stateTask;
+ }
+ // 闆嗘垚浠诲姟 鍒涘缓鏃ユ湡 鍜� 闆嗘垚鏃ュ織 璁板綍鏃堕棿
+ if ((type === 'loge' || type === 'task') && dateFlag) {
+ const formattedDate = this.$moment(Date).format('YYYY-M-D');
+ requestParams['conditionMap[createTime_like]'] = formattedDate;
+ }
+ // 闆嗘垚浠诲姟 鏈�鍚庢帹閫佹椂闂�
+ if (type === 'task' && lastDateFlag) {
+ const formattedDate = this.$moment(lastDate).format('YYYY-M-D');
+ requestParams['conditionMap[lastModifyTime_like]'] = formattedDate;
+ }
+ // 闆嗘垚浠诲姟 闆嗘垚鏁版嵁 鎺ㄩ�佺被鍨�
+ if ((type === 'task' || type === 'data') && sendTypeFlga) {
+ requestParams['conditionMap[sendType_like]'] = taskCut;
+ }
+ // 璇锋眰
+ getList(currentPage, pageSize, requestParams).then(res => {
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+ }else {
+ let Data=res.data.data.records;
+ this.$emit('getList',Data)
+ }
+ });
}
}
}
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index fa4a1bd..7aab2aa 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -17,6 +17,7 @@
components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
data() {
return {
+ reterTypeLeavl:'213',
refertype: this.referConfig.options.type,
emitData:{},
title:'',
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index c556696..e249724 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -16,7 +16,7 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
- <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+ <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
</template>
</avue-crud>
</basic-container>
@@ -189,6 +189,9 @@
}
},
methods: {
+ dockingGetList(val){
+ this.data=val;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 37333e4..2de73b5 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -3,7 +3,7 @@
<basic-container>
<avue-crud :option="option"
:table-loading="loading"
- :data="data"
+ :data="data || getList"
:page.sync="page"
:permission="permissionList"
ref="crud"
@@ -16,7 +16,7 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
- <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+ <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
</template>
</avue-crud>
</basic-container>
@@ -218,6 +218,10 @@
}
},
methods: {
+ dockingGetList(val){
+ console.log(val,'val')
+ this.data=val;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index fd99ef0..2d637e1 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -23,7 +23,7 @@
@click="handleSend">鎵嬪姩鎺ㄩ��
</el-button>
<div style="float: right;margin-left: 10px">
- <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status"></vci-docking-search>
+ <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status" @getList="dockingGetList"></vci-docking-search>
</div>
</template>
</avue-crud>
@@ -242,6 +242,9 @@
}
},
methods: {
+ dockingGetList(val){
+ this.data=val;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
diff --git a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
index 64471d3..aa9b662 100644
--- a/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
+++ b/Source/UBCS-WEB/src/views/system/PasswordManagement/passwords.vue
@@ -312,12 +312,6 @@
checkboxedit:"",
// 鐢ㄤ簬鍒ゆ柇鏄惁鏄紪杈�
editFlag:false
- // 鑷充簬涓轰粈涔堟病鍦ㄧ敤鎴烽�夋嫨蹇呭～绉嶇被澶т簬缁勫悎鏂瑰紡鐨勬椂鍊欙紝缁欎笅鎷夎彍鍗曢�変腑鐨勬暟鎹竻绌轰簡锛岃繖鏍锋瘮缁欎簣寮圭獥鎻愰啋鏇村悎鐞�
- // 鍘熷洜鏄壘浜嗗ソ涔呮病鎵惧埌avue妗嗘灦杩欎釜閫変腑鐨勫睘鎬ф樉绀哄湪椤甸潰鎬庝箞淇敼锛岀洿鎺ヤ慨鏀逛笅鎷夎彍鍗曟暟鎹殑value娌℃晥鏋滐紝鎵句笉鍒版槸浠�涔堟帶鍒惰繖椤甸潰鏄剧ず鐨勯�変腑鏁版嵁
- // 鎴戝皾璇曞湪dicdata澶栭潰瀹氫箟value淇敼涓嬫媺鑿滃崟鏄剧ず鐨勯粯璁ゅ�间篃涓嶈锛岀劧鍚庡啀灏濊瘯璋冪敤avue鐨刢lose娓呴櫎鏂规硶锛屼絾鏄篃鏄彧鑳藉疄鐜板湪涓嬫媺鑿滃崟鍚庨潰鏄剧ず涓�涓猉鍙�
- // 褰撶敤鎴锋墜鍔ㄧ偣鍑绘竻闄わ紝鎵嶅彲浠ユ妸鏁版嵁娓呴櫎锛屾�昏�岃█涔嬫壘浜嗗ソ涔咃紝娌℃壘鍒拌繖涓竻闄ゆ柟娉曪紝avue鐨勮鏄庢枃妗ｄ篃娌℃槑纭爣鏄庤繖涓姛鑳界殑鍐呯疆鎿嶄綔鏂规硶
- // 鎴戞兂鍒扮殑搴旇鍙互鐨勬柟娉曟槸锛岃垗寮僶ption閲岄潰鐨勭粍鍚堟柟寮忥紝鑷繁鎵嬪姩鍦ㄩ〉闈㈡坊鍔犳彃妲藉畾涔夌粍鍚堟柟寮忥紝鑷充簬鏄娇鐢╝vue杩樻槸element-ui鏉ュ啓锛岃繕瑕佺湅鍏蜂綋鐨勬楠�
- // 鍥犱负涓�鏀瑰姩锛屾垜鐜板湪鍐欑殑閫昏緫姣斿涓嬫媺鑿滃崟绂佺敤鍜岀瓥鐣ラ獙璇佺瓑绛夎閲嶆柊姊崇悊锛屾垜杩欒竟鎬ョ潃璧跺璞″缓妯＄殑杩涘害锛屾墍浠ュ厛鐢ㄨ繖绉嶆柟寮忔潵澶勭悊锛屽鏋滄垜鍥炲ご鏈夋椂闂存垜鍐嶆潵缁х画鏀癸紝灏辨病鏈夎繖鏉℃敞閲婁簡銆�
}
},
@@ -336,125 +330,36 @@
// console.log("澶т簬")
// }
},
- handleCheckboxChange(val){
- const arr=this.option.column[5];
- this.checkboxlength=val.value;
- //娣诲姞鐨勬椂鍊檆heckboxlength鏄竴涓暟缁勶紝鍒颁簡缂栬緫浠栧氨鏄竴涓瓧绗︿覆锛屽鏋滄垜鎴戠洿鎺ヨ浆鎹负鏁扮粍锛屽洜涓烘湰鏉ュ氨鏄暟缁勬墍浠ョ偣鍑绘坊鍔犵殑鏃跺�欎細鎶ラ敊
- //濡傛灉鎴戝彉鎴愬瓧绗︿覆鍚庡啀杞暟缁�,娣诲姞涓嶄細鎶ラ敊浜�,浣嗘槸缂栬緫鐨勬椂鍊欏氨鍙堜細鎶ラ敊浜�,鏈潵灏辨槸瀛楃涓插張璧颁簡涓�閬峵ostring
- this.checkboxedit=this.checkboxlength.toString().split(",")
- if(val.value != undefined && val.value != null){
- if(this.checkboxlist == val.value){
- // 鍒ゆ柇鐩哥瓑鍒欎笉鎿嶄綔锛屼笉绛夊垯閲嶆柊鎵ц銆傚姞杩欏眰鍒ゆ柇鏄洜涓篶hange浜嬩欢瑙﹀彂涓ゆ锛屼細鍑虹幇涓や釜娑堟伅鎻愮ず妗�
- // 瀹氫箟checkboxlist鍙橀噺,瀛樺偍鐨勬敼鍙樼殑鍊�,濡傛灉鍊兼敼鍙樺拰鍙橀噺鐩哥瓑鍒欎笉闇�瑕佷换浣曟搷浣�
- }else {
- this.checkboxlist=val.value
- if( this.selectlength.value >= val.value.length && val.value.length > 0 ){
- this.$message({
- message: '蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
- type: 'warning',
- showClose: true,
- });
- }else if(this.selectlength.value >= this.checkboxedit.length && this.checkboxedit.length > 0 ){
- this.$message({
- message: '蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
- type: 'warning',
- showClose: true,
- });
+ handleCheckboxChange(val) {
+ const arr = this.option.column[5];
+ this.checkboxlength = val.value;
+ this.checkboxedit = this.checkboxlength.toString().split(",");
+
+ if (val.value != undefined && val.value != null) {
+ if (this.checkboxlist == val.value) {
+ } else {
+ this.checkboxlist = val.value;
+ if (
+ this.selectlength.value >= val.value.length &&
+ val.value.length > 0
+ ) {
+ this.showMessage("蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�");
+ } else if (
+ this.selectlength.value >= this.checkboxedit.length &&
+ this.checkboxedit.length > 0
+ ) {
+ this.showMessage("蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�");
}
}
- // if(this.checkboxeditlist == val.value){
- // // tong
- // }else {
- // this.checkboxeditlist=val.value
- // if(this.selectlength.value >= this.checkboxedit.length && this.checkboxedit.length > 0){
- // this.$message({
- // message: '蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
- // type: 'warning',
- // showClose: true,
- // });
- // }
- // }
- // if(this.selectlength.value >= this.checkboxedit.length && this.checkboxedit.length > 0){
- // this.$message({
- // message: '蹇呭～绉嶇被涓嶈兘澶т簬缁勫悎鏂规硶锛岃閲嶆柊閫夋嫨锛�',
- // type: 'warning',
- // showClose: true,
- // });
- // }
}
- // 杩欓噷涓�鐩存姤length鐨勯敊璇�
- // arr.forEach((item,index)=>{
- // console.log(item,index)
- // if(val.value != undefined && val.value != null && val.value.length==0){
- // item.disabled=false
- // }
- // if(val.value != undefined && val.value != null && val.value.length>=1){
- //
- // }
- // })
- // if(val.value != undefined && val.value != null && val.value.length >= 0){
- // arr.dicData[val.value.length-1].disabled=true
- // }
- // }else if(val.value != undefined && val.value != null && val.value.length ==0){
- // arr.dicData.disabled=false
- // }
- if(val.value != undefined && val.value != null && val.value.length == 1){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=true
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
- }else if(val.value != undefined && val.value != null && val.value.length ==2){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
- }else if(val.value != undefined && val.value != null && val.value.length ==3){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=false
- arr.dicData[3].disabled=true
- }else if(val.value != undefined && val.value != null && val.value.length==4){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=false
- arr.dicData[3].disabled=false
- }else if(val.value != undefined && val.value != null && val.value.length==0 ){
- arr.dicData[0].disabled=true
- arr.dicData[1].disabled=true
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
- }else if(this.checkboxNumber.length!=0){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=false
- arr.dicData[3].disabled=false
+ const disabledCount = Math.min(this.checkboxedit.length, 4);
+ for (let i = 0; i < arr.dicData.length; i++) {
+ arr.dicData[i].disabled = i >= disabledCount;
}
- if(this.editFlag == true){
- if(this.checkboxedit.length == 1){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=true
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
- }else if(this.checkboxedit.length == 2){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
- }else if(this.checkboxedit.length ==3){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=false
- arr.dicData[3].disabled=true
- }else if(this.checkboxedit ==4){
- arr.dicData[0].disabled=false
- arr.dicData[1].disabled=false
- arr.dicData[2].disabled=false
- arr.dicData[3].disabled=false
- }else if(this.checkboxedit.length ==0){
- arr.dicData[0].disabled=true
- arr.dicData[1].disabled=true
- arr.dicData[2].disabled=true
- arr.dicData[3].disabled=true
+ if (this.editFlag == true) {
+ const disabledCount = Math.min(this.checkboxedit.length, 4);
+ for (let i = 0; i < arr.dicData.length; i++) {
+ arr.dicData[i].disabled = i >= disabledCount;
}
}
},
--
Gitblit v1.9.3