From 19bafb73302b861194a56cf5f2c9fc365a27b490 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 4 Aug 2025 16:26:36 +0800
Subject: [PATCH] v1.9 优化采购相关bug

---
 src/api/resource/purchaseApplyDetailApi.js                 |  15 +++++++++++++++
 src/components/inspection/maintainanceTaskTransfer.vue     |   3 ++-
 src/components/resource/AddResourceAuditFlow.vue           |  74 +++++++++++++++++++-------------------------------------------------------
 src/components/resource/AddStorehouse.vue                  |   6 +++---
 src/components/resource/EditStorehouse.vue                 |   8 ++++----
 src/components/resource/allocationAuditDiv.vue             | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/resource/auditDiv.vue                       |  23 +++++++++++++----------
 src/components/staff/StaffAttendanceDetail.vue             |   3 ++-
 src/components/work/dispatchRepair.vue                     |   2 +-
 src/components/work/editOwnerRepair.vue                    |   4 ++--
 src/i18n/commonLang.js                                     |   2 ++
 src/views/contract/contractApplyAuditOrdersList.vue        |   3 ++-
 src/views/contract/contractChangeAuditOrdersList.vue       |   3 ++-
 src/views/fee/printPayFeeBangTaiList.vue                   |   4 ++--
 src/views/oa/newOaWorkflowDoingList.vue                    |   2 +-
 src/views/resource/addItemOutList.vue                      |  31 ++++++++++++++++++++++++-------
 src/views/resource/addPurchaseApplyList.vue                |  10 +++++-----
 src/views/resource/allocationStorehouseApplyList.vue       |  24 ++++++++++++++----------
 src/views/resource/allocationStorehouseAuditOrdersList.vue |   6 ++++--
 src/views/resource/allocationStorehouseDetailList.vue      |  78 +++++++++++++++++++++++++++++++++++++++++-------------------------------------
 src/views/resource/allocationStorehouseEnterList.vue       |  12 ++----------
 src/views/resource/myAuditOrdersList.vue                   |  12 ++++++------
 src/views/resource/myItemOutAuditOrdersList.vue            |  11 +++++++----
 src/views/resource/printEquipmentAccountLabelList.vue      |   4 ++--
 src/views/resource/purchaseApplyDetailList.vue             |   5 ++++-
 src/views/resource/resourceAuditFlowList.vue               |   6 +++---
 src/views/resource/resourceEnterManageList.vue             |  63 ++++++++++++++++++++++-----------------------------------------
 src/views/resource/resourceOutManageList.vue               | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 src/views/resource/storehouseManageLang.js                 |   6 ++++--
 29 files changed, 580 insertions(+), 256 deletions(-)
 create mode 100644 src/components/resource/allocationAuditDiv.vue

diff --git a/src/api/resource/purchaseApplyDetailApi.js b/src/api/resource/purchaseApplyDetailApi.js
index e1f7c97..1905bd4 100644
--- a/src/api/resource/purchaseApplyDetailApi.js
+++ b/src/api/resource/purchaseApplyDetailApi.js
@@ -36,6 +36,21 @@ export function auditApplyOrder(data) {
   })
 }
 
