From 0640224585c4a00327c0fa310284d6c96b9752ac Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 四月 2024 10:53:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/record/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/views/system/calculate/record/index.vue b/src/views/system/calculate/record/index.vue
index e132a74..16306e6 100644
--- a/src/views/system/calculate/record/index.vue
+++ b/src/views/system/calculate/record/index.vue
@@ -2,14 +2,12 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鍗曚綅鍚�" prop="checkUnitId">
- <el-select v-model="queryParams.checkUnitId" clearable @clear="handleQuery" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-select v-model="form.unitId" placeholder="璇烽�夋嫨">
<el-option
- label="鎴愰兘x杩愮淮"
- value="1">
- </el-option>
- <el-option
- label="鎴愰兘a杩愮淮"
- value="2">
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -46,7 +44,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:record:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -57,7 +54,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:record:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -67,7 +63,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:record:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,8 +85,8 @@
<div v-if="scope.row.unitId == 2">鎴愰兘x杩愮淮</div>
</template>
</el-table-column>
- <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalAmount" />
- <el-table-column label="鎵ｅ噺鏈嶅姟璐�" align="center" prop="deductAmount" />
+ <!-- <el-table-column label="鎬绘湇鍔¤垂" align="center" prop="totalAmount" /> -->
+ <!-- <el-table-column label="鎵ｅ噺鏈嶅姟璐�" align="center" prop="deductAmount" /> -->
<el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="score" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -100,14 +95,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:record:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:record:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -125,15 +118,18 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="鏍哥畻瀵硅薄" prop="checkUnitId">
- <el-select v-model="queryParams.checkUnitId" clearable @clear="handleQuery" placeholder="鏍哥畻瀵硅薄">
+ <el-select v-model="form.unitId" placeholder="璇烽�夋嫨">
<el-option
- label="鎴愰兘x杩愮淮"
- value="1">
+ v-for="item in unitList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
</el-option>
- <el-option
- label="鎴愰兘a杩愮淮"
- value="2">
- </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏍哥畻瑙勫垯" prop="ruleId">
+ <el-select v-model="form.ruleId" placeholder="璇烽�夋嫨">
+ <el-option label="鎴愰兘x杩愮淮鑰冩牳缁撴灉搴旂敤瑙勫垯" value="1">鎴愰兘x杩愮淮鑰冩牳缁撴灉搴旂敤瑙勫垯</el-option>
</el-select>
</el-form-item>
<el-form-item label="鏍哥畻璁板綍鏃ユ湡" prop="date" >
@@ -144,12 +140,12 @@
placeholder="璇烽�夋嫨鏍哥畻璁板綍鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="鎬绘湇鍔¤垂" prop="totalAmount">
+ <!-- <el-form-item label="鎬绘湇鍔¤垂" prop="totalAmount">
<el-input v-model="form.totalAmount" placeholder="璇疯緭鍏ユ�绘湇鍔¤垂" />
- </el-form-item>
- <el-form-item label="鎵ｅ噺鏈嶅姟璐�" prop="deductAmount">
+ </el-form-item> -->
+ <!-- <el-form-item label="鎵ｅ噺鏈嶅姟璐�" prop="deductAmount">
<el-input v-model="form.deductAmount" placeholder="璇疯緭鍏ユ墸鍑忔湇鍔¤垂" />
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鑰冩牳鍒嗘暟" prop="score">
<el-input v-model="form.score" placeholder="璇疯緭鍏ヨ�冩牳鍒嗘暟" />
</el-form-item>
@@ -164,7 +160,7 @@
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/platform/calculate-record";
-
+import {unitSelect} from "@/api/platform/unit";
export default {
name: "Record",
data() {
@@ -210,8 +206,15 @@
},
created() {
this.getList();
+ this.selectUnit();
},
methods: {
+ // 杩愮淮鍏徃涓嬫媺鏁版嵁
+ selectUnit() {
+ unitSelect().then(res => {
+ this.unitList = res.data;
+ })
+ },
/** 鏌ヨ鏍哥畻璁板綍鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.8.0