浏览代码

对接调整

车车 11 月之前
父节点
当前提交
06eda1da0f
共有 2 个文件被更改,包括 13 次插入13 次删除
  1. 1 1
      src/views/mes/hw/Lock/index.vue
  2. 12 12
      src/views/mes/hw/padLocks/index.vue

+ 1 - 1
src/views/mes/hw/Lock/index.vue

@@ -38,7 +38,7 @@
         </el-form-item>
 
         <el-form-item
-          style="margin-left
+          style="margin-left:
         20px"
         >
           <el-button

+ 12 - 12
src/views/mes/hw/padLocks/index.vue

@@ -10,19 +10,19 @@
     >
       <el-row>
 
-        <el-form-item label="锁编码" prop="locksetCode">
+        <el-form-item label="锁编码" prop="lockCode">
           <el-input
-            v-model="queryParams.locksetCode"
-            placeholder="请输入锁编码"
+            v-model="queryParams.lockCode"
+            placeholder="请输入锁编码"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="锁名称" prop="locksetName">
+        <el-form-item label="锁名称" prop="lockName">
           <el-input
-            v-model="queryParams.locksetName"
-            placeholder="请输入锁名称"
+            v-model="queryParams.lockName"
+            placeholder="请输入锁名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -106,14 +106,14 @@
 
 
       <el-table-column
-        label="硬件类型Id"
+        label="所属硬件"
         align="center"
-        prop="hardwareId"
+        prop="hardwareName"
       />
       <el-table-column
-        label="挂锁类型Id"
+        label="挂锁类型"
         align="center"
-        prop="lockTypeId"
+        prop="lockTypeName"
       />
       <el-table-column
         label="创建时间"
@@ -216,10 +216,10 @@
             placeholder="请输入挂锁Nfc"
           />
         </el-form-item>
-        <el-form-item label="挂锁类型Id" prop="lockTypeId">
+        <el-form-item label="挂锁类型" prop="lockTypeId">
           <el-input
             v-model="form.lockTypeId"
-            placeholder="请输入挂锁类型Id"
+            placeholder="请输入挂锁类型"
           />
         </el-form-item>
         <el-form-item label="备注" prop="remark">