From 25b3ceace406229ee36f6d5938c70103d2f665dc Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 16 Apr 2024 14:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E6=A0=87=E5=87=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publicPage/financialschemeEdit.vue        | 42 +++++++++++--------
 .../publicPage/financialschemeInfo.vue        | 42 +++++++++++--------
 .../publicPage/financialschemeEdit.vue        | 42 +++++++++++--------
 .../publicPage/financialschemeInfo.vue        | 42 +++++++++++--------
 4 files changed, 100 insertions(+), 68 deletions(-)

diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue
index 65e324ba27..6152230a17 100644
--- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue
+++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue
@@ -217,18 +217,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">代收费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              </div>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
@@ -237,24 +241,28 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+              </div>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
-          </el-row>
-          <el-row v-show="formobj.offsetAccessories != '0'">
-            <el-col :span="24">
-              <div class="span-sty">配件抵顶</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">配件抵顶</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
diff --git a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
index 24c6820fe9..011042b2c0 100644
--- a/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
+++ b/anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
@@ -219,18 +219,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">代收费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              </div>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
@@ -239,24 +243,28 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+              </div>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
-          </el-row>
-          <el-row v-show="formobj.offsetAccessories != '0'">
-            <el-col :span="24">
-              <div class="span-sty">配件抵顶</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">配件抵顶</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue
index 98d07c81c4..75952d8d25 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue
@@ -217,18 +217,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">代收费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              </div>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
@@ -237,24 +241,28 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+              </div>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
-          </el-row>
-          <el-row v-show="formobj.offsetAccessories != '0'">
-            <el-col :span="24">
-              <div class="addinputInfo">配件抵顶</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">配件抵顶</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue
index c4cc725377..fb9bcc83b7 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue
@@ -219,18 +219,22 @@
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">代收费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+              </div>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">代收购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              <div v-if="formobj.proxyTotal != '0'">
+                <div class="span-sty">代收购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>
@@ -239,24 +243,28 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+          <el-row>
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶首年保险费</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶首年保险费</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+              </div>
             </el-col>
-            <el-col :span="9">
-              <div class="span-sty">抵顶购置税</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">抵顶购置税</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+              </div>
             </el-col>
-          </el-row>
-          <el-row v-show="formobj.offsetAccessories != '0'">
-            <el-col :span="24">
-              <div class="span-sty">配件抵顶</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-if="formobj.offsetTotal != '0'">
+                <div class="span-sty">配件抵顶</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <el-row>