From ac4fe7a83ac3ce0486ec09ce8c5696bad16f22d8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 23:25:13 +0800
Subject: [PATCH] 视频优化
---
src/views/system/contract/score/index.vue | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue
index f2db340..2ef8338 100644
--- a/src/views/system/contract/score/index.vue
+++ b/src/views/system/contract/score/index.vue
@@ -17,8 +17,8 @@
type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -26,10 +26,6 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['platform:score:add']">鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
- v-hasPermi="['platform:score:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -59,7 +55,7 @@
</template>
</el-table-column>
<el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="230px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">璇︽儏</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
@@ -99,8 +95,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
<el-button @click="closeAuditing">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -123,12 +119,12 @@
<template slot-scope="{ data }">
<el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
:content="
- data.label.length < 16 ?
- data.deductCategory ?
- data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�' :
- '' :
- (data.deductCategory ?
- data.label + ' ' + (data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�') :
+ data.label.length < 16 ?
+ data.deductCategory ?
+ data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�' :
+ '' :
+ (data.deductCategory ?
+ data.label + ' ' + (data.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + data.calcFraction + '鍒�*鏁伴噺 ' : data.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + data.calcFraction + '鍒�/' + data.calcUnit + '灏忔椂' : '鎵�' + data.calcFraction + '鍒�') :
data.label)"
placement="left">
<span>{{ data.label }}</span>
@@ -151,8 +147,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -289,6 +285,7 @@
let item = this.$refs['cascader'].getCheckedNodes()[0].data;
this.calcObj = item;
this.form.contractId = item.contractId;
+ this.form.ruleName = item.ruleName + " / " + item.label;
this.form.deductCategory = item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '鍒�*鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : '鎵�' + item.calcFraction + '鍒�';
if (item.deductCategory == "鎵ｆ寚瀹氬垎鏁�") {
this.needNum = false;
@@ -315,6 +312,24 @@
handleChangeUnit(value) {
getRuleListByUnitId(value).then((res) => {
this.options = this.getTreeData(res.data);
+ // 鎵嬪姩鏍戝舰缁撴瀯
+ if (this.options) {
+ let groupedList = {};
+ this.options.forEach(item => {
+ if (!groupedList[item.ruleName]) {
+ groupedList[item.ruleName] = {
+ value: 0,
+ children: [],
+ label: item.ruleName,
+ ruleName: item.ruleName,
+ contractId: item.contractId
+ };
+ }
+ groupedList[item.ruleName].children.push(item);
+ });
+ let result = Object.values(groupedList);
+ this.options = result;
+ }
})
},
getTreeData(data) {
@@ -369,12 +384,17 @@
if (null != this.daterangeAuditingTime && '' != this.daterangeAuditingTime) {
this.queryParams["auditingStartTime"] = this.daterangeAuditingTime[0];
this.queryParams["auditingEndTime"] = this.daterangeAuditingTime[1];
+ } else {
+ this.queryParams["auditingStartTime"] = null;
+ this.queryParams["auditingEndTime"] = null;
}
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams["createStartTime"] = this.daterangeCreateTime[0];
this.queryParams["createEndTime"] = this.daterangeCreateTime[1];
+ } else {
+ this.queryParams["createStartTime"] = null;
+ this.queryParams["createEndTime"] = null;
}
- console.log("this.queryParams", this.queryParams)
listAuditing(this.queryParams).then(response => {
this.auditingList = response.rows;
this.total = response.total;
@@ -518,4 +538,4 @@
.el-cascader-node {
max-width: 300px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0