Bläddra i källkod

feat(验收单):验收单业务审核

sufan 5 månader sedan
förälder
incheckning
bead0e4bcb

+ 9 - 0
src/api/acceptanceManagement/index.js

@@ -83,3 +83,12 @@ export function Loadings(text, time = timeout) {
   return loading
 }
 
+// 验收单管理 - 法务审核
+
+export const businessReviewSubmit = (data) => (
+  request({
+    url: '/acceptance/businessReview',
+    method: 'post',
+    data
+  })
+)

+ 8 - 0
src/router/moudules/tradeManagement.js

@@ -150,6 +150,14 @@ export default {
           hidden: true,
           meta: { title: '法务审核' }
         },
+
+        {
+          path: '/acceptanceManagement/businessReview/:id',
+          name: 'AccepetanceBusinessReview',
+          component: () => import('@/views/acceptanceManagement/businessReview'),
+          hidden: true,
+          meta: { title: '业务审核' }
+        },
         {
           path: '/acceptanceManagement/adjustReview/:id',
           name: 'AccepetanceAdjustReview',

+ 61 - 0
src/views/acceptanceManagement/businessReview.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="business-review">
+    <cy-up-down-drag>
+      <div slot="top">
+        <history-view></history-view>
+      </div>
+      <div slot="bar">
+        <div>
+          业务审核
+        </div>
+      </div>
+      <div slot="bottom">
+        <template>
+          <acceptance-conclusion ref="conclusion" type="businessReview"></acceptance-conclusion>
+          <div class="submit-btn">
+            <el-button style="width: 150px;" @click="() => { $router.go(-1) }">取消</el-button>
+            <el-button style="width: 150px;" type="primary" @click="onSubmit">提交</el-button>
+          </div>
+        </template>
+      </div>
+    </cy-up-down-drag>
+  </div>
+</template>
+
+<script >
+import AcceptanceConclusion from './components/AcceptanceConclusion.vue'
+import HistoryView from './components/HistoryView.vue'
+import { businessReviewSubmit } from '@/api/acceptanceManagement/index'
+import { Loading } from 'element-ui'
+export default {
+  name: 'AcceptanceLegalReview',
+  components: {
+    AcceptanceConclusion,
+    HistoryView
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    async onSubmit() {
+      const { approvalConclusion, approvalComment } = await this.$refs.conclusion.getSubmit()
+      const { taskId, id } = this.$route.query
+      const params = {
+        Loading: true,
+        approvalConclusion,
+        approvalComment,
+        taskId,
+        acceptanceBasicInfoId: id
+      }
+      businessReviewSubmit(params).then(() => {
+        this.$message.success('提交成功')
+        this.$router.go(-1)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 6 - 2
src/views/acceptanceManagement/components/AcceptanceConclusion.vue

@@ -5,8 +5,8 @@
       <el-form-item label="审批结论:" prop="approvalConclusion">
         <el-radio-group v-model="ruleForm.approvalConclusion">
           <el-radio label="pass" :disabled="disabled">通过</el-radio>
-          <el-radio v-show="show" label="back" :disabled="disabled">退回</el-radio>
-          <el-radio label="veto" :disabled="disabled">否决</el-radio>
+          <el-radio v-show="show || type === 'businessReview'" label="back" :disabled="disabled">退回</el-radio>
+          <el-radio v-if="type !== 'businessReview'" label="veto" :disabled="disabled">否决</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
@@ -39,6 +39,10 @@ export default {
     deatailsInfo: {
       type: Object,
       default: () => {}
+    },
+    type: {
+      type: String,
+      default: '' // 'businessReview' 业务审核
     }
   },
   data() {

+ 5 - 2
src/views/acceptanceManagement/components/HistoryView.vue

@@ -3,7 +3,7 @@
     <div v-if="advanceViewList.length" class="view-steps-box">
       <cy-steps :steps-data="advanceViewList"></cy-steps>
     </div>
-    <div v-loading="loading" class="tempalte-content">
+    <div v-loading="loading">
       <el-collapse v-if="advanceViewList.length" v-model="activeNames">
         <el-collapse-item v-for="(item, index) in advanceViewList" :key="index" :name="index">
           <template slot="title">
@@ -17,6 +17,7 @@
           <legal-review v-if="item.formBusinessName === '法务审核'" :details-info="item.obj"></legal-review>
           <price-adjust v-if="item.formBusinessName.includes('单价调整')" :details-info="item.obj"></price-adjust>
           <adjust-review v-if="item.formBusinessName === '单价变更审核'" :details-info="item.obj"></adjust-review>
+          <acceptance-conclusion v-if="item.formBusinessName === '业务审核'" :deatails-info="item.obj" type="businessReview"></acceptance-conclusion>
         </el-collapse-item>
       </el-collapse>
       <!-- <el-empty v-else style="height: calc(100vh - 0.85rem - 90px)"></el-empty> -->
@@ -32,6 +33,7 @@ import SignConfirm from './historyViewContent/signConfirm'
 import LegalReview from './historyViewContent/legalReview'
 import PriceAdjust from './historyViewContent/priceAdjust'
 import AdjustReview from './historyViewContent/adjustReview'
+import AcceptanceConclusion from './AcceptanceConclusion.vue'
 
 export default {
   components: {
@@ -39,7 +41,8 @@ export default {
     SignConfirm,
     LegalReview,
     PriceAdjust,
-    AdjustReview
+    AdjustReview,
+    AcceptanceConclusion
   },
   mixins: [collapseSeeMix],
   data() {

+ 10 - 0
src/views/acceptanceManagement/index.vue

@@ -157,6 +157,16 @@ export default {
               taskId: row.taskId
             }
           })
+        } else if (row.taskName === '业务审核') {
+          this.$router.push({
+            name: 'AccepetanceBusinessReview',
+            params: { id: row.id },
+            query: {
+              taskName: row.taskName,
+              id: row.id,
+              taskId: row.taskId
+            }
+          })
         }
       } else if (type === 'timeAxis') {
         this.timeAxisClick(row)

+ 0 - 1
src/views/acceptanceManagement/legalReview.vue

@@ -111,4 +111,3 @@ export default {
     right: 40px;
   } */
 </style>
-

+ 15 - 15
src/views/divideAccountsManage/edit.vue

@@ -292,7 +292,7 @@ export default {
           label: '是否计提(履约保证金)',
           prop: 'accrual',
           showTooltip: true,
-          width: '80',
+          width: '100',
           render: (h, row) => {
             return <el-select v-model={ row.accrual } disabled={this.disabled} onChange={() => { this.oneCalc('click') }} placeholder='请选择是否计提'>
               <el-option label='是' value={true}></el-option>
@@ -323,10 +323,10 @@ export default {
           }
         },
         {
-          label: '是否分配融资利息',
+          label: '是否分配融资利息和管理费',
           prop: 'hasAssignInterest',
           showTooltip: true,
-          width: '80',
+          width: '110',
           render: (h, row) => {
             return <el-select disabled={this.disabled} v-model={ row.hasAssignInterest } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
               <el-option label='是' value={true}></el-option>
@@ -344,18 +344,18 @@ export default {
             return <span> { this.handlerMoneyEmpty(row.financingInterest) }</span>
           }
         },
-        {
-          label: '是否分配管理费',
-          prop: 'hasAssignManagementFee',
-          showTooltip: true,
-          width: '80',
-          render: (h, row) => {
-            return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
-              <el-option label='是' value={true}></el-option>
-              <el-option label='否' value={false}></el-option>
-            </el-select>
-          }
-        },
+        // {
+        //   label: '是否分配管理费',
+        //   prop: 'hasAssignManagementFee',
+        //   showTooltip: true,
+        //   width: '80',
+        //   render: (h, row) => {
+        //     return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
+        //       <el-option label='是' value={true}></el-option>
+        //       <el-option label='否' value={false}></el-option>
+        //     </el-select>
+        //   }
+        // },
         {
           label: '融资管理费',
           prop: 'financingManagementFee',