From 6817c96db53ac16f5d5eca72b73230d898f32126 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:43:32 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/template/default/index.vue | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/views/system/check-template/index.vue b/src/views/system/template/default/index.vue
similarity index 88%
rename from src/views/system/check-template/index.vue
rename to src/views/system/template/default/index.vue
index 227f892..418ad37 100644
--- a/src/views/system/check-template/index.vue
+++ b/src/views/system/template/default/index.vue
@@ -86,8 +86,6 @@
<div v-else-if="scope.row.unitId === 3">瀵岄『鍘�,鑽ｅ幙,楂樻柊鍖�,鑷祦浜曞尯,璐′簳鍖�,澶у畨鍖�,娌挎哗鍖�</div>
</template>
</el-table-column>
- <el-table-column label="璋冩暣绯绘暟" align="center" prop="adjustCoefficient" />
- <el-table-column label="璋冩暣绯绘暟璁＄畻鏂瑰紡" align="center" prop="adjustWay"/>
<el-table-column label="鐘舵��" align="center" prop="status" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -121,6 +119,13 @@
<el-form-item label="妯℃澘鍚嶇О" prop="templateName">
<el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" />
</el-form-item>
+ <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory">
+ <el-select v-model="form.examineCategory" placeholder="璇烽�夋嫨鑰冩牳绫诲瀷">
+ <el-option label="鐪佸巺鑰冩牳" value="鐪佸巺鑰冩牳"/>
+ <el-option label="鍖哄幙鑰冩牳" value="鍖哄幙鑰冩牳"/>
+ <el-option label="杩愮淮鑰冩牳" value="鍏徃鑰冩牳"/>
+ </el-select>
+ </el-form-item>
<el-form-item label="鑰冩牳瀵硅薄" prop="unitName">
<div class="block">
<span class="demonstration"></span>
@@ -149,7 +154,7 @@
</div>
</div>
<div class="row-right">
- <div>鏉冮噸</div>
+ <div>鏁板��</div>
<div class="margin-5">
<el-input type="number" v-model="form.weight"/>
</div>
@@ -162,21 +167,6 @@
<el-button type="success" @click="nextAdd" size="mini" plain>娣诲姞</el-button>
</div>
</div>
- </el-form-item>
- <el-form-item label="璋冩暣绯绘暟" prop="adjustCoefficient">
- <el-input v-model="form.adjustCoefficient" placeholder="璇疯緭鍏ョ郴鏁板��" />
- </el-form-item>
- <el-form-item label="璋冩暣鏂瑰紡" prop="adjustWay">
- <el-select v-model="form.adjustWay" placeholder="璇烽�夋嫨璋冩暣绯绘暟璁＄畻鏂瑰紡">
- <el-option
- label="涔�"
- value="*">
- </el-option>
- <el-option
- label="闄�"
- value="/">
- </el-option>
- </el-select>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
<el-radio v-model="form.status" label="use">鍚敤</el-radio>
@@ -192,9 +182,9 @@
</template>
<script>
-import { listCheckTemplate, getCheckTemplate, delCheckTemplate, addCheckTemplate, updateCheckTemplate } from "@/api/platform/check-template";
-import { ruleSelect } from '../../../api/platform/check-rule'
-import { unitSelect } from '../../../api/platform/unit'
+import { listTemplate, getTemplate, delTemplate, addTemplate, updateTemplate } from "@/api/platform/default-template";
+// import { ruleSelect } from '@/api/platform/default-rule'
+import { unitSelect } from '@/api/platform/unit'
export default {
name: "CheckTemplate",
@@ -282,12 +272,6 @@
templateName: [
{ required: true, message: "妯℃澘鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- adjustCoefficient: [
- { required: true, message: "璋冩暣绯绘暟涓嶈兘涓虹┖", trigger: "blur" }
- ],
- adjustWay: [
- { required: true, message: "璋冩暣鏂瑰紡锛氫箻闄や笉鑳戒负绌�", trigger: "blur" }
- ],
}
};
},
@@ -316,11 +300,11 @@
this.tempRuleFormList.push({"ruleId": null, "weight": null})
},
// 鑰冩牳瑙勫垯涓嬫媺鏁版嵁
- selectCheckRule() {
- ruleSelect().then(res => {
- this.ruleList = res.data;
- })
- },
+ // selectCheckRule() {
+ // ruleSelect().then(res => {
+ // this.ruleList = res.data;
+ // })
+ // },
// 杩愮淮鍏徃涓嬫媺鏁版嵁
selectUnit() {
unitSelect().then(res => {
@@ -334,7 +318,7 @@
this.queryParams["start"] = this.daterangeCreateTime[0];
this.queryParams["end"] = this.daterangeCreateTime[1];
}
- listCheckTemplate(this.queryParams).then(response => {
+ listTemplate(this.queryParams).then(response => {
this.checkTemplateList = response.data;
this.total = response.total;
this.loading = false;
@@ -385,7 +369,7 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
- getCheckTemplate(id).then(response => {
+ getTemplate(id).then(response => {
this.form = response.data;
this.tempRuleFormList = this.form.ruleFormList;
this.ruleFormList = this.form.ruleFormList;
@@ -399,7 +383,7 @@
if (valid) {
this.form.ruleFormList = this.tempRuleFormList;
if (this.form.id != null) {
- updateCheckTemplate(this.form).then(response => {
+ updateTemplate(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.tempRuleFormList = [];
@@ -407,7 +391,7 @@
this.getList();
});
} else {
- addCheckTemplate(this.form).then(response => {
+ addTemplate(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -420,7 +404,7 @@
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳妯℃澘缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckTemplate(ids);
+ return delTemplate(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.8.0