Browse Source

feature(经费):删除经费认领校验;添加经费入账详情的预算情况

yanglingling 8 months ago
parent
commit
d83b25963c
2 changed files with 18 additions and 12 deletions
  1. 6 0
      src/view/fund/claim-records/detail.vue
  2. 12 12
      src/view/fund/claim/edit.vue

+ 6 - 0
src/view/fund/claim-records/detail.vue

@@ -31,6 +31,12 @@
         </van-field>
         <van-field v-model="state.form.remark" type="textarea" label="入账说明" readonly></van-field>
       </van-cell-group>
+      <h4>预算情况</h4>
+      <van-cell-group class="mt10">
+        <van-field v-for="item in state.form.fundsList" :key="item.id" :label="item.subjName" :placeholder="item.subjName" v-model="amountUnitFormatter(Number(item.amount))">
+          <template #extra>元</template>
+        </van-field>
+      </van-cell-group>
     </van-form>
   </div>
   <van-action-bar placeholder>

+ 12 - 12
src/view/fund/claim/edit.vue

@@ -103,7 +103,8 @@
       remark: '',
       serialNo: '',
       type: '',
-      unit: ''
+      unit: '',
+      status: '', // 10 待认领 20 已认领
     }
   })
   const getDict = () => {
@@ -130,6 +131,15 @@
     state.fundDetail = res.data
     state.form = { ...state.form, ...res.data }
     state.form.unAmount = state.form.amount - state.form.manageAmount - state.form.taxAmount
+    if (state.form.status == '20') {
+      // 跳转到已认领页面
+      router.push({
+        path: '/fund/claim/detail',
+        query: {
+          id
+        }
+      })
+    }
     // state.form.projectName = res.data.projectName
     // state.form.amount = res.data.amount
     // state.form.manageAmount = res.data.manageAmount
@@ -145,16 +155,6 @@
     })
   }
   const onClickButton = async () => {
-    const totalAmount = state.detail.reduce((acc, current) => {
-      return acc + Number(current.amount * 100)
-    }, 0)
-    if (Number(state.form.amount * 100) / 100 != totalAmount / 100) {
-      showNotify({
-        type: 'warning',
-        message: '认领金额必须等于本次到款总计金额'
-      })
-      return
-    }
     state.loading = true
     const params = JSON.parse(JSON.stringify(state.form))
     params.fundId = state.form.id
@@ -162,7 +162,7 @@
     params.amount = Number(params.amount)
     params.detail = params.detail.map((item: any) => ({
       ...item,
-      amount: Number(item.amount * 100)
+      amount: Number(item.amount)
     }))
     params.externalAmount = Number(params.externalAmount)
     params.internalAmount = Number(params.internalAmount)