Hu Cheng 2 жил өмнө
parent
commit
2d3f412116

+ 6 - 5
src/views/equipment/index.vue

@@ -183,9 +183,12 @@ const handleClear = () => {
 const submitCallback = () => {
   if (modal.title === '批量导入') {
     const arr = formValue.T_snid.split('\n');
-    arr.forEach((item) => {
+    arr.forEach(async (item) => {
       const [T_sn, T_id] = item.split('-');
-      addDeviceClass(T_sn, T_id);
+      const code = await addDeviceClass(T_sn, T_id);
+      if (code !== 200) {
+        return false;
+      }
     });
     getDataList();
   } else {
@@ -251,9 +254,7 @@ const addDeviceClass = async (T_sn, T_id) => {
       T_id,
       T_remark: formValue.T_remark,
     });
-    if (res.Code !== 200) {
-      return false;
-    }
+    return res.Code;
   } catch (e) {
     console.log(e);
   }

+ 8 - 10
src/views/report/create/index.vue

@@ -140,16 +140,14 @@
           trigger="none"
           ref="scrollbarRef"
         >
-          <n-space vertical>
-            <div
-              class="flex items-center"
-              v-for="(item, index) of items"
-              :key="index"
-            >
-              <n-badge class="mr-5" type="info" :value="index + 1" />
-              <span>{{ item }}</span>
-            </div>
-          </n-space>
+          <div
+            class="flex items-center"
+            v-for="(item, index) of items"
+            :key="index"
+          >
+            <n-badge class="mr-5" type="info" :value="index + 1" />
+            <span>{{ item }}</span>
+          </div>
         </n-scrollbar>
       </n-card>
     </template>