From 686f95dadb6d7f9a37e5425457ef8b89658df35f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 03:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/score/index.vue | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue
index b38f87c..fd5e618 100644
--- a/src/views/system/contract/score/index.vue
+++ b/src/views/system/contract/score/index.vue
@@ -44,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">
@@ -61,7 +61,7 @@
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
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="['contract:score:edit']">淇敼</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>
@@ -80,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="杩愮淮鑰冩牳鎵ｅ垎">
@@ -160,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>
@@ -312,24 +312,6 @@
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) {
@@ -447,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;
--
Gitblit v1.8.0