From f8e7dc84f30df6dbac5d32ce84a85c7d804f0f9d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@126.com>
Date: 星期五, 07 一月 2022 18:31:14 +0800
Subject: [PATCH] 代码提交
---
src/views/device/peripheralUnit/index.vue | 90 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 006987b..a5d36be 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -29,23 +29,24 @@
/>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚晢" prop="manufacturer">
- <el-input
- v-model="queryParams.manufacturer"
- placeholder="璇疯緭鍏ョ敓浜у巶鍟�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-select v-model="queryParams.manufacturer" placeholder="璇烽�夋嫨鐢熶骇鍘傚晢" clearable size="small">
+ <el-option
+ v-for="item in manufacturerList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鍘傚晢浠ｇ爜" prop="vendorCode">
- <el-input
- v-model="queryParams.vendorCode"
- placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+<!-- <el-form-item label="鍘傚晢浠ｇ爜" prop="vendorCode">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.vendorCode"-->
+<!-- placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�"-->
+<!-- clearable-->
+<!-- size="small"-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item label="娉㈢壒鐜�" prop="baudRate">
<el-select v-model="queryParams.baudRate" placeholder="璇烽�夋嫨娉㈢壒鐜�" clearable size="small">
<el-option
@@ -121,14 +122,14 @@
<el-table-column label="澶栬浠ｇ爜" align="center" prop="code"/>
<el-table-column label="澶栬鍚嶇О" align="center" prop="name"/>
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer"/>
- <el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="vendorCode"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
+ <el-table-column label="鍘傚晢浠ｇ爜" align="center" prop="vendorCode_dictText"/>
<el-table-column label="娉㈢壒鐜�" align="center" prop="baudRate">
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
</template>
</el-table-column>
- <el-table-column label="璇绘暟鎸囦护" align="center" prop="readInstruction"/>
+ <el-table-column label="璇绘暟鎸囦护" align="center" width="180" prop="readInstruction"/>
<el-table-column label="鍥炴暟闀垮害" align="center" prop="loopLength"/>
<el-table-column label="鍔熻兘鎻忚堪" align="center" prop="description"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
@@ -136,7 +137,7 @@
<el-button
size="mini"
type="text"
- icon="el-icon-edit"
+ icon="el-icon-view"
@click="handleInfo(scope.row)"
v-hasPermi="['oa:peripheralUnit:info']"
>鏌ョ湅
@@ -152,17 +153,18 @@
<el-button
size="mini"
type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['oa:peripheralUnit:remove']"
- >鍒犻櫎
+ icon="el-icon-document"
+ @click="handleUpload(scope.row)"
+ >闄勪欢
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
- @click="handleUpload(scope.row)"
- >闄勪欢
+ class="del-btn"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['oa:peripheralUnit:remove']"
+ >鍒犻櫎
</el-button>
</template>
</el-table-column>
@@ -189,11 +191,18 @@
<el-input v-model="form.model" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" :disabled="disabled"/>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚晢" prop="manufacturer">
- <el-input v-model="form.manufacturer" placeholder="璇疯緭鍏ョ敓浜у巶鍟�" :disabled="disabled"/>
+ <el-select v-model="form.manufacturer" placeholder="璇烽�夋嫨鐢熶骇鍘傚晢" clearable size="small" :disabled="disabled">
+ <el-option
+ v-for="item in manufacturerList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鍘傚晢浠ｇ爜" prop="vendorCode">
- <el-input v-model="form.vendorCode" placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�" :disabled="disabled"/>
- </el-form-item>
+<!-- <el-form-item label="鍘傚晢浠ｇ爜" prop="vendorCode">-->
+<!-- <el-input v-model="form.vendorCode" placeholder="璇疯緭鍏ュ巶鍟嗕唬鐮�" :disabled="disabled"/>-->
+<!-- </el-form-item>-->
<el-form-item label="娉㈢壒鐜�" prop="baudRate">
<el-select v-model="form.baudRate" placeholder="璇烽�夋嫨娉㈢壒鐜�" :disabled="disabled">
<el-option
@@ -246,6 +255,8 @@
addPeripheralUnit,
updatePeripheralUnit
} from "@/api/oa/peripheralUnit";
+import {Base64} from 'js-base64';
+import { listManufacturer } from "@/api/common/common"
export default {
name: "PeripheralUnit",
@@ -295,7 +306,8 @@
{required: true, message: "澶栬浠ｇ爜涓嶈兘涓虹┖", trigger: "blur"}
],
name: [
- {required: true, message: "澶栬鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}
+ {required: true, message: "澶栬鍚嶇О涓嶈兘涓虹┖", trigger: "blur"},
+ {max: 32, message: '鏈�澶氳緭鍏�32涓枃瀛楃', trigger: 'blur' }
],
model: [
{required: true, message: "瑙勬牸鍨嬪彿涓嶈兘涓虹┖", trigger: "blur"}
@@ -319,13 +331,21 @@
{required: true, message: "闄勪欢涓嶈兘涓虹┖", trigger: "blur"}
],
},
- disabled: false
+ disabled: false,
+ // 鐢熶骇鍘傚晢
+ manufacturerList: []
};
},
created() {
this.getList();
+ this.getManufacturerList();
},
methods: {
+ getManufacturerList() {
+ listManufacturer().then(res => {
+ this.manufacturerList = res.data
+ })
+ },
/** 鏌ヨ澶栬鍗曞厓鍒楄〃 */
getList() {
this.loading = true;
@@ -367,11 +387,13 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+ this.getManufacturerList();
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.resetForm("queryForm");
+ this.getManufacturerList();
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -383,6 +405,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
+ this.getManufacturerList();
this.form.baudRate = '3'
this.open = true;
this.title = "娣诲姞澶栬鍗曞厓";
@@ -403,6 +426,7 @@
handleUpdate(row) {
this.loading = true;
this.reset();
+ this.getManufacturerList();
const id = row.id || this.ids
getPeripheralUnit(id).then(response => {
this.loading = false;
@@ -440,7 +464,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎澶栬鍗曞厓缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delPeripheralUnit(ids);
}).then(() => {
--
Gitblit v1.9.1