修改问题

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/financialscheme.vue → anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/financialschemeInfo.vue

@@ -1,21 +1,15 @@
 <template>
-  <div class="app-container">
-    <div class="tab-header webtop">
-      <div>{{ viewTitle }}</div>
-      <div>
-        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
-      </div>
-    </div>
-    <div class="listconadd">
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-if="formobj.typeKey !== '02'">
+  <div>
+    <div>
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div>
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
               <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
             </el-col>
             <el-col :span="18">
-              <div class="span-sty">资方及产品政策</div>
+              <div class="span-sty">产品政策</div>
               <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -24,11 +18,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }}元</span>
-                  <span>融资票据{{ formobj.accessoriesAmount }}元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
-                  <span>车损上浮{{ formobj.vehDamageFloat }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
+                  <span style="padding-left: 10px">配件 {{ formobj.accessoriesAmount }} 元</span>
+                  <span style="padding-left: 10px">挂车 {{ formobj.trailerAmount }} 元</span>
+                  <span style="padding-left: 10px">保险 {{ formobj.premium }} 元</span>
+                  <span style="padding-left: 10px">购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -39,7 +33,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">首付比例</div>
+              <div class="span-sty">首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -57,7 +51,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">贷款保证金比例</div>
+              <div class="span-sty">贷款保证金比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -69,11 +63,15 @@
               <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">年利率</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
@@ -82,9 +80,11 @@
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <div v-show="formobj.otherPolicyState">
@@ -104,26 +104,34 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
               <el-col :span="6">
                 <div class="span-sty">月还金额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="6">
                 <div class="span-sty">利息总额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
               </el-col>
               <el-col :span="6">
-                <div class="span-sty">年利率</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+                <div class="span-sty">其它融贴息</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherDiscount }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
           <div class="title">方案汇总</div>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">融资首付</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">实际首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">总贷款金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanAmountTotal }}</span></el-form-item>
@@ -134,11 +142,12 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6"></el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
             </el-col>
@@ -199,10 +208,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="24">
               <div class="span-sty">办理方式选择</div>
               <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-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>
@@ -218,7 +233,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
@@ -254,28 +269,6 @@
             </el-col>
           </el-row>
         </div>
-        <div v-if="formobj.typeKey == '02'">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscount }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>服务费</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.serviceAmount }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
       </el-form>
     </div>
   </div>
