From 7d312ba048cd9767286c6bc5b8c3f7e94c160c9f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 四月 2024 13:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/score/default/index.vue | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue
index 538e637..f2db340 100644
--- a/src/views/system/score/default/index.vue
+++ b/src/views/system/score/default/index.vue
@@ -44,12 +44,13 @@
<el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName" width="180" />
- <el-table-column label="鑰冩牳鍚堝悓" align="center" prop="contractName" width="180" />
- <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" />
- <el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num" width="120" />
- <el-table-column label="鑰冩牳鎵ｅ垎" align="center" prop="score" width="120" />
- <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" />
+ <el-table-column label="鑰冩牳鍗曚綅" align="center" prop="unitName"/>
+ <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="score"/>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180px"/>
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus">
<template slot-scope="scope">
<el-tag
@@ -60,6 +61,7 @@
<el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<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>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -120,7 +122,14 @@
<el-cascader ref="cascader" v-model="form.ruleIdsArray" :options="options" @change="handleChange">
<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.calcUnit ? '/' + data.calcUnit : '') : '' : (data.deductCategory ? data.label + ' ' + data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : data.label)"
+ :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)"
placement="left">
<span>{{ data.label }}</span>
</el-tooltip>
@@ -146,6 +155,31 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 璇︽儏 -->
+ <el-dialog title="杩愮淮鑰冩牳璇︽儏" :visible.sync="openView" width="800px" append-to-body>
+ <el-form ref="form" :model="view" label-width="150px" size="mini">
+ <el-row>
+ <el-col>
+ <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.score }} </el-form-item>
+ <el-form-item label="鍒涘缓浜猴細">{{ view.createUser }} </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿锛�">{{ view.createTime }} </el-form-item>
+ <el-form-item label="瀹℃牳鐘舵�侊細">{{ view.auditingStatus }} </el-form-item>
+ <el-form-item label="瀹℃牳澶囨敞锛�">{{ view.remark }} </el-form-item>
+ <el-form-item label="瀹℃牳浜猴細">{{ view.auditingUser }} </el-form-item>
+ <el-form-item label="瀹℃牳鏃堕棿锛�">{{ view.auditingTime }} </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="openView = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
@@ -158,6 +192,8 @@
name: "Auditing",
data() {
return {
+ view: {},
+ openView: false,
needNum: false,
options: [],
auditingOpen: false,
@@ -241,6 +277,11 @@
this.getUnitSelect();
},
methods: {
+ /** 璇︾粏鎸夐挳鎿嶄綔 */
+ handleView(row) {
+ this.openView = true;
+ this.view = row;
+ },
/**
* 閫夋嫨瑙勫垯
*/
@@ -248,6 +289,7 @@
let item = this.$refs['cascader'].getCheckedNodes()[0].data;
this.calcObj = item;
this.form.contractId = item.contractId;
+ this.form.deductCategory = item.deductCategory == '鍒嗘暟涔樹互鏁伴噺' ? '鎵�' + item.calcFraction + '鍒�*鏁伴噺 ' : item.deductCategory == '闄や互鏁伴噺鍚庝箻浠ュ垎鏁�' ? '鎵�' + item.calcFraction + '鍒�/' + item.calcUnit + '灏忔椂' : '鎵�' + item.calcFraction + '鍒�';
if (item.deductCategory == "鎵ｆ寚瀹氬垎鏁�") {
this.needNum = false;
this.form.score = item.calcFraction;
@@ -366,6 +408,7 @@
this.daterangeAuditingTime = [];
this.daterangeCreateTime = [];
this.resetForm("queryForm");
+ this.queryParams = {};
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.8.0