+export function auditAllocationStoreOrder(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/resourceStore.auditAllocationStoreOrder',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
 // 获取工作流审核信息
 export function listWorkflowAuditInfo(params) {
   return new Promise((resolve, reject) => {
diff --git a/src/components/inspection/maintainanceTaskTransfer.vue b/src/components/inspection/maintainanceTaskTransfer.vue
index 1235498..fc2d022 100644
--- a/src/components/inspection/maintainanceTaskTransfer.vue
+++ b/src/components/inspection/maintainanceTaskTransfer.vue
@@ -26,6 +26,7 @@
 import { updateMaintainanceTask } from '@/api/inspection/maintainanceTaskManageApi'
 import { getCommunityId } from '@/api/community/communityApi'
 import { queryStaffInfos } from '@/api/staff/staffApi.js'
+import { getUserId } from '@/api/user/userApi'
 
 
 export default {
@@ -78,7 +79,7 @@ export default {
       this.form = {
         ...this.form,
         ...data,
-        currentUserId: this.$store.getters.userId,
+        currentUserId: getUserId(),
         communityId: getCommunityId()
       }
       this.loadStaffs()
diff --git a/src/components/resource/AddResourceAuditFlow.vue b/src/components/resource/AddResourceAuditFlow.vue
index 71ab28c..f85e7f1 100644
--- a/src/components/resource/AddResourceAuditFlow.vue
+++ b/src/components/resource/AddResourceAuditFlow.vue
@@ -1,61 +1,25 @@
 <template>
-  <el-dialog 
-    :title="$t('resourceAuditFlow.addTitle')" 
-    :visible.sync="dialogVisible" 
-    width="600px"
-    @close="handleClose"
-  >
+  <el-dialog :title="$t('resourceAuditFlow.addTitle')" :visible.sync="dialogVisible" width="600px" @close="handleClose">
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-form-item 
-        :label="$t('resourceAuditFlow.flowName')" 
-        prop="flowName"
-        :label-width="formLabelWidth"
-      >
-        <el-input 
-          v-model="form.flowName" 
-          :placeholder="$t('resourceAuditFlow.flowNamePlaceholder')"
-        />
+      <el-form-item :label="$t('resourceAuditFlow.flowName')" prop="flowName" :label-width="formLabelWidth">
+        <el-input v-model="form.flowName" :placeholder="$t('resourceAuditFlow.flowNamePlaceholder')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('resourceAuditFlow.flowType')" 
-        prop="auditType"
-        :label-width="formLabelWidth"
-      >
-        <el-select 
-          v-model="form.auditType" 
-          :placeholder="$t('resourceAuditFlow.flowTypePlaceholder')"
-          style="width:100%"
-        >
-          <el-option 
-            :label="$t('resourceAuditFlow.purchaseFlow')" 
-            value="10001" 
-          />
-          <el-option 
-            :label="$t('resourceAuditFlow.receiveFlow')" 
-            value="10002" 
-          />
-          <el-option 
-            :label="$t('resourceAuditFlow.transferFlow')" 
-            value="10003" 
-          />
+
+      <el-form-item :label="$t('resourceAuditFlow.flowType')" prop="auditType" :label-width="formLabelWidth">
+        <el-select v-model="form.auditType" :placeholder="$t('resourceAuditFlow.flowTypePlaceholder')"
+          style="width:100%">
+          <el-option :label="$t('resourceAuditFlow.purchaseFlow')" value="10001" />
+          <el-option :label="$t('resourceAuditFlow.receiveFlow')" value="10002" />
+          <el-option :label="$t('resourceAuditFlow.transferFlow')" value="10003" />
         </el-select>
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('resourceAuditFlow.remark')" 
-        prop="remark"
-        :label-width="formLabelWidth"
-      >
-        <el-input 
-          v-model="form.remark" 
-          type="textarea"
-          :rows="3"
-          :placeholder="$t('resourceAuditFlow.remarkPlaceholder')"
-        />
+
+      <el-form-item :label="$t('resourceAuditFlow.remark')" prop="remark" :label-width="formLabelWidth">
+        <el-input v-model="form.remark" type="textarea" :rows="3"
+          :placeholder="$t('resourceAuditFlow.remarkPlaceholder')" />
       </el-form-item>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">
         {{ $t('resourceAuditFlow.cancel') }}
@@ -112,16 +76,16 @@ export default {
         if (valid) {
           try {
             const res = await saveResourceAuditFlow(this.form)
-            if (res.code === 0) {
-              this.$message.success(this.$t('common.addSuccess'))
+            if (res.code == 0) {
+              this.$message.success(this.$t('common.submitSuccess'))
               this.dialogVisible = false
               this.$emit('success')
             } else {
-              this.$message.error(res.msg || this.$t('common.addFailed'))
+              this.$message.error(res.msg || this.$t('common.submitFailed'))
             }
           } catch (error) {
             console.error('添加审批流程失败:', error)
-            this.$message.error(this.$t('common.addFailed'))
+            this.$message.error(this.$t('common.submitFailed'))
           }
         }
       })
diff --git a/src/components/resource/AddStorehouse.vue b/src/components/resource/AddStorehouse.vue
index f5d391c..5e8cd07 100644
--- a/src/components/resource/AddStorehouse.vue
+++ b/src/components/resource/AddStorehouse.vue
@@ -40,7 +40,7 @@
           <el-form-item prop="purchaseRafId">
             <el-select v-model="form.purchaseRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '5005')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
@@ -57,7 +57,7 @@
           <el-form-item prop="useRafId">
             <el-select v-model="form.useRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '6006')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
@@ -74,7 +74,7 @@
           <el-form-item prop="allocationRafId">
             <el-select v-model="form.allocationRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '7007')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
diff --git a/src/components/resource/EditStorehouse.vue b/src/components/resource/EditStorehouse.vue
index 26b6e5e..73d1a37 100644
--- a/src/components/resource/EditStorehouse.vue
+++ b/src/components/resource/EditStorehouse.vue
@@ -47,7 +47,7 @@
           <el-form-item prop="purchaseRafId">
             <el-select v-model="form.purchaseRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '5005')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
@@ -65,7 +65,7 @@
           <el-form-item prop="useRafId">
             <el-select v-model="form.useRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '6006')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
@@ -82,7 +82,7 @@
           <el-form-item prop="allocationRafId">
             <el-select v-model="form.allocationRafId" :placeholder="$t('storehouseManage.placeholders.selectFlow')"
               style="width:100%">
-              <el-option v-for="item in flows.filter(f => f.auditType === '10001')" :key="item.rafId"
+              <el-option v-for="item in flows.filter(f => f.flowType === '7007')" :key="item.rafId"
                 :label="item.flowName" :value="item.rafId" />
             </el-select>
           </el-form-item>
@@ -167,7 +167,7 @@ export default {
         await updateStorehouse(this.form)
         this.$emit('success')
         this.close()
-        this.$message.success(this.$t('storehouseManage.messages.updateSuccess'))
+        this.$message.success(this.$t('common.submitSuccess'))
       } catch (error) {
         if (error.message) {
           this.$message.error(error.message)
diff --git a/src/components/resource/allocationAuditDiv.vue b/src/components/resource/allocationAuditDiv.vue
new file mode 100644
index 0000000..e0eac55
--- /dev/null
+++ b/src/components/resource/allocationAuditDiv.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-card  width="50%" >
+    <el-form ref="form" :model="formData" label-width="120px">
+      <el-form-item :label="$t('auditDiv.action')" prop="auditCode">
+        <el-select v-model="formData.auditCode" :placeholder="$t('auditDiv.pleaseSelect')" style="width: 100%">
+          <el-option value="" disabled :label="$t('auditDiv.pleaseSelect')"></el-option>
+          <el-option v-if="nextAudit.next || nextAudit.exit" value="1100" :label="$t('auditDiv.agree')"></el-option>
+          <el-option v-if="nextAudit.back" value="1200" :label="$t('auditDiv.return')"></el-option>
+          <el-option v-if="nextAudit.backIndex" value="1400" :label="$t('auditDiv.returnToSubmitter')"></el-option>
+          <el-option value="1300" :label="$t('auditDiv.transfer')"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('auditDiv.workOrderDescription')" prop="auditMessage">
+        <el-input type="textarea" :placeholder="$t('auditDiv.requiredDescription')" v-model="formData.auditMessage"
+          :rows="4"></el-input>
+      </el-form-item>
+
+      <el-form-item v-if="(formData.auditCode === '1100' && nextAudit.assignee === '-2') || formData.auditCode === '1300'"
+        :label="$t('auditDiv.nextHandler')" prop="staffName">
+        <el-input v-model="formData.staffName" :placeholder="$t('auditDiv.requiredNextHandler')" disabled
+          style="width: calc(100% - 100px); margin-right: 10px;"></el-input>
+        <el-button @click="chooseStaff">
+          <i class="el-icon-search"></i>
+          {{ $t('auditDiv.select') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <div  class="dialog-footer">
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.submit') }}</el-button>
+    </div>
+    <select-staff ref="selectStaff" @selectStaff="handleStaffChange"></select-staff>
+  </el-card>
+</template>
+
+<script>
+import { queryNextDealUser,auditAllocationStoreOrder } from '@/api/resource/purchaseApplyDetailApi'
+import SelectStaff from '@/components/staff/SelectStaff'
+
+export default {
+  name: 'AllocationAuditDiv',
+  components: {
+    SelectStaff
+  },
+  data() {
+    return {
+      visible: false,
+      formData: {
+        auditCode: '',
+        auditMessage: '',
+        staffId: '',
+        staffName: '',
+        taskId: '',
+        flowId: '',
+        id: ''
+      },
+      nextAudit: {},
+      createUserId: ''
+    }
+  },
+  methods: {
+    open(data) {
+      this.formData.taskId = data.taskId
+      this.formData.flowId = data.flowId
+      this.formData.id = data.id
+      this.createUserId = data.createUserId
+      this.loadNextAuditPerson()
+    },
+    async loadNextAuditPerson() {
+      try {
+        const params = {
+          taskId: this.formData.taskId,
+          startUserId: this.createUserId
+        }
+        const res = await queryNextDealUser(params)
+        if (res.code == '0') {
+          this.nextAudit = res.data[0]
+        }
+      } catch (error) {
+        console.error('获取下一处理人失败:', error)
+      }
+    },
+    chooseStaff() {
+      this.$refs.selectStaff.open({
+        from: 'purchase',
+        call: (staff) => {
+          this.formData.staffId = staff.staffId
+          this.formData.staffName = staff.staffName
+        }
+      })
+    },
+    async handleSubmit() {
+      if (!this.formData.auditCode) {
+        this.$message.warning(this.$t('auditDiv.pleaseSelectStatus'))
+        return
+      }
+      if (!this.formData.auditMessage) {
+        this.$message.warning(this.$t('auditDiv.pleaseFillDescription'))
+        return
+      }
+      if (this.formData.auditCode !== '1200' &&
+        this.formData.auditCode !== '1400' &&
+        !this.formData.staffId) {
+        this.$message.warning(this.$t('auditDiv.pleaseSelectNextHandler'))
+        return
+      }
+
+      if (this.nextAudit.assignee !== '-2') {
+        this.formData.staffId = this.nextAudit.assignee
+      }
+
+      try {
+        const res = await auditAllocationStoreOrder(this.formData)
+        if (res.code == 0) {
+          this.$message.success(this.$t('common.submitSuccess'))
+          this.$router.go(-1)
+          this.$emit('success')
+        } else {
+          this.$message.error(res.msg)
+        }
+      } catch (error) {
+        console.error('提交审核失败:', error)
+        this.$message.error(this.$t('auditDiv.submitFailed'))
+      }
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+      this.formData = {
+        auditCode: '',
+        auditMessage: '',
+        staffId: '',
+        staffName: '',
+        taskId: '',
+        flowId: '',
+        id: ''
+      }
+      this.nextAudit = {}
+    },
+    handleStaffChange(staff) {
+      this.formData.staffId = staff.staffId
+      this.formData.staffName = staff.staffName
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/resource/auditDiv.vue b/src/components/resource/auditDiv.vue
index 1c5dc4b..9d7d30a 100644
--- a/src/components/resource/auditDiv.vue
+++ b/src/components/resource/auditDiv.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('auditDiv.workOrderProcessing')" :visible.sync="visible" width="50%" @close="handleClose">
+  <el-card  width="50%" >
     <el-form ref="form" :model="formData" label-width="120px">
       <el-form-item :label="$t('auditDiv.action')" prop="auditCode">
         <el-select v-model="formData.auditCode" :placeholder="$t('auditDiv.pleaseSelect')" style="width: 100%">
@@ -27,21 +27,21 @@
       </el-form-item>
     </el-form>
 
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
+    <div  class="dialog-footer">
       <el-button type="primary" @click="handleSubmit">{{ $t('common.submit') }}</el-button>
-    </span>
-  </el-dialog>
+    </div>
+    <select-staff ref="selectStaff" @selectStaff="handleStaffChange"></select-staff>
+  </el-card>
 </template>
 
 <script>
 import { queryNextDealUser,auditApplyOrder } from '@/api/resource/purchaseApplyDetailApi'
-//import SelectStaff from '@/components/resource/selectStaff'
+import SelectStaff from '@/components/staff/SelectStaff'
 
 export default {
   name: 'AuditDiv',
   components: {
-   // SelectStaff
+    SelectStaff
   },
   data() {
     return {
@@ -65,7 +65,6 @@ export default {
       this.formData.flowId = data.flowId
       this.formData.id = data.id
       this.createUserId = data.createUserId
-      this.visible = true
       this.loadNextAuditPerson()
     },
     async loadNextAuditPerson() {
@@ -75,7 +74,7 @@ export default {
           startUserId: this.createUserId
         }
         const res = await queryNextDealUser(params)
-        if (res.code === '0') {
+        if (res.code == '0') {
           this.nextAudit = res.data[0]
         }
       } catch (error) {
@@ -115,7 +114,7 @@ export default {
         const res = await auditApplyOrder(this.formData)
         if (res.code === 0) {
           this.$message.success(this.$t('auditDiv.submitSuccess'))
-          this.visible = false
+          this.$router.go(-1)
           this.$emit('success')
         } else {
           this.$message.error(res.msg)
@@ -137,6 +136,10 @@ export default {
         id: ''
       }
       this.nextAudit = {}
+    },
+    handleStaffChange(staff) {
+      this.formData.staffId = staff.staffId
+      this.formData.staffName = staff.staffName
     }
   }
 }
diff --git a/src/components/staff/StaffAttendanceDetail.vue b/src/components/staff/StaffAttendanceDetail.vue
index 0e06379..ebe8932 100644
--- a/src/components/staff/StaffAttendanceDetail.vue
+++ b/src/components/staff/StaffAttendanceDetail.vue
@@ -22,6 +22,7 @@
   
   <script>
   import { queryAttendanceLog } from '@/api/staff/adminStaffDetailApi'
+  import { getCommunityId } from '@/api/community/communityApi' 
   
   export default {
     name: 'StaffAttendanceDetail',
@@ -38,7 +39,7 @@
         this.visible = true
         try {
           const { data } = await queryAttendanceLog({
-            communityId: this.$store.getters.currentCommunityId,
+            communityId: getCommunityId(),
             staffId: param.staffId,
             date: param.date,
             page: 1,
diff --git a/src/components/work/dispatchRepair.vue b/src/components/work/dispatchRepair.vue
index 9ba19dd..0576b2a 100644
--- a/src/components/work/dispatchRepair.vue
+++ b/src/components/work/dispatchRepair.vue
@@ -126,7 +126,7 @@ export default {
         context: '',
         action: '',
         repairTypeUsers: [],
-        currentUserId: this.$store.getters.userId
+        currentUserId: getUserId()
       }
     }
   }
diff --git a/src/components/work/editOwnerRepair.vue b/src/components/work/editOwnerRepair.vue
index 4221d03..57677d0 100644
--- a/src/components/work/editOwnerRepair.vue
+++ b/src/components/work/editOwnerRepair.vue
@@ -43,7 +43,7 @@
 
 <script>
 import { updateOwnerRepair,listRepairSettings } from '@/api/work/ownerRepairManageApi'
-import { getCommunityId } from '@/api/community/communityApi'
+import { getCommunityId,getCommunityName } from '@/api/community/communityApi'
 
 export default {
   name: 'EditOwnerRepair',
@@ -100,7 +100,7 @@ export default {
           try {
             if (this.formData.repairObjType === '001') {
               this.formData.repairObjId = getCommunityId()
-              this.formData.repairObjName = this.$store.getters.community.name
+              this.formData.repairObjName = getCommunityName()
             }
 
             const data = {
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index c61de62..8f2fc83 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -57,6 +57,7 @@ export const messages = {
         audit:'Audit',
         choose:'Choose',
         submitSuccess:'Submit successfully',
+        submitFailed:'Submit failed',
         saveSuccess:'successfully',
         noData:'No Data',
         file:'File',
@@ -124,6 +125,7 @@ export const messages = {
         audit:'审核',
         choose:'选择',
         submitSuccess:'提交成功',
+        submitFailed:'提交失败',
         saveSuccess:'成功',
         noData:'暂无数据',
         file:'附件',
diff --git a/src/views/contract/contractApplyAuditOrdersList.vue b/src/views/contract/contractApplyAuditOrdersList.vue
index 9555e66..731a951 100644
--- a/src/views/contract/contractApplyAuditOrdersList.vue
+++ b/src/views/contract/contractApplyAuditOrdersList.vue
@@ -47,6 +47,7 @@
 import { queryContractTask, needAuditContract,listWorkflowStepStaffs } from '@/api/contract/contractApplyAuditOrdersApi'
 import { getCommunityId } from '@/api/community/communityApi'
 import FlowAudit from '@/components/contract/flowAudit'
+import { getUserId } from '@/api/user/userApi'  
 
 export default {
   name: 'ContractApplyAuditOrdersList',
@@ -79,7 +80,7 @@ export default {
   },
   created() {
     this.communityId = getCommunityId()
-    this.contractApplyAuditOrdersInfo.currentUserId = this.$store.getters.userId
+    this.contractApplyAuditOrdersInfo.currentUserId = getUserId()
     this._listAuditOrders(this.page.current, this.page.size)
     this._loadStepStaff()
   },
diff --git a/src/views/contract/contractChangeAuditOrdersList.vue b/src/views/contract/contractChangeAuditOrdersList.vue
index 9a1f650..b0ebb31 100644
--- a/src/views/contract/contractChangeAuditOrdersList.vue
+++ b/src/views/contract/contractChangeAuditOrdersList.vue
@@ -49,6 +49,7 @@
 <script>
 import { queryContractChangeTask, needAuditContractPlan } from '@/api/resource/contractChangeAuditOrdersApi'
 import FlowAudit from '@/components/contract/flowAudit'
+import { getUserId } from '@/api/user/userApi'
 
 export default {
   name: 'ContractChangeAuditOrdersList',
@@ -81,7 +82,7 @@ export default {
     }
   },
   created() {
-    this.currentUserId = this.$store.getters.userId
+    this.contractChangeAuditOrdersInfo.currentUserId = getUserId()
     this._listAuditOrders(this.page.current, this.page.size)
   },
   methods: {
diff --git a/src/views/fee/printPayFeeBangTaiList.vue b/src/views/fee/printPayFeeBangTaiList.vue
index 7e54178..567b16e 100644
--- a/src/views/fee/printPayFeeBangTaiList.vue
+++ b/src/views/fee/printPayFeeBangTaiList.vue
@@ -109,7 +109,7 @@
 
 <script>
 import { queryFeeReceipt, queryFeeReceiptDetail, queryFeePrintSpec } from '@/api/fee/printPayFeeBangTaiApi'
-import { getCommunityId } from '@/api/community/communityApi'
+import { getCommunityId,getCommunityName } from '@/api/community/communityApi'
 import { getUserId,getUserName } from '@/api/user/userApi'
 import { dateFormat } from '@/utils/dateUtil'
 import { changeNumMoneyToChinese } from '@/utils/moneyUtil'
@@ -157,7 +157,7 @@ export default {
       }
     },
     async loadData() {
-      this.printPayFeeInfo.communityName = this.$store.getters.currentCommunity.name
+      this.printPayFeeInfo.communityName = getCommunityName()
       await this.loadReceipt()
       await this.loadPrintSpec()
     },
diff --git a/src/views/oa/newOaWorkflowDoingList.vue b/src/views/oa/newOaWorkflowDoingList.vue
index 7f74bf6..360eb8d 100644
--- a/src/views/oa/newOaWorkflowDoingList.vue
+++ b/src/views/oa/newOaWorkflowDoingList.vue
@@ -146,7 +146,7 @@ export default {
           page: 1,
           row: 10
         }
-        const data = await getUndoInfo(params)
+        const {data} = await getUndoInfo(params)
         Object.assign(this.newOaWorkflowDoingInfo, data)
 
         // Update counts in pendingItems
diff --git a/src/views/resource/addItemOutList.vue b/src/views/resource/addItemOutList.vue
index 73bbbb3..d635ac4 100644
--- a/src/views/resource/addItemOutList.vue
+++ b/src/views/resource/addItemOutList.vue
@@ -162,11 +162,11 @@
           <div slot="header" class="clearfix">
             <h5>{{ $t('addItemOut.approver') }}</h5>
           </div>
-          <div class="ibox-content">
+          <div class="">
             <el-form :model="addItemOutInfo" label-position="right" label-width="120px">
               <el-form-item :label="$t('addItemOut.approver')">
                 <el-row :gutter="20">
-                  <el-col :span="18">
+                  <el-col :span="17">
                     <el-input :placeholder="$t('addItemOut.approverPlaceholder')"
                       v-model="addItemOutInfo.audit.staffName" disabled></el-input>
                   </el-col>
@@ -194,15 +194,15 @@
     <choose-resource-store2 ref="chooseResourceStore2"
       @setSelectResourceStores="handleSetSelectResourceStores"></choose-resource-store2>
 
-    <select-staff ref="selectStaff"></select-staff>
+    <select-staff ref="selectStaff" @selectStaff="handleStaffChange"></select-staff>
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
 import ChooseResourceStore2 from '@/components/resource/chooseResourceStore2'
-import SelectStaff from '@/components/resource/selectStaff'
-import { goodsCollection, listStorehouses } from '@/api/resource/addItemOutApi'
+import SelectStaff from '@/components/staff/SelectStaff'
+import { goodsCollection, listStorehouses, queryFirstAuditStaff } from '@/api/resource/addItemOutApi'
 import { getUserName, getUserTel } from '@/api/user/userApi'
 
 export default {
@@ -434,10 +434,21 @@ export default {
 
       return stock
     },
-    _loadStaffOrg(flowId) {
+    async _loadStaffOrg(flowId) {
       // 实际调用API的方法
       // 这里保留占位，实际实现需要调用API
-      console.log(flowId)
+      const res = await queryFirstAuditStaff({
+        communityId: this.communityId,
+        flowId: flowId
+      })
+      if (res.code != 0) {
+        return;
+      }
+      let _data = res.data
+      Object.assign(this.addItemOutInfo.audit, _data[0])
+      if (!_data[0].assignee.startsWith('-')) {
+        this.addItemOutInfo.audit.staffId = this.addItemOutInfo.audit.assignee;
+      }
     },
     chooseStaff() {
       this.$refs.selectStaff.open(this.addItemOutInfo.audit)
@@ -476,6 +487,12 @@ export default {
 
       const filteredList = newList.filter(item => item['resId'])
       this.addItemOutInfo.resourceStores = [...oldList, ...filteredList]
+    },
+    handleStaffChange(staff) {
+      this.addItemOutInfo.audit.staffId = staff.staffId
+      this.addItemOutInfo.audit.staffName = staff.staffName
+      this.addItemOutInfo.endUserInfo.staffId = staff.staffId
+      this.addItemOutInfo.endUserInfo.staffName = staff.staffName
     }
   }
 }
diff --git a/src/views/resource/addPurchaseApplyList.vue b/src/views/resource/addPurchaseApplyList.vue
index ce3acc4..0a9ba60 100644
--- a/src/views/resource/addPurchaseApplyList.vue
+++ b/src/views/resource/addPurchaseApplyList.vue
@@ -146,14 +146,14 @@
     <choose-resource-store2 ref="chooseResourceStore2"
       @setSelectResourceStores="handleSetSelectResourceStores"></choose-resource-store2>
 
-    <select-staff ref="selectStaff" @change="handleStaffChange"></select-staff>
+    <select-staff ref="selectStaff" @selectStaff="handleStaffChange"></select-staff>
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
 import ChooseResourceStore2 from '@/components/resource/chooseResourceStore2'
-import SelectStaff from '@/components/resource/selectStaff'
+import SelectStaff from '@/components/staff/SelectStaff'
 import { getUserName } from '@/api/user/userApi'
 import {
   listStorehouses,
@@ -282,7 +282,7 @@ export default {
         const res = await purchaseApply(this.addPurchaseApplyInfo)
         if (res.code === 0) {
           this.$router.go(-1)
-          this.$message.success(this.$t('common.operationSuccess'))
+          this.$message.success(this.$t('common.submitSuccess'))
         } else {
           this.$message.error(res.msg)
         }
@@ -423,8 +423,8 @@ export default {
       this.addPurchaseApplyInfo.resourceStores = resourceStores
     },
     handleStaffChange(staff) {
-      this.addPurchaseApplyInfo.audit.staffId = staff.userId
-      this.addPurchaseApplyInfo.audit.staffName = staff.userName
+      this.addPurchaseApplyInfo.audit.staffId = staff.staffId
+      this.addPurchaseApplyInfo.audit.staffName = staff.staffName
     },
     goBack() {
       this.$router.go(-1)
diff --git a/src/views/resource/allocationStorehouseApplyList.vue b/src/views/resource/allocationStorehouseApplyList.vue
index ec26b4a..b1a5eb5 100644
--- a/src/views/resource/allocationStorehouseApplyList.vue
+++ b/src/views/resource/allocationStorehouseApplyList.vue
@@ -136,22 +136,25 @@
     </el-card>
 
     <el-card class="box-card margin-top" v-if="form.audit.assignee === '-2'">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('allocationStorehouseApply.approverTitle') }}</span>
       </div>
 
       <el-form label-width="120px">
         <el-row :gutter="20">
-          <el-col :span="24">
+          <el-col :span="18">
             <el-form-item :label="$t('allocationStorehouseApply.approver')">
               <el-input v-model="form.audit.staffName" :placeholder="$t('allocationStorehouseApply.selectApprover')"
                 disabled></el-input>
-              <el-button type="primary" class="margin-top" @click="chooseStaff">
-                <i class="el-icon-search"></i>
-                {{ $t('allocationStorehouseApply.select') }}
-              </el-button>
+
             </el-form-item>
           </el-col>
+          <el-col :span="6" class="text-left">
+            <el-button type="primary"  @click="chooseStaff">
+              <i class="el-icon-search"></i>
+              {{ $t('allocationStorehouseApply.select') }}
+            </el-button>
+          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -164,14 +167,14 @@
 
     <choose-resource-store ref="chooseResourceStore" @choose="handleChooseResource" />
 
-    <select-staff ref="selectStaff" @select="handleSelectStaff" />
+    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff" />
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
 import ChooseResourceStore from '@/components/resource/chooseResourceStore'
-import SelectStaff from '@/components/resource/selectStaff'
+import SelectStaff from '@/components/staff/SelectStaff'
 import {
   listStorehouses,
   saveAllocationStorehouse,
@@ -194,6 +197,7 @@ export default {
         communityId: '',
         shId: '',
         flowId: '',
+        apply_type: 10000,
         audit: {
           assignee: '',
           staffId: '',
@@ -322,8 +326,8 @@ export default {
       this.$refs.selectStaff.open(this.form.audit)
     },
     handleSelectStaff(staff) {
-      this.form.audit.staffId = staff.userId
-      this.form.audit.staffName = staff.userName
+      this.form.audit.staffId = staff.staffId
+      this.form.audit.staffName = staff.staffName
     },
     async submitApply() {
       // 验证数据
diff --git a/src/views/resource/allocationStorehouseAuditOrdersList.vue b/src/views/resource/allocationStorehouseAuditOrdersList.vue
index 8d53e75..2183b65 100644
--- a/src/views/resource/allocationStorehouseAuditOrdersList.vue
+++ b/src/views/resource/allocationStorehouseAuditOrdersList.vue
@@ -62,6 +62,7 @@
 <script>
 import { listAllocationStoreAuditOrders, listWorkflowStepStaffs } from '@/api/resource/allocationStorehouseAuditOrdersApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import { getUserId } from '@/api/user/userApi'
 
 export default {
   name: 'AllocationStorehouseAuditOrdersList',
@@ -91,7 +92,7 @@ export default {
   },
   created() {
     this.communityId = getCommunityId()
-    this.allocationStorehouseAuditOrdersInfo.currentUserId = this.$store.getters.userId
+    this.allocationStorehouseAuditOrdersInfo.currentUserId = getUserId()
     this.listAuditOrders()
     this.loadStepStaff()
   },
@@ -139,7 +140,8 @@ export default {
         query: {
           applyId: auditOrder.applyId,
           action: 'audit',
-          taskId: auditOrder.taskId
+          taskId: auditOrder.taskId,
+          flowId: auditOrder.flowId
         }
       })
     },
diff --git a/src/views/resource/allocationStorehouseDetailList.vue b/src/views/resource/allocationStorehouseDetailList.vue
index 436d882..9d4ceee 100644
--- a/src/views/resource/allocationStorehouseDetailList.vue
+++ b/src/views/resource/allocationStorehouseDetailList.vue
@@ -17,36 +17,36 @@
             </div>
           </div>
           <el-form :model="allocationStorehouseDetailInfo" label-width="120px" class="text-left">
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item :label="$t('allocationStorehouseDetail.applicant')">
-                <span>{{ allocationStorehouseDetailInfo.startUserName }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('allocationStorehouseDetail.applyTime')">
-                <span>{{ allocationStorehouseDetailInfo.createTime }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('allocationStorehouseDetail.type')">
-                <span>{{ allocationStorehouseDetailInfo.applyTypeName }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item :label="$t('allocationStorehouseDetail.status')">
-                <span>{{ allocationStorehouseDetailInfo.stateName }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <el-form-item :label="$t('allocationStorehouseDetail.applyRemark')">
-                <span>{{ allocationStorehouseDetailInfo.remark }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item :label="$t('allocationStorehouseDetail.applicant')">
+                  <span>{{ allocationStorehouseDetailInfo.startUserName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('allocationStorehouseDetail.applyTime')">
+                  <span>{{ allocationStorehouseDetailInfo.createTime }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('allocationStorehouseDetail.type')">
+                  <span>{{ allocationStorehouseDetailInfo.applyTypeName }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item :label="$t('allocationStorehouseDetail.status')">
+                  <span>{{ allocationStorehouseDetailInfo.stateName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item :label="$t('allocationStorehouseDetail.applyRemark')">
+                  <span>{{ allocationStorehouseDetailInfo.remark }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
         </el-card>
       </el-col>
     </el-row>
@@ -103,7 +103,7 @@
       v-if="allocationStorehouseDetailInfo.applyType === '10000' && allocationStorehouseDetailInfo.auditUsersCount > 0">
       <el-col :span="24">
         <el-card>
-          <div slot="header" class="clearfix">
+          <div slot="header" class="flex justify-between">
             <span>{{ $t('allocationStorehouseDetail.workflow') }}</span>
           </div>
           <el-table :data="allocationStorehouseDetailInfo.auditUsers" border style="width: 100%">
@@ -125,8 +125,9 @@
         </el-card>
       </el-col>
     </el-row>
-
-    <audit-div v-if="allocationStorehouseDetailInfo.action === 'audit'" ref="auditDiv" />
+    <div class="mt-20">
+      <allocation-audit-div v-if="allocationStorehouseDetailInfo.action === 'audit'" ref="auditDiv" />
+    </div>
   </div>
 </template>
 
@@ -136,14 +137,14 @@ import {
   listAllocationStorehouseApplys,
   listAllocationStorehouses,
   listWorkflowAuditInfo
- // auditAllocationStoreOrder
+  // auditAllocationStoreOrder
 } from '@/api/resource/allocationStorehouseDetailApi'
-import AuditDiv from '@/components/resource/auditDiv'
+import AllocationAuditDiv from '@/components/resource/allocationAuditDiv'
 
 export default {
   name: 'AllocationStorehouseDetailList',
   components: {
-    AuditDiv
+    AllocationAuditDiv
   },
   data() {
     return {
@@ -160,7 +161,8 @@ export default {
         applyType: '',
         applyTypeName: '',
         action: '',
-        taskId: ''
+        taskId: '',
+        flowId: ''
       }
     }
   },
@@ -171,6 +173,7 @@ export default {
     this.allocationStorehouseDetailInfo.applyTypeName = this.$route.query.applyTypeName
     this.allocationStorehouseDetailInfo.action = this.$route.query.action
     this.allocationStorehouseDetailInfo.taskId = this.$route.query.taskId
+    this.allocationStorehouseDetailInfo.flowId = this.$route.query.flowId
     this.listAllocationStorehouseApply()
     this.listPurchaseApply(1, 100)
   },
@@ -208,6 +211,7 @@ export default {
             createUserId: purchaseApply.startUserId,
             action: this.allocationStorehouseDetailInfo.action,
             taskId: this.allocationStorehouseDetailInfo.taskId,
+            flowId: this.allocationStorehouseDetailInfo.flowId,
             url: '/resourceStore.auditAllocationStoreOrder',
             id: purchaseApply.applyId,
           })
diff --git a/src/views/resource/allocationStorehouseEnterList.vue b/src/views/resource/allocationStorehouseEnterList.vue
index b41c321..33851c5 100644
--- a/src/views/resource/allocationStorehouseEnterList.vue
+++ b/src/views/resource/allocationStorehouseEnterList.vue
@@ -7,16 +7,9 @@
 
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-card>
-            <div slot="header">
-              <h5>
-                <span>{{ $t('allocationStorehouseEnter.applyId') }}</span>{{ allocationStorehouseEnterInfo.applyId }}
-              </h5>
-            </div>
-
             <el-table :data="allocationStorehouseEnterInfo.resourceStores" border style="width: 100%"
-              v-loading="loading">
-              <el-table-column type="selection" width="55" align="center" @selection-change="handleSelectionChange">
+              v-loading="loading"  @selection-change="handleSelectionChange">
+              <el-table-column type="selection" width="55" align="center">
               </el-table-column>
               <el-table-column prop="parentRstName" :label="$t('allocationStorehouseEnter.resourceType')"
                 align="center">
@@ -67,7 +60,6 @@
                 </template>
               </el-table-column>
             </el-table>
-          </el-card>
         </el-col>
       </el-row>
 
diff --git a/src/views/resource/myAuditOrdersList.vue b/src/views/resource/myAuditOrdersList.vue
index 01e177a..050e836 100644
--- a/src/views/resource/myAuditOrdersList.vue
+++ b/src/views/resource/myAuditOrdersList.vue
@@ -112,11 +112,11 @@ export default {
       this.auditOrdersInfo.conditions.row = _rows
       try {
         const res = await listAuditOrders(this.auditOrdersInfo.conditions)
-        const _auditOrdersInfo = res.data
-        this.auditOrdersInfo.total = _auditOrdersInfo.total
-        this.auditOrdersInfo.records = _auditOrdersInfo.records
-        this.auditOrdersInfo.auditOrders = _auditOrdersInfo.data
-        this.total = _auditOrdersInfo.records
+        this.auditOrdersInfo.total = res.total
+        this.auditOrdersInfo.records = res.records
+        this.auditOrdersInfo.auditOrders = res.data
+        console.log(res)
+        this.total = res.total
         this.currentPage = _page
       } catch (error) {
         console.error('请求失败:', error)
@@ -139,7 +139,7 @@ export default {
     },
     _openDetailPurchaseApplyModel(_purchaseApply) {
       this.$router.push({
-        path: '/views/resource/purchaseApplyDetaill',
+        path: '/views/resource/purchaseApplyDetail',
         query: {
           applyOrderId: _purchaseApply.applyOrderId,
           resOrderType: _purchaseApply.resOrderType
diff --git a/src/views/resource/myItemOutAuditOrdersList.vue b/src/views/resource/myItemOutAuditOrdersList.vue
index c0820da..13da824 100644
--- a/src/views/resource/myItemOutAuditOrdersList.vue
+++ b/src/views/resource/myItemOutAuditOrdersList.vue
@@ -57,6 +57,7 @@
 <script>
 import { getCollectionAuditOrder } from '@/api/resource/myItemOutAuditOrdersApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import { getUserId } from '@/api/user/userApi'
 
 export default {
   name: 'MyItemOutAuditOrdersList',
@@ -88,7 +89,7 @@ export default {
     }
   },
   created() {
-    this.auditOrdersInfo.currentUserId = this.$store.getters.userId
+    this.auditOrdersInfo.currentUserId = getUserId()
     this._listAuditOrders(this.DEFAULT_PAGE, this.DEFAULT_ROWS)
   },
   methods: {
@@ -117,6 +118,7 @@ export default {
         query: {
           applyOrderId: auditOrder.applyOrderId,
           resOrderType: auditOrder.resOrderType,
+          flowId: auditOrder.flowId,
           action: 'audit',
           taskId: auditOrder.taskId
         }
@@ -127,7 +129,7 @@ export default {
     },
     _openDetailPurchaseApplyModel(purchaseApply) {
       this.$router.push({
-        path: '/views/resource/purchaseApplyDetaill',
+        path: '/views/resource/purchaseApplyDetail',
         query: {
           applyOrderId: purchaseApply.applyOrderId,
           resOrderType: purchaseApply.resOrderType
@@ -145,11 +147,12 @@ export default {
     },
     _distributionOrder(purchaseApply) {
       this.$router.push({
-        path: '/pages/common/resourceOutManage',
+        path: '/pages/admin/resourceOutManage',
         query: {
           applyOrderId: purchaseApply.applyOrderId,
           resOrderType: purchaseApply.resOrderType,
-          taskId: purchaseApply.taskId
+          taskId: purchaseApply.taskId,
+          flowId: purchaseApply.flowId
         }
       })
     },
diff --git a/src/views/resource/printEquipmentAccountLabelList.vue b/src/views/resource/printEquipmentAccountLabelList.vue
index 27f2998..37e9b42 100644
--- a/src/views/resource/printEquipmentAccountLabelList.vue
+++ b/src/views/resource/printEquipmentAccountLabelList.vue
@@ -86,7 +86,7 @@
 <script>
 import { getEquipmentAccountList } from '@/api/resource/printEquipmentAccountLabelApi'
 import QRCode from 'qrcodejs2'
-import { getCommunityId } from '@/api/community/communityApi'
+import { getCommunityId ,getCommunityName} from '@/api/community/communityApi'
 
 export default {
   name: 'PrintEquipmentAccountLabelList',
@@ -131,7 +131,7 @@ export default {
     this._initPrintRepairDetailDateInfo()
     const myDate = new Date()
     this.nowTime = myDate.toLocaleDateString()
-    this.printEquipmentAccountInfo.yqName = this.$store.getters.currentCommunity.name
+    this.printEquipmentAccountInfo.yqName = getCommunityName()
   },
   methods: {
     async _initPrintRepairDetailDateInfo() {
diff --git a/src/views/resource/purchaseApplyDetailList.vue b/src/views/resource/purchaseApplyDetailList.vue
index 78b84b2..efdc0ef 100644
--- a/src/views/resource/purchaseApplyDetailList.vue
+++ b/src/views/resource/purchaseApplyDetailList.vue
@@ -231,7 +231,8 @@ export default {
         auditUsers: [],
         warehousingWay: '',
         action: '',
-        taskId: ''
+        taskId: '',
+        flowId: ''
       },
       communityId: ''
     }
@@ -242,6 +243,7 @@ export default {
     this.purchaseApplyDetailInfo.resOrderType = this.$route.query.resOrderType
     this.purchaseApplyDetailInfo.action = this.$route.query.action
     this.purchaseApplyDetailInfo.taskId = this.$route.query.taskId
+    this.purchaseApplyDetailInfo.flowId = this.$route.query.flowId
     this._listPurchaseApply()
   },
   methods: {
@@ -267,6 +269,7 @@ export default {
             createUserId: purchaseApply.createUserId,
             action: this.purchaseApplyDetailInfo.action,
             taskId: this.purchaseApplyDetailInfo.taskId,
+            flowId: this.purchaseApplyDetailInfo.flowId,
             url: '/purchaseApply.auditApplyOrder',
             id: purchaseApply.applyOrderId,
           })
diff --git a/src/views/resource/resourceAuditFlowList.vue b/src/views/resource/resourceAuditFlowList.vue
index 04408ba..27c2186 100644
--- a/src/views/resource/resourceAuditFlowList.vue
+++ b/src/views/resource/resourceAuditFlowList.vue
@@ -182,14 +182,14 @@ export default {
         this.loading = true
         const res = await deployWorkflow({ modelId: row.modelId })
         if (res.code === 0) {
-          this.$message.success(this.$t('resourceAuditFlow.deploySuccess'))
+          this.$message.success(this.$t('common.submitSuccess'))
           this.fetchData()
         } else {
-          this.$message.error(res.msg || this.$t('resourceAuditFlow.deployFailed'))
+          this.$message.error(res.msg || this.$t('common.submitFailed'))
         }
       } catch (error) {
         console.error('部署流程失败:', error)
-        this.$message.error(this.$t('resourceAuditFlow.deployFailed'))
+        this.$message.error(this.$t('common.submitFailed'))
       } finally {
         this.loading = false
       }
diff --git a/src/views/resource/resourceEnterManageList.vue b/src/views/resource/resourceEnterManageList.vue
index 856f24a..8e0dc4c 100644
--- a/src/views/resource/resourceEnterManageList.vue
+++ b/src/views/resource/resourceEnterManageList.vue
@@ -1,79 +1,59 @@
 <template>
   <div class="resource-enter-manage-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>{{ $t('resourceEnterManage.orderId') }}：{{resourceEnterManageInfo.applyOrderId}}</span>
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('resourceEnterManage.orderId') }}：{{ resourceEnterManageInfo.applyOrderId }}</span>
       </div>
 
       <el-row :gutter="20">
         <el-col :span="24">
-          <el-table
-            :data="resourceEnterManageInfo.purchaseApplyDetailVo"
-            border
-            style="width: 100%"
-            class="table-wrapper"
-          >
-            <el-table-column type="selection" width="55" align="center" @selection-change="handleSelectionChange" />
+          <el-table :data="resourceEnterManageInfo.purchaseApplyDetailVo" border style="width: 100%"
+            class="table-wrapper" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
             <el-table-column prop="rstName" :label="$t('resourceEnterManage.itemType')" align="center">
               <template slot-scope="scope">
-                {{scope.row.rstName || '-'}}
+                {{ scope.row.rstName || '-' }}
               </template>
             </el-table-column>
             <el-table-column prop="resName" :label="$t('resourceEnterManage.itemName')" align="center" />
             <el-table-column prop="specName" :label="$t('resourceEnterManage.itemSpec')" align="center">
               <template slot-scope="scope">
-                {{scope.row.specName || '-'}}
+                {{ scope.row.specName || '-' }}
               </template>
             </el-table-column>
             <el-table-column prop="resCode" :label="$t('resourceEnterManage.itemCode')" align="center" />
             <el-table-column prop="stock" :label="$t('resourceEnterManage.itemStock')" align="center" />
             <el-table-column prop="standardPrice" :label="$t('resourceEnterManage.referencePrice')" align="center">
               <template slot-scope="scope">
-                ￥{{scope.row.standardPrice}}
+                ￥{{ scope.row.standardPrice }}
               </template>
             </el-table-column>
             <el-table-column prop="quantity" :label="$t('resourceEnterManage.applyQuantity')" align="center" />
             <el-table-column :label="$t('resourceEnterManage.purchaseQuantity')" align="center">
               <template slot-scope="scope">
-                <el-input
-                  v-model.number="scope.row.purchaseQuantity"
-                  type="number"
-                  :placeholder="$t('resourceEnterManage.purchaseQuantityPlaceholder')"
-                />
+                <el-input v-model.number="scope.row.purchaseQuantity" type="number"
+                  :placeholder="$t('resourceEnterManage.purchaseQuantityPlaceholder')" />
               </template>
             </el-table-column>
             <el-table-column :label="$t('resourceEnterManage.purchasePrice')" align="center">
               <template slot-scope="scope">
-                <el-input
-                  v-model.number="scope.row.price"
-                  type="number"
-                  :placeholder="$t('resourceEnterManage.purchasePricePlaceholder')"
-                />
+                <el-input v-model.number="scope.row.price" type="number"
+                  :placeholder="$t('resourceEnterManage.purchasePricePlaceholder')" />
               </template>
             </el-table-column>
             <el-table-column :label="$t('resourceEnterManage.supplier')" align="center">
               <template slot-scope="scope">
-                <el-select
-                  v-model="scope.row.rsId"
-                  :placeholder="$t('resourceEnterManage.selectSupplier')"
-                  style="width:100%"
-                >
-                  <el-option
-                    v-for="supplier in resourceEnterManageInfo.resourceSuppliers"
-                    :key="supplier.rsId"
-                    :label="supplier.supplierName"
-                    :value="supplier.rsId"
-                  />
+                <el-select v-model="scope.row.rsId" :placeholder="$t('resourceEnterManage.selectSupplier')"
+                  style="width:100%">
+                  <el-option v-for="supplier in resourceEnterManageInfo.resourceSuppliers" :key="supplier.rsId"
+                    :label="supplier.supplierName" :value="supplier.rsId" />
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column :label="$t('resourceEnterManage.remark')" align="center">
               <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.purchaseRemark"
-                  type="text"
-                  :placeholder="$t('resourceEnterManage.remarkPlaceholder')"
-                />
+                <el-input v-model="scope.row.purchaseRemark" type="text"
+                  :placeholder="$t('resourceEnterManage.remarkPlaceholder')" />
               </template>
             </el-table-column>
           </el-table>
@@ -125,7 +105,7 @@ export default {
           applyOrderId: this.resourceEnterManageInfo.applyOrderId,
           resOrderType: this.resourceEnterManageInfo.resOrderType
         }
-        const { data } = await listPurchaseApplys(params)
+        const data  = await listPurchaseApplys(params)
         const purchaseApply = data.purchaseApplys[0]
         Object.assign(this.resourceEnterManageInfo, purchaseApply)
         this.resourceEnterManageInfo.purchaseApplyDetailVo.forEach(item => {
@@ -148,12 +128,13 @@ export default {
       }
     },
     handleSelectionChange(selection) {
+      console.log(selection)
       this.resourceEnterManageInfo.selectResIds = selection.map(item => item.resId)
     },
     async handleSubmit() {
       // Validation
       let msg = ''
-      const selectedItems = this.resourceEnterManageInfo.purchaseApplyDetailVo.filter(item => 
+      const selectedItems = this.resourceEnterManageInfo.purchaseApplyDetailVo.filter(item =>
         this.resourceEnterManageInfo.selectResIds.includes(item.resId)
       )
 
@@ -168,7 +149,7 @@ export default {
           break
         }
         item.purchaseQuantity = parseInt(item.purchaseQuantity)
-        
+
         if (!item.price || parseFloat(item.price) <= 0) {
           msg = this.$t('resourceEnterManage.purchasePriceError')
           break
diff --git a/src/views/resource/resourceOutManageList.vue b/src/views/resource/resourceOutManageList.vue
index 6c5710b..21917b0 100644
--- a/src/views/resource/resourceOutManageList.vue
+++ b/src/views/resource/resourceOutManageList.vue
@@ -1,51 +1,73 @@
 <template>
   <div class="resource-out-manage-container">
-    <el-card class="box-card">
-      <div slot="header" class="flex justify-between">
+    <div class="box-card">
+      <div class="card-header flex justify-between">
         <span>{{ $t('resourceOutManage.orderId') }}：{{ resourceOutManageInfo.applyOrderId }}</span>
       </div>
-      <el-row>
-        <el-col :span="24">
-          <el-table :data="resourceOutManageInfo.purchaseApplyDetailVo" border style="width: 100%" v-loading="loading">
-            <el-table-column prop="rstName" :label="$t('resourceOutManage.itemType')" align="center" width="180">
-              <template slot-scope="scope">
-                {{ scope.row.rstName || '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="resName" :label="$t('resourceOutManage.itemName')" align="center" width="180" />
-            <el-table-column prop="specName" :label="$t('resourceOutManage.itemSpec')" align="center" width="180">
-              <template slot-scope="scope">
-                {{ scope.row.specName || '-' }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="resCode" :label="$t('resourceOutManage.itemCode')" align="center" width="180" />
-            <el-table-column prop="stock" :label="$t('resourceOutManage.itemStock')" align="center" width="120" />
-            <el-table-column prop="quantity" :label="$t('resourceOutManage.applyQuantity')" align="center"
-              width="120" />
-            <el-table-column :label="$t('resourceOutManage.issueQuantity')" align="center" width="200">
-              <template slot-scope="scope">
-                <el-input v-model.number="scope.row.purchaseQuantity" type="number"
-                  :placeholder="$t('resourceOutManage.issueQuantityPlaceholder')" clearable />
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('resourceOutManage.remark')" align="center" width="200">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.purchaseRemark" type="text"
-                  :placeholder="$t('resourceOutManage.remarkPlaceholder')" clearable />
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
-
-      <el-row class="footer-row">
-        <el-col :span="24" class="text-right">
-          <el-button type="primary" @click="handleSubmit">
+      
+      <div class="table-container">
+        <!-- 加载状态 -->
+        <div v-if="loading" class="loading-overlay">
+          <div class="loading-spinner">加载中...</div>
+        </div>
+        
+        <!-- 普通HTML表格 -->
+        <table class="data-table" v-if="!loading">
+          <thead>
+            <tr>
+              <th class="table-header">{{ $t('resourceOutManage.itemType') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.itemName') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.itemSpec') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.itemCode') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.itemStock') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.applyQuantity') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.issueQuantity') }}</th>
+              <th class="table-header">{{ $t('resourceOutManage.remark') }}</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(item, index) in resourceOutManageInfo.purchaseApplyDetailVo" :key="index" class="table-row">
+              <td class="table-cell">{{ item.rstName || '-' }}</td>
+              <td class="table-cell">{{ item.resName }}</td>
+              <td class="table-cell">{{ item.specName || '-' }}</td>
+              <td class="table-cell">{{ item.resCode }}</td>
+              <td class="table-cell">{{ item.stock }}</td>
+              <td class="table-cell">{{ item.quantity }}</td>
+              <td class="table-cell">
+                <input 
+                  v-model.number="item.purchaseQuantity" 
+                  type="number" 
+                  class="form-input"
+                  :placeholder="$t('resourceOutManage.issueQuantityPlaceholder')"
+                  @input="validateQuantity(item)"
+                />
+              </td>
+              <td class="table-cell">
+                <input 
+                  v-model="item.purchaseRemark" 
+                  type="text" 
+                  class="form-input"
+                  :placeholder="$t('resourceOutManage.remarkPlaceholder')"
+                />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        
+        <!-- 空数据状态 -->
+        <div v-if="!loading && resourceOutManageInfo.purchaseApplyDetailVo.length === 0" class="empty-data">
+          暂无数据
+        </div>
+      </div>
+
+      <div class="footer-row">
+        <div class="text-right">
+          <button type="button" class="btn btn-primary" @click="handleSubmit">
             {{ $t('resourceOutManage.submit') }}
-          </el-button>
-        </el-col>
-      </el-row>
-    </el-card>
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -81,7 +103,7 @@ export default {
           applyOrderId: this.resourceOutManageInfo.applyOrderId,
           resOrderType: this.resourceOutManageInfo.resOrderType
         }
-        const { data } = await listPurchaseApplys(params)
+        const data = await listPurchaseApplys(params)
         const purchaseApply = data.purchaseApplys[0]
         this.resourceOutManageInfo = {
           ...this.resourceOutManageInfo,
@@ -99,6 +121,14 @@ export default {
         this.loading = false
       }
     },
+    
+    // 新增：验证数量输入
+    validateQuantity(item) {
+      if (item.purchaseQuantity && parseFloat(item.purchaseQuantity) > parseFloat(item.stock)) {
+        this.$message.warning('出库数量不能超过库存数量')
+      }
+    },
+    
     async handleSubmit() {
       try {
         // Validate form
@@ -140,15 +170,167 @@ export default {
   padding: 20px;
 
   .box-card {
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     margin-bottom: 20px;
   }
 
+  .card-header {
+    padding: 20px;
+    border-bottom: 1px solid #ebeef5;
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+  }
+
+  .table-container {
+    position: relative;
+    padding: 20px;
+  }
+
+  .loading-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.8);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
+
+  .loading-spinner {
+    color: #409eff;
+    font-size: 14px;
+  }
+
+  .data-table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    overflow: hidden;
+  }
+
+  .table-header {
+    background-color: #fafafa;
+    color: #606266;
+    font-weight: 500;
+    padding: 12px 8px;
+    text-align: center;
+    border-bottom: 1px solid #ebeef5;
+    font-size: 14px;
+    min-width: 120px;
+  }
+
+  .table-row {
+    &:hover {
+      background-color: #f5f7fa;
+    }
+    
+    &:nth-child(even) {
+      background-color: #fafafa;
+    }
+  }
+
+  .table-cell {
+    padding: 12px 8px;
+    text-align: center;
+    border-bottom: 1px solid #ebeef5;
+    font-size: 14px;
+    color: #606266;
+    vertical-align: middle;
+  }
+
+  .form-input {
+    width: 100%;
+    padding: 8px 12px;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #606266;
+    background-color: #fff;
+    transition: border-color 0.2s;
+    box-sizing: border-box;
+    
+    &:focus {
+      outline: none;
+      border-color: #409eff;
+      box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+    }
+    
+    &::placeholder {
+      color: #c0c4cc;
+    }
+    
+    &:hover {
+      border-color: #c0c4cc;
+    }
+  }
+
+  .empty-data {
+    text-align: center;
+    padding: 40px;
+    color: #909399;
+    font-size: 14px;
+  }
+
   .footer-row {
     margin-top: 20px;
+    padding: 20px;
+    border-top: 1px solid #ebeef5;
   }
 
   .text-right {
     text-align: right;
   }
+
+  .btn {
+    padding: 10px 20px;
+    border: none;
+    border-radius: 4px;
+    font-size: 14px;
+    cursor: pointer;
+    transition: all 0.3s;
+    
+    &.btn-primary {
+      background-color: #409eff;
+      color: #fff;
+      
+      &:hover {
+        background-color: #66b1ff;
+      }
+      
+      &:active {
+        background-color: #3a8ee6;
+      }
+      
+      &:disabled {
+        background-color: #a0cfff;
+        cursor: not-allowed;
+      }
+    }
+  }
+
+  // 响应式设计
+  @media (max-width: 768px) {
+    .data-table {
+      font-size: 12px;
+    }
+    
+    .table-header,
+    .table-cell {
+      padding: 8px 4px;
+      min-width: 80px;
+    }
+    
+    .form-input {
+      padding: 6px 8px;
+      font-size: 12px;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/resource/storehouseManageLang.js b/src/views/resource/storehouseManageLang.js
index 990f49b..ea1e844 100644
--- a/src/views/resource/storehouseManageLang.js
+++ b/src/views/resource/storehouseManageLang.js
@@ -7,7 +7,8 @@ export const messages = {
         shName: 'Please enter warehouse name',
         shId: 'Please enter warehouse ID',
         isShow: 'Please select whether it is open to the public',
-        shDesc: 'Please enter warehouse description'
+        shDesc: 'Please enter warehouse description',
+        selectFlow: 'Please select flow'
       },
       options: {
         all: 'All',
@@ -49,7 +50,8 @@ export const messages = {
         shName: '请输入仓库名称',
         shId: '请输入仓库编号',
         isShow: '请选择是否对外开放',
-        shDesc: '请输入仓库描述'
+        shDesc: '请输入仓库描述',
+        selectFlow: '请选择流程'
       },
       options: {
         all: '全部',
--
libgit2 0.21.4