From 44d9a94ceafae734add7d09628fd2ac132f0ee83 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 29 四月 2024 09:03:54 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/calculate/order/index.vue | 77 +---------
src/views/system/point/index.vue | 268 +++++++++++++++-----------------------
src/api/system/dept.js | 8 +
src/views/system/score/default/index.vue | 35 ++++
4 files changed, 158 insertions(+), 230 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 277263c..70be0eb 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -65,3 +65,11 @@
method: 'get'
})
}
+
+// 鑾峰彇绾ц仈鏁版嵁
+export function cascader() {
+ return request({
+ url: '/system/dept/cascader',
+ method: 'get'
+ })
+}
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
index 6cba56b..f694391 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/calculate/order/index.vue
@@ -10,18 +10,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select v-model="queryParams.frequency" clearable @clear="handleQuery" placeholder="鑰冩牳棰戠巼">
- <el-option
- label="鏈堝害鑰冩牳"
- value="1">
- </el-option>
- <el-option
- label="瀛ｅ害鑰冩牳"
- value="2">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
v-model="daterangeCheckTime"
@@ -74,15 +62,13 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-card class="box-card" v-for="(item) in checkResultList">
+ <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
<div slot="header" class="clearfix">
- <span>{{ checkUnitName }}</span>
+ <span>{{ item.contractName }}</span>
<el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">璇︽儏</el-button>
- <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">鎵撳垎</el-button>
</div>
- <div class="text item">鑰冩牳<span class="time">{{ examineName }}</span></div>
- <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛ｅ害鑰冩牳" }}</span></div>
- <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div>
+ <div class="text item">鑰冩牳<span class="time">{{ item.unitName }}</span></div>
+ <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.score }}</span></div>
<div class="text item">鑰冩牳鏃堕棿
<span class="time">{{ item.checkTime }}</span>
<el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
@@ -90,37 +76,6 @@
</div>
</el-card>
- <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="checkUnitName" />
- <el-table-column label="鑰冩牳" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿":formatter="examineRangeFormatter" align="center" prop="examineRange" />
- <el-table-column label="鑰冩牳棰戠巼" :formatter="frequencyFormatter" align="center" prop="frequency" />
- <el-table-column label="鑰冩牳鍒嗘暟" falign="center" prop="checkScore" />
- <el-table-column label="鑰冩牳鏃堕棿" align="center" prop="checkTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleDetail(scope.row)"
- >璇︽儏</el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-edit"
- @click="handleSetManualScore(scope.row)"
- >浜哄伐鎵撳垎</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
<pagination
v-show="total>0"
@@ -128,7 +83,7 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
- /> -->
+ />
<el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
<el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"/>
@@ -140,36 +95,26 @@
<el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
<el-descriptions class="margin-top" :column="3" border>
-<!-- <template slot="extra">-->
-<!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
-<!-- </template>-->
<el-descriptions-item>
<template slot="label">
<i class="el-icon-user"></i>
鑰冩牳瀵硅薄
</template>
- {{checkUnitName}}
+ {{detail.unitName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-s-management"></i>
- 鑰冩牳鍚嶇О
+ 鍚堝悓鍚嶇О
</template>
- {{examineName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-timer"></i>
- 鑰冩牳棰戠巼
- </template>
- <el-tag size="small">{{detail.frequency === 1 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳'}}</el-tag>
+ {{detail.contractName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
缁煎悎鍒嗘暟
</template>
- <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
+ <el-tag type="danger" size="small">{{detail.score}}</el-tag>
</el-descriptions-item>
</el-descriptions>
<el-table
@@ -217,8 +162,6 @@
detail:{
},
- checkUnitName: '鎴愰兘x杩愮淮',
- examineName: '鎴愰兘x杩愮淮鑰冩牳',
tableData: [{
name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
content: '97%',
@@ -461,6 +404,6 @@
clear: both
}
.box-card {
- width: 480px;
+ width: 350px;
}
</style>
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index c8b775e..fe561c1 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -2,26 +2,15 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input
- v-model="queryParams.pointName"
- placeholder="璇疯緭鍏ョ偣浣嶅悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐐逛綅寮�濮嬫椂闂�" prop="startTime">
- <el-date-picker clearable
- v-model="queryParams.startTime"
- type="date"
- value-format="yyyy-MM-dd"
+ <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鐐逛綅寮�濮嬫椂闂�">
</el-date-picker>
</el-form-item>
<el-form-item label="鐐逛綅缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker clearable
- v-model="queryParams.endTime"
- type="date"
- value-format="yyyy-MM-dd"
+ <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鐐逛綅缁撴潫鏃堕棿">
</el-date-picker>
</el-form-item>
@@ -32,65 +21,41 @@
</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"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
+ <!-- <el-col :span="1.5">-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- plain-->
+ <!-- icon="el-icon-plus"-->
+ <!-- size="mini"-->
+ <!-- @click="handleAdd"-->
+ <!-- >鏂板</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="['point:edit']"
- >淇敼</el-button>
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['point: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"
- v-hasPermi="['point:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-top"
- size="mini"
- @click="handleImportPoint"
- v-hasPermi="['point:import']"
- >瀵煎叆鐐逛綅</el-button>
+ <el-button type="warning" plain icon="el-icon-top" size="mini" @click="handleImportPoint"
+ v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-receiving"
- size="mini"
- @click="handleEditBatch"
- v-hasPermi="['point:edit']"
- >鎵归噺淇敼</el-button>
+ <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"
+ v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐐逛綅绫诲瀷" align="center" prop="pointType" />
- <el-table-column label="鏍囩" align="center" prop="tag" >
- <span>{{important}}</span>
+ <el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" />
+ <el-table-column label="鏍囩" align="center" width="90">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
+ </template>
</el-table-column>
<el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
<template slot-scope="scope">
@@ -113,33 +78,18 @@
</el-table-column>
<el-table-column label="杩愮淮鐘舵��" align="center" prop="status" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <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-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['point:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['point:remove']"
- >鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['point:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -147,50 +97,35 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
- <el-form-item label="鐐逛綅鏍囩" prop="tag">
- <el-select v-model="form.tag" placeholder="鐐逛綅鏍囩">
- <el-option label="鏅�氱偣浣�" value="鏅�氱偣浣�"/>
- <el-option label="閲嶇偣鐐逛綅" value="閲嶇偣鐐逛綅"/>
+ <el-form-item label="鐐逛綅鏍囩" prop="pointTag">
+ <el-select v-model="form.pointTag" placeholder="鐐逛綅鏍囩" multiple clearable>
+ <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">
- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>
- </el-form-item>
+ <!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
+ <!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>-->
+ <!-- </el-form-item>-->
<el-form-item label="璁惧绫诲瀷" prop="category">
- <el-select v-model="form.category" placeholder="璁惧绫诲瀷">
- <el-option label="浜鸿劯璇嗗埆" value="2"/>
- <el-option label="瑙嗛鐩戞帶" value="1"/>
- <el-option label="杞﹁締鐩戞帶" value="3"/>
+ <el-select v-model="form.category" placeholder="璁惧绫诲瀷">
+ <el-option label="浜鸿劯璇嗗埆" value="2" />
+ <el-option label="瑙嗛鐩戞帶" value="1" />
+ <el-option label="杞﹁締鐩戞帶" value="3" />
</el-select>
</el-form-item>
- <el-form-item label="鐩戠閮ㄩ棬" prop="category">
- <el-select v-model="form.deptName" placeholder="鐩戠閮ㄩ棬">
- <el-option label="鐪佸巺" value="鐪佸巺"/>
- <el-option label="鑷础鑽ｅ幙鍏畨灞�" value="鑷础鑽ｅ幙鍏畨灞�"/>
- <el-option label="鑷础瀵岄『鍏畨灞�" value="鑷础瀵岄『鍏畨灞�"/>
- </el-select>
+ <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
+ <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
+ :props="{ checkStrictly: true }">
+ </el-cascader>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
- <el-date-picker
- @change="dateChange"
- v-model="form.timezone"
- type="daterange"
- align="right"
- unlink-panels
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
+ <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-form>
@@ -204,29 +139,18 @@
<el-dialog title="鎵归噺淇敼杩愮淮鍗曚綅" :visible.sync="batchOpen" width="600px" append-to-body>
<el-form ref="form" :model="batchEditForm" :rules="batchRules" label-width="120px">
<el-form-item label="鐐逛綅閫夋嫨" prop="ids">
- <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="璇烽�夋嫨鍖哄煙" :props="props" collapse-tags></el-cascader>
+ <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="璇烽�夋嫨鍖哄煙"
+ :props="props" collapse-tags></el-cascader>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="batchEditForm.unitId" placeholder="閫夋嫨杩愮淮鍗曚綅">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
+ <el-select v-model="batchEditForm.unitId" placeholder="閫夋嫨杩愮淮鍗曚綅">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="杩愮淮鏃堕棿娈�" prop="timezone">
- <el-date-picker
- @change="dateChange"
- v-model="batchEditForm.timezone"
- type="daterange"
- align="right"
- unlink-panels
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
+ <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
+ unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-form>
@@ -242,12 +166,15 @@
<script>
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
-import { getCascader } from '../../../api/platform/region'
+import { getCascader } from '@/api/platform/region'
+import { cascader } from '@/api/system/dept'
export default {
name: "Point",
+ dicts: ['point_tag'],
data() {
return {
+ deptOptions: [],
// 鎵归噺淇敼琛ㄥ崟
batchEditForm: {
ids: [],
@@ -264,7 +191,6 @@
editingIndex: null,
// 閬僵灞�
loading: true,
- important: '閲嶇偣鐐逛綅',
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -286,7 +212,7 @@
// 杩愮淮鍗曚綅
unitList: [],
// 杩愮淮鏃跺尯
- timezone:[],
+ timezone: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -300,7 +226,7 @@
// 琛ㄥ崟鍙傛暟
form: {},
// 鎵归噺琛ㄥ崟鍐呭
- formList:[],
+ formList: [],
// 涓存椂琛ㄥ崟鏁版嵁
tempForm: {},
// 涓存椂琛ㄥ崟鏁版嵁鍒楄〃
@@ -310,10 +236,10 @@
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- region: [
- { required: true, message: "鐐逛綅鎵�鍦ㄥ湴涓嶈兘涓虹┖", trigger: "change" }
+ pointTag: [
+ { required: true, message: "鐐逛綅鏍囩涓嶈兘涓虹┖", trigger: "change" }
],
- deptName: [
+ deptId: [
{ required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
category: [
@@ -331,7 +257,8 @@
created() {
this.getList();
this.getUnitSelect();
- this.getCascader();
+ // this.getCascader();
+ this.getDeptCascader();
},
methods: {
// 鐐逛綅瀵煎叆
@@ -364,6 +291,12 @@
getCascader() {
getCascader().then(res => {
this.regionList = res.data;
+ })
+ },
+ // 鑾峰彇閮ㄩ棬绾ц仈
+ getDeptCascader() {
+ cascader().then(res => {
+ this.deptOptions = res.data;
})
},
// 鐐逛綅椤逛慨鏀瑰畬鎴�
@@ -426,12 +359,13 @@
startTime: null,
endTime: null,
unitId: null,
+ deptId: [],
status: null,
remark: null,
createTime: null,
updateTime: null,
deleted: null,
- pointDetail: ""
+ pointTag: []
};
this.resetForm("form");
},
@@ -463,38 +397,48 @@
const id = row.id || this.ids
getPoint(id).then(response => {
this.form = response.data;
+ this.form.pointTag = response.data.pointTags;
+ this.form.deptId = response.data.deptIds
this.form.timezone = [this.form.startTime, this.form.endTime]
- if (this.form.pointDetail) {
- this.tempFormList = JSON.parse(this.form.pointDetail)
- }
+ this.form.category = this.form.category + ''
this.open = true;
this.title = "淇敼杩愮淮鐐逛綅";
});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- if (this.tempFormList) {
- this.form.pointDetail = JSON.stringify(this.tempFormList)
- }
- if (this.form.id != null) {
- updatePoint(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addPoint(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.reset()
- this.getList();
- });
- }
+ this.$refs['form'].validate(valid => {
+ if (valid) {
+ if (this.form.deptId && this.form.deptId.length > 0) {
+ this.form.deptId = this.form.deptId[this.form.deptId.length - 1]
+ }
+ let temp = {
+ ...this.form,
+ category: parseInt(this.form.category)
+ };
+ if (temp.id != null) {
+ updatePoint(temp).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addPoint(temp).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.reset()
+ this.getList();
+ });
+ }
+ } else {
+ console.log("error")
+ }
+ })
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杩愮淮鐐逛綅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎杩愮淮鐐逛綅缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delPoint(ids);
}).then(() => {
this.getList();
diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue
index 538e637..bb3d5be 100644
--- a/src/views/system/score/default/index.vue
+++ b/src/views/system/score/default/index.vue
@@ -49,7 +49,7 @@
<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="createTime" />
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus">
<template slot-scope="scope">
<el-tag
@@ -60,6 +60,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)"
@@ -146,6 +147,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 +184,8 @@
name: "Auditing",
data() {
return {
+ view: {},
+ openView: false,
needNum: false,
options: [],
auditingOpen: false,
@@ -241,6 +269,11 @@
this.getUnitSelect();
},
methods: {
+ /** 璇︾粏鎸夐挳鎿嶄綔 */
+ handleView(row) {
+ this.openView = true;
+ this.view = row;
+ },
/**
* 閫夋嫨瑙勫垯
*/
--
Gitblit v1.8.0