zpy 8.9

ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue

@@ -25,7 +25,7 @@
             </el-col>
         </el-row>
         <!-- 表单数据 -->
-        <el-table v-if="refreshTable" :data="assetsList" v-loading="loading" row-key="id" :default-expand-all="isExpandAll"
+        <el-table :data="assetsList" v-loading="loading" row-key="id" :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
             <el-table-column label="分类编码" header-align="center" prop="typeName"></el-table-column>
             <el-table-column label="设备分类" align="center" prop="typeNum"></el-table-column>
@@ -46,7 +46,7 @@
             </el-table-column>
         </el-table>
         <!-- 新增/修改弹出框 -->
-        <el-dialog width="40%" :visible.sync="open" :title="title" append-to-body @close="cancel">
+        <el-dialog width="50%" :visible.sync="open" :title="title" append-to-body>
             <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
                 <el-row>
                     <el-col :span="12">
@@ -60,7 +60,7 @@
                         <el-form-item label="设备分类" prop="typeNum">
                             <el-select v-model="postForm.typeNum" placeholder="请选择设备分类" clearable style="width: 100%;">
                                 <el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
-                                    :value="item.value" :style="{ width: '206.66px' }" />
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -70,7 +70,7 @@
                         <el-form-item label="型号" prop="typeOrder">
                             <el-select v-model="postForm.typeOrder" placeholder="请选择型号" clearable style="width: 100%;">
                                 <el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
-                                    :value="item.value" :style="{ width: '100%' }" />
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -90,7 +90,7 @@
             </div>
         </el-dialog>
         <!-- 查看弹出框 -->
-        <el-dialog width="800px" :visible.sync="openLook" :title="title" append-to-body @close="cancel">
+        <el-dialog width="800px" :visible.sync="openLook" :title="title" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="110px">
                 <el-row>
                     <el-col :span="12">
@@ -102,9 +102,9 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="设备分类" prop="typeNum">
-                            <el-select v-model="form.typeNum" placeholder="请选择设备分类" clearable>
+                            <el-select v-model="form.typeNum" placeholder="请选择设备分类" clearable :style="{ width: '100%' }">
                                 <el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
-                                    :value="item.value" :style="{ width: '206.66px' }" />
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -112,9 +112,9 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="型号" prop="typeOrder">
-                            <el-select v-model="form.typeOrder" placeholder="请选择型号" clearable>
+                            <el-select v-model="form.typeOrder" placeholder="请选择型号" clearable :style="{ width: '100%' }">
                                 <el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
-                                    :value="item.value" :style="{ width: '100%' }" />
+                                    :value="item.value" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -178,7 +178,7 @@ import {
 } from '@/api/smartSchool/logisticsManage/assetsClassification.js'
 
 export default {
-    name: "AssetsClassification",
+    name: "classiFication",
     dicts: ["vehicle_type", "vehicle_state"],
     data() {
         return {
@@ -220,7 +220,7 @@ export default {
             sbflOptions: [],
             // 遮罩层
             loading: false,
-            // 资产信息列表
+            // 列表
             assetsList: [],
             // 新增/修改表单
             postForm: {},
@@ -239,7 +239,7 @@ export default {
             // 校验规则
             rules: {
                 typeName: [{ required: true, message: '资产分类不能为空', trigger: 'blur' }],
-                typeNum: [{ required: true, message: '资产编号不能为空', trigger: 'blur' }],
+                // typeNum: [{ required: true, message: '资产编号不能为空', trigger: 'blur' }],
             },
 
         }
@@ -343,6 +343,7 @@ export default {
         handleAdd(row) {
             this.reset();
             if (row != null && row.id) {
+                console.log(row, row.id);
                 this.postForm.pid = row.id;
             } else {
                 this.postForm.pid = 0;