From fcb6eb2c02f00b0da864a8915af2afcb285a63a8 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 20:29:59 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

---
 src/container/ledger/Manage-add-update.vue |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/container/ledger/Manage-add-update.vue b/src/container/ledger/Manage-add-update.vue
index 94538bb..7ed08aa 100644
--- a/src/container/ledger/Manage-add-update.vue
+++ b/src/container/ledger/Manage-add-update.vue
@@ -8,18 +8,12 @@
       <!-- 娣诲姞鍐呭-->
       <el-form  :model="dataForm" label-width="100px" ref="dataForm">
       	<el-row :gutter="20">
-          <!-- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
+          <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>
@@ -183,6 +177,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="classes">
               <el-select v-model="dataForm.classes" placeholder="---璇烽�夋嫨---">
@@ -192,6 +187,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>
@@ -275,7 +271,7 @@
       return {
         visible: false,
         dataForm: {
-          id: 0, // title鏄剧ず鏂板杩樻槸淇敼
+          id: '', // title鏄剧ず鏂板杩樻槸淇敼
           machineName: '', // 鏈哄簥鍚�
           machineIp: '', // 鏈哄簥ip
           workshop: '', // 杞﹂棿鍚�
@@ -365,7 +361,7 @@
       },
       /* 鎻愪氦*/
       dataFormSubmit() {
-        if (this.dataForm.id === '') { // 鏂板
+        if (!this.dataForm.id) { // 鏂板
           accountCreate(this.dataForm).then(res => {
             this.$message({
               message: '鏂板鎴愬姛',

--
Gitblit v1.9.3