From 7db3ee6e84714a868e0b57a61a033d050b1a61fc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 21:06:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/task.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 4c2cec2..81df647 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>
@@ -31,7 +31,7 @@
</template>
<script>
-import {getList,sendData} from "@/api/docking/task";
+import {getTaskList,sendData} from "@/api/docking/task";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import {remove} from "@/api/code/codeSynonym";
@@ -40,6 +40,7 @@
name: "task",
data(){
return {
+ //model缁戝畾
formInline:{
type:'',
stateTask:'',
@@ -48,13 +49,15 @@
text:'',
taskCut:''
},
+ //鍚勪釜绫诲瀷鐘舵��
status:{
type:'task',
- stateTaskFlag:false,
+ stateTaskDataFlag:false,
dateFlag:false,
lastDateFlag:false,
sendTypeFlga:false
},
+ //闆嗘垚绫诲瀷姝绘暟鎹�
SearchObject:{
searchData:[
{
@@ -119,7 +122,8 @@
calcHeight: 0,
tip: false,
searchShow: false,
- searchMenuSpan: 6,
+ searchShowBtn:false,
+ // searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
@@ -239,6 +243,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) {
@@ -286,7 +296,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
+ getTaskList(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