Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -241,7 +241,7 @@
               </el-form-item>
             </div>
             <div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
-              <div class="span-sty">抵顶首年保险费</div>
+              <div class="span-sty">首年保险费抵顶</div>
               <el-form-item>
                 <el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
               </el-form-item>
@@ -255,7 +255,7 @@
               </el-form-item>
             </div>
             <div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
-              <div class="span-sty">抵顶购置税</div>
+              <div class="span-sty">购置税抵顶</div>
               <el-form-item>
                 <el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
               </el-form-item>
@@ -870,11 +870,11 @@ export default {
       }
       if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
         if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
-          this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
+          this.$message({ showClose: true, type: 'error', message: '首年保险费抵顶数额不能大于融资项目中的保险数额' })
           return
         }
         if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
-          this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
+          this.$message({ showClose: true, type: 'error', message: '购置税抵顶数额不能大于融资项目中的购置税数额' })
           return
         }
       }

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -251,13 +251,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue

@@ -250,13 +250,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -241,7 +241,7 @@
               </el-form-item>
             </div>
             <div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
-              <div class="span-sty">抵顶首年保险费</div>
+              <div class="span-sty">首年保险费抵顶</div>
               <el-form-item>
                 <el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
               </el-form-item>
@@ -255,7 +255,7 @@
               </el-form-item>
             </div>
             <div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
-              <div class="span-sty">抵顶购置税</div>
+              <div class="span-sty">购置税抵顶</div>
               <el-form-item>
                 <el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
               </el-form-item>
@@ -797,11 +797,11 @@ export default {
       }
       if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
         if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
-          this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
+          this.$message({ showClose: true, type: 'error', message: '首年保险费抵顶数额不能大于融资项目中的保险数额' })
           return
         }
         if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
-          this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
+          this.$message({ showClose: true, type: 'error', message: '购置税抵顶数额不能大于融资项目中的购置税数额' })
           return
         }
       }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue

@@ -251,13 +251,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue

@@ -250,13 +250,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue

@@ -243,11 +243,11 @@
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">抵顶首年保险费</div>
+              <div class="span-sty">首年保险费抵顶</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
             </el-col>
             <el-col :span="9">
-              <div class="span-sty">抵顶购置税</div>
+              <div class="span-sty">购置税抵顶</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
             </el-col>
           </el-row>

anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/financialschemeInfo.vue

@@ -244,13 +244,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@@ -244,13 +244,13 @@
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶首年保险费</div>
+                <div class="span-sty">首年保险费抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
               </div>
             </el-col>
             <el-col :span="6">
               <div v-if="formobj.offsetTotal != '0'">
-                <div class="span-sty">抵顶购置税</div>
+                <div class="span-sty">购置税抵顶</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
               </div>
             </el-col>