户室开锁记录

src/views/reservation/completeIndex.vue

@@ -2,44 +2,66 @@
   <div>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24">
-        <el-input
-          v-model="search.keyword"
-          style="margin-left:16px;width: 200px"
-          size="small"
-          placeholder="请输入购房人姓名或电话"
-          class="ch-input ch-input-size"
-          @keyup.enter.native="handleSearch()"
-        />
+        <!--        <el-input-->
+        <!--          v-model="search.keyword"-->
+        <!--          style="margin-left:16px;width: 200px"-->
+        <!--          size="small"-->
+        <!--          placeholder="请输入购房人姓名或电话"-->
+        <!--          class="ch-input ch-input-size"-->
+        <!--          @keyup.enter.native="handleSearch()"-->
+        <!--        />-->
         <el-date-picker
           v-model="dateRange"
           size="small"
           type="daterange"
           range-separator="至"
           value-format="yyyy-MM-dd"
-          start-placeholder="创建日期起"
-          end-placeholder="创建日期止"
+          start-placeholder="日志日期起"
+          end-placeholder="日志日期止"
           @change="handleSearch"
         />
-        <el-select v-model="search.parkInfoId" filterable clearable size="small" placeholder="楼盘/小区" @change="parkChange">
+        <!--        <el-select v-model="search.parkInfoId" filterable clearable size="small" placeholder="楼盘/小区" @change="parkChange">-->
+        <!--          <el-option-->
+        <!--            v-for="item in parkOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :value="item.id"-->
+        <!--            :label="item.groupName"-->
+        <!--          />-->
+        <!--        </el-select>-->
+        <!--        <el-select v-model="search.mnpBuildingId" filterable clearable size="small" placeholder="单元/楼栋号" @change="handleSearch">-->
+        <!--          <el-option-->
+        <!--            v-for="item in buildingOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :value="item.id"-->
+        <!--            :label="item.buildNum"-->
+        <!--          />-->
+        <!--        </el-select>-->
+        <el-select v-model="search.logType" filterable clearable size="small" placeholder="日志类型" @change="parkChange">
           <el-option
-            v-for="item in parkOptions"
-            :key="item.id"
-            :value="item.id"
-            :label="item.groupName"
-          />
-        </el-select>
-        <el-select v-model="search.mnpBuildingId" filterable clearable size="small" placeholder="单元/楼栋号" @change="handleSearch">
-          <el-option
-            v-for="item in buildingOptions"
-            :key="item.id"
-            :value="item.id"
-            :label="item.buildNum"
+            v-for="item in logTypes"
+            :key="item.value"
+            :value="item.value"
+            :label="item.label"
           />
         </el-select>
         <el-input
-          v-model="search.parkRoomNo"
+          v-model="search.houseName"
           size="small"
-          placeholder="户室号"
+          placeholder="小区名称"
+          class="ch-input ch-input-size"
+          @keyup.enter.native="handleSearch()"
+        />
+        <el-input
+          v-model="search.buildingName"
+          size="small"
+          placeholder="楼栋名称"
+          class="ch-input ch-input-size"
+          @keyup.enter.native="handleSearch()"
+        />
+        <el-input
+          v-model="search.roomName"
+          size="small"
+          placeholder="房间名称"
           class="ch-input ch-input-size"
           @keyup.enter.native="handleSearch()"
         />
@@ -68,28 +90,26 @@
           :header-cell-style="{ background:'#f2f2f2'}"
         >
           <el-table-column type="index" label="序号" width="60" />
-          <el-table-column label="楼盘/小区" prop="parkInfoName" min-width="100" />
-          <el-table-column label="分期" prop="parkFloorDiscName" min-width="100" />
-          <el-table-column label="单元/楼栋号" prop="mnpBuildingNo" min-width="120" />
-          <el-table-column label="户室号" prop="parkRoomNo" />
+          <el-table-column label="小区名称" prop="houseName" />
+          <el-table-column label="楼栋名称" prop="buildingName" />
+          <el-table-column label="房间名称" prop="roomName" />
+          <el-table-column label="地址" prop="roomAddress" min-width="150" />
+          <el-table-column label="日志类型" prop="logTypeStr" />
+          <el-table-column label="房屋关联" prop="roomBind" />
           <el-table-column label="申请人" prop="applicantName" />
           <el-table-column label="申请人电话" prop="applicantPhone" min-width="120" />
           <el-table-column label="购房人" prop="buyerName" />
           <el-table-column label="购房人电话" prop="buyerPhone" min-width="120" />
-          <el-table-column label="状态" prop="reservationStatusStr" />
-          <el-table-column label="门锁" prop="doorStatus" />
+          <el-table-column label="预约状态" prop="reservationStatusStr" />
           <el-table-column label="开锁日期" prop="reservationDate" min-width="100" />
