Merge remote-tracking branch 'origin/master'

src/views/pms/devicetemplate/detail/dataSpecs/DeviceAttrModelEnumDataSpecs.vue

@@ -2,18 +2,21 @@
 <template>
   <el-form-item
     :rules="[{ required: true, validator: validateEnumList, trigger: 'change' }]"
-    label="枚举项"
+    label="下拉选项"
   >
     <div class="flex flex-col">
       <div class="flex items-center">
+        <!--
         <span class="flex-1"> 参数值 </span>
         <span class="flex-1"> 参数描述 </span>
+        -->
       </div>
       <div
         v-for="(item, index) in dataSpecsList"
         :key="index"
         class="flex items-center justify-between mb-5px"
       >
+        <!--
         <el-form-item
           :prop="`selectOptions.dataSpecsList[${index}].value`"
           :rules="[
@@ -25,19 +28,20 @@
           <el-input v-model="item.value" placeholder="请输入枚举值,如'0'" />
         </el-form-item>
         <span class="mx-2">~</span>
+        -->
         <el-form-item
           :prop="`selectOptions.dataSpecsList[${index}].name`"
           :rules="[
-            { required: true, message: '枚举描述不能为空' },
+            { required: true, message: '下拉选项不能为空' },
             { validator: validateEnumName, trigger: 'blur' }
           ]"
           class="flex-1 mb-0"
         >
-          <el-input v-model="item.name" placeholder="对该枚举项的描述" />
+          <el-input v-model="item.name" placeholder="对该下拉选项的描述" />
         </el-form-item>
         <el-button class="ml-10px" link type="primary" @click="deleteEnum(index)">删除</el-button>
       </div>
-      <el-button link type="primary" @click="addEnum">+添加枚举项</el-button>
+      <el-button link type="primary" @click="addEnum">+添加下拉选项值</el-button>
     </div>
   </el-form-item>
 </template>

src/views/pms/material/MaterialForm.vue

@@ -42,16 +42,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="单位"
-            prop="unit"
-          >
-            <el-select
-              :model-value="formData.unit"
-              filterable
-              placeholder="请选择单位"
-              class="w-1/1"
-            >
+          <el-form-item label="单位" prop="unit">
+            <el-select v-model="formData.unit" filterable clearable placeholder="请选择单位" class="w-1/1">
               <el-option
                 v-for="(item, index) in getStrDictOptions(DICT_TYPE.IOT_THING_MODEL_UNIT)"
                 :key="index"

src/views/supplier/base/index.vue

@@ -169,11 +169,13 @@
 <!--          <dict-tag :type="DICT_TYPE.SUPPLIER_SIZE" :value="scope.row.size" />-->
 <!--        </template>-->
 <!--      </el-table-column>-->
+      <!--
       <el-table-column label="状态" align="center" prop="status" >
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SUPPLIER_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      -->
       <el-table-column
         label="创建时间"
         align="center"