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 |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/container/ledger/Manage-add-update.vue b/src/container/ledger/Manage-add-update.vue
index 56e11c9..e01863d 100644
--- a/src/container/ledger/Manage-add-update.vue
+++ b/src/container/ledger/Manage-add-update.vue
@@ -10,7 +10,7 @@
       	<el-row :gutter="20">
           <el-col :xs="24":sm="6":md="6":lg="6":xl="6">
             <el-form-item label="鏈哄簥鍚�" prop="machineName">
-              <el-input v-model="dataForm.machineName" placeholder="鏈哄簥ip" clearable></el-input>
+              <el-input v-model="dataForm.machineName" placeholder="鏈哄簥鍚嶇О" clearable></el-input>
             </el-form-item>
           </el-col>
           <!-- 
@@ -74,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"
@@ -88,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"
@@ -105,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"
@@ -170,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="---璇烽�夋嫨---">
@@ -186,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>
@@ -193,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">
@@ -294,7 +308,8 @@
           originalValue: '', // 璁惧鍘熷��
           presentValue: '', // 璁惧鍑�鐜板��
           weight: '', // 璁惧閲嶉噺
-          remark: ''// 澶囨敞
+          remark: '',// 澶囨敞
+          deviceTypeId:  ''
         },
         machineNamelist: [], // 鏈哄簥涓嬫媺
         workshoplist: [], // 杞﹂棿list

--
Gitblit v1.9.3