From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/score/index.vue | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue
index f2db340..fd5e618 100644
--- a/src/views/system/contract/score/index.vue
+++ b/src/views/system/contract/score/index.vue
@@ -17,27 +17,23 @@
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>
<el-row :gutter="10" class="mb8">
<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>
+ v-hasPermi="['contract:score:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
- v-hasPermi="['platform:score:remove']">鍒犻櫎</el-button>
+ v-hasPermi="['contract:score:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
- v-hasPermi="['platform:score:export']">瀵煎嚭</el-button>
+ v-hasPermi="['contract:score:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -48,7 +44,7 @@
<el-table-column label="鑰冩牳鍚堝悓" align="center" prop="contractName"/>
<el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" :show-overflow-tooltip="true" />
<el-table-column label="鎵ｅ噺鏂瑰紡" align="center" prop="deductCategory"/>
- <el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num"/>
+ <el-table-column label="瓒呮湡閲忓��" align="center" prop="num"/>
<el-table-column label="鑰冩牳鎵ｅ垎" align="center" prop="score"/>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180px"/>
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus">
@@ -59,14 +55,14 @@
</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)"
- v-hasPermi="['default:audit']" v-if="scope.row.auditingStatus === '寰呭鏍�'">瀹℃牳</el-button>
+ v-hasPermi="['contract:score:audit']" v-if="scope.row.auditingStatus === '寰呭鏍�'">瀹℃牳</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
- v-if="scope.row.auditingStatus === '寰呭鏍�'" v-hasPermi="['system:auditing:edit']">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ v-hasPermi="['contract:score:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['contract:score:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -84,7 +80,7 @@
<el-form-item label="杩愮淮鑰冩牳瑙勫垯">
<el-input v-model="auditingForm.ruleName" type="textarea" autosize disabled />
</el-form-item>
- <el-form-item label="杩愮淮鑰冩牳鎸囨爣">
+ <el-form-item label="杩愮淮瓒呮湡閲忓��">
<el-input v-model="auditingForm.num" disabled />
</el-form-item>
<el-form-item label="杩愮淮鑰冩牳鎵ｅ垎">
@@ -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>
@@ -164,7 +160,7 @@
<el-form-item label="鑰冩牳鍗曚綅锛�">{{ view.unitName }}</el-form-item>
<el-form-item label="鑰冩牳鍚堝悓锛�">{{ view.contractName }} </el-form-item>
<el-form-item label="鑰冩牳瑙勫垯锛�">{{ view.ruleName }} </el-form-item>
- <el-form-item label="鑰冩牳鎸囨爣锛�">{{ view.num }} </el-form-item>
+ <el-form-item label="瓒呮湡閲忓�硷細">{{ view.num }} </el-form-item>
<el-form-item label="鑰冩牳鎵ｅ垎锛�">{{ view.score }} </el-form-item>
<el-form-item label="鍒涘缓浜猴細">{{ view.createUser }} </el-form-item>
<el-form-item label="鍒涘缓鏃堕棿锛�">{{ view.createTime }} </el-form-item>
@@ -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;
@@ -369,12 +366,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;
@@ -427,10 +429,6 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
- if (row.auditingStatus != '寰呭鏍�') {
- this.$message.warning("璇ヨ褰曞凡瀹℃牳锛屼笉鑳戒慨鏀�");
- return;
- }
getAuditing(id).then(response => {
this.form = { ...response.data };
this.open = true;
@@ -518,4 +516,4 @@
.el-cascader-node {
max-width: 300px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0