chris il y a 2 ans
Parent
commit
190ca5bdeb

+ 26 - 2
src/views/modules/finance/expense-detail.vue

@@ -25,6 +25,9 @@
         </el-collapse-item>
         </el-collapse>
       </div>
+      <div v-if="isFlow">
+        <approve-component ref="approve" @approveFinished="approveFinished"/>
+      </div>
       <e-desc title="基本信息" column="3">
         <e-desc-item label="编码">{{dataForm.code}}</e-desc-item>
         <e-desc-item label="发生日期">{{dataForm.happenTime}}</e-desc-item>
@@ -48,13 +51,18 @@
   import EDescItem from '../common/e-desc-item'
   import uploadComponent from '../common/upload-component'
   import { getExpenseDetail } from '@/api/finance'
+  import ApproveComponent from '@/views/modules/common/approve-component'
   export default {
     name: 'expense-detail',
     components: {
-      EDesc, EDescItem, uploadComponent
+      ApproveComponent,
+      EDesc,
+      EDescItem,
+      uploadComponent
     },
     data () {
       return {
+        isFlow: false,
         visible: false,
         id: 0,
         dataForm: {},
@@ -75,7 +83,8 @@
       onChose () {
         this.$emit('onChose')
       },
-      async init (id) {
+      async init (id, businessType) {
+        this.isFlow = !!(businessType && businessType !== '')
         this.visible = true
         this.id = id || 0
         if (!id) return
@@ -93,8 +102,23 @@
                 })
               })
             }
+            // 初始化审批Form
+            this.showApproveForm(businessType, this.id)
           }
         })
+      },
+      // 初始化审批Form
+      showApproveForm (businessType, businessId) {
+        if (this.isFlow) {
+          this.$nextTick(() => {
+            this.$refs.approve.init(businessType, businessId)
+          })
+        }
+      },
+      // 审批完成
+      approveFinished () {
+        this.onChose()
+        this.$emit('approveFinished')
       }
     }
   }

+ 8 - 1
src/views/modules/msg-center/approve-add-or-update.vue

@@ -30,6 +30,9 @@
     <div v-show="businessType === 'pur_commission_flow'">
       <outsource-detail ref="outsourceDetail" @approveFinished="approveFinished" @onChose="onChose"/>
     </div>
+    <div v-show="businessType === 'submit_expense_flow'">
+      <expense-detail ref="expenseDetail" @approveFinished="approveFinished" @onChose="onChose"/>
+    </div>
   </div>
 </template>
 
@@ -44,6 +47,7 @@
   import InventoryDetail from '../warehouse/inventory-detail'
   import SupplierDetail from '../sale/supplier-detail'
   import OutsourceDetail from '../sale/outsource-detail'
+  import ExpenseDetail from '../finance/expense-detail'
 export default {
     name: 'approve-add-or-update',
     components: {
@@ -56,7 +60,8 @@ export default {
       productDetail,
       craftDetail,
       SupplierDetail,
-      OutsourceDetail
+      OutsourceDetail,
+      ExpenseDetail
     },
     data () {
       return {
@@ -93,6 +98,8 @@ export default {
           this.display ? this.$refs.supplierDetail.init(this.businessId) : this.$refs.supplierDetail.init(this.businessId, businessType)
         } else if (this.businessType === 'pur_commission_flow') {
           this.display ? this.$refs.outsourceDetail.init(this.businessId) : this.$refs.outsourceDetail.init(this.businessId, businessType)
+        } else if (this.businessType === 'submit_expense_flow') {
+          this.display ? this.$refs.expenseDetail.init(this.businessId) : this.$refs.expenseDetail.init(this.businessId, businessType)
         } else {
           this.$message.error('流程类别不支持,请联系管理员!')
         }