From cc077cba0e6a0c1d9ec11af6c89ee5c898cee423 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期三, 17 一月 2024 00:25:06 +0800
Subject: [PATCH] updatte
---
src/container/ledger/Manage-add-update.vue | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/container/ledger/Manage-add-update.vue b/src/container/ledger/Manage-add-update.vue
index 9cbfc72..e01863d 100644
--- a/src/container/ledger/Manage-add-update.vue
+++ b/src/container/ledger/Manage-add-update.vue
@@ -7,19 +7,13 @@
:visible.sync="addVisible">
<!-- 娣诲姞鍐呭-->
<el-form :model="dataForm" label-width="100px" ref="dataForm">
- <!-- <el-row :gutter="20">
+ <el-row :gutter="20">
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鏈哄簥鍚�" prop="machineName">
- <el-select filterable v-model="dataForm.machineName" placeholder="鏀寔妯＄硦鏌ヨ" clearable>
- <el-option
- v-for="item in machineNamelist"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="dataForm.machineName" placeholder="鏈哄簥鍚嶇О" clearable></el-input>
</el-form-item>
</el-col>
+ <!--
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鏈哄簥ip" prop="machineIp">
<el-input v-model="dataForm.machineIp" placeholder="鏈哄簥ip" clearable></el-input>
@@ -80,8 +74,20 @@
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
+ <el-form-item label="璁惧绫诲瀷" prop="deviceTypeId">
+ <el-select v-model="dataForm.deviceTypeId" placeholder="---璇烽�夋嫨---" clearable>
+ <el-option
+ v-for="item in deviceTypeIds"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鍔犲伐绫诲瀷" prop="category">
- <el-select v-model="dataForm.category" placeholder="---璇烽�夋嫨---">
+ <el-select v-model="dataForm.category" placeholder="---璇烽�夋嫨---" clearable>
<el-option
v-for="item in deviceType"
:key="item.value"
@@ -94,7 +100,7 @@
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="璐﹀姟灞炴��" prop="accountingAttribute">
- <el-select v-model="dataForm.accountingAttribute" placeholder="---璇烽�夋嫨---">
+ <el-select v-model="dataForm.accountingAttribute" placeholder="---璇烽�夋嫨---" clearable>
<el-option
v-for="item in financePro"
:key="item.value"
@@ -111,7 +117,7 @@
</el-col> -->
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="浣跨敤閮ㄩ棬" prop="department">
- <el-select v-model="dataForm.department">
+ <el-select v-model="dataForm.department" clearable>
<el-option
v-for="item in departmentlist"
:key="item.value"
@@ -176,13 +182,14 @@
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="璁惧绠＄悊鍒嗙被" prop="manageType">
- <el-select v-model="dataForm.manageType" placeholder="---璇烽�夋嫨---">
+ <el-select v-model="dataForm.manageType" placeholder="---璇烽�夋嫨---" clearable>
<el-option value="A">A</el-option>
<el-option value="B">B</el-option>
<el-option value="C">C</el-option>
</el-select>
</el-form-item>
</el-col>
+ <!--
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鐝" prop="classes">
<el-select v-model="dataForm.classes" placeholder="---璇烽�夋嫨---">
@@ -192,6 +199,7 @@
</el-select>
</el-form-item>
</el-col>
+ -->
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鐢熶骇鍘傚" prop="manufacturer">
<el-input v-model="dataForm.manufacturer" placeholder="鐢熶骇鍘傚" clearable></el-input>
@@ -199,7 +207,7 @@
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鎶曚骇鏃ユ湡" prop="productionDate">
- <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="dataForm.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="dataForm.productionDate" type="date" clearable placeholder="閫夋嫨鏃ユ湡" clearable></el-date-picker>
</el-form-item>
</el-col>
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
@@ -254,14 +262,14 @@
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
- </el-col>
- </el-row> -->
+ </el-col> -->
+ </el-row>
</el-form>
<!-- 鎸夐挳 -->
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="cancel">鍙栨秷</el-button>
- <el-button size="mini" type="primary" @click="dataFormSubmit()">淇濆瓨</el-button>
+ <el-button size="mini" type="primary" style="background-color: #409EFF;" @click="dataFormSubmit()">淇濆瓨</el-button>
</span>
</el-dialog>
</div>
@@ -275,7 +283,7 @@
return {
visible: false,
dataForm: {
- id: 0, // title鏄剧ず鏂板杩樻槸淇敼
+ id: '', // title鏄剧ず鏂板杩樻槸淇敼
machineName: '', // 鏈哄簥鍚�
machineIp: '', // 鏈哄簥ip
workshop: '', // 杞﹂棿鍚�
@@ -300,7 +308,8 @@
originalValue: '', // 璁惧鍘熷��
presentValue: '', // 璁惧鍑�鐜板��
weight: '', // 璁惧閲嶉噺
- remark: ''// 澶囨敞
+ remark: '',// 澶囨敞
+ deviceTypeId: ''
},
machineNamelist: [], // 鏈哄簥涓嬫媺
workshoplist: [], // 杞﹂棿list
@@ -365,7 +374,7 @@
},
/* 鎻愪氦*/
dataFormSubmit() {
- if (this.dataForm.id === '') { // 鏂板
+ if (!this.dataForm.id) { // 鏂板
accountCreate(this.dataForm).then(res => {
this.$message({
message: '鏂板鎴愬姛',
@@ -401,6 +410,9 @@
width: 100%;
}
}
+ .el-dialog__body {
+ overflow: hidden;
+ }
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
--
Gitblit v1.9.3