From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/basicInfo/ParamData.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/src/views/modules/basicInfo/ParamData.vue b/web/src/views/modules/basicInfo/ParamData.vue
index 5519625..a3ddbe7 100644
--- a/web/src/views/modules/basicInfo/ParamData.vue
+++ b/web/src/views/modules/basicInfo/ParamData.vue
@@ -30,6 +30,9 @@
                          clearable></zt-dict>
               </el-form-item>
               <el-form-item>
+                <el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
+              </el-form-item>
+              <el-form-item>
                 <zt-button v-if="dataForm.srcId" type="warning" @click="handleSaveRows">淇濆瓨</zt-button>
                 <zt-button v-if="dataForm.srcId" type="query" @click="table.query()"/>
                <!-- <zt-button type="add" v-if="dataForm.productType==='3'" @click="add()"/>-->
@@ -120,12 +123,12 @@
                          <span v-else v-text="scope.row.basicMtbfAcceptSuccRate"></span>
                        </template>
                      </el-table-column>-->
-              <!--      <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100" align="center">
+                    <el-table-column prop="basicUnitNum" label="鍗曞厓鏁伴噺" :key="11" width="100" align="center">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicUnitNum"></el-input>
                         <span v-else v-text="scope.row.basicUnitNum"></span>
                       </template>
-                    </el-table-column>-->
+                    </el-table-column>
                     <el-table-column prop="basicRunsNum" label="杩愯娆℃暟" :key="12" width="100" align="center">
                       <template slot-scope="scope">
                         <el-input v-if="scope.row.isEdit" v-model="scope.row.basicRunsNum"></el-input>

--
Gitblit v1.9.1