From 821205d09297946ec40cf90f74482ea8ad6dbd1e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 23 四月 2024 18:10:39 +0800
Subject: [PATCH] 合同导入、规则、展示
---
src/views/system/contract/index.vue | 149 ++++++++++---------------------------------------
src/api/platform/calculate-rule.js | 8 ++
2 files changed, 38 insertions(+), 119 deletions(-)
diff --git a/src/api/platform/calculate-rule.js b/src/api/platform/calculate-rule.js
index 1af5aea..fd72c18 100644
--- a/src/api/platform/calculate-rule.js
+++ b/src/api/platform/calculate-rule.js
@@ -9,6 +9,14 @@
})
}
+// 鏍规嵁鍚堝悓id鏌ヨ杩濈害瑙勫垯鍒楄〃
+export function getRuleListByContractId(data) {
+ return request({
+ url: '/calculate/rule/getRuleListByContractId?contractId=' + data,
+ method: 'get'
+ })
+}
+
// 鏌ヨ杩濈害瑙勫垯璇︾粏
export function getRule(id) {
return request({
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 8774b65..a0551cf 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -2,15 +2,15 @@
<div class="app-container">
<el-row>
- <el-col :span="8" v-for="(item) in tableData" :key="item" style="margin: 10px;width: 30%;">
+ <el-col :span="8" v-for="(item) in contractList" :key="item" style="margin: 10px;width: 30%;">
<el-card :body-style="{ padding: '0px' }">
<el-image style="width: 420px;height: 187px;"
:preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']"
fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357"
class="image" />
<div style="padding: 14px;">
- <span>{{ item.companyName }}</span>
- <span class="time" style="margin-left: 10px;">{{ item.deptName }}</span>
+ <span>{{ item.name }}</span>
+ <span class="time" style="margin-left: 10px;">{{ item.unitName }}</span>
<div class="bottom clearfix">
<time class="time">{{ item.startTime }} 鈥� {{ item.endTime }}</time>
<el-button type="text" class="button" @click="handleDetail(item)">鏌ョ湅璇︽儏</el-button>
@@ -22,8 +22,8 @@
<el-row :gutter="10" class="mb8" style="margin-top: 40px;">
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-top" size="mini" v-hasPermi="['system:contract:import']"
- @click="handleImport">瀵煎叆</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" v-hasPermi="['system:contract:import']"
+ @click="handleImport">鏂板</el-button>
</el-col>
</el-row>
@@ -31,89 +31,10 @@
<el-dialog :title="detailName" :visible.sync="detail" width="800px" append-to-body>
<el-form label-position="left" inline class="table-expand">
<el-collapse v-model="activeNames" @change="handleChange">
- <el-collapse-item title="瑙嗛骞冲潎鍦ㄧ嚎鐜�" name="1">
- <el-collapse class="nest-collapse" style="margin-top: 10px;">
- <el-collapse-item title="绗笁灞�-1" name="3">
- <div>鈮�98%锛氫笉鎵ｅ垎</div>
- <div class="inline-input-container">
- 95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%锛氭墸0.1鍒�
- </div>
- <div class="inline-input-container">
- 90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%锛氭墸0.5鍒�
- </div>
- <div class="inline-input-container">
- 锛�90%锛� 鎵�1鍒�
- 鑻ユ湁杩炵画涓ゆ鐪佸巺鑰冩牳鍦ㄧ嚎鐜囦綆浜�90%锛屾嫑鏍囦汉鏈夋潈瑙ｉ櫎鍚堝悓銆�
- </div>
- </el-collapse-item>
- </el-collapse>
- <el-collapse class="nest-collapse" style="margin-top: 10px;">
- <el-collapse-item title="绗笁灞�-2" name="3">
- <div>鈮�98%锛氫笉鎵ｅ垎</div>
- <div class="inline-input-container">
- 95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%锛氭墸0.1鍒�
- </div>
- <div class="inline-input-container">
- 90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%锛氭墸0.5鍒�
- </div>
- <div class="inline-input-container">
- 锛�90%锛� 鎵�1鍒�
- 鑻ユ湁杩炵画涓ゆ鐪佸巺鑰冩牳鍦ㄧ嚎鐜囦綆浜�90%锛屾嫑鏍囦汉鏈夋潈瑙ｉ櫎鍚堝悓銆�
- </div>
- </el-collapse-item>
- </el-collapse>
- </el-collapse-item>
- <el-collapse-item title="鍓嶇鎰熺煡婧愭不鐞嗗伐浣�" name="2">
- <div class="inline-input-container">
- 鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
- </div>
- <div class="inline-input-container">
- OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*0.1鍒�
- </div>
- <div class="inline-input-container">
- 鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
- </div>
- </el-collapse-item>
- <el-collapse-item title="鍚庡彴绯荤粺鐨勪繚闅�" name="3">
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.2鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭144灏忔椂浠ュ悗锛屾瘡瓒呭嚭12灏忔椂锛氭墸0.1鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�3娆★細鎵�0.2鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭24灏忔椂涓嶈冻48灏忔椂鐨勶細鎵�0.3鍒�/娆�
- </div>
- <div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.1鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭48灏忔椂浠ュ悗锛氭墸0.5鍒�/12灏忔椂
- </div>
- <div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�2娆★細鎵�0.5鍒�/娆�
- </div>
- </el-collapse-item>
- <el-collapse-item title="瀛樺偍鏁呴殰" name="4">
- <div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.3鍒�/灏忔椂
- </div>
- <div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.1鍒�/灏忔椂
- </div>
- <div class="inline-input-container">
- 鍥犺棰戞垨鑰呭浘鐗囦涪澶卞鑷撮噸瑕佹浜嬩欢涓嶈兘鍥炴斁鎴栨煡鐪�,鍚屼竴鐐逛綅瑙嗛鍥惧儚鍚屼竴妗堜欢涓嶇疮璁¤绠楋細鎵�0.1鍒�/娆�
- </div>
- </el-collapse-item>
- <el-collapse-item title="瀵逛簬鍓嶇鐐逛綅寮傚父鎯呭喌鐨勫鐞�" name="5">
- <div class="inline-input-container">
- 24灏忔椂鍚庢湭淇鐨勶細鎵�0.1鍒�*闀滃ご鏁伴噺
- </div>
- <div class="inline-input-container">
- 48灏忔椂鍚庢湭淇锛岀疮璁℃墸鍒嗭細鎵�0.1鍒�*闀滃ご鏁伴噺*澶�
+ <el-collapse-item v-for="(item, index) in ruleData" :key="index" :title="item.ruleName" :name="index">
+ <div class="inline-input-container" v-for="(item, index) in item.children" :key="index">
+ {{ item.ruleDesc }} <br/>
+ {{ item.ruleCondition }} {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : item.calcUnit }}
</div>
</el-collapse-item>
<el-form-item label="鍚堝悓闄勪欢" prop="certificates">
@@ -135,7 +56,10 @@
<!-- 鍚堝悓瀵煎叆瀵硅瘽妗� -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="550px" append-to-body>
<el-form ref="form" :model="upload" :rules="rules" label-width="80px">
- <el-form-item label="鍏徃鍚�" prop="unitId">
+ <el-form-item label="鍚堝悓鍚嶇О" prop="name">
+ <el-input v-model="upload.name" />
+ </el-form-item>
+ <el-form-item label="鍏徃鍚嶇О" prop="unitId">
<el-select v-model="upload.unitId" placeholder="璇烽�夋嫨">
<el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
@@ -148,7 +72,7 @@
</el-date-picker>
</el-form-item>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
- :action="upload.url + '?unitId=' + upload.unitId + '&startTime=' + upload.startTime + '&endTime=' + upload.endTime"
+ :action="upload.url + '?unitId=' + upload.unitId + '&startTime=' + upload.startTime + '&endTime=' + upload.endTime + '&name=' + upload.name"
:disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
:auto-upload="false" drag style="text-align: center;">
<i class="el-icon-upload"></i>
@@ -172,6 +96,7 @@
<script>
import { listContract, getContract } from "@/api/platform/contract";
+import { getRuleListByContractId } from "../../../api/platform/calculate-rule";
import { unitSelect } from "../../../api/platform/unit";
import { deptSelect } from "../../../api/system/dept";
import { getToken } from "@/utils/auth";
@@ -229,38 +154,17 @@
open: false,
// 鏄惁鏄剧ず璇︽儏
detail: false,
- tableData: [{
- id: '12987122',
- companyName: '杩愮淮鍏徃鐢�',
- deptName: '鑷础瀵岄『鍏畨灞�',
- startTime: '2023-12-11 10:20:20',
- endTime: '2024-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }, {
- id: '12987123',
- companyName: '杩愮淮鍏徃涔�',
- deptName: '鑷础澶у畨鍏畨灞�',
- startTime: '2023-12-11 10:20:20',
- endTime: '2023-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }, {
- id: '12987125',
- companyName: '杩愮淮鍏徃涓�',
- deptName: '鑷础鑷祦浜曞叕瀹夊眬',
- startTime: '2023-12-11 10:20:20',
- endTime: '2023-12-11 10:20:20',
- shop: '鐜嬪皬铏庡か濡诲簵',
- shopId: '10333'
- }],
+ ruleData: [],
// 琛ㄥ崟鍙傛暟
form: {
},
// 琛ㄥ崟鏍￠獙
rules: {
+ name: [
+ { required: true, message: "鍚堝悓鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ ],
unitId: [
- { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "change" }
],
timezone: [
{ type: "array", required: true, message: "鍚堝悓鏃堕棿涓嶈兘涓虹┖", trigger: "change" }
@@ -293,7 +197,7 @@
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
- this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ this.$message.success("鎿嶄綔鎴愬姛");
this.getList();
},
// 鎻愪氦涓婁紶鏂囦欢
@@ -333,9 +237,15 @@
getList() {
this.loading = true;
listContract(this.queryParams).then(response => {
- this.contractList = response.rows;
+ this.contractList = response;
this.total = response.total;
this.loading = false;
+ });
+ },
+ /** 鑾峰彇鍚堝悓瑙勫垯 */
+ getRuleList(item) {
+ getRuleListByContractId(item.id).then(response => {
+ this.ruleData = response.data;
});
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -347,7 +257,8 @@
/** 璇︽儏鎸夐挳鎿嶄綔 */
handleDetail(item) {
this.detail = true;
- this.detailName = item.companyName
+ this.detailName = item.name;
+ this.getRuleList(item);
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
--
Gitblit v1.8.0