@@ -297,7 +290,7 @@ export default {
   methods: {
     showInfo(value) {
       this.viewTitle = '金融方案'
-      this.formobj = value
+      this.formobj = JSON.parse(JSON.stringify(value))
     },
     handleReturn() {
       this.$emit('doback')
@@ -307,6 +300,9 @@ export default {
 </script>
 
 <style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
 .span-sty {
   width: 130px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/xiaoshoudingdanInfo.vue → anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue

@@ -304,17 +304,17 @@
         </el-form>
       </div>
     </div>
-    <financialscheme ref="divInfo" v-show="viewState == 2" @doback="resetState"/>
+    <financialschemeInfo ref="divInfo" v-show="viewState == 2" @doback="resetState"/>
   </div>
 </template>
 <script>
-import { fetchDetails } from '@/api/anruifinmanagement/finwaitinvoiceapply'
-import financialscheme from './financialscheme'
+import { fetchDetails } from '@/api/Common/dictcommons'
+import financialschemeInfo from './financialschemeInfo'
 
 export default {
   name: 'XiaoShouDingDanInfo',
   components: {
-    financialscheme
+    financialschemeInfo
   },
   data() {
     return {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapply.vue

@@ -190,6 +190,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      multipleSelection: [],
       FormLoading: false,
       listLoading: false,
       // start 日期选择
@@ -328,6 +329,7 @@ export default {
     // 信息条数 获取点击时当前的sid
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.sid)
       })
@@ -394,12 +396,16 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
         return
       }
-      // for (var i = 0; i < this.multipleSelection.length; i++) {
-      //   if (!this.multipleSelection[i].isCZ) {
-      //     this.$message({ showClose: true, type: 'error', message: '因包含非本人创建的记录,无权限操作' })
-      //     return
-      //   }
-      // }
+      for (var i = 0; i < this.multipleSelection.length; i++) {
+        if (!this.multipleSelection[i].isCZ) {
+          this.$message({ showClose: true, type: 'error', message: '因包含非本人创建的记录,无权限操作' })
+          return
+        }
+        if (this.multipleSelection[i].showBtnStr === '0') {
+          this.$message({ showClose: true, type: 'error', message: '因包含非手动新增的记录,无法删除' })
+          return
+        }
+      }
       const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
       this.$confirm(tip, '提示', {
         confirmButtonText: '确定',

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@@ -189,7 +189,7 @@
         </el-form>
       </div>
     </div>
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <weihukaipiaoxinxi v-show="viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="resetData"/>
     <selectCar  v-show="viewState == 4" ref="divSelect" @doback="resetState" @backData="backData"/>
   </div>
@@ -199,7 +199,7 @@
 import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import salesOrder from '@/components/publicPage/salesOrder'
 import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
 import selectCar from './relation/selectCar'
 
@@ -207,7 +207,7 @@ export default {
   name: '',
   components: {
     upload,
-    xiaoshoudingdanInfo,
+    salesOrder,
     weihukaipiaoxinxi,
     selectCar
   },

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyInfo.vue

@@ -165,17 +165,17 @@
         </el-form>
       </div>
     </div>
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid } from '@/api/anruifinmanagement/finwaitinvoiceapply'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import salesOrder from '@/components/publicPage/salesOrder'
 export default {
   name: 'finginvoiceapplyInfo',
   components: {
-    xiaoshoudingdanInfo
+    salesOrder
   },
   data() {
     return {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@@ -223,7 +223,7 @@
       </el-form>
     </el-dialog>
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
@@ -231,14 +231,14 @@
 <script>
 import { fetchDetailsBySid, completeByKP, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import upload from '@/components/uploadFile/upload'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
-import paymentticket from './relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'finginvoiceapplyByFileDaiBanInfo',
   components: {
     upload,
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@@ -223,20 +223,20 @@
       </el-form>
     </el-dialog>
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
-import paymentticket from './relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'finginvoiceapplyDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -189,7 +189,7 @@
       </div>
     </div>
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <weihukaipiaoxinxi v-show="viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="resetData"/>
     <selectCar  v-show="viewState == 4" ref="divSelect" @doback="resetState" @backData="backData"/>
   </div>
@@ -199,7 +199,7 @@
 import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
 import upload from '@/components/uploadFile/upload'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import salesOrder from '../publicPage/salesOrder'
 import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
 import selectCar from './relation/selectCar'
 
@@ -207,7 +207,7 @@ export default {
   name: '',
   components: {
     upload,
-    xiaoshoudingdanInfo,
+    salesOrder,
     weihukaipiaoxinxi,
     selectCar
   },

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@@ -194,20 +194,20 @@
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, revokeProcess } from '@/api/anruifinmanagement/finwaitinvoiceapply'
-import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
-import paymentticket from './relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'finginvoiceapplyYiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/financialscheme.vue → anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@@ -1,21 +1,15 @@
 <template>
-  <div class="app-container">
-    <div class="tab-header webtop">
-      <div>{{ viewTitle }}</div>
-      <div>
-        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
-      </div>
-    </div>
-    <div class="listconadd">
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-if="formobj.typeKey !== '02'">
+  <div>
+    <div>
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div>
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
               <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
             </el-col>
             <el-col :span="18">
-              <div class="span-sty">资方及产品政策</div>
+              <div class="span-sty">产品政策</div>
               <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -24,12 +18,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
-                  <span>融资票据{{ formobj.accessoriesAmount }} 元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
-                  <span>保险{{ formobj.premium }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
-                  <span>车损上浮{{ formobj.vehDamageFloat }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
+                  <span style="padding-left: 10px">配件 {{ formobj.accessoriesAmount }} 元</span>
+                  <span style="padding-left: 10px">挂车 {{ formobj.trailerAmount }} 元</span>
+                  <span style="padding-left: 10px">保险 {{ formobj.premium }} 元</span>
+                  <span style="padding-left: 10px">购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -40,7 +33,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">首付比例</div>
+              <div class="span-sty">首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -58,7 +51,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">贷款保证金比例</div>
+              <div class="span-sty">贷款保证金比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -70,11 +63,15 @@
               <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">年利率</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
@@ -83,9 +80,11 @@
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <div v-show="formobj.otherPolicyState">
@@ -105,26 +104,34 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
               <el-col :span="6">
                 <div class="span-sty">月还金额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="6">
                 <div class="span-sty">利息总额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
               </el-col>
               <el-col :span="6">
-                <div class="span-sty">年利率</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+                <div class="span-sty">其它融贴息</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherDiscount }}</span></el-form-item>
               </el-col>
             </el-row>
           </div>
           <div class="title">方案汇总</div>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">融资首付</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
             </el-col>
+            <el-col :span="6">
+              <div class="span-sty">实际首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">总贷款金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanAmountTotal }}</span></el-form-item>
@@ -135,11 +142,12 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6"></el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
             </el-col>
@@ -200,10 +208,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="24">
               <div class="span-sty">办理方式选择</div>
               <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-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>
@@ -219,7 +233,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
@@ -255,28 +269,6 @@
             </el-col>
           </el-row>
         </div>
-        <div v-if="formobj.typeKey == '02'">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscount }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>服务费</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.serviceAmount }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
       </el-form>
     </div>
   </div>
@@ -284,7 +276,7 @@
 <script>
 
 export default {
-  name: 'JinRongFangAnInfo',
+  name: '',
   data() {
     return {
       viewTitle: '',
@@ -299,6 +291,8 @@ export default {
     showInfo(value) {
       this.viewTitle = '金融方案'
       this.formobj = value
+      console.log(value, 8888)
+      console.log(this.formobj, 9999)
     },
     handleReturn() {
       this.$emit('doback')
@@ -308,6 +302,9 @@ export default {
 </script>
 
 <style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
 .span-sty {
   width: 130px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo.vue → anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue

@@ -304,17 +304,17 @@
         </el-form>
       </div>
     </div>
-    <financialscheme ref="divInfo" v-show="viewState == 2" @doback="resetState"/>
+    <financialschemeInfo ref="divInfo" v-show="viewState == 2" @doback="resetState"/>
   </div>
 </template>
 <script>
-import { fetchDetails } from '@/api/anruifinmanagement/finwaitinvoiceapply'
-import financialscheme from './financialscheme'
+import { fetchDetails } from '@/api/Common/dictcommons'
+import financialschemeInfo from './financialschemeInfo'
 
 export default {
   name: 'XiaoShouDingDanInfo',
   components: {
-    financialscheme
+    financialschemeInfo
   },
   data() {
     return {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@@ -241,20 +241,20 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, completeByDivision, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'arrearsbillingByDivisionDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByFileDaiBanInfo.vue

@@ -239,7 +239,7 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
@@ -247,14 +247,14 @@
 <script>
 import { fetchDetailsBySid, completeBy, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
 import upload from '@/components/uploadFile/upload'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'arrearsbillingByFileDaiBanInfo',
   components: {
     upload,
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@@ -240,21 +240,20 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
-import upload from "@/components/uploadFile/upload";
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'arrearsbillingDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@@ -214,7 +214,7 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
@@ -222,13 +222,13 @@
 <script>
 import { fetchDetailsBySid, revokeProcess, createPdf } from '@/api/anruifinmanagement/arrearsbilling'
 import { getStorage } from '@/utils/auth'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'arrearsbillingYiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue

@@ -212,20 +212,20 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, completeByDivision, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/arrearscollection'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'ArrearsScollectionByDivisionDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue

@@ -214,7 +214,7 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
@@ -222,14 +222,14 @@
 <script>
 import { fetchDetailsBySid, breakProcess, completeBy, getNextNodesForSubmit, getPreviousNodesForReject, reject } from '@/api/anruifinmanagement/arrearscollection'
 import upload from '@/components/uploadFile/upload'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'ArrearsScollectionByFileDaiBanInfo',
   components: {
     upload,
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue

@@ -212,20 +212,20 @@
     </el-dialog>
 
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearscollection'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'ArrearsScollectionDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue

@@ -183,20 +183,20 @@
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
     <!-- 查看销售订单详情 -->
-    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <salesOrder v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, revokeProcess } from '@/api/anruifinmanagement/arrearscollection'
-import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
-import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import salesOrder from '../publicPage/salesOrder'
+import paymentticket from '../publicPage/paymentticket'
 
 export default {
   name: 'ArrearsScollectionYiBanInfo',
   components: {
-    xiaoshoudingdanInfo,
+    salesOrder,
     paymentticket
   },
   data() {