From 27c87cc797f4fc9b0744ed8c44b58dbe4ff3a63c Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 21 三月 2024 18:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/default-auditing/index.vue | 138 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 135 insertions(+), 3 deletions(-)
diff --git a/src/views/system/default-auditing/index.vue b/src/views/system/default-auditing/index.vue
index 6d65f7b..1b035f0 100644
--- a/src/views/system/default-auditing/index.vue
+++ b/src/views/system/default-auditing/index.vue
@@ -86,8 +86,14 @@
<el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="杩濈害鍗曚綅" align="center" prop="unitName" width="180"/>
- <el-table-column label="杩濈害瑙勫垯" align="center" prop="defaultRuleName"width="120" />
- <el-table-column label="杩濈害鎵ｅ垎" align="center" prop="score"width="120" />
+ <el-table-column label="鑰冩牳鍚�" align="center" prop="checkPublishId" width="180">
+ <template slot-scope="scope">
+ <div v-if="scope.row.checkPublishId === 5">瑙嗛鑰冩牳</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="杩濈害瑙勫垯" align="center" prop="defaultRuleName" width="180" />
+ <el-table-column label="杩濈害鎵ｅ垎" align="center" prop="score" width="120" />
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
<el-table-column label="瀹℃牳浜�" align="center" prop="auditingUserName" />
<el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus" />
<el-table-column label="瀹℃牳璇存槑" align="center" prop="remark" width="180"/>
@@ -100,6 +106,7 @@
type="text"
icon="el-icon-s-check"
@click="handleAuditing(scope.row)"
+ v-hasPermi="['default:audit']"
>瀹℃牳</el-button>
<!-- <el-button-->
<!-- size="mini"-->
@@ -132,6 +139,7 @@
<el-form-item label="杩濈害鍗曚綅">
<el-input v-model="auditingForm.unitName" disabled/>
</el-form-item>
+
<el-form-item label="杩濈害瑙勫垯">
<el-input v-model="auditingForm.defaultRuleName" disabled/>
</el-form-item>
@@ -151,6 +159,68 @@
<el-button @click="closeAuditing">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鏂板鎴栦慨鏀� -->
+ <el-dialog title="杩濈害瀹℃牳" :visible.sync="open" width="700px"append-to-body>
+ <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
+ <el-form-item label="杩濈害鍗曚綅" prop="unitName">
+ <el-select v-model="form.unitNameList" placeholder="杩濈害鍗曚綅">
+ <el-option
+ v-for="item in unitNameList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鑰冩牳鍚�" prop="examineId">
+ <el-select v-model="form.examineId" placeholder="鑰冩牳鍚�" >
+ <el-option
+ v-for="item in examineList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩濈害瑙勫垯" prop="tempRuleFormList">
+ <div class="row-warp">
+ <div class="row" v-for="(form) in tempRuleFormList">
+ <div class="row-left">
+ <div>瑙勫垯</div>
+ <div class="block">
+ <span class="demonstration"></span>
+ <el-cascader
+ v-model="value"
+ :options="options"
+ :props = "props"
+ @change="handleChange"></el-cascader>
+ </div>
+ </div>
+ <div class="row-right">
+ <div>鏁伴噺</div>
+ <div class="margin-5">
+ <el-input type="number" v-model="form.weight"/>
+ </div>
+ </div>
+ <div class="item-op">
+ <el-button @click="removeRule(form)" type="danger" icon="el-icon-delete" circle></el-button>
+ </div>
+ </div>
+ <div style="margin-top: 25px">
+ <el-button type="success" @click="nextAdd" size="mini" plain>娣诲姞</el-button>
+ </div>
+ </div>
+ </el-form-item>
+ <el-form-item label="杩濈害鎵ｅ垎" style="width: 20%">
+ <el-input v-model="auditingForm.score"></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitAuditing">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -162,9 +232,37 @@
name: "Auditing",
data() {
return {
+ options: [{
+ value: 'city',
+ label: '鍓嶇鎰熺煡婧愭不鐞嗗伐浣�',
+ children: [{
+ value: 'fushun',
+ label: '鏃堕挓鍚屾',
+ }, {
+ value: 'rong',
+ label: 'OSD鏍囪瘑鏈慨澶�',
+ }, {
+ value: 'rong',
+ label: '涓�鏈轰竴妗ｄ笉鍚堟牸',
+ }
+ ]
+ },
+ ],
auditingOpen: false,
auditingForm: {},
unitList: [],
+ unitNameList: [
+ {id:2 , value:"鎴愰兘x杩愮淮"}
+ ],
+ // 鑰冩牳妯℃澘
+ examineList: [
+ {id:1 , value:"杞﹁締鑰冩牳"},
+ {id:2 , value:"瑙嗛鑰冩牳"}
+ ],
+ // 涓存椂瑙勫垯琛ㄥ崟
+ tempRuleForm: {},
+ // 涓存椂瑙勫垯琛ㄥ崟鍒楄〃
+ tempRuleFormList: [{"ruleId": null, "adjustCoefficient": null}],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -183,6 +281,7 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ auditOpen: false,
// 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
daterangeAuditingTime: [],
// 閫昏緫鍒犻櫎鏃堕棿鑼冨洿
@@ -212,6 +311,9 @@
this.getUnitSelect();
},
methods: {
+ handleChange(value) {
+ console.log(value);
+ },
// 鎻愪氦瀹℃牳
submitAuditing() {
this.$refs["auditingForm"].validate(valid => {
@@ -239,6 +341,8 @@
this.auditingForm = {};
this.auditingOpen = false;
},
+
+
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
unitSelect().then((res) => {
@@ -265,6 +369,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.auditOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -304,7 +409,7 @@
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞杩濊瀹℃牳";
+ this.title = "娣诲姞杩濊璁板綍";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -355,3 +460,30 @@
}
};
</script>
+<style scoped>
+.margin-5 {
+ margin-left: 5px;
+}
+.row-warp {
+ display: flex;
+ flex-direction: column;
+}
+.row {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ margin: 5px 0;
+}
+.row-left {
+ flex: 1;
+ display: flex;
+ flex-direction: row;
+}
+.row-right {
+ flex: 1;
+ display: flex;
+ flex-direction: row;
+}
+</style>
+
--
Gitblit v1.8.0