sz

src/api/base/roomInfo.js

@@ -41,7 +41,6 @@ function batchRemove(idList){
   });
 }
 
-
 function query(formData) {
   return request.post(constant.serverUrl + "/base/roomInfo/query", formData);
 }

src/api/base/terminalInfo.js

@@ -41,6 +41,10 @@ function batchRemove(idList){
   });
 }
 
+function query(formData) {
+  return request.post(constant.serverUrl + "/base/terminalInfo/query", formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove
+  pageList,create,edit,add,update,remove,batchRemove,query
 }

src/api/sys/dataDictionary.js

@@ -45,6 +45,10 @@ function query(formData) {
   return request.post(constant.serverUrl + "/sys/dataDictionary/query", formData);
 }
 
+function queryChildren(formData) {
+  return request.post(constant.serverUrl + "/sys/dataDictionary/queryChildren", formData);
+}
+
 export default {
-  pageList, create, edit, add, update, remove, batchRemove,query
+  pageList, create, edit, add, update, remove, batchRemove,query,queryChildren
 }

src/views/base/electricClientInfo-detail.vue

@@ -14,52 +14,37 @@
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label prop="id">
-          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
         <el-form-item label="户号" prop="customerNo">
           <el-input v-model="formModel.customerNo" placeholder="请输入户号" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="房间号ID" prop="roomId">
-          <el-input v-model="formModel.roomId" placeholder="请输入房间号ID" style="width:300px"></el-input>
+        <el-form-item label="房间号" prop="roomId">
+          <el-select
+            v-model="formModel.roomId"
+            filterable
+            remote
+            placeholder
+            :remote-method="queryRoomInfo"
+            style="width:300px"
+          >
+            <el-option
+              v-for="roomInfo in roomInfoListFilter"
+              :key="roomInfo.id"
+              :label="roomInfo.name"
+              :value="roomInfo.id"
+            ></el-option>
+          </el-select>
+          <el-button icon="el-icon-search" circle size="small" @click="innerVisible=true;"></el-button>
         </el-form-item>
-        <el-form-item label="电表号ID" prop="meterId">
+        <el-form-item label="电表号" prop="meterId">
           <el-input v-model="formModel.meterId" placeholder="请输入电表号ID" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="总购电量" prop="electricityTotal">
-          <el-input v-model="formModel.electricityTotal" placeholder="请输入总购电量" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="总购电金额" prop="amountTotal">
-          <el-input v-model="formModel.amountTotal" placeholder="请输入总购电金额" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="购买次数" prop="buyNum">
-          <el-input v-model="formModel.buyNum" placeholder="请输入购买次数" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="剩余电量" prop="electricityRemaining">
+        <el-form-item label="电量" prop="electricityRemaining">
           <el-input
             v-model="formModel.electricityRemaining"
-            placeholder="请输入剩余电量"
+            placeholder="请输入电量"
             style="width:300px"
           ></el-input>
         </el-form-item>
-        <el-form-item label="剩余金额" prop="amountRemaining">
-          <el-input v-model="formModel.amountRemaining" placeholder="请输入剩余金额" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createBy">
-          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createTime">
-          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateBy">
-          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateTime">
-          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="是否删除" prop="delFlag">
-          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
-        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -71,13 +56,13 @@
 <script>
 import Constant from "@/constant";
 import electricClientInfoApi from "@/api/base/electricClientInfo";
+import roomInfoApi from "@/api/base/roomInfo";
 
 export default {
   props: ["businessKey", "title"],
   data() {
     return {
       ruleValidate: {
-        id: [{ required: true, message: "不能为空", trigger: "blur" }],
         customerNo: [
           { required: true, message: "户号不能为空", trigger: "blur" }
         ],
@@ -87,35 +72,26 @@ export default {
         meterId: [
           { required: true, message: "电表号ID不能为空", trigger: "blur" }
         ],
-        electricityTotal: [
-          { required: true, message: "总购电量不能为空", trigger: "blur" }
-        ],
-        amountTotal: [
-          { required: true, message: "总购电金额不能为空", trigger: "blur" }
-        ],
-        buyNum: [
-          { required: true, message: "购买次数不能为空", trigger: "blur" }
-        ],
         electricityRemaining: [
           { required: true, message: "剩余电量不能为空", trigger: "blur" }
-        ],
-        amountRemaining: [
-          { required: true, message: "剩余金额不能为空", trigger: "blur" }
-        ],
-        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
-        updateTime: [{ required: true, message: "不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "是否删除不能为空", trigger: "blur" }
         ]
       },
       showDialog: true,
       loading: false,
       submitting: false,
-      formModel: {}
+      formModel: {},
+      roomInfoList: []
     };
   },
+  computed: {
+    roomInfoListFilter() {
+      var self = this;
+
+      return self.roomInfoList.filter(roomInfo => {
+        return roomInfo.id;
+      });
+    }
+  },
   methods: {
     closeDialog() {
       this.$emit("close", false);
@@ -154,16 +130,33 @@ export default {
           });
         }
       });
+    },
+    queryRoomInfo(keywords) {
+      var formData = new FormData();
+      formData.append("keywords", keywords);
+      formData.append("type", 3);
+      formData.append("excludeId", this.formModel.id);
+      formData.append("limit", 10);
+
+      return roomInfoApi.query(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.roomInfoList = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
     }
   },
-  mounted: function() {
+  async mounted() {
     var self = this;
-
+    this.queryRoomInfo("");
     (function() {
       if (self.businessKey.length == 0) {
         return electricClientInfoApi.create();
       } else {
-        return electricClientInfoApi.edit(self.menuId);
+        return electricClientInfoApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/electricClientInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/electricClientInfo">electricClientInfo管理</a>
+        <a href="/electricClientInfo">户号管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -14,9 +14,6 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
       <el-form-item label="户号" prop="customerNo">
         <el-input type="text" size="mini" v-model="queryModel.customerNo"></el-input>
       </el-form-item>
@@ -26,36 +23,6 @@
       <el-form-item label="电表号ID" prop="meterId">
         <el-input type="text" size="mini" v-model="queryModel.meterId"></el-input>
       </el-form-item>
-      <el-form-item label="总购电量" prop="electricityTotal">
-        <el-input type="text" size="mini" v-model="queryModel.electricityTotal"></el-input>
-      </el-form-item>
-      <el-form-item label="总购电金额" prop="amountTotal">
-        <el-input type="text" size="mini" v-model="queryModel.amountTotal"></el-input>
-      </el-form-item>
-      <el-form-item label="购买次数" prop="buyNum">
-        <el-input type="text" size="mini" v-model="queryModel.buyNum"></el-input>
-      </el-form-item>
-      <el-form-item label="剩余电量" prop="electricityRemaining">
-        <el-input type="text" size="mini" v-model="queryModel.electricityRemaining"></el-input>
-      </el-form-item>
-      <el-form-item label="剩余金额" prop="amountRemaining">
-        <el-input type="text" size="mini" v-model="queryModel.amountRemaining"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createBy">
-        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createTime">
-        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateBy">
-        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateTime">
-        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
-      </el-form-item>
-      <el-form-item label="是否删除" prop="delFlag">
-        <el-input type="text" size="mini" v-model="queryModel.delFlag"></el-input>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -233,11 +200,6 @@ export default {
         self.queryModel.electricityRemaining
       );
       formData.append("amountRemaining", self.queryModel.amountRemaining);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
 
       if (this.field != null) {
         formData.append("field", this.field);

src/views/base/electricMeterInfo-detail.vue

@@ -14,9 +14,6 @@
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label prop="id">
-          <el-input v-model="formModel.id" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
         <el-form-item label="表号" prop="meterNo">
           <el-input v-model="formModel.meterNo" placeholder="请输入表号" style="width:300px"></el-input>
         </el-form-item>
@@ -26,23 +23,22 @@
         <el-form-item label="标识名称" prop="name">
           <el-input v-model="formModel.name" placeholder="请输入标识名称" style="width:300px"></el-input>
         </el-form-item>
-        <el-form-item label="所属终端ID" prop="terminalId">
-          <el-input v-model="formModel.terminalId" placeholder="请输入所属终端ID" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createBy">
-          <el-input v-model="formModel.createBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="createTime">
-          <el-input v-model="formModel.createTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateBy">
-          <el-input v-model="formModel.updateBy" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label prop="updateTime">
-          <el-input v-model="formModel.updateTime" placeholder="请输入" style="width:300px"></el-input>
-        </el-form-item>
-        <el-form-item label="是否删除" prop="delFlag">
-          <el-input v-model="formModel.delFlag" placeholder="请输入是否删除" style="width:300px"></el-input>
+        <el-form-item label="所属终端" prop="terminalId">
+          <el-select
+            v-model="formModel.terminalId"
+            filterable
+            remote
+            placeholder
+            :remote-method="queryTerminal"
+            style="width:300px"
+          >
+            <el-option
+              v-for="terminal in terminalListFilter"
+              :key="terminal.id"
+              :label="terminal.name"
+              :value="terminal.id"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
     </div>
@@ -55,6 +51,7 @@
 <script>
 import Constant from "@/constant";
 import electricMeterInfoApi from "@/api/base/electricMeterInfo";
+import terminalApi from "@/api/base/terminalInfo";
 
 export default {
   props: ["businessKey", "title"],
@@ -80,12 +77,22 @@ export default {
           { required: true, message: "是否删除不能为空", trigger: "blur" }
         ]
       },
+      terminalList: [],
       showDialog: true,
       loading: false,
       submitting: false,
       formModel: {}
     };
   },
+  computed: {
+    terminalListFilter() {
+      var self = this;
+
+      return self.terminalList.filter(terminal => {
+        return terminal.id;
+      });
+    }
+  },
   methods: {
     closeDialog() {
       this.$emit("close", false);
@@ -124,16 +131,34 @@ export default {
           });
         }
       });
+    },
+    queryTerminal(keywords) {
+      var formData = new FormData();
+      formData.append("keywords", keywords);
+      formData.append("parentType", this.parentType);
+      formData.append("excludeId", this.formModel.id);
+      formData.append("limit", 10);
+
+      return terminalApi.query(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.terminalList = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
     }
   },
   mounted: function() {
     var self = this;
-
+    self.loading = true;
+    this.queryTerminal("");
     (function() {
       if (self.businessKey.length == 0) {
         return electricMeterInfoApi.create();
       } else {
-        return electricMeterInfoApi.edit(self.menuId);
+        return electricMeterInfoApi.edit(self.businessKey);
       }
     })()
       .then(response => {

src/views/base/electricMeterInfo-list.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/electricMeterInfo">electricMeterInfo管理</a>
+        <a href="/electricMeterInfo">电表管理</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -14,35 +14,22 @@
       要resetFields起作用，必须配置:model和prop
     -->
     <el-form ref="queryForm" :model="queryModel" inline class="demo-form-inline">
-      <el-form-item label prop="id">
-        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
-      </el-form-item>
-      <el-form-item label="表号" prop="meterNo">
-        <el-input type="text" size="mini" v-model="queryModel.meterNo"></el-input>
-      </el-form-item>
-      <el-form-item label="单位号" prop="unitNo">
-        <el-input type="text" size="mini" v-model="queryModel.unitNo"></el-input>
-      </el-form-item>
-      <el-form-item label="标识名称" prop="name">
-        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-      </el-form-item>
-      <el-form-item label="所属终端ID" prop="terminalId">
-        <el-input type="text" size="mini" v-model="queryModel.terminalId"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createBy">
-        <el-input type="text" size="mini" v-model="queryModel.createBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="createTime">
-        <el-input type="text" size="mini" v-model="queryModel.createTime"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateBy">
-        <el-input type="text" size="mini" v-model="queryModel.updateBy"></el-input>
-      </el-form-item>
-      <el-form-item label prop="updateTime">
-        <el-input type="text" size="mini" v-model="queryModel.updateTime"></el-input>
-      </el-form-item>
-      <el-form-item label="是否删除" prop="delFlag">
-        <el-input type="text" size="mini" v-model="queryModel.delFlag"></el-input>
+      <el-form-item label="所属终端" prop="terminalId">
+        <el-select
+            v-model="queryModel.terminalId"
+            filterable
+            remote
+            placeholder
+            :remote-method="queryTerminal"
+            style="width:300px"
+          >
+            <el-option
+              v-for="terminal in queryTerminalResult"
+              :key="terminal.id"
+              :label="terminal.name"
+              :value="terminal.id"
+            ></el-option>
+          </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -81,22 +68,16 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="id" sort-by="id_" label sortable="custom" width="180"></el-table-column>
       <el-table-column prop="meterNo" sort-by="meter_no" label="表号" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="unitNo" sort-by="unit_no" label="单位号" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="标识名称" sortable="custom" width="180"></el-table-column>
       <el-table-column
-        prop="terminalId"
-        sort-by="terminal_id"
-        label="所属终端ID"
+        prop="terminalName"
+        sort-by="terminalName"
+        label="所属终端"
         sortable="custom"
         width="180"
       ></el-table-column>
-      <el-table-column prop="createBy" sort-by="create_by" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="createTime" sort-by="create_time" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="updateBy" sort-by="update_by" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="updateTime" sort-by="update_time" label sortable="custom" width="180"></el-table-column>
-      <el-table-column prop="delFlag" sort-by="del_flag" label="是否删除" sortable="custom" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
@@ -124,6 +105,7 @@
 import Constant from "@/constant";
 import ElectricMeterInfoDetail from "./electricMeterInfo-detail";
 import electricMeterInfoApi from "@/api/base/electricMeterInfo";
+import terminalApi from "@/api/base/terminalInfo";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -156,7 +138,8 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      queryTerminalResult: []
     };
   },
   methods: {
@@ -176,11 +159,6 @@ export default {
       formData.append("unitNo", self.queryModel.unitNo);
       formData.append("name", self.queryModel.name);
       formData.append("terminalId", self.queryModel.terminalId);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
 
       if (this.field != null) {
         formData.append("field", this.field);
@@ -209,6 +187,21 @@ export default {
     pageSizeChange(pageSize) {
       this.pageSize = pageSize;
     },
+    queryTerminal(keywords) {
+      var formData = new FormData();
+      formData.append("keywords", keywords);
+      formData.append("limit", 10);
+
+      return terminalApi.query(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.queryTerminalResult = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
     sortChange(data) {
       this.field = data.column.field;
       this.direction = data.order;
@@ -294,6 +287,7 @@ export default {
   },
   mounted: function() {
     this.changePage(1);
+    this.queryTerminal("");
   },
   components: {
     "electricMeterInfo-detail": ElectricMeterInfoDetail

src/views/base/roomInfo-detail.vue

@@ -26,6 +26,24 @@
             <el-option label="房号" value="3"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="用电类型" prop="useType">
+          <el-select
+            v-model="formModel.useType"
+            filterable
+            remote
+            placeholder
+            :remote-method="queryUseType"
+            style="width:300px"
+            v-bind:disabled="useDisabled"
+          >
+            <el-option
+              v-for="useType in useTypeListFilter"
+              :key="useType.id"
+              :label="useType.name"
+              :value="useType.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="排序号" prop="sortNo">
           <el-input v-model="formModel.sortNo" placeholder="请输入排序号" style="width:300px"></el-input>
         </el-form-item>
@@ -34,10 +52,10 @@
             v-model="formModel.parentId"
             filterable
             remote
-            placeholder=""
+            placeholder
             :remote-method="queryRoomInfo"
             style="width:300px"
-            v-bind:disabled="disabledInput"
+            v-bind:disabled="parentDsabled"
           >
             <el-option
               v-for="roomInfo in roomInfoListFilter"
@@ -58,6 +76,7 @@
 <script>
 import Constant from "@/constant";
 import roomInfoApi from "@/api/base/roomInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 
 export default {
   props: ["businessKey", "title"],
@@ -72,17 +91,17 @@ export default {
             trigger: "blur"
           }
         ],
-        sortNo: [
-          { required: true, message: "排序号不能为空", trigger: "blur" }
-        ]
+        sortNo: [{ required: true, message: "排序号不能为空", trigger: "blur" }]
       },
       roomInfoList: [],
+      useTypeList: [],
       showDialog: true,
       loading: false,
       submitting: false,
       formModel: {},
-      disabledInput:true,
-      parentType:"",
+      parentDsabled: true,
+      useDisabled: true,
+      parentType: ""
     };
   },
   computed: {
@@ -90,7 +109,14 @@ export default {
       var self = this;
 
       return self.roomInfoList.filter(roomInfo => {
-        return self.formModel.parentId != roomInfo.id;
+        return roomInfo.id;
+      });
+    },
+    useTypeListFilter() {
+      var self = this;
+
+      return self.useTypeList.filter(useType => {
+        return useType.id;
       });
     }
   },
@@ -138,7 +164,7 @@ export default {
       formData.append("parentType", this.parentType);
       //formData.append("excludeId", this.formModel.id);
       formData.append("limit", 10);
-    
+
       return roomInfoApi.query(formData).then(response => {
         var jsonData = response.data;
 
@@ -149,17 +175,41 @@ export default {
         }
       });
     },
-    selectType(keywords){
+    queryUseType(keywords) {
+      var formData = new FormData();
+      formData.append("parentId", keywords);
+      //formData.append("excludeId", this.formModel.id);
+      formData.append("limit", 10);
+
+      return dataDictionaryApi.queryChildren(formData).then(response => {
+        var jsonData = response.data;
+
+        if (jsonData.result) {
+          this.useTypeList = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    selectType(keywords) {
       this.parentType = keywords;
       this.queryRoomInfo("");
-      if(keywords != "1"){
-        this.disabledInput = false;
+      if (keywords == "1") {
+        this.parentDsabled = true;
+      } else {
+         this.parentDsabled = false;
+        if (keywords == "3") {
+          this.useDisabled = false;
+        } else {
+          this.useDisabled = true;
+        }
       }
     }
   },
   async mounted() {
     var self = this;
     self.loading = true;
+    this.queryUseType("d18b7e03-63ed-4d86-b2b3-b93a7de2673b");
     (function() {
       if (self.businessKey.length == 0) {
         return roomInfoApi.create();
@@ -170,13 +220,18 @@ export default {
       .then(response => {
         var jsonData = response.data;
         self.loading = false;
-
         if (jsonData.result) {
           self.formModel = jsonData.data;
-          if(self.formModel.parentId != ""){
+          if (
+            self.formModel.parentId != "" &&
+            self.formModel.parentId != null
+          ) {
             this.parentType = self.formModel.type;
             this.queryRoomInfo("");
-            this.disabledInput = false;
+            this.parentDsabled = false;
+          }
+          if (self.formModel.type == "3") {
+            this.useDisabled = false;
           }
         } else {
           self.$message.error(jsonData.message + "");

src/views/base/roomInfo-list.vue

@@ -77,6 +77,7 @@
 					</p>
         </template>
       </el-table-column>
+      <el-table-column prop="useTypeN" sort-by="use_type_n" label="用电类型" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">

src/views/base/terminalInfo-detail.vue

@@ -19,6 +19,9 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formModel.remark" placeholder="请输入备注" style="width:300px"></el-input>
         </el-form-item>
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input v-model="formModel.sortNo" placeholder="请输入排序号" style="width:300px"></el-input>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -36,7 +39,8 @@ export default {
   data() {
     return {
       ruleValidate: {
-        name: [{ required: true, message: "终端名称不能为空", trigger: "blur" }]
+        name: [{ required: true, message: "终端名称不能为空", trigger: "blur" }],
+        sortNo: [{ required: true, message: "排序号不能为空", trigger: "blur" }]
       },
       showDialog: true,
       loading: false,

src/views/base/terminalInfo-list.vue

@@ -56,6 +56,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="终端名称" sortable="custom" width="180"></el-table-column>
       <el-table-column prop="remark" sort-by="remark_" label="备注" sortable="custom" width="180"></el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="排序号" sortable="custom" width="180"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
@@ -93,13 +94,7 @@ export default {
     return {
       queryModel: {
         id: "",
-        name: "",
-        remark: "",
-        createBy: "",
-        createTime: "",
-        updateBy: "",
-        updateTime: "",
-        delFlag: ""
+        name: ""
       },
       loading: false,
       tableData: [],
@@ -130,12 +125,6 @@ export default {
 
       formData.append("id", self.queryModel.id);
       formData.append("name", self.queryModel.name);
-      formData.append("remark", self.queryModel.remark);
-      formData.append("createBy", self.queryModel.createBy);
-      formData.append("createTime", self.queryModel.createTime);
-      formData.append("updateBy", self.queryModel.updateBy);
-      formData.append("updateTime", self.queryModel.updateTime);
-      formData.append("delFlag", self.queryModel.delFlag);
 
       if (this.field != null) {
         formData.append("field", this.field);

src/views/sys/dataDictionary-detail.vue

@@ -93,7 +93,7 @@ export default {
     dataDictionaryListFilter() {
       var self = this;
       return self.dataDictionaryList.filter(dataDictionary => {
-        return self.formModel.parentId != dataDictionary.id;
+        return dataDictionary.id;
       });
     }
   },