From e1ecc186e3cfdde0faf7ea1fc296b509cf11193c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 21 三月 2024 10:02:56 +0800
Subject: [PATCH] 合同取消配置，违约规则配置分数
---
src/views/system/contract/index.vue | 82 +++++++++------------------
src/views/system/default-rule/index.vue | 60 +++++++++++++-------
2 files changed, 66 insertions(+), 76 deletions(-)
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 5353213..8f1a107 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -93,7 +93,7 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍚堝悓璇︽儏 -->
<el-dialog :title="detailName" :visible.sync="detail" width="800px" append-to-body>
<el-form label-position="left" inline class="table-expand">
@@ -101,103 +101,75 @@
<el-collapse-item title="瑙嗛骞冲潎鍦ㄧ嚎鐜�" name="1">
<div>鈮�98%锛氫笉鎵ｅ垎</div>
<div class="inline-input-container">
- 95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%锛� <el-input v-model="props.row.score95to98" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>
+ 95%鈮よ棰戝钩鍧囧湪绾跨巼锛�98%锛氭墸0.1鍒�
</div>
<div class="inline-input-container">
- 90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%锛�<el-input v-model="props.row.score90to95" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>
+ 90%鈮よ棰戝钩鍧囧湪绾跨巼锛�95%锛氭墸0.5鍒�
</div>
<div class="inline-input-container">
- 锛�90%锛� <el-input v-model="props.row.scoreBelow90" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>锛�
+ 锛�90%锛� 鎵�1鍒�
鑻ユ湁杩炵画涓ゆ鐪佸巺鑰冩牳鍦ㄧ嚎鐜囦綆浜�90%锛屾嫑鏍囦汉鏈夋潈瑙ｉ櫎鍚堝悓銆�
</div>
</el-collapse-item>
<el-collapse-item title="鍓嶇鎰熺煡婧愭不鐞嗗伐浣�" name="2">
<div class="inline-input-container">
- 鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�
+ 鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
</div>
<div class="inline-input-container">
- OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�
+ OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*0.1鍒�
</div>
<div class="inline-input-container">
- 鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�
+ 鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*0.1鍒�
</div>
</el-collapse-item>
<el-collapse-item title="鍚庡彴绯荤粺鐨勪繚闅�" name="3">
<div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵� <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/12灏忔椂
+ 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.2鍒�/12灏忔椂
</div>
<div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭144灏忔椂浠ュ悗锛屾瘡瓒呭嚭12灏忔椂锛氭墸 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/12灏忔椂
+ 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭144灏忔椂浠ュ悗锛屾瘡瓒呭嚭12灏忔椂锛氭墸0.1鍒�/12灏忔椂
</div>
<div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�3娆★細鎵� <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/12灏忔椂
+ 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�3娆★細鎵�0.2鍒�/12灏忔椂
</div>
<div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭24灏忔椂涓嶈冻48灏忔椂鐨勶細鎵� <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/娆�
+ 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭24灏忔椂涓嶈冻48灏忔椂鐨勶細鎵�0.3鍒�/娆�
</div>
<div class="inline-input-container">
- 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵� <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/12灏忔椂
+ 涓埆璁惧鏁呴殰浣嗕笉褰卞搷璇ュ姛鑳芥ā鍧楁暣浣撳簲鐢ㄦ儏鍐典笅,瓒呭嚭72灏忔椂涓嶈冻144灏忔椂鐨勶紱鎵�0.1鍒�/12灏忔椂
</div>
<div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭48灏忔椂浠ュ悗锛氭墸 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/12灏忔椂
+ 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,瓒呭嚭48灏忔椂浠ュ悗锛氭墸0.5鍒�/12灏忔椂
</div>
<div class="inline-input-container">
- 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�2娆★細鎵� <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/娆�
+ 鍚庡彴鍔熻兘妯″潡涓嶈兘姝ｅ父杩愯褰卞搷姝ｅ父浣跨敤鐨�,鍚屼竴鍔熻兘妯″潡鐨勭浉鍚屾垨涓嶅悓璁惧绱涓�涓湀鍐呮晠闅滆秴杩�2娆★細鎵�0.5鍒�/娆�
</div>
</el-collapse-item>
<el-collapse-item title="瀛樺偍鏁呴殰" name="4">
<div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/灏忔椂
+ 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.3鍒�/灏忔椂
</div>
<div class="inline-input-container">
- 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/灏忔椂
+ 鍥犲瓨鍌ㄨ澶囥�佷簯瀛樺偍杞欢绛夊紩璧峰钩鍙颁笉鑳芥甯告煡鐪嬪巻鍙插浘鍍�,鍗曟鏁呴殰鏃堕暱鍦�24灏忔椂浠ュ唴鐨勶細鎵�0.1鍒�/灏忔椂
</div>
<div class="inline-input-container">
- 鍥犺棰戞垨鑰呭浘鐗囦涪澶卞鑷撮噸瑕佹浜嬩欢涓嶈兘鍥炴斁鎴栨煡鐪�,鍚屼竴鐐逛綅瑙嗛鍥惧儚鍚屼竴妗堜欢涓嶇疮璁¤绠楋細鎵�<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�/娆�
+ 鍥犺棰戞垨鑰呭浘鐗囦涪澶卞鑷撮噸瑕佹浜嬩欢涓嶈兘鍥炴斁鎴栨煡鐪�,鍚屼竴鐐逛綅瑙嗛鍥惧儚鍚屼竴妗堜欢涓嶇疮璁¤绠楋細鎵�0.1鍒�/娆�
</div>
</el-collapse-item>
<el-collapse-item title="瀵逛簬鍓嶇鐐逛綅寮傚父鎯呭喌鐨勫鐞�" name="5">
<div class="inline-input-container">
- 24灏忔椂鍚庢湭淇鐨勶細鎵�<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�*闀滃ご鏁伴噺
+ 24灏忔椂鍚庢湭淇鐨勶細鎵�0.1鍒�*闀滃ご鏁伴噺
</div>
<div class="inline-input-container">
- 48灏忔椂鍚庢湭淇锛岀疮璁℃墸鍒嗭細鎵�<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="璇疯緭鍏ユ墸鍒�"></el-input>鍒�*闀滃ご鏁伴噺*澶�
+ 48灏忔椂鍚庢湭淇锛岀疮璁℃墸鍒嗭細鎵�0.1鍒�*闀滃ご鏁伴噺*澶�
</div>
</el-collapse-item>
- <el-upload
- action="#"
- list-type="picture-card"
- :auto-upload="false">
- <i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url" alt=""
- >
- <span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleDownload(file)"
- >
- <i class="el-icon-download"></i>
- </span>
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
- </div>
- </el-upload>
+ <el-form-item label="鍚堝悓闄勪欢" prop="certificates">
+ <el-upload>
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">璇蜂笂浼犲ぇ灏忎笉瓒呰繃 5MB 鏍煎紡涓� doc/xls/ppt/txt/pdf/png/jpg 鐨勬枃浠�</div>
+ </el-upload>
+ </el-form-item>
<el-dialog :visible.sync="dialogVisible" append-to-body="false">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
@@ -227,7 +199,7 @@
disabled: false,
props: {
row: {
-
+
}
},
unitList: [],
@@ -481,4 +453,4 @@
.clearfix:after {
clear: both
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/default-rule/index.vue b/src/views/system/default-rule/index.vue
index 309f8dd..ebd70e4 100644
--- a/src/views/system/default-rule/index.vue
+++ b/src/views/system/default-rule/index.vue
@@ -73,6 +73,9 @@
<el-table v-loading="loading" :data="ruleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瑙勫垯鍚嶇О" align="center" prop="ruleName" />
+ <el-table-column label="杩愮淮鍏徃" align="center" prop="companyName" >
+ {{'鎴愰兘x杩愮淮鍏徃'}}
+ </el-table-column>
<el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDesc" />
<el-table-column label="瑙勫垯鐘舵��" align="center" prop="ruleStatus" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
@@ -127,23 +130,30 @@
/>
<!-- 瑙勫垯璇︽儏 -->
- <el-dialog title="瑙勫垯璇︽儏" :visible.sync="detailOpen" width="500px" append-to-body>
+ <el-dialog title="瑙勫垯璇︽儏" :visible.sync="detailOpen" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input disabled v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ <el-input class="input" disabled v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍏徃" prop="companyName">
+ <el-input class="input" disabled :value ="companyName" placeholder="璇疯緭鍏ヨ繍缁村叕鍙稿悕绉�"></el-input>
</el-form-item>
<el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
- <el-input disabled v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
+ <el-input class="input" disabled v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
</el-form-item>
<el-form-item label="瑙勫垯璁剧疆">
- <div style="margin-top: 30px">
+ <div >
<div class="line">
- <div class="line-left">宸ュ崟鏈強鏃跺鐞嗘暟锛�</div>
- <div class="line-right"><el-input disabled v-model="jsonRule.overTime" type="number"/></div>
+ <div class="line-left">鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
+ <div class="line-right"><el-input disabled v-model="jsonRule.overTime" type="text"/></div>鍒�
</div>
<div class="line">
- <div class="line-left">杩愮淮澶辫触鏁伴噺瓒呰繃锛�</div>
- <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="number"/></div>
+ <div class="line-left">OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*</div>
+ <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="text"/></div>鍒�
+ </div>
+ <div class="line">
+ <div class="line-left">鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
+ <div class="line-right"><el-input disabled v-model="jsonRule.failNum" type="text"/></div>鍒�
</div>
</div>
</el-form-item>
@@ -154,23 +164,30 @@
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀硅繚绾﹁鍒欏璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
- <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ <el-input class="input" v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
+ </el-form-item>
+ <el-form-item label="杩愮淮鍏徃" prop="companyName">
+ <el-input class="input" :value ="companyName" placeholder="璇疯緭鍏ヨ繍缁村叕鍙稿悕绉�"></el-input>
</el-form-item>
<el-form-item label="瑙勫垯鎻忚堪" prop="ruleDesc">
- <el-input v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
+ <el-input class="input" v-model="form.ruleDesc" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
</el-form-item>
<el-form-item label="瑙勫垯璁剧疆">
- <div style="margin-top: 30px">
+ <div >
<div class="line">
- <div class="line-left">宸ュ崟鏈強鏃跺鐞嗘暟锛�</div>
- <div class="line-right"><el-input v-model="jsonRule.overTime" type="number"/></div>
+ <div class="line-left">鏃堕挓鍚屾锛堣秴杩嚶�3绉掍负涓嶅悎鏍硷級24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
+ <div class="line-right"><el-input v-model="jsonRule.overTime" type="text"/></div>鍒�
</div>
<div class="line">
- <div class="line-left">杩愮淮澶辫触鏁伴噺瓒呰繃锛�</div>
- <div class="line-right"><el-input v-model="jsonRule.failNum" type="number"/></div>
+ <div class="line-left">OSD鏍囪瘑涓嶆弧瓒炽�奊AT 751-2008 瑙嗛鍥惧儚鏂囧瓧鏍囨敞瑙勮寖銆嬶紝24灏忔椂鍐呮湭淇鐨勶細鏍囨墸闄ょ浉鍏抽暅澶存暟閲�*</div>
+ <div class="line-right"><el-input v-model="jsonRule.failNum" type="text"/></div>鍒�
+ </div>
+ <div class="line">
+ <div class="line-left">鐢ㄦ埛鎶芥锛屼竴鏈轰竴妗ｆ暟鎹」涓嶅悎鏍硷紙鎻愪緵铏氬亣鏁版嵁鎴栭敊璇暟鎹负涓嶅悎鏍硷級锛�24灏忔椂鍐呮湭淇鐨勶細鎵ｉ櫎鐩稿叧闀滃ご鏁伴噺*</div>
+ <div class="line-right"><el-input v-model="jsonRule.failNum" type="text"/></div>鍒�
</div>
</div>
</el-form-item>
@@ -190,6 +207,7 @@
name: "Rule",
data() {
return {
+ companyName: "鎴愰兘x杩愮淮鍏徃",
detailOpen: false,
// 閬僵灞�
loading: true,
@@ -377,11 +395,11 @@
justify-content: flex-start;
align-items: center;
}
-.line-left {
- width: 200px;
- text-align: center;
-}
+
.line-right {
- width: 100px;
+ width: 50px;
+}
+.input{
+ width: 200px;
}
</style>
--
Gitblit v1.8.0