From 98c0721e362de73bbe1b64fa85ff92dbcacd7182 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 380498a..1e14d7a 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -15,12 +15,15 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+ <template slot-scope="scope" slot="menuLeft">
+ <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
+ </template>
</avue-crud>
</basic-container>
</template>
<script>
-import {getList} from "@/api/docking/data";
+import {getDataList} from "@/api/docking/data";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import website from "@/config/website";
@@ -29,6 +32,49 @@
name: "data",
data(){
return {
+ //鍚勪釜绫诲瀷鐘舵��
+ status:{
+ type:'data',
+ sendTypeFlga:false,
+ stateTaskDataFlag:false
+ },
+ //model缁戝畾
+ formInline:{
+ type:'',
+ text:'',
+ stateTask:'',
+ taskCut:''
+ },
+ //闆嗘垚绫诲瀷姝绘暟鎹�
+ SearchObject:{
+ searchData:[
+ {
+ label:'鏁版嵁缂栫爜',
+ prop: "id",
+ value:0
+ },
+ {
+ label:'鍒嗙被浠ｅ彿',
+ prop: "classifyId",
+ value:1
+ },
+ {
+ label:'鍒嗙被鍚嶇О',
+ prop: 'classifyName',
+ value:2
+ },
+ {
+ label:'鎺ㄩ�佺被鍨�',
+ prop: 'sendType',
+ value:3
+ },
+ {
+ label:'鏄惁鍒嗚В浠诲姟',
+ prop: 'sendFlag',
+ value:4
+ },
+ ]
+ },
value:'',
loading: false,
query: {},
@@ -44,6 +90,7 @@
calcHeight: 0,
tip: false,
searchShow: false,
+ searchShowBtn:false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -143,6 +190,12 @@
}
},
methods: {
+ dockingGetList(val){
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
@@ -190,7 +243,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getDataList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3