From ee2b8ab26ad9fe00402e66aa6cfa41016bdf5fe2 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 26 Aug 2022 11:13:49 +0800
Subject: [PATCH] 2022.8.26

---
 .env.development                              | 10 +++++-----
 .../components/detailPaymentRegistration.vue  | 20 +++++++++----------
 .../components/examineRegistration.vue        | 20 +++++++++----------
 .../components/paymentRegistration.vue        | 13 +++---------
 .../contract/components/printRegistration.vue |  2 +-
 .../components/examineRegistration.vue        | 12 +++++------
 6 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/.env.development b/.env.development
index 4380241..cfc0ea5 100644
--- a/.env.development
+++ b/.env.development
@@ -2,9 +2,9 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
-VUE_APP_BASE_API = ''
-VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+#VUE_APP_BASE_API = ''
+#VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
 
-#VUE_APP_OUT_URL = http://192.168.60.18:2021
+VUE_APP_OUT_URL = http://192.168.60.18:2021
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index c82c1d9..861ed08 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -68,18 +68,18 @@
           </div>
         </div>
       </template>
-      <template v-slot:is_end>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px;">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.is_end" />
+<!--      <template v-slot:is_end>-->
+<!--        <div class="xy-table-item">-->
+<!--          <div class="xy-table-item-label" style="width: 200px;">-->
+<!--            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目-->
+<!--          </div>-->
+<!--          <div class="xy-table-item-content">-->
+<!--            <el-switch v-model="form.is_end" />-->
 <!--                       @change="toggleSelection"-->
 
-          </div>
-        </div>
-      </template>
+<!--          </div>-->
+<!--        </div>-->
+<!--      </template>-->
       <template v-slot:extraFormBottom v-if="false">
         <Input search enter-button="搜 索" placeholder="搜索预算计划.." v-model="searchContent" @on-search="getBudgets"/>
         <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;" ref="planTable" @select="selectPlan">
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index c906041..f5f8e85 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -89,16 +89,16 @@
           </div>
         </div>
       </template>
-      <template v-slot:isLast>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch disabled v-model="paymentRegistrationForm.isLast"/>
-          </div>
-        </div>
-      </template>
+<!--      <template v-slot:isLast>-->
+<!--        <div class="xy-table-item">-->
+<!--          <div class="xy-table-item-label" style="width: 200px">-->
+<!--            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目-->
+<!--          </div>-->
+<!--          <div class="xy-table-item-content">-->
+<!--            <el-switch disabled v-model="paymentRegistrationForm.isLast"/>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </template>-->
       <template v-slot:actMoney>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index 419fabb..5140414 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -160,7 +160,7 @@ export default {
         applyMoney:"",
         deductionMoney:"",
         type:"",
-        isLast:false,
+        //isLast:false,
         plan:[]
       },
       paymentRegistrationRules:{
@@ -247,19 +247,12 @@ export default {
     },
 
     submit(){
-      let data = this.paymentRegistrationForm.isLast ?  {
+      let data = {
         contract_id:this.contract.id,
         apply_money:this.paymentRegistrationForm.applyMoney,
         discount_money:this.paymentRegistrationForm.deductionMoney,
         type:this.paymentRegistrationForm.type,
-        is_end:this.paymentRegistrationForm.isLast ? 1 : 0,
-        contract_plan_links:this.paymentRegistrationForm.plan
-      } : {
-        contract_id:this.contract.id,
-        apply_money:this.paymentRegistrationForm.applyMoney,
-        discount_money:this.paymentRegistrationForm.deductionMoney,
-        type:this.paymentRegistrationForm.type,
-        is_end:this.paymentRegistrationForm.isLast ? 1 : 0
+        //is_end:this.paymentRegistrationForm.isLast ? 1 : 0
       }
       addFundLog(data).then(res=>{
         this.isShowPaymentRegistration = false
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index 908e99f..97331f8 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -108,7 +108,7 @@ export default {
       return res.toString()
     },
     guaranteeRate(gua,money){
-      return ((moneyRecovery(gua) / money) * 100).toFixed(4)
+      if(gua && money) return ((moneyRecovery(gua) / money) * 100).toFixed(4)
     },
 
     async getDetailFundLog(id){
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 6751c4b..e21c74c 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -184,7 +184,7 @@ export default {
         applyMoney:"",
         deductionMoney:"",
         type:"",
-        isLast:false,
+        //isLast:false,
         plan:[],
         actMoney:'',
         moneyWay:'',//资金列支渠道
@@ -240,7 +240,7 @@ export default {
   },
   methods: {
     inputMoney(e,row){
-      row.useMoney = e
+      row.use_money = e
       this.paymentRegistrationForm.plan.forEach(item => {
         if(item.plan_id == row.id){
           item.use_money = e
@@ -275,7 +275,7 @@ export default {
       this.registrationId = id
       const res = await detailFundLog({id})
       this.paymentRegistrationForm.type = res.type
-      this.paymentRegistrationForm.isLast = res.is_end === 1 ? true : false
+      //this.paymentRegistrationForm.isLast = res.is_end === 1 ? true : false
       this.paymentRegistrationForm.deductionMoney = res.apply_money
       this.paymentRegistrationForm.applyMoney = res.apply_money
       this.paymentRegistrationForm.plan = res.plan_link
@@ -323,7 +323,7 @@ export default {
       this.planTotal = res.list.total
 
       this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
-        return item.value.plan_id
+        return item.plan_id
       }))
     },
     planPageChange(e){
@@ -335,7 +335,7 @@ export default {
         this.paymentRegistrationForm.plan = sel.map(item => {
           return {
             plan_id:item.id,
-            use_money:item.useMoney,
+            use_money:item.use_money,
             new_money:item.money
           }
         })
@@ -348,7 +348,7 @@ export default {
       if (plans) {
         this.plans.filter(plan => {
           if(plans.includes(plan.id)){
-            plan.useMoney = this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].value.use_money
+            plan.use_money = this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money
             return true
           }
         }).map(row => {