From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 116 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 3216c5f..2118a26 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -8,18 +8,22 @@
:permission="permissionList"
ref="crud"
@search-change="searchChange"
+ @cell-dblclick="cellDbClick"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@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";
@@ -28,6 +32,50 @@
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: {},
selectionList: [],
@@ -40,8 +88,10 @@
option: {
height:'auto',
calcHeight: 0,
+ columnBtn:false,
tip: false,
searchShow: false,
+ searchShowBtn:false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -55,52 +105,63 @@
prop: "id",
search: true,
sortable:true,
- width:150
+ // width:150
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
- width: 250
+ // width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
- sortable:true
+ sortable:true,
},
{
label: '涓氬姟绫诲瀷oid',
- prop: 'btmoid',
+ prop: 'btmOid',
sortable:true,
- width: 150
+ hide:true,
+ // width: 250
},
{
label: '涓氬姟绫诲瀷id',
- prop: 'btmid',
+ prop: 'btmId',
sortable:true,
- width: 150
+ // width: 150
},
{
label: '鎺ㄩ�佺被鍨�',
- prop: 'sendtype',
+ prop: 'sendType',
search: true,
sortable:true,
- width: 150
+ // width: 150,
+ formatter: function (row, column) {
+ if (row.sendType === 'Enabled') {
+ return '鍙戝竷';
+ } else if (row.sendType === 'TakeBack') {
+ return '鍥炴敹';
+ } else if (row.sendType === 'Disabled') {
+ return '鍋滅敤';
+ }
+ }
},
{
label: '鏄惁鍒嗚В浠诲姟',
- prop: 'sendflag',
+ prop: 'sendFlag',
search: true,
sortable:true,
- width: 130,
+ // width: 130,
html:true,
align:'center',
type:'select',
@@ -111,7 +172,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
+ return row.sendFlag == 'true' || row.sendFlag == '1' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800" ></i>'
}
}
]
@@ -130,6 +191,25 @@
}
},
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) {
+ this.value = row[key];
+ }
+ }
+ try {
+ await this.$copyText(this.value);
+ this.$message.success('澶嶅埗鎴愬姛');
+ } catch (error) {
+ this.$message.warning('澶嶅埗澶辫触');
+ }
+ },
searchReset() {
this.query = {};
this.onLoad(this.page);
@@ -164,7 +244,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