设备登记页面bug修复

src/views/system/device/index.vue

@@ -19,9 +19,9 @@
                 <el-input clearable v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                           @keyup.enter.native="handleQuery"/>
               </el-form-item>
-              <el-form-item label="资产类别" prop="assetType" label-width="80">
-                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择资产类别"
-                           @change="assetSelectChange" @clear="clearAsset" clearable>
+              <el-form-item label="资产分类" prop="assetType" label-width="80">
+                <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择资产分类"
+                           @change="queryAssetSelectChange" @clear="clearAsset" clearable>
                   <el-option v-for="item in getAssetDict('AssetDeviceType',-1)" :key="item.id" :label="item.name"
                              :value="item.id"></el-option>
                 </el-select>
@@ -72,7 +72,7 @@
             <el-table-column label="地区" align="left" prop="affiliatedArea"/>
             <el-table-column label="行社" align="left" prop="affiliatedBank"/>
             <el-table-column label="所属机构" align="left" prop="orgName"/>
-            <el-table-column label="设备类别" align="center" key="assetType" prop="assetType"/>
+            <el-table-column label="资产分类" align="center" key="assetType" prop="assetType"/>
             <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType"/>
             <el-table-column label="设备名称" align="center" prop="deviceName"/>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -175,37 +175,9 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--        <el-row>
-                    <el-col :span="12">
-                      <el-form-item v-if="form.deviceType == 2" label="硬盘录像机" prop="hostId">
-                        <el-select style="width: 100%" v-model="form.hostId" placeholder="请选择关联主机">
-                          <el-option v-for="item in hostList" :key="item.id" :label="item.deviceName"
-                                     :value="item.id"></el-option>
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col :span="12">
-                      <el-form-item v-if="form.deviceType == 2" label="通道号" prop="channel">
-                        <el-input type="number" max="64" min="0"
-                                  oninput="if(value<=0)value=null;if(value>=64)value=64;value=parseInt(value)"
-                                  v-model="form.channel" placeholder="请输入关联通道号"/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-
-                  <el-row>
-                    <el-col :span="12">
-                      <el-form-item v-if="form.assetType == 0" label="有效期至" prop="checkTime">
-                        <el-date-picker style="width: 100%" clearable v-model="form.checkTime" type="date"
-                                        value-format="yyyy-MM-dd" placeholder="请选择到期时间">
-                        </el-date-picker>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>-->
           <el-col :span="12">
             <el-form-item label="设备型号" prop="deviceModel">
-              <el-select style="width: 100%" v-model="form.deviceModel" placeholder="请选择设备型号">
+              <el-select @change="brandSelectChange1" style="width: 100%" v-model="form.deviceModel" placeholder="请选择设备型号">
                 <el-option v-for="item in brandChildrenDictList" :key="item.id" :label="item.name"
                            :value="item.id"></el-option>
               </el-select>
@@ -259,7 +231,7 @@
               <el-select
                 v-model="form.deviceStatus"
                 clearable
-                placeholder="请选择机构类型"
+                placeholder="请选择资产状态"
                 style="width: 100%;">
                 <el-option
                   v-for="dict in dict.type.asset_status"
@@ -271,21 +243,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-        <!--        <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="关联登记簿" v-if="form.deviceType == 1" prop="inBook">
-                      <el-switch v-model="form.inBook" :active-value="1" :inactive-value="0"></el-switch>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="是否高清" v-if="form.deviceType == 2">
-                      <el-switch v-model="form.definition" active-value="1" inactive-value="0"></el-switch>
-                    </el-form-item>
-                  </el-col>
-                </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -663,17 +620,18 @@ export default {
         id: null,
         orgId: null,
         orgName: null,
+        assetNo: null,
         deviceName: null,
         assetType: null,
         deviceType: null,
         deviceBrand: null,
+        deviceModel: null,
+        purchasingTime: null,
+        address: null,
         checkTime: null,
         maintenanceTerm: null,
-        createTime: null,
-        updateTime: null,
-        createBy: null,
-        updateBy: null,
-        delFlag: null,
+        useTime: null,
+        deviceStatus: null,
         hostId: null,
         channel: null,
         definition: "1",
@@ -734,8 +692,8 @@ export default {
       });
       return arr;
     },
+    //新增设备时
     assetSelectChange(val) {
-      //改成数据库查询, children里面
       if (!val) return;
       this.form.deviceType = null;
       getDictTreeByParentId(val).then((response) => {
@@ -743,15 +701,26 @@ export default {
         console.log('获取设备分类数据', this.assetChildrenDictList);
       });
     },
+    //查询时
+    queryAssetSelectChange(val) {
+      if (!val) return;
+      this.queryParams.deviceType = null;
+      getDictTreeByParentId(val).then((response) => {
+        this.assetChildrenDictList = response.data;
+        console.log('获取设备分类数据', this.assetChildrenDictList);
+      });
+    },
     brandSelectChange(val) {
-      //改成数据库查询, children里面
       if (!val) return;
       this.form.deviceModel = null;
       getDictTreeByParentId(val).then((response) => {
         this.brandChildrenDictList = response.data;
-        console.log('获取设备型号数据', this.assetChildrenDictList);
+        console.log('获取设备型号数据', this.brandChildrenDictList);
       });
     },
+    brandSelectChange1(val) {
+      console.log(this.form.deviceModel,val)
+    },
     clearAsset() {
       this.queryParams.deviceType = null;
     },