工作办理待办功能测试完成

wuxw
1 parent 9c311762
Showing 10 changed files with 524 additions and 3 deletions
src/api/oa/visitUndoApi.js
src/api/resource/itemReleaseUndoApi.js
src/i18n/oaI18n.js
src/i18n/resourceI18n.js
src/router/oaRouter.js
src/router/resourceRouter.js
src/views/oa/visitUndoLang.js
src/views/oa/visitUndoList.vue
src/views/resource/itemReleaseUndoLang.js
src/views/resource/itemReleaseUndoList.vue
+import request from '@/utils/request'
+
+/**
+ * 查询待办访客列表
+ * @param {Object} params 查询参数
+ * @returns {Promise} 返回Promise对象
+ */
+export function queryUndoVisit(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/visit.queryUndoVisit',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
 \ No newline at end of file
+import request from '@/utils/request'
+import { getCommunityId } from '@/api/community/communityApi'
+
+// 查询待办放行单列表
+export function queryUndoItemRelease(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/itemRelease.queryUndoItemRelease',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 查询放行物品列表
+export function listItemReleaseRes(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/itemRelease.listItemReleaseRes',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
 \ No newline at end of file
@@ -52,6 +52,7 @@ import { messages as newOaWorkflowFormEditMessages } from &#39;../views/oa/newOaWork
 import { messages as simplifyNotepadManageMessages } from '../views/oa/simplifyNotepadManageLang'
 import { messages as uodoComplaintsMessages } from '../views/oa/uodoComplaintsLang'
 import { messages as complaintDetailMessages } from '../views/oa/complaintDetailLang'
+import { messages as visitUndoMessages } from '../views/oa/visitUndoLang'
 export const messages ={
@@ -109,6 +110,7 @@ export const messages ={
         ...simplifyNotepadManageMessages.en,
         ...uodoComplaintsMessages.en,
         ...complaintDetailMessages.en,
+        ...visitUndoMessages.en,
     },
     zh:{    
         ...activitiesTypeManageMessages.zh, 
@@ -164,5 +166,6 @@ export const messages ={
         ...simplifyNotepadManageMessages.zh,
         ...uodoComplaintsMessages.zh,
         ...complaintDetailMessages.zh,
+        ...visitUndoMessages.zh,
     }
 }
 \ No newline at end of file
@@ -39,6 +39,7 @@ import { messages as resourceOutManageMessages } from &#39;../views/resource/resourc
 import { messages as allocationStorehouseAuditOrdersMessages } from '../views/resource/allocationStorehouseAuditOrdersLang'
 import { messages as editAllocationStorehouseApplyMessages } from '../views/resource/editAllocationStorehouseApplyLang'
 import { messages as allocationStorehouseEnterMessages } from '../views/resource/allocationStorehouseEnterLang'
+import { messages as itemReleaseUndoMessages } from '../views/resource/itemReleaseUndoLang'
 export const messages = {
     en: {
@@ -81,6 +82,7 @@ export const messages = {
         ...allocationStorehouseAuditOrdersMessages.en,
         ...editAllocationStorehouseApplyMessages.en,
         ...allocationStorehouseEnterMessages.en,
+        ...itemReleaseUndoMessages.en,
     },
     zh: {
         ...resourceAuditFlowMessages.zh,
@@ -122,5 +124,6 @@ export const messages = {
         ...allocationStorehouseAuditOrdersMessages.zh,
         ...editAllocationStorehouseApplyMessages.zh,
         ...allocationStorehouseEnterMessages.zh,
+        ...itemReleaseUndoMessages.zh,
     }
 }
 \ No newline at end of file
@@ -249,4 +249,9 @@ export default [
         name: '/pages/complaint/complaintDetail',
         component: () => import('@/views/oa/complaintDetailList.vue')
     },
+    {
+        path: '/pages/property/visitUndo',
+        name: '/pages/property/visitUndo',
+        component: () => import('@/views/oa/visitUndoList.vue')
+    },
 ]
 \ No newline at end of file
@@ -181,9 +181,14 @@ export default [
         component: () => import('@/views/resource/editAllocationStorehouseApplyList.vue')
     },
     {
-        path:'/pages/resource/allocationStorehouseEnter',
-        name:'/pages/resource/allocationStorehouseEnter',
+        path: '/pages/resource/allocationStorehouseEnter',
+        name: '/pages/resource/allocationStorehouseEnter',
         component: () => import('@/views/resource/allocationStorehouseEnterList.vue')
-        },
+    },
+    {
+        path: '/pages/property/itemReleaseUndo',
+        name: '/pages/property/itemReleaseUndo',
+        component: () => import('@/views/resource/itemReleaseUndoList.vue')
+    },
 ]
 \ No newline at end of file
+export const messages = {
+  en: {
+    visitUndo: {
+      title: 'Visitor To-do List',
+      back: 'Back',
+      refresh: 'Refresh',
+      visitorId: 'Visitor ID',
+      visitor: 'Visitor',
+      male: 'Male',
+      female: 'Female',
+      ownerName: 'Owner Name',
+      visitReason: 'Visit Reason/Type',
+      carNumber: 'Car Number',
+      entourageCount: 'Entourage Count',
+      createTime: 'Create Time',
+      visitTime: 'Visit/Departure Time',
+      status: 'Status',
+      operation: 'Operation',
+      process: 'Process',
+      detail: 'Detail'
+    }
+  },
+  zh: {
+    visitUndo: {
+      title: '访客待办单',
+      back: '返回',
+      refresh: '刷新',
+      visitorId: '访客ID',
+      visitor: '访客',
+      male: '男',
+      female: '女',
+      ownerName: '业主姓名',
+      visitReason: '来访事由/类型',
+      carNumber: '车牌号',
+      entourageCount: '随行人数',
+      createTime: '创建时间',
+      visitTime: '来访/离开时间',
+      status: '状态',
+      operation: '操作',
+      process: '办理',
+      detail: '详情'
+    }
+  }
+}
 \ No newline at end of file
+<template>
+  <div class="animated fadeInRight visit-undo-container">
+    <el-row>
+      <el-col :span="24">
+        <el-card>
+          <div slot="header" class="flex justify-between">
+            <span>{{ $t('visitUndo.title') }}</span>
+            <div class="card-header-actions">
+              <el-button size="small" @click="goBack">{{ $t('visitUndo.back') }}</el-button>
+              <el-button type="primary" size="small" @click="queryUndoOrders">{{ $t('visitUndo.refresh') }}</el-button>
+            </div>
+          </div>
+
+          <el-table
+            v-loading="loading"
+            :data="visitUndoInfo.undos"
+            border
+            style="width: 100%"
+          >
+            <el-table-column prop="vId" :label="$t('visitUndo.visitorId')" align="center" />
+            <el-table-column :label="$t('visitUndo.visitor')" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.vName }}({{ scope.row.phoneNumber }})/{{ scope.row.visitGender === '0' ? $t('visitUndo.male') : $t('visitUndo.female') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="ownerName" :label="$t('visitUndo.ownerName')" align="center" />
+            <el-table-column :label="$t('visitUndo.visitReason')" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.visitCase }}({{ scope.row.reasonTypeName }})
+              </template>
+            </el-table-column>
+            <el-table-column prop="carNum" :label="$t('visitUndo.carNumber')" align="center" />
+            <el-table-column prop="entourage" :label="$t('visitUndo.entourageCount')" align="center" />
+            <el-table-column prop="createTime" :label="$t('visitUndo.createTime')" align="center" />
+            <el-table-column :label="$t('visitUndo.visitTime')" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.visitTime }}<br>{{ scope.row.departureTime }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="stateName" :label="$t('visitUndo.status')" align="center" />
+            <el-table-column :label="$t('visitUndo.operation')" align="center" width="200">
+              <template slot-scope="scope">
+                <el-button-group>
+                  <el-button size="mini" @click="openAuditUndoDetail(scope.row)">{{ $t('visitUndo.process') }}</el-button>
+                  <el-button size="mini" @click="openDetail(scope.row)">{{ $t('visitUndo.detail') }}</el-button>
+                </el-button-group>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            :current-page.sync="page.current"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="page.size"
+            :total="page.total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { queryUndoVisit } from '@/api/oa/visitUndoApi'
+import { getCommunityId } from '@/api/community/communityApi'
+
+export default {
+  name: 'VisitUndoList',
+  data() {
+    return {
+      loading: false,
+      communityId: '',
+      visitUndoInfo: {
+        undos: [],
+        conditions: {
+          vId: '',
+          userName: '',
+          auditLink: ''
+        }
+      },
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.communityId = getCommunityId()
+    this.listUndoOrders()
+  },
+  methods: {
+    async listUndoOrders() {
+      try {
+        this.loading = true
+        const params = {
+          page: this.page.current,
+          row: this.page.size,
+          ...this.visitUndoInfo.conditions,
+          communityId: this.communityId,
+          audit: '1'
+        }
+        const { data, total } = await queryUndoVisit(params)
+        this.visitUndoInfo.undos = data
+        this.page.total = total
+      } catch (error) {
+        console.error('Failed to fetch undo orders:', error)
+      } finally {
+        this.loading = false
+      }
+    },
+    queryUndoOrders() {
+      this.page.current = 1
+      this.listUndoOrders()
+    },
+    openDetail(item) {
+      this.$router.push({
+        path: '/views/property/visitDetail',
+        query: {
+          vId: item.vId,
+          flowId: item.flowId
+        }
+      })
+    },
+    openAuditUndoDetail(undo) {
+      this.$router.push({
+        path: '/views/property/visitDetail',
+        query: {
+          vId: undo.vId,
+          flowId: undo.flowId,
+          action: 'Audit',
+          taskId: undo.taskId
+        }
+      })
+    },
+    goBack() {
+      this.$router.go(-1)
+    },
+    handleSizeChange(val) {
+      this.page.size = val
+      this.listUndoOrders()
+    },
+    handleCurrentChange(val) {
+      this.page.current = val
+      this.listUndoOrders()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.visit-undo-container {
+  padding: 20px;
+
+  .el-card {
+    margin-bottom: 20px;
+  }
+
+  .card-header-actions {
+    float: right;
+  }
+
+  .el-pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
 \ No newline at end of file
+export const messages = {
+  en: {
+    itemReleaseUndo: {
+      title: 'Release Pending Orders',
+      back: 'Back',
+      refresh: 'Refresh',
+      orderNo: 'Order No',
+      releaseType: 'Release Type',
+      applyUnit: 'Applicant Unit',
+      applicant: 'Applicant',
+      idCard: 'ID Card',
+      phone: 'Phone',
+      passTime: 'Pass Time',
+      items: 'Items',
+      viewItems: 'View Items',
+      status: 'Status',
+      plateNo: 'Plate No',
+      none: 'None',
+      operations: 'Operations',
+      process: 'Process',
+      detail: 'Detail'
+    },
+
+  },
+  zh: {
+    itemReleaseUndo: {
+      title: '放行待办单',
+      back: '返回',
+      refresh: '刷新',
+      orderNo: '单号',
+      releaseType: '放行类型',
+      applyUnit: '申请单位',
+      applicant: '申请人',
+      idCard: '身份证',
+      phone: '手机号',
+      passTime: '通行时间',
+      items: '物品',
+      viewItems: '查看物品',
+      status: '状态',
+      plateNo: '车牌号',
+      none: '无',
+      operations: '操作',
+      process: '办理',
+      detail: '详情'
+    },
+
+  }
+}
 \ No newline at end of file
+<template>
+  <div class="item-release-undo-container animated fadeInRight">
+    <el-card class="box-card">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('itemReleaseUndo.title') }}</span>
+        <div class="header-actions">
+          <el-button size="small" @click="goBack()">
+            {{ $t('itemReleaseUndo.back') }}
+          </el-button>
+          <el-button type="primary" size="small" @click="_queryUndoOrdersMethod()">
+            {{ $t('itemReleaseUndo.refresh') }}
+          </el-button>
+        </div>
+      </div>
+
+      <el-table :data="itemReleaseUndoInfo.undos" border style="width: 100%" v-loading="loading">
+        <el-table-column prop="irId" :label="$t('itemReleaseUndo.orderNo')" align="center" />
+        <el-table-column prop="typeName" :label="$t('itemReleaseUndo.releaseType')" align="center" />
+        <el-table-column prop="applyCompany" :label="$t('itemReleaseUndo.applyUnit')" align="center" />
+        <el-table-column prop="applyPerson" :label="$t('itemReleaseUndo.applicant')" align="center" />
+        <el-table-column prop="idCard" :label="$t('itemReleaseUndo.idCard')" align="center" />
+        <el-table-column prop="applyTel" :label="$t('itemReleaseUndo.phone')" align="center" />
+        <el-table-column prop="passTime" :label="$t('itemReleaseUndo.passTime')" align="center" />
+        <el-table-column :label="$t('itemReleaseUndo.items')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.amount }}(<el-link type="primary" @click="viewResName(scope.row)">{{
+              $t('itemReleaseUndo.viewItems') }}</el-link>)
+          </template>
+        </el-table-column>
+        <el-table-column prop="stateName" :label="$t('itemReleaseUndo.status')" align="center" />
+        <el-table-column prop="carNum" :label="$t('itemReleaseUndo.plateNo')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.carNum || $t('itemReleaseUndo.none') }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('itemReleaseUndo.operations')" align="center" width="180">
+          <template slot-scope="scope">
+            <el-button-group>
+              <el-button size="mini" @click="_openAuditUndoDetail(scope.row)">
+                {{ $t('itemReleaseUndo.process') }}
+              </el-button>
+              <el-button size="mini" @click="_openDetail(scope.row)">
+                {{ $t('itemReleaseUndo.detail') }}
+              </el-button>
+            </el-button-group>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" class="pagination" />
+
+      <view-item-release-res ref="viewItemReleaseRes" />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { queryUndoItemRelease } from '@/api/resource/itemReleaseUndoApi'
+import ViewItemReleaseRes from '@/components/work/viewItemReleaseRes'
+import { getCommunityId } from '@/api/community/communityApi'
+import { getUserId } from '@/api/user/userApi'
+
+export default {
+  name: 'ItemReleaseUndoList',
+  components: {
+    ViewItemReleaseRes
+  },
+  data() {
+    return {
+      loading: false,
+      itemReleaseUndoInfo: {
+        undos: [],
+        conditions: {
+          irId: '',
+          userName: '',
+          auditLink: '',
+          page: 1,
+          row: 10
+        },
+        currentUserId: ''
+      },
+      pagination: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.itemReleaseUndoInfo.currentUserId = getUserId()
+    this._listUndoOrders()
+  },
+  methods: {
+    async _listUndoOrders() {
+      try {
+        this.loading = true
+        const params = {
+          ...this.itemReleaseUndoInfo.conditions,
+          communityId: getCommunityId(),
+          audit: '1'
+        }
+        const { data, total } = await queryUndoItemRelease(params)
+        this.itemReleaseUndoInfo.undos = data
+        this.pagination.total = total
+      } catch (error) {
+        console.error('Error fetching undo orders:', error)
+      } finally {
+        this.loading = false
+      }
+    },
+    _queryUndoOrdersMethod() {
+      this.pagination.current = 1
+      this._listUndoOrders()
+    },
+    _openDetail(item) {
+      this.$router.push({
+        path: '/views/property/itemReleaseDetail',
+        query: {
+          irId: item.irId,
+          flowId: item.flowId
+        }
+      })
+    },
+    _openAuditUndoDetail(undo) {
+      this.$router.push({
+        path: '/views/property/itemReleaseDetail',
+        query: {
+          irId: undo.irId,
+          flowId: undo.flowId,
+          action: 'Audit',
+          taskId: undo.taskId
+        }
+      })
+    },
+    viewResName(item) {
+      this.$refs.viewItemReleaseRes.open(item)
+    },
+    handleSizeChange(val) {
+      this.pagination.size = val
+      this.itemReleaseUndoInfo.conditions.row = val
+      this._listUndoOrders()
+    },
+    handleCurrentChange(val) {
+      this.pagination.current = val
+      this.itemReleaseUndoInfo.conditions.page = val
+      this._listUndoOrders()
+    },
+    goBack() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.item-release-undo-container {
+  padding: 20px;
+
+  .box-card {
+    margin-bottom: 20px;
+
+    .clearfix {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+
+    .header-actions {
+      display: flex;
+      gap: 10px;
+    }
+  }
+
+  .pagination {
+    margin-top: 20px;
+    text-align: right;
+  }
+}
+</style>
 \ No newline at end of file