-          <el-table-column label="看房时段" min-width="100">
-            <template v-slot="scope">
-              {{ scope.row.reservationTimeStart + '~' + scope.row.reservationTimeEnd }}
-            </template>
-          </el-table-column>
-          <el-table-column label="开门密码" prop="doorPassStatusStr" min-width="100" />
+          <el-table-column label="开锁时段" prop="reservationTimeRange" min-width="100" />
           <el-table-column label="备注" prop="lookingNotes" min-width="400" />
-          <el-table-column label="操作" width="200" fixed="right">
+          <el-table-column label="操作人" prop="updateUserName" />
+          <el-table-column label="日志日期" prop="createTime" min-width="160" />
+          <el-table-column label="操作" width="180" fixed="right">
             <template scope="scope">
               <el-button size="small" type="primary" @click="handleEdit(scope.row)">备注</el-button>
-              <el-button size="small" type="primary" @click="handleDetail(scope.row)">查看预约单</el-button>
+              <el-button v-show="scope.row.logType === 4" size="small" type="primary" @click="handleDetail(scope.row)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -122,7 +142,7 @@
     </el-dialog>
 
     <el-dialog
-      title="看房备注"
+      title="备注"
       :visible.sync="notesVisible"
       width="50%"
       top="50px"
@@ -152,13 +172,13 @@ export default {
         return {
             dateRange: [],
             search: {
-                keyword: '',
                 createTimeStart: '',
                 createTimeEnd: '',
-                parkRoomNo: '',
-                parkInfoId: '',
-                mnpBuildingId: '',
-                roomAddress: ''
+                houseName: '',
+                buildingName: '',
+                roomName: '',
+                roomAddress: '',
+                logType: ''
             },
             AllData: [],
             parkOptions: [],
@@ -167,12 +187,26 @@ export default {
             dialogTitle: '',
             dialogVisible: false,
             notesVisible: false,
-            btnLoading: false
+            btnLoading: false,
+            logTypes: [
+                { value: 1, label: '强拆报警' }, { value: 2, label: '非法操作报警（错误次数超限等），系统已锁定' },
+                { value: 3, label: '低电量报警' }, { value: 4, label: '开锁' }, { value: 5, label: '布防' },
+                { value: 6, label: '撤防' }, { value: 7, label: '胁迫开锁' }, { value: 8, label: '添加授权' },
+                { value: 9, label: '删除授权' }, { value: 10, label: '反锁' }, { value: 11, label: '反锁解除' },
+                { value: 12, label: '撬锁芯报警' }, { value: 13, label: '门铃事件' }, { value: 14, label: '门未关好（假锁报警）' },
+                { value: 15, label: '未关门报警' }, { value: 17, label: '门锁已关闭常开' }, { value: 18, label: '故障报警' },
+                { value: 19, label: '状态更新事件' }, { value: 20, label: '切换系统语言' }, { value: 21, label: '系统锁定状态解除' },
+                { value: 22, label: '申请时间同步' }, { value: 23, label: '门锁已恢复出厂设置' }, { value: 24, label: '修改授权' },
+                { value: 25, label: '未拔钥匙事件' }, { value: 26, label: '打开锁头盖事件' }, { value: 27, label: '系统参数设置事件' },
+                { value: 28, label: '使能与禁止' }, { value: 30, label: '上锁事件' }, { value: 31, label: '斜舌缩进事件(压把手事件)' },
+                { value: 32, label: '机械钥匙开锁事件' }, { value: 33, label: '门锁激活事件' }, { value: 34, label: '修改钥匙有效时间' },
+                { value: 54, label: '错误/禁用钥匙开锁事件' }
+            ]
         }
     },
     mounted() {
-        this.getParkOptions()
-        this.getBuildingOptions()
+        // this.getParkOptions()
+        // this.getBuildingOptions()
         this.getData()
     },
     methods: {
@@ -231,10 +265,14 @@ export default {
             })
         },
         handleDetail(val) {
+            if (!val.reservationId) {
+                this.$message.warning('无预约单信息')
+                return
+            }
             this.dialogVisible = true
             this.dialogTitle = '详情'
             this.$nextTick(() => {
-                this.$refs.editDialog.initData(val.id, true)
+                this.$refs.editDialog.initData(val.reservationId, true)
             })
         },
         handleEditClose(refresh) {

src/views/reservation/lookingNotesEdit.vue

@@ -50,7 +50,7 @@ export default {
         },
         getData() {
             this.loading = true
-            this.baseRequest('getById', { id: this.id }).then(res => {
+            this.baseRequest('getLogById', { id: this.id }).then(res => {
                 this.form.lookingNotes = res.data.lookingNotes || ''
                 this.loading = false
             })