完善付款申请

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js

@@ -19,11 +19,20 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
-  // 获取厂家销售通路
-  actualList: function(data) {
+  // 根据分公司Sid获取本分公司下的付款信息
+  selectByUseOrgSid: function(data) {
     return request({
-      url: '/base/v1/basemanufacturerbank/payList',
-      method: 'get'
+      url: '/fin/v1/finpayment/selectByUseOrgSid',
+      method: 'get',
+      params: data
+    })
+  },
+  paymentSave: function(data) {
+    return request({
+      url: 'fin/v1/finpayment/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
     })
   },
   // 保存修改记录

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -224,3 +224,10 @@ export function fetchDetails(data) {
     method: 'get'
   })
 }
+// 通过sid查询一条记录(上装配置信息)
+export function fetchBySidByTops(sid) {
+  return request({
+    url: '/base/v1/basevehinstallmodel/fetchDetailsBySid/' + sid,
+    method: 'get'
+  })
+}

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

@@ -0,0 +1,142 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>上装配置信息</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>车辆功能</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.vehicleTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>上装名称</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.installNameValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>委改方式</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refitMethodValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>供应商</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formobj.installNameKey == '08'">
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>冷机型号</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div v-if="formobj.installNameKey != '08'">
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
+              <el-form-item>
+                <div class="addinputInfo addinputwOne">
+                  长<span class="inputStyle">{{ formobj.wk_long }}</span>mm,
+                  宽<span class="inputStyle">{{ formobj.wk_wide }}</span>mm,
+                  高<span class="inputStyle">{{ formobj.wk_high }}</span>mm
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>颜色</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.colorValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>板材材质</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.plateMaterialValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>板材厚度</span></div>
+              <el-form-item>
+                <div class="addinputInfo addinputwOne">
+                  底<span class="inputStyle">{{ formobj.plateThicknessBottom }}</span>mm,
+                  边<span class="inputStyle">{{ formobj.plateThicknessEdge }}</span>mm
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.selfUnHyCoPl }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>底板加热</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>更多配置</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.moreConfig }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchBySidByTops } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'ShangZhuangInfo',
+  data() {
+    return {
+      formobj: {}
+    }
+  },
+  methods: {
+    handleReturn() {
+      this.$emit('doback')
+    },
+    showInfo(row) {
+      fetchBySidByTops(row.sid).then((resp) => {
+        this.formobj = resp.data
+      }).catch((e) => {
+        this.formobj = row
+      })
+      console.log('这里是详情回显', row)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.spanOneWidth {
+  width: 110px !important;
+}
+.addinputwOne {
+  margin-left: 110px !important;
+}
+.inputStyle {
+  display: inline-block;
+  margin: 0 5px;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -120,7 +120,7 @@ const codemenu = [
     children: [{
       path: '/anruifinmanagement/fukuanshenqing',
       component: () => import('@/views/anruifinmanagement/fukuanshenqing/payment.vue'),
-      name: 'fukuanshenqingguaili',
+      name: 'Payment',
       meta: { title: '付款申请管理', noCache: true }
     }]
   },
@@ -293,21 +293,21 @@ const codemenu = [
     path: '/fukuanguanliFlow/fukuanguanli/fukuanEdit',
     component: () =>
       import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue'),
-    name: 'fukuanEdit'
+    name: 'FuKuanEdit'
   },
   // 付款申请管理待办详情
   {
     path: '/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo',
     component: () =>
       import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue'),
-    name: 'fukaunDaiBanInfo'
+    name: 'FuKuanDaiBanInfo'
   },
   // 付款申请管理已办详情
   {
     path: '/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo',
     component: () =>
       import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue'),
-    name: 'fukuanYiBanInfo'
+    name: 'FuKuanYiBanInfo'
   },
   // 开票申请管理编辑
   {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue

@@ -8,9 +8,36 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
-              <el-form-item label="付款状态">
-                <el-select v-model="listQuery.params.state" clearable filterable placeholder="请选择">
-                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.name" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.applyEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+              <el-form-item label="品牌">
+                <el-select v-model="listQuery.params.carBrandSid" filterable placeholder="请选择" clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="款项范围">
+                <el-select v-model="listQuery.params.costRangeKey" clearable filterable placeholder="请选择">
+                  <el-option v-for="item in costRange_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="款项类别">
@@ -18,20 +45,18 @@
                   <el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="款项名称">
-                <el-select v-model="listQuery.params.costTitleKey" clearable filterable placeholder="请选择">
-                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              <el-form-item label="是否涉及车辆">
+                <el-select v-model="listQuery.params.isVeh" clearable filterable placeholder="请选择">
+                  <el-option v-for="item in isVeh_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="收款单位">
-                <el-select v-model="listQuery.params.receiveCompanySid" clearable filterable placeholder="请选择">
-                  <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid"></el-option>
-                </el-select>
+              <el-form-item label="付款单位">
+                <el-input v-model="listQuery.params.payCompany" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请日期">
-                <el-date-picker v-model="listQuery.params.applyStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
-                <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.applyEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+              <el-form-item label="付款状态">
+                <el-select v-model="listQuery.params.state" clearable filterable placeholder="请选择">
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -54,52 +79,34 @@
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center">
+            <el-table-column label="状态" align="center" width="140">
               <template slot-scope="scope">
                 <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="业务编号" align="center">
+            <el-table-column prop="billNo" label="单据编号" align="center" width="170" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="name" label="申请人" align="center" width="100" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="carBrandName" label="品牌" align="center" width="100" />
+            <el-table-column prop="costRangeValue" label="款项范围" align="center" width="120" />
+            <el-table-column prop="costTypeValue" label="款项类别" align="center" width="120" />
+            <el-table-column label="是否涉及车辆" align="center" width="140">
               <template slot-scope="scope">
-                <span>{{ scope.row.busSid }}</span>
+                <span>{{ scope.row.isVeh == '1' ?  '是' : '否' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="款项类别" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.costTypeValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="款项名称" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.costTitleValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="收款单位名称" align="center" width="130">
-              <template slot-scope="scope">
-                <span>{{ scope.row.receiveCompany }}</span>
-              </template>
-            </el-table-column>
-<!--            <el-table-column label="收款账号" align="center" width="130px">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.receiveBankAccount }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column label="金额" align="center" width="130px">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.cost }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-            <el-table-column label="付款状态" align="center" width="130">
+            <el-table-column prop="payCompany" label="付款单位" align="center" width="130" />
+            <el-table-column prop="remarks" label="付款申请备注" align="center" min-width="200" />
+            <el-table-column prop="paymentTotal" label="金额合计" align="center" width="120" />
+            <el-table-column label="付款状态" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.state }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" width="130">
-              <template slot-scope="scope">
-                <span>{{ scope.row.remarks }}</span>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
         <div class="pages">
@@ -121,13 +128,13 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/anruifinmanagement/payment'
-import {typeValues, getOrgSidByPath, selectByOrgSid, selectHaveMessage } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, selectByOrgSid, selectHaveMessage, brandDown } from '@/api/jichuxinxi/dictcommons'
 import paymentAdd from './paymentAdd'
 import paymentInfo from './paymentInfo'
 import { getStorage } from '@/utils/auth'
 
 export default {
-  name: 'fukuanshenqingguaili',
+  name: 'Payment',
   components: {
     Pagination,
     pageye,
@@ -167,16 +174,27 @@ export default {
       receiveCompany_list: [],
       state_list: [
         {
-          dictKey: 1,
+          dictKey: '1',
           dictValue: '未付款'
         },
         {
-          dictKey: 2,
+          dictKey: '2',
           dictValue: '已付款'
         }
       ],
+      isVeh_list: [
+        {
+          dictKey: '0',
+          dictValue: '否'
+        },
+        {
+          dictKey: '1',
+          dictValue: '是'
+        }
+      ],
+      carBrand_list: [],
       costType_list: [],
-      costTitle_list: [],
+      costRange_list: [],
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
       viewState: 1,
@@ -188,13 +206,21 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          applyEndDate: '',
+          useOrgName: '',
+          deptName: '',
+          name: '',
+          billNo: '',
           applyStartDate: '',
-          costTitleKey: '',
-          costTypeKey: '',
-          receiveCompany: '',
+          applyEndDate: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          carBrandSid: '',
+          costRangeKey: '',
+          isVeh: '',
+          payCompany: '',
           state: '',
           userSid: '',
+          menuUrl: '',
           orgPath: ''
         },
         current: 1,
@@ -245,6 +271,11 @@ export default {
     init() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
         if (response.success) {
+          brandDown({ useOrg: response.data }).then((res) => {
+            if (res.success) {
+              this.carBrand_list = res.data
+            }
+          })
           selectByOrgSid({ orgSid: response.data }).then((resp) => {
             if (resp.success) {
               this.receiveCompany_list = resp.data
@@ -252,14 +283,14 @@ export default {
           })
         }
       })
-      typeValues({ type: 'payCostType' }).then((res) => {
+      typeValues({ type: 'paymentCategory' }).then((res) => {
         if (res.success) {
           this.costType_list = res.data
         }
       })
-      typeValues({ type: 'payCostTitle' }).then((res) => {
+      typeValues({ type: 'paymentScope' }).then((res) => {
         if (res.success) {
-          this.costTitle_list = res.data
+          this.costRange_list = res.data
         }
       })
       this.getList()
@@ -309,14 +340,10 @@ export default {
       this.listLoading = true
       this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
-        console.log('列表查询结果：', response)
         this.listLoading = false
-        if (
-          response.success &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -333,13 +360,21 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          applyEndDate: '',
+          useOrgName: '',
+          deptName: '',
+          name: '',
+          billNo: '',
           applyStartDate: '',
-          costTitleKey: '',
-          costTypeKey: '',
-          receiveCompany: '',
+          applyEndDate: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          carBrandSid: '',
+          costRangeKey: '',
+          isVeh: '',
+          payCompany: '',
           state: '',
           userSid: '',
+          menuUrl: '',
           orgPath: ''
         },
         current: 1,
@@ -404,5 +439,6 @@ export default {
   }
 }
 </script>
+
 <style scoped>
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -11,187 +11,193 @@
       </div>
       <div class="listconadd">
         <div class="titwu"><span>付款申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="4" class="tleftb">
-              <span>申请日期</span>
-            </el-col>
             <el-col :span="8">
-              <el-form-item><span>{{ formobj.createTime }}</span></el-form-item>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>申请人</span>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item><span>{{ formobj.name }}</span></el-form-item>
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>款项类别</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
               <el-form-item>
-                <el-select v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
-                  <el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                <el-select class="addinputInfo" v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>款项名称</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">款项范围</div>
               <el-form-item>
-                <el-select v-model="formobj.costTitleValue" clearable filterable @change="changeCostTitle" placeholder="请选择">
-                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                <el-select class="addinputInfo" v-model="formobj.costRangeValue" clearable filterable @change="changeCostRange" placeholder="请选择">
+                  <el-option v-for="item in costRange_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>业务编号</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <el-input v-model="formobj.busSid" class="addinputw" placeholder="" clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-            </el-col>
-            <el-col :span="8">
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>付款单位名称</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">款项类别</div>
               <el-form-item>
-                <el-select v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
-                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                <el-select class="addinputInfo" v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
+                  <el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>收款单位名称</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
               <el-form-item>
-                <el-select v-model="formobj.receiveCompany" filterable placeholder="请选择" @change="changeReceiveCompany" clearable>
-                  <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"/>
-                </el-select>
+                <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>付款备注</span>
-            </el-col>
-            <el-col :span="20">
+            <el-col :span="8">
+              <div class="span-sty">付款单位</div>
               <el-form-item>
-                <el-input v-model="formobj.remarks" placeholder="更多配置" clearable/>
+                <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
+                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>品牌</span>
-            </el-col>
             <el-col :span="8">
+              <div class="span-sty">付款申请备注</div>
               <el-form-item>
-                <el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
-                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
-                </el-select>
+                <el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable/>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>是否涉及车辆</span>
-            </el-col>
             <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
               <el-form-item>
-                <el-radio v-model="formobj.isVeh" label="1">是</el-radio>
-                <el-radio v-model="formobj.isVeh" label="0">否</el-radio>
+                <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
+          <div class="title titleOne">
             <div>付款明细</div>
-            <div>
             <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
           </div>
-          </div>
           <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除
-                </el-button>
+                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
+                <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增付款信息</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="付款方式" align="center">
+            <el-table-column label="款项名称" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
-                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
+                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="厂家回款通路" align="center">
+            <el-table-column label="付款方式" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
-                  <el-option v-for="item in actualPay_list" :key="item.bankAccount" :label="item.actualPay" :value="item.actualPay"/>
+                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
+                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="开户行" align="center">
+            <el-table-column label="厂家回款通路" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.bank }}</span>
+                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
+                  <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
+                </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="收款银行账号" align="center">
+            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+            <el-table-column prop="bank" label="开户行" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.receivingAccount }}</span>
+                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center">
+            <el-table-column label="付款备注" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="UpNumberOne($event, scope.row)" @keydown.native="UpNumberOne($event, scope.row)"></el-input>
+                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="付款备注" align="center">
+            <el-table-column label="关联付款详情" align="center" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
+                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
           </el-table>
-          <div v-show="formobj.isVeh === '1'">
-            <div class="title">
+          <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
+            <div class="title titleOne">
               <div>车辆列表</div>
-              <div>
-                <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleselect()">选择</el-button>
+              <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+                <div style="margin-right: 10px">
+                  <span><span class="icon">*</span>是否已销售：</span>
+                  <el-radio-group v-model="formobj.isSales">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                </div>
+                <div style="margin-right: 10px">
+                  <span><span class="icon">*</span>款项是否已交清：</span>
+                  <el-radio-group v-model="formobj.isSettle">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                </div>
+                <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="toSelect()">选择</el-button>
               </div>
             </div>
             <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-              <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="danger" @click="Delete(scope.$index)">删除
-                  </el-button>
+                  <el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
-              <el-table-column label="车型" align="center">
+              <el-table-column prop="modelName" label="车型" align="center" min-width="180" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="160" />
+              <el-table-column prop="marketSegmentsValue" label="版本" align="center" width="100" />
+              <el-table-column prop="carColor" label="颜色" align="center" width="100" />
+              <el-table-column prop="emissionStandardValue" label="排放" align="center" width="100" />
+              <el-table-column prop="tranCaseTypeValue" label="变速箱" align="center" width="110" />
+              <el-table-column prop="rearAxleValue" label="后桥" align="center" width="100" />
+              <el-table-column prop="libraryAge" label="厂家库龄" align="center" width="120" />
+              <el-table-column prop="orgLibraryAge" label="公司库龄" align="center" width="120" />
+              <el-table-column label="上装名称" align="center" width="130">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.modelName }}</span>
+                  <span class="bluezi" @click="lookTops(scope.row)">{{ scope.row.topName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="车架号" align="center">
+              <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
+              <el-table-column prop="money" label="厂家结算价" align="center" width="130" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.vinNo }}</span>
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家结算价" prop="money" align="center">
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="saleTypeValue" label="销售订单类型" align="center" width="150" />
+              <el-table-column prop="settlementStatusValue" label="买断状态" align="center" width="120" />
+              <el-table-column label="是否申请买断" align="center" width="140">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.money }}</span>
+                  <el-radio-group v-if="scope.row.settlementStatusValue != '已买断'" v-model="scope.row.isSettle">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                  <span v-else>{{ scope.row.isSettle }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -200,95 +206,149 @@
       </div>
     </div>
     <!--End 添加修改部分-->
-    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>
+    <!-- 主车车辆列表选择车辆 -->
+    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState"/>
+    <!-- 付款明细表新增关联付款信息 -->
+    <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
+      <el-form class="formaddcopy02">
+        <div class="title titleOne">
+          <div>关联付款信息列表</div>
+          <el-button type="primary" size="mini" class="btntopblueline" v-show="paymentBtn" @click="paymentAdd">新增</el-button>
+        </div>
+        <el-table :key="paymentKey" :data="paymentInformation.list" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" width="180" align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="danger" v-show="paymentBtn" @click="paymentDelete(scope.$index)">删除</el-button>
+              <el-button size="mini" type="primary" @click="paymentLook(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="costTitleValue" label="款项名称" align="center" width="120" />
+          <el-table-column prop="paymentType" label="付款方式" align="center" width="120" />
+          <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="160" />
+          <el-table-column prop="bank" label="开户行" align="center" width="120" />
+          <el-table-column prop="receivingAccount" label="银行账号" align="center" width="120" />
+          <el-table-column prop="payAccount" label="付款金额" align="center" width="120" />
+          <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+          <el-table-column prop="isPay" label="后期是否有平仓付款" align="center" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.isPay == '1' ? '是' : '否' }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" type="primary" v-show="paymentBtn" @click="paymentSave">保存</el-button>
+        <el-button size="small" @click="paymentClose">关闭</el-button>
+      </div>
+    </el-dialog>
+    <!-- 关联付款信息新增 -->
+    <paymentInformationAdd v-show="viewState == 3" ref="divPaymentInformation" @backInformation="backInformation" @doback="resetStateByInformation" />
+    <!-- 关联付款信息详情 -->
+    <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
+    <!-- 查看上装配置信息 -->
+    <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import {
-  typeValues,
-  getOrgSidByPath,
-  fetchBySid,
-  getGysByOrgSid,
-  getListOrg,
-  brandDown,
-  selectNameByOrg
-} from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, fetchBySid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
+import paymentInformationAdd from './relation/paymentInformationAdd'
+import paymentInformationInfo from './relation/paymentInformationInfo'
+import tops from '@/components/publicPage/tops'
+
 export default {
-  name: 'fukuanshenqingAdd',
+  name: 'PaymentAdd',
   components: {
-    vehcile
+    vehcile,
+    paymentInformationAdd,
+    paymentInformationInfo,
+    tops
   },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
       tableKey: 0,
-      index: 0,
       vehicleKey: 1,
-      viewState: 1,
+      paymentKey: 2,
+      index: 0,
       carBrand_list: [],
+      costRange_list: [],
       costType_list: [],
       costTitle_list: [],
       payCompany_list: [],
-      receiveCompany_list: [],
       payment_list: [],
       actualPay_list: [],
       formobj: {
-        busSid: '',
-        comment: '',
-        costTitleKey: '',
-        costTitleValue: '',
-        costTypeKey: '',
-        costTypeValue: '',
-        createBySid: '',
-        instanceId: '',
-        name: '',
-        payCompany: '',
-        payCompanySid: '',
-        receiveCompany: '',
-        receiveCompanySid: '',
-        remarks: '',
-        sid: '',
-        taskId: '',
-        isVeh: '',
-        carBrandName: '',
-        carBrandSid: '',
-        orgPath: '',
+        billNo: '', // 申请编号
+        name: '', // 申请人姓名
+        deptSid: '', // 申请部门sid
+        deptName: '', // 申请部门名称
+        createTime: '', // 申请日期
+        costRangeKey: '', // 款项范围Key
+        costRangeValue: '', // 款项范围value
+        isLeaderSp: '', // 是否事业部领导审批，1是0否
+        isSales: '', // 是否已销售
+        isSettle: '', // 款项是否已交清
+        costTypeKey: '', // 款项类别key
+        costTypeValue: '', // 款项类别value
+        cost: '', // 金额
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        busSid: '', // 关联业务sid
+        createOrgSid: '', // 创建组织
+        useOrgSid: '', // 使用组织
+        procInstId: '', // 流程实例id
+        taskId: '', // 任务id
+        isVeh: '', // 是否涉及车辆，1是，0否
+        paymentTotal: '', // 付款明细合计
+        carTotal: '', // 车辆金额合计
+        carBrandSid: '', // 品牌sid
+        carBrandName: '', // 品牌名称
+        orgSidPath: '',
         detailsList: [],
         vehicleList: []
       },
       rules: {},
-      submitdisabled: false
+      paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
+      paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
+      paymentInformation: { // 关联付款信息列表
+        index: '',
+        liquidationPayment: '', // 平仓款名称
+        list: []
+      }
     }
   },
   methods: {
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
-      let day = date.getDate() // 日
-      if (month < 10) {
-        month = '0' + month
-      }
-      if (day < 10) {
-        day = '0' + day
-      }
-      this.formobj.createTime = year + '-' + month + '-' + day
-    },
-    UpNumberOne(e, row) {
-      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
-      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-        console.log(e.target.value)
-        e.target.value = parseFloat(e.target.value)
-      }
-      row.payAccount = e.target.value
-    },
-    DataDictionary() {
-      typeValues({ type: 'payCostType' }).then((res) => {
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    init() {
+      typeValues({ type: 'paymentScope' }).then((res) => {
+        if (res.success) {
+          this.costRange_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentCategory' }).then((res) => {
         if (res.success) {
           this.costType_list = res.data
         }
@@ -308,16 +368,11 @@ export default {
           this.payment_list = res.data
         }
       })
-    },
-    getPathSidByUserSid() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
         if (response.success) {
-          getGysByOrgSid({ orgSid: response.data }).then((resp) => {
-            if (resp.success) {
+          this.formobj.createOrgSid = response.data
+          this.formobj.useOrgSid = response.data
           this.formobj.payCompanySid = response.data
-              this.receiveCompany_list = resp.data
-            }
-          })
           fetchBySid(response.data).then((res) => {
             if (res.success) {
               this.formobj.payCompany = res.data.name
@@ -332,19 +387,26 @@ export default {
       })
     },
     showAdd() {
-      this.newDate()
-      this.DataDictionary()
-      this.getPathSidByUserSid()
+      this.init()
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.viewTitle = '【新增】付款申请'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.name = window.sessionStorage.getItem('name')
+      this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.viewTitle = '【新增】付款申请'
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
     },
     showEdit(row) {
-      this.DataDictionary()
+      this.init()
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -363,151 +425,234 @@ export default {
         this.formobj = row
       })
     },
+    changeCarBrand(value) {
+      const choose = this.carBrand_list.filter((item) => item.brandName === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.carBrandSid = choose[0].sid
+        selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+          if (res.success) {
+            this.actualPay_list = res.data
+          }
+        })
+      } else {
+        this.formobj.carBrandSid = ''
+        this.actualPay_list = []
+      }
+    },
+    changeCostRange(value) {
+      const choose = this.costRange_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.costRangeKey = choose[0].dictKey
+      } else {
+        this.formobj.costRangeKey = ''
+      }
+    },
+    changeCostType(value) {
+      const choose = this.costType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.costTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.costTypeKey = ''
+      }
+    },
+    changePayCompany(value) {
+      const choose = this.payCompany_list.filter((item) => item.name === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.payCompanySid = choose[0].sid
+      } else {
+        this.formobj.payCompanySid = ''
+      }
+    },
     handleAdd() {
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
         return
       }
       this.formobj.detailsList.push({
+        costTitleKey: '',
+        costTitleValue: '',
+        paymentType: '',
+        paymentTypeKey: '',
         actualPay: '',
+        receiveCompany: '',
+        receiveCompanySid: '',
         bank: '',
+        receivingAccount: '',
         payAccount: '',
         remarks: '',
-        paymentType: '',
-        paymentTypeKey: '',
-        receivingAccount: ''
+        isPay: '',
+        payAccountTotal: '',
+        finPaymentapplyDetailsBelowList: []
       })
     },
     handleDelete(index) {
       this.formobj.detailsList.splice(index, 1)
     },
-    handleselect() {
+    handleAddPayment(row, index) {
+      if (row.paymentType === '') {
+        this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
+        return
+      }
+      this.paymentVisible = true
+      this.paymentBtn = true
+      this.paymentInformation.index = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    handleLookPayment(row, index) {
+      this.paymentVisible = true
+      this.paymentBtn = false
+      this.paymentInformation.inde = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    paymentAdd() {
+      this.paymentVisible = false
+      this.viewState = 3
+      this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid, this.paymentInformation.liquidationPayment)
+    },
+    backInformation(value) {
+      this.viewState = 1
+      this.paymentVisible = true
+      value = JSON.parse(JSON.stringify(value))
+      this.paymentInformation.list.push({
+        sid: '', // sid
+        costTitleKey: value.costTitleKey, // 款项名称，数据字典
+        costTitleValue: value.costTitleValue, // 款项名称
+        paymentTypeKey: value.paymentTypeKey, // 付款方式key
+        paymentType: value.paymentType, // 付款方式value
+        receiveCompany: value.receiveCompany, // 收款单位名称
+        receiveCompanySid: value.receiveCompanySid, // 收款单位sid
+        bank: value.bank, // 开户行
+        receivingAccount: value.receivingAccount, // 收款银行账号
+        payAccount: value.payAccount, // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: value.isPay, // 后期是否有平仓付款
+        remarks: value.remarks, // 付款备注
+        finPaymentapplyDetailsBelowEveList: value.finPaymentapplyDetailsBelowEveList
+      })
+    },
+    resetStateByInformation() {
+      this.viewState = 1
+      this.paymentVisible = true
+    },
+    paymentDelete(index) {
+      this.paymentInformation.list.splice(index, 1)
+    },
+    paymentLook(row) {
+      this.paymentVisible = false
+      this.viewState = 4
+      this.$refs['divPaymentInformationInfo'].showInfo(row)
+    },
+    paymentSave() {
+      if (this.formobj.detailsList.length > 0) {
+        this.formobj.detailsList[this.paymentInformation.index].finPaymentapplyDetailsBelowList = this.paymentInformation.list
+        this.formobj.detailsList.forEach((e) => {
+          if (e.finPaymentapplyDetailsBelowList.length > 0) {
+            e.finPaymentapplyDetailsBelowList.forEach((k) => {
+              e.payAccountTotal = Math.round((parseFloat(e.payAccountTotal !== '' ? e.payAccountTotal : 0) + parseFloat(k.payAccount !== '' ? k.payAccount : 0)) * 100) / 100
+            })
+          } else {
+            e.payAccountTotal = ''
+          }
+        })
+      }
+      this.paymentClose()
+    },
+    paymentClose() {
+      this.paymentVisible = false
+      this.paymentBtn = false
+      this.paymentInformation = {
+        index: '',
+        liquidationPayment: '',
+        list: []
+      }
+    },
+    toSelect() {
+      if (this.formobj.isSettle !== '' && this.formobj.isSales !== '') {
         this.viewState = 2
-      this.$refs['divVehicle'].showData(this.formobj.vehicleList)
+        this.$refs['divVehicle'].showData(this.formobj.vehicleList, this.formobj.useOrgSid, this.formobj.isSales, this.formobj.isSettle)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '是否已销售和款项是否已交清，请选择是或否' })
+      }
     },
-    Delete(index) {
+    toDelete(index) {
       this.formobj.vehicleList.splice(index, 1)
     },
-    // 车型常用配置列表--新增确定返回的数据
+    // 选择车辆--确定返回的数据
     backData(value) {
       this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
       if (value.length > 0) {
         value.forEach((e) => {
           this.formobj.vehicleList.push({
-            vinNo: e.vinNo,
-            vehiSid: e.vehiSid,
-            modelName: e.modelName,
+            applySid: '',
+            modelName: e.vehicleAlias,
             modelSid: e.modelSid,
+            vinNo: e.vinNo,
+            vehiSid: e.sid,
             money: e.money,
-            configSid: e.configSid
+            configSid: e.configSid,
+            marketSegmentsValue: e.marketSegmentsValue,
+            carColor: e.carColor,
+            emissionStandardValue: e.emissionStandardValue,
+            tranCaseTypeValue: e.tranCaseTypeValue,
+            rearAxleValue: e.rearAxleValue,
+            libraryAge: e.libraryAge,
+            orgLibraryAge: e.orgLibraryAge,
+            topName: e.topName,
+            topSid: e.topSid,
+            insideCode: e.insideCode,
+            contractNo: e.contractNo,
+            saleBillNo: e.saleBillNo,
+            customerName: e.customerName,
+            saleTypeValue: e.saleTypeValue,
+            settlementStatusValue: e.settlementStatusValue,
+            isSettle: e.settlementStatusValue === '已买断' ? '——' : ''
           })
         })
       }
     },
-    changeCarBrand(value) {
-      let bb = null
-      this.carBrand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.carBrandSid = bb.sid
-      selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
-        if (res.success) {
-          this.actualPay_list = res.data
+    lookTops(row) {
+      this.viewState = 5
+      this.$refs['divTops'].showInfo({ sid: row.topSid })
+    },
+    changeCostTitle(value, row) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.costTitleKey = choose[0].dictKey
+      } else {
+        row.costTitleKey = ''
       }
-      })
     },
     changePaymentType(value, row) {
-      let bb = null
-      this.payment_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            value: e.dictValue,
-            key: e.dictKey
-          }
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.paymentTypeKey = choose[0].dictKey
+      } else {
+        row.paymentTypeKey = ''
       }
-      })
-      row.paymentTypeKey = bb.key
     },
     changeActualPay(value, row) {
-      let bb = null
-      this.actualPay_list.forEach((e) => {
-        if (e.actualPay === value) {
-          bb = {
-            actualPay: e.actualPay,
-            bankAccount: e.bankAccount,
-            depositBank: e.depositBank
-          }
-        }
-      })
-      row.actualPay = bb.actualPay
-      row.bank = bb.depositBank
-      row.receivingAccount = bb.bankAccount
-    },
-    changeCostType(value) {
-      let bb = null
-      this.costType_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            key: e.dictKey,
-            value: e.dictValue
-          }
-        }
-      })
-      this.formobj.costTypeKey = bb.key
-    },
-    changeCostTitle(value) {
-      let bb = null
-      this.costTitle_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            key: e.dictKey,
-            value: e.dictValue
-          }
-        }
-      })
-      this.formobj.costTitleKey = bb.key
-    },
-    changePayCompany(value) {
-      let bb = null
-      this.payCompany_list.forEach((e) => {
-        if (e.name === value) {
-          bb = {
-            name: e.name,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.payCompanySid = bb.sid
-    },
-    changeReceiveCompany(value) {
-      let bb = null
-      this.receiveCompany_list.forEach((e) => {
-        if (e.manufacturerName === value) {
-          bb = {
-            manufacturerName: e.manufacturerName,
-            sid: e.sid
-          }
+      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      if (choose.length > 0 && choose !== null) {
+        row.actualPay = choose[0].actualPay
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.actualPay = ''
+        row.bank = ''
+        row.receivingAccount = ''
       }
-      })
-      this.formobj.receiveCompanySid = bb.sid
     },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
-            this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -527,13 +672,8 @@ export default {
         if (valid) {
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj, this.formobj.sid).then((resp) => {
-            this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               this.handleReturn('true')
             }
           }).catch(() => {
@@ -564,7 +704,7 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.payAccountAll = sums[index] += ''
+          this.formobj.paymentTotal = sums[index] += ''
         } else if (column.property === 'money') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
@@ -575,45 +715,61 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.money = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
+          this.formobj.carTotal = sums[index] += ''
         }
       })
       return sums
     },
+    resetState() {
+      this.viewState = 1
+    },
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {}
+      this.submitdisabled = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
-    },
-    closePage() {
-      this.viewState = 1
     }
   }
 }
 </script>
 
 <style scoped>
-.title {
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
+/deep/ .el-form-item__error {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+.titleOne {
   padding: 7px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
 }
+/* 覆盖element-ui的单选按钮样式 */
+/deep/.titleOne .el-radio__input.is-checked .el-radio__inner {
+  border-color: #409EFF; /* 未选中状态下的边框颜色 */
+  background-color: #409EFF; /* 选中后的背景色 */
+}
+/* 如果需要改变选中后对勾的颜色 */
+/deep/.titleOne .el-radio__input.is-checked .el-radio__inner:after {
+  background-color: #000000; /* 对勾的颜色 */
+}
+/deep/.titleOne .el-radio__input.is-checked+.el-radio__label {
+  color: #000000; /* 选中后的字体颜色 */
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@@ -1,179 +1,270 @@
 <template>
   <div class="app-container">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
-      <div>付款详情</div>
+        <div>{{ viewTitle }}</div>
         <div>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
-      <div class="titwu"><span>付款申请</span></div>
-      <el-form ref="dataForm" :model="formobj" class="formadd">
+        <div class="titwu"><span>{{ viewTitle }}</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-          <el-col :span="4" class="tleftb">
-            <span>申请日期</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>申请人</span>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.name }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>款项类别</span>
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTypeValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>款项名称</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTitleValue }}</span></el-form-item>
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>业务编号</span>
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.busSid }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">款项范围</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costRangeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="4" class="tleftb">
+            <el-col :span="6">
+              <div class="span-sty">款项类别</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTypeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">是否涉及车辆</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isVeh == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款单位名称</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.payCompany }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>收款单位名称</span>
+              <div class="span-sty">付款单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.receiveCompany }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款备注</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>品牌</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>是否涉及车辆</span>
+              <div class="span-sty">付款申请备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
+              <div class="span-sty">是否事业部领导审批</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
-        <div class="title">
-          <div>付款明细</div>
-        </div>
+          <div class="title">付款明细</div>
           <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="付款方式" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.paymentType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="厂家回款通路" align="center">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+            <el-table-column prop="bank" label="开户行" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            <el-table-column label="关联付款详情" align="center" width="120">
               <template slot-scope="scope">
-              <span>{{ scope.row.actualPay }}</span>
+                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
               </template>
             </el-table-column>
-          <el-table-column label="开户行" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.bank }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="收款银行账号" align="center">
+            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+          </el-table>
+          <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
+            <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              <div>车辆列表</div>
+              <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+                <div style="margin-right: 10px">
+                  <span>是否已销售：{{ formobj.isSales == '1' ? '是' : '否' }}</span>
+                </div>
+                <div>
+                  <span>款项是否已交清：{{ formobj.isSettle == '1' ? '是' : '否' }}</span>
+                </div>
+              </div>
+            </div>
+            <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="modelName" label="车型" align="center" min-width="180" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="160" />
+              <el-table-column prop="marketSegmentsValue" label="版本" align="center" width="100" />
+              <el-table-column prop="carColor" label="颜色" align="center" width="100" />
+              <el-table-column prop="emissionStandardValue" label="排放" align="center" width="100" />
+              <el-table-column prop="tranCaseTypeValue" label="变速箱" align="center" width="110" />
+              <el-table-column prop="rearAxleValue" label="后桥" align="center" width="100" />
+              <el-table-column prop="libraryAge" label="厂家库龄" align="center" width="120" />
+              <el-table-column prop="orgLibraryAge" label="公司库龄" align="center" width="120" />
+              <el-table-column prop="topName" label="上装名称" align="center" width="130">
                 <template slot-scope="scope">
-              <span>{{ scope.row.receivingAccount }}</span>
+                  <span class="bluezi" @click="lookTops(scope.row)">{{ scope.row.topName }}</span>
                 </template>
               </el-table-column>
-          <el-table-column prop="payAccount" label="付款金额(元)" align="center">
+              <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
+              <el-table-column prop="money" label="厂家结算价" align="center" width="130" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
                 <template slot-scope="scope">
-              <span>{{ scope.row.payAccount }}</span>
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>
                 </template>
               </el-table-column>
-          <el-table-column label="付款备注" align="center">
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="saleTypeValue" label="销售订单类型" align="center" width="150" />
+              <el-table-column prop="settlementStatusValue" label="买断状态" align="center" width="120" />
+              <el-table-column label="是否申请买断" align="center" width="140">
                 <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
+                  <span>{{ scope.row.isSettle == '1' ? '是' : scope.row.isSettle == '0' ? '否' : scope.row.isSettle == '——' ? '——' : '' }}</span>
                 </template>
               </el-table-column>
             </el-table>
-        <div v-show="formobj.isVeh === '1'">
-          <div class="title">
-            <div>车辆列表</div>
           </div>
-          <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+    <!-- 付款明细表新增关联付款信息 -->
+    <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
+      <el-form class="formaddcopy02">
+        <div class="title">关联付款信息列表</div>
+        <el-table :key="paymentKey" :data="paymentInformation.list" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" width="180" align="center">
             <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+              <el-button size="mini" type="primary" @click="paymentLook(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-            <el-table-column label="厂家结算价" prop="money" align="center">
+          <el-table-column prop="costTitleValue" label="款项名称" align="center" width="120" />
+          <el-table-column prop="paymentType" label="付款方式" align="center" width="120" />
+          <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="160" />
+          <el-table-column prop="bank" label="开户行" align="center" width="120" />
+          <el-table-column prop="receivingAccount" label="银行账号" align="center" width="120" />
+          <el-table-column prop="payAccount" label="付款金额" align="center" width="120" />
+          <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+          <el-table-column prop="isPay" label="后期是否有平仓付款" align="center" width="180">
             <template slot-scope="scope">
-                <span>{{ scope.row.money }}</span>
+              <span>{{ scope.row.isPay == '1' ? '是' : '否' }}</span>
             </template>
           </el-table-column>
         </el-table>
-        </div>
       </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" @click="paymentClose">关闭</el-button>
       </div>
+    </el-dialog>
+    <!-- 关联付款信息详情 -->
+    <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
+    <!-- 查看上装配置信息 -->
+    <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
+import paymentInformationInfo from './relation/paymentInformationInfo'
+import tops from '@/components/publicPage/tops'
 
 export default {
-  name: 'fukuanshenqingInfo',
+  name: 'PaymentInfo',
+  components: {
+    paymentInformationInfo,
+    tops
+  },
   data() {
     return {
-      formobj: {},
+      viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       vehicleKey: 1,
-      index: 0
+      paymentKey: 2,
+      index: 0,
+      formobj: {
+        billNo: '', // 申请编号
+        name: '', // 申请人姓名
+        deptSid: '', // 申请部门sid
+        deptName: '', // 申请部门名称
+        createTime: '', // 申请日期
+        costRangeKey: '', // 款项范围Key
+        costRangeValue: '', // 款项范围value
+        isLeaderSp: '', // 是否事业部领导审批，1是0否
+        isSales: '', // 是否已销售
+        isSettle: '', // 款项是否已交清
+        costTypeKey: '', // 款项类别key
+        costTypeValue: '', // 款项类别value
+        cost: '', // 金额
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        busSid: '', // 关联业务sid
+        createOrgSid: '', // 创建组织
+        useOrgSid: '', // 使用组织
+        procInstId: '', // 流程实例id
+        taskId: '', // 任务id
+        isVeh: '', // 是否涉及车辆，1是，0否
+        paymentTotal: '', // 付款明细合计
+        carTotal: '', // 车辆金额合计
+        carBrandSid: '', // 品牌sid
+        carBrandName: '', // 品牌名称
+        orgSidPath: '',
+        detailsList: [],
+        vehicleList: []
+      },
+      rules: {},
+      paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
+      paymentInformation: { // 关联付款信息列表
+        index: '',
+        liquidationPayment: '', // 平仓款名称
+        list: []
+      }
     }
   },
   methods: {
-    handleReturn() {
-      this.formobj = {}
-      this.$emit('doback')
-    },
     showInfo(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '付款申请'
       req.fetchBySid(row.sid).then((resp) => {
+        if (resp.success) {
           this.formobj = resp.data
+          if (this.formobj.vehicleList.length > 0) {
+            for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+              if (this.formobj.vehicleList[i].isSettle === '是') {
+                this.viewTitle = '付款买断申请'
+                return
+              }
+            }
+          }
+        }
       }).catch((e) => {
-        this.formobj = row
+        this.formobj = {}
       })
-      console.log('这里是详情回显', row)
+    },
+    handleLookPayment(row, index) {
+      this.paymentVisible = true
+      this.paymentInformation.inde = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    resetStateByInformation() {
+      this.viewState = 1
+      this.paymentVisible = true
+    },
+    paymentLook(row) {
+      this.paymentVisible = false
+      this.viewState = 4
+      this.$refs['divPaymentInformationInfo'].showInfo(row)
+    },
+    paymentClose() {
+      this.paymentVisible = false
+      this.paymentInformation = {
+        index: '',
+        liquidationPayment: '',
+        list: []
+      }
+    },
+    lookTops(row) {
+      this.viewState = 5
+      this.$refs['divTops'].showInfo({ sid: row.topSid })
     },
     // 合计
     getSummaries(param) {
@@ -195,7 +286,7 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.payAccountAll = sums[index] += ''
+          this.formobj.paymentTotal = sums[index] += ''
         } else if (column.property === 'money') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
@@ -206,29 +297,28 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.money = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
+          this.formobj.carTotal = sums[index] += ''
         }
       })
       return sums
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReturn() {
+      this.formobj = {}
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
     }
   }
 }
 </script>
 
 <style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@@ -0,0 +1,397 @@
+<temp<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>款项名称</div>
+              <el-form-item prop="costTitleValue">
+                <el-select class="addinputInfo" v-model="formobj.costTitleValue" placeholder="请选择" @change="costTitleChange" clearable filterable>
+                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>付款方式</div>
+              <el-form-item prop="paymentType">
+                <el-select class="addinputInfo" v-model="formobj.paymentType" placeholder="请选择" @change="paymentChange" clearable filterable>
+                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>收款单位名称</div>
+              <el-form-item prop="receiveCompany">
+                <el-select class="addinputInfo" v-model="formobj.receiveCompany" placeholder="请选择" @change="receiveCompanyChange" clearable filterable>
+                  <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.companyName" :value="item.companyName"></el-option>
+                </el-select>
+                <el-button style="margin-left: 10px" type="primary" size="mini" @click="receiveCompanyAdd">添加</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">银行账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivingAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">开户行</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bank }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>付款金额</div>
+              <el-form-item prop="payAccount"><el-input class="addinputInfo addinputw" @keyup.native="formobj.payAccount = getNumber(formobj.payAccount, 2)" v-model="formobj.payAccount" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">付款备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>后期是否有平仓付款</div>
+              <el-form-item prop="isPay">
+                <el-radio-group class="addinputInfo" v-model="formobj.isPay">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.isPay == '1'">
+            <div class="title titleOne">
+              <div>平仓信息</div>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="toAdd">添加</el-button>
+            </div>
+            <el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
+              <el-table-column label="期数" align="center">
+                <template slot-scope="scope">
+                  <el-input @keyup.native="scope.row.period = getNumber(scope.row.period, 2)" v-model="scope.row.period" clearable placeholder="" />
+                </template>
+              </el-table-column>
+              <el-table-column label="平仓付款日期" align="center">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="scope.row.exePayDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="平仓付款金额" align="center">
+                <template slot-scope="scope">
+                  <el-input @keyup.native="scope.row.exePayPrice = getNumber(scope.row.exePayPrice, 2)" v-model="scope.row.exePayPrice" clearable placeholder="" />
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.remarks" clearable placeholder="" />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="50%" :show-close="false">
+      <el-form ref="temp_obj" :model="temp" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">单位编码</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.companyCode" clearable  placeholder=""/></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">单位名称</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.companyName" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">开户行</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.bank" clearable  placeholder=""/></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">银行账号</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.receivingAccount" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">业务类型</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="temp.businessTypeValue" placeholder="请选择" @change="businessTypeChange" clearable filterable>
+                <el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.remarks" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+        <el-button size="small" @click="handleClose">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/anruifinmanagement/payment'
+import { typeValues } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PaymentInformationAdd',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      costTitle_list: [],
+      payment_list: [],
+      receiveCompany_list: [],
+      businessType_list: [],
+      liquidationPayment: '', // 平仓款名称
+      formobj: {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      },
+      dialogVisible: false,
+      temp: {
+        companyCode: '', // 单位编码
+        companyName: '', // 单位名称
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        businessTypeKey: '', // 业务类型key
+        businessTypeValue: '', // 业务类型value
+        remarks: '', // 备注
+        useOrgSid: '', // 分公司sid
+        useOrgName: ''
+      },
+      rules: {
+        costTitleValue: [{ required: true, message: '款项名称不能为空', trigger: 'change' }],
+        paymentType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
+        receiveCompany: [{ required: true, message: '收款单位名称不能为空', trigger: 'change' }],
+        payAccount: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }],
+        isPay: [{ required: true, message: '后期是否有平仓付款不能为空', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'payCostTitle' }).then((res) => {
+        if (res.success) {
+          this.costTitle_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentType' }).then((res) => {
+        if (res.success) {
+          this.payment_list = res.data
+        }
+      })
+      typeValues({ type: 'cw_businessType' }).then((res) => {
+        if (res.success) {
+          this.businessType_list = res.data
+        }
+      })
+    },
+    showAdd(useOrgSid, liquidationPayment) {
+      this.viewTitle = '【新增】付款信息'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      this.liquidationPayment = liquidationPayment
+      this.temp.useOrgSid = useOrgSid
+      this.selectByUseOrgSid(useOrgSid)
+    },
+    selectByUseOrgSid(value) {
+      req.selectByUseOrgSid({ useOrgSid: value }).then((res) => {
+        if (res.success) {
+          this.receiveCompany_list = res.data
+        }
+      })
+    },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    costTitleChange(value) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.costTitleKey = choose[0].dictKey
+      } else {
+        this.formobj.costTitleKey = ''
+      }
+    },
+    paymentChange(value) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.paymentTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.paymentTypeKey = ''
+      }
+    },
+    receiveCompanyChange(value) {
+      const choose = this.receiveCompany_list.filter((item) => item.companyName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.receiveCompanySid = choose[0].sid
+        this.formobj.receivingAccount = choose[0].companyName
+        this.formobj.bank = choose[0].bank
+      } else {
+        this.formobj.receiveCompanySid = ''
+        this.formobj.receivingAccount = ''
+        this.formobj.bank = ''
+      }
+    },
+    receiveCompanyAdd() {
+      this.dialogVisible = true
+    },
+    handleSave() {
+      req.paymentSave(this.temp).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.selectByUseOrgSid(this.temp.useOrgSid)
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.temp.companyCode = '' // 单位编码
+      this.temp.companyName = '' // 单位名称
+      this.temp.bank = '' // 开户行
+      this.temp.receivingAccount = '' // 收款银行账号
+      this.temp.businessTypeKey = '' // 业务类型key
+      this.temp.businessTypeValue = '' // 业务类型value
+      this.temp.remarks = '' // 备注
+    },
+    toAdd() {
+      this.formobj.finPaymentapplyDetailsBelowEveList.push({
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: this.liquidationPayment, // 款项名称
+        detailSid: '', // 付款申请明细的明细sid
+        openDate: '', // 融资付款开通日期
+        period: '', // 期数
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        receivingAccount: '', // 收款银行账号
+        actualPay: '', // 厂家销售通路
+        bank: '', // 开户行
+        exePayDate: '', // 平仓付款日期
+        exePayPrice: '', // 平仓付款金额
+        remarks: ''
+      })
+    },
+    toDelete(index) {
+      this.formobj.finPaymentapplyDetailsBelowEveList.splice(index, 1)
+    },
+    businessTypeChange(value) {
+      const choose = this.businessType_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.temp.businessTypeKey = choose[0].dictKey
+      } else {
+        this.temp.businessTypeKey = ''
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.$emit('backInformation', this.formobj)
+          this.handleReturn()
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+/deep/ .el-form-item__error {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue

@@ -0,0 +1,135 @@
+<temp<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="12">
+              <div class="span-sty">款项名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTitleValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentType }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">收款单位名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receiveCompany }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">银行账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivingAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">开户行</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bank }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">付款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">付款备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">后期是否有平仓付款</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isPay == '1' ? '是' : '否' }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.isPay == '1'">
+            <div class="title">平仓信息</div>
+            <el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
+              <el-table-column prop="period" label="期数" align="center" />
+              <el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
+              <el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />
+              <el-table-column prop="remarks" label="备注" align="center" />
+            </el-table>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'PaymentInformationInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '付款信息'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      const value = JSON.parse(JSON.stringify(row))
+      this.formobj = row
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue

@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="颜色" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.color }}</span>
+                <span>{{ scope.row.carColor }}</span>
               </template>
             </el-table-column>
             <el-table-column label="存放地点" align="center">
@@ -109,7 +109,7 @@
             </el-table-column>
             <el-table-column label="厂家结算价" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.money }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -130,7 +130,7 @@ import req from '@/api/anruifinmanagement/payment'
 import { typeValues, brandDown, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
 
 export default {
-  name: 'xianchechaxun',
+  name: 'Vehcile',
   components: {
     Pagination
   },
@@ -149,6 +149,7 @@ export default {
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
+      multipleSelection: [],
       list: [],
       number: '',
       listLoading: false,
@@ -168,7 +169,10 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
+          orgSid: '',
           orderingNo: '',
+          isSales: '',
+          isSettle: '',
           vinSidList: []
         },
         total: 0
@@ -210,37 +214,37 @@ export default {
         }
       })
       typeValues({ type: 'productLine' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.productLine_list = res.data
         }
       })
       typeValues({ type: 'driver' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.driveForm_list = res.data
         }
       })
       typeValues({ type: 'horsepower' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.power_list = res.data
         }
       })
       typeValues({ type: 'vehicleVersion' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.vehicleVersion_list = res.data
         }
       })
       typeValues({ type: 'fuelType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.fuelType_list = res.data
         }
       })
       typeValues({ type: 'gearbox' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.gearboxType_list = res.data
         }
       })
       typeValues({ type: 'emissionStandard' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.emissionStandard_list = res.data
         }
       })
@@ -292,21 +296,9 @@ export default {
       this.getList()
     },
     handleSelectionChange(row) {
-      this.sids = []
-      const aa = []
-      row.forEach((element) => {
-        aa.push({
-          vinNo: element.vinNo,
-          vehiSid: element.sid,
-          modelName: element.vehicleAlias,
-          modelSid: element.modelSid,
-          money: element.priced,
-          configSid: element.configSid
-        })
-      })
-      this.sids = aa
+      this.multipleSelection = row
     },
-    showData(value) {
+    showData(value, useOrgSid, isSales, isSettle) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -316,19 +308,17 @@ export default {
       } else {
         this.listQuery.params.vinSidList = []
       }
+      this.listQuery.params.isSales = isSales
+      this.listQuery.params.isSettle = isSettle
+      this.listQuery.params.orgSid = useOrgSid
       this.init()
     },
     // 添加修改返回
     AddUpdateReturn() {
-      if (this.sids.length > 0) {
-        this.$emit('backData', this.sids)
+      if (this.multipleSelection.length > 0) {
+        this.$emit('backData', this.multipleSelection)
       } else {
-        this.$notify({
-          title: '提示',
-          message: '请选择至少一条车型记录!',
-          type: 'error',
-          duration: 2000
-        })
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
       }
     }
   }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
-      <div>付款详情</div>
+        <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
           <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
@@ -9,145 +10,153 @@
         </div>
       </div>
       <div class="">
-      <div class="titwu"><span>付款申请</span></div>
-      <el-form ref="dataForm" :model="formobj" class="formadd">
+        <div class="titwu"><span>{{ viewTitle }}</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-          <el-col :span="4" class="tleftb">
-            <span>申请日期</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>申请人</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.name }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>款项类别</span>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTypeValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>款项名称</span>
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTitleValue }}</span></el-form-item>
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>业务编号</span>
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.busSid }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">款项范围</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costRangeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="4" class="tleftb">
+            <el-col :span="6">
+              <div class="span-sty">款项类别</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTypeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">是否涉及车辆</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isVeh == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款单位名称</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.payCompany }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>收款单位名称</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.receiveCompany }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款备注</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>品牌</span>
+              <div class="span-sty">付款单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>是否涉及车辆</span>
+              <div class="span-sty">付款申请备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
+              <div class="span-sty">是否事业部领导审批</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
-        <div class="title">
-          <div>付款明细</div>
-        </div>
+          <div class="title">付款明细</div>
           <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="付款方式" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.paymentType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="厂家回款通路" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.actualPay }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开户行" align="center">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+            <el-table-column prop="bank" label="开户行" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            <el-table-column label="关联付款详情" align="center" width="120">
               <template slot-scope="scope">
-              <span>{{ scope.row.bank }}</span>
+                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
               </template>
             </el-table-column>
-          <el-table-column label="收款银行账号" align="center">
+            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+          </el-table>
+          <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
+            <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              <div>车辆列表</div>
+              <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+                <div style="margin-right: 10px">
+                  <span>是否已销售：{{ formobj.isSales == '1' ? '是' : '否' }}</span>
+                </div>
+                <div>
+                  <span>款项是否已交清：{{ formobj.isSettle == '1' ? '是' : '否' }}</span>
+                </div>
+              </div>
+            </div>
+            <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="modelName" label="车型" align="center" min-width="180" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="160" />
+              <el-table-column prop="marketSegmentsValue" label="版本" align="center" width="100" />
+              <el-table-column prop="carColor" label="颜色" align="center" width="100" />
+              <el-table-column prop="emissionStandardValue" label="排放" align="center" width="100" />
+              <el-table-column prop="tranCaseTypeValue" label="变速箱" align="center" width="110" />
+              <el-table-column prop="rearAxleValue" label="后桥" align="center" width="100" />
+              <el-table-column prop="libraryAge" label="厂家库龄" align="center" width="120" />
+              <el-table-column prop="orgLibraryAge" label="公司库龄" align="center" width="120" />
+              <el-table-column prop="topName" label="上装名称" align="center" width="130">
                 <template slot-scope="scope">
-              <span>{{ scope.row.receivingAccount }}</span>
+                  <span class="bluezi" @click="lookTops(scope.row)">{{ scope.row.topName }}</span>
                 </template>
               </el-table-column>
-          <el-table-column prop="payAccount" label="付款金额(元)" align="center">
+              <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
+              <el-table-column prop="money" label="厂家结算价" align="center" width="130" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
                 <template slot-scope="scope">
-              <span>{{ scope.row.payAccount }}</span>
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>
                 </template>
               </el-table-column>
-          <el-table-column label="付款备注" align="center">
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="saleTypeValue" label="销售订单类型" align="center" width="150" />
+              <el-table-column prop="settlementStatusValue" label="买断状态" align="center" width="120" />
+              <el-table-column label="是否申请买断" align="center" width="140">
                 <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
+                  <span>{{ scope.row.isSettle == '1' ? '是' : scope.row.isSettle == '0' ? '否' : scope.row.isSettle == '——' ? '——' : '' }}</span>
                 </template>
               </el-table-column>
             </el-table>
-        <div v-show="formobj.isVeh === '1'">
-          <div class="title">
-            <div>车辆列表</div>
           </div>
-          <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
+        </el-form>
+      </div>
+    </div>
+    <!-- 付款明细表新增关联付款信息 -->
+    <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
+      <el-form class="formaddcopy02">
+        <div class="title">关联付款信息列表</div>
+        <el-table :key="paymentKey" :data="paymentInformation.list" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" width="180" align="center">
             <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+              <el-button size="mini" type="primary" @click="paymentLook(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-            <el-table-column label="厂家结算价" prop="money" align="center">
+          <el-table-column prop="costTitleValue" label="款项名称" align="center" width="120" />
+          <el-table-column prop="paymentType" label="付款方式" align="center" width="120" />
+          <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="160" />
+          <el-table-column prop="bank" label="开户行" align="center" width="120" />
+          <el-table-column prop="receivingAccount" label="银行账号" align="center" width="120" />
+          <el-table-column prop="payAccount" label="付款金额" align="center" width="120" />
+          <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+          <el-table-column prop="isPay" label="后期是否有平仓付款" align="center" width="180">
             <template slot-scope="scope">
-                <span>{{ scope.row.money }}</span>
+              <span>{{ scope.row.isPay == '1' ? '是' : '否' }}</span>
             </template>
           </el-table-column>
         </el-table>
-        </div>
       </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" @click="paymentClose">关闭</el-button>
       </div>
+    </el-dialog>
+    <!-- 关联付款信息详情 -->
+    <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
+    <!-- 查看上装配置信息 -->
+    <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
       <el-form label-position="right" class="formadd" >
@@ -176,15 +185,60 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
+import paymentInformationInfo from './relation/paymentInformationInfo'
+import tops from '@/components/publicPage/tops'
 
 export default {
-  name: 'fukuanDaiBanInfo',
+  name: 'FuKuanDaiBanInfo',
+  components: {
+    paymentInformationInfo,
+    tops
+  },
   data() {
     return {
-      formobj: {},
+      viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       vehicleKey: 1,
+      paymentKey: 2,
       index: 0,
+      formobj: {
+        billNo: '', // 申请编号
+        name: '', // 申请人姓名
+        deptSid: '', // 申请部门sid
+        deptName: '', // 申请部门名称
+        createTime: '', // 申请日期
+        costRangeKey: '', // 款项范围Key
+        costRangeValue: '', // 款项范围value
+        isLeaderSp: '', // 是否事业部领导审批，1是0否
+        isSales: '', // 是否已销售
+        isSettle: '', // 款项是否已交清
+        costTypeKey: '', // 款项类别key
+        costTypeValue: '', // 款项类别value
+        cost: '', // 金额
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        busSid: '', // 关联业务sid
+        createOrgSid: '', // 创建组织
+        useOrgSid: '', // 使用组织
+        procInstId: '', // 流程实例id
+        taskId: '', // 任务id
+        isVeh: '', // 是否涉及车辆，1是，0否
+        paymentTotal: '', // 付款明细合计
+        carTotal: '', // 车辆金额合计
+        carBrandSid: '', // 品牌sid
+        carBrandName: '', // 品牌名称
+        orgSidPath: '',
+        detailsList: [],
+        vehicleList: []
+      },
+      rules: {},
+      paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
+      paymentInformation: { // 关联付款信息列表
+        index: '',
+        liquidationPayment: '', // 平仓款名称
+        list: []
+      },
       dialogList: {
         comment: ''
       },
@@ -242,12 +296,53 @@ export default {
       this.$emit('doback')
     },
     showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '付款申请'
       req.fetchBySid(sid).then((resp) => {
+        if (resp.success) {
           this.formobj = resp.data
+          if (this.formobj.vehicleList.length > 0) {
+            for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+              if (this.formobj.vehicleList[i].isSettle === '是') {
+                this.viewTitle = '付款买断申请'
+                return
+              }
+            }
+          }
+        }
       }).catch((e) => {
         this.formobj = {}
       })
     },
+    handleLookPayment(row, index) {
+      this.paymentVisible = true
+      this.paymentInformation.inde = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    resetStateByInformation() {
+      this.viewState = 1
+      this.paymentVisible = true
+    },
+    paymentLook(row) {
+      this.paymentVisible = false
+      this.viewState = 4
+      this.$refs['divPaymentInformationInfo'].showInfo(row)
+    },
+    paymentClose() {
+      this.paymentVisible = false
+      this.paymentInformation = {
+        index: '',
+        liquidationPayment: '',
+        list: []
+      }
+    },
+    lookTops(row) {
+      this.viewState = 5
+      this.$refs['divTops'].showInfo({ sid: row.topSid })
+    },
     // 合计
     getSummaries(param) {
       const { columns, data } = param
@@ -268,7 +363,7 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.payAccountAll = sums[index] += ''
+          this.formobj.paymentTotal = sums[index] += ''
         } else if (column.property === 'money') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
@@ -279,26 +374,14 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.money = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
+          this.formobj.carTotal = sums[index] += ''
         }
       })
       return sums
     },
+    resetState() {
+      this.viewState = 1
+    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -434,4 +517,10 @@ export default {
 .rowClass {
   border-top: 1px solid #e0e3eb;
 }
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -10,187 +10,193 @@
       </div>
       <div class="">
         <div class="titwu"><span>付款申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="4" class="tleftb">
-              <span>申请日期</span>
-            </el-col>
             <el-col :span="8">
-              <el-form-item><span>{{ formobj.createTime }}</span></el-form-item>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>申请人</span>
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item><span>{{ formobj.name }}</span></el-form-item>
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>款项类别</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
               <el-form-item>
-                <el-select v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
-                  <el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                <el-select class="addinputInfo" v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>款项名称</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">款项范围</div>
               <el-form-item>
-                <el-select v-model="formobj.costTitleValue" clearable filterable @change="changeCostTitle" placeholder="请选择">
-                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                <el-select class="addinputInfo" v-model="formobj.costRangeValue" clearable filterable @change="changeCostRange" placeholder="请选择">
+                  <el-option v-for="item in costRange_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>业务编号</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">款项类别</div>
               <el-form-item>
-                <el-input v-model="formobj.busSid" class="addinputw" placeholder="" clearable/>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="tleftb">
-            </el-col>
-            <el-col :span="8">
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>付款单位名称</span>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <el-select v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
-                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                <el-select class="addinputInfo" v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
+                  <el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span>收款单位名称</span>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
               <el-form-item>
-                <el-select v-model="formobj.receiveCompany" filterable placeholder="请选择" @change="changeReceiveCompany" clearable>
-                  <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"/>
-                </el-select>
+                <el-radio-group class="addinputInfo" v-model="formobj.isVeh">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>付款备注</span>
-            </el-col>
-            <el-col :span="20">
+            <el-col :span="8">
+              <div class="span-sty">付款单位</div>
               <el-form-item>
-                <el-input v-model="formobj.remarks" placeholder="更多配置" clearable/>
+                <el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
+                  <el-option v-for="item in payCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+                </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="4" class="tleftb">
-              <span>品牌</span>
-            </el-col>
             <el-col :span="8">
+              <div class="span-sty">付款申请备注</div>
               <el-form-item>
-                <el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
-                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
-                </el-select>
+                <el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable/>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>是否涉及车辆</span>
-            </el-col>
             <el-col :span="8">
+              <div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
               <el-form-item>
-                <el-radio v-model="formobj.isVeh" label="1">是</el-radio>
-                <el-radio v-model="formobj.isVeh" label="0">否</el-radio>
+                <el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
-          <div class="title">
+          <div class="title titleOne">
             <div>付款明细</div>
-            <div>
             <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleAdd()">添加</el-button>
           </div>
-          </div>
           <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除
-                </el-button>
+                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除</el-button>
+                <el-button size="mini" type="primary" @click="handleAddPayment(scope.row, scope.$index)">新增付款信息</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="付款方式" align="center">
+            <el-table-column label="款项名称" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
-                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                <el-select v-model="scope.row.costTitleValue" clearable filterable @change="changeCostTitle($event, scope.row)" placeholder="请选择">
+                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="厂家销售通路" align="center">
+            <el-table-column label="付款方式" align="center" width="200">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
-                  <el-option v-for="item in actualPay_list" :key="item.bankAccount" :label="item.actualPay" :value="item.actualPay"/>
+                <el-select v-model="scope.row.paymentType" placeholder="请选择" filterable @change="changePaymentType($event, scope.row)">
+                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="开户行" align="center">
+            <el-table-column label="厂家回款通路" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.bank }}</span>
+                <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
+                  <el-option v-for="item in actualPay_list" :key="item.actualPaySid" :label="item.actualPay" :value="item.actualPay"/>
+                </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="收款银行账号" align="center">
+            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+            <el-table-column prop="bank" label="开户行" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.receivingAccount }}</span>
+                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)" @keydown.native="scope.row.payAccount = getNumber(scope.row.payAccount, 2)"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="payAccount" label="付款金额(元)" align="center">
+            <el-table-column label="付款备注" align="center" min-width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.payAccount" placeholder="" clearable @keyup.native="UpNumberOne($event, scope.row)" @keydown.native="UpNumberOne($event, scope.row)"></el-input>
+                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="付款备注" align="center">
+            <el-table-column label="关联付款详情" align="center" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
+                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
           </el-table>
-          <div v-show="formobj.isVeh === '1'">
-            <div class="title">
+          <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
+            <div class="title titleOne">
               <div>车辆列表</div>
-              <div>
-                <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="handleselect()">选择</el-button>
+              <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+                <div style="margin-right: 10px">
+                  <span><span class="icon">*</span>是否已销售：</span>
+                  <el-radio-group v-model="formobj.isSales">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                </div>
+                <div style="margin-right: 10px">
+                  <span><span class="icon">*</span>款项是否已交清：</span>
+                  <el-radio-group v-model="formobj.isSettle">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                </div>
+                <el-button type="primary" size="mini" icon="el-icon-plus" class="btntopblueline" @click="toSelect()">选择</el-button>
               </div>
             </div>
             <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-              <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="danger" @click="Delete(scope.$index)">删除
-                  </el-button>
+                  <el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
-              <el-table-column label="车型" align="center">
+              <el-table-column prop="modelName" label="车型" align="center" min-width="180" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="160" />
+              <el-table-column prop="marketSegmentsValue" label="版本" align="center" width="100" />
+              <el-table-column prop="carColor" label="颜色" align="center" width="100" />
+              <el-table-column prop="emissionStandardValue" label="排放" align="center" width="100" />
+              <el-table-column prop="tranCaseTypeValue" label="变速箱" align="center" width="110" />
+              <el-table-column prop="rearAxleValue" label="后桥" align="center" width="100" />
+              <el-table-column prop="libraryAge" label="厂家库龄" align="center" width="120" />
+              <el-table-column prop="orgLibraryAge" label="公司库龄" align="center" width="120" />
+              <el-table-column label="上装名称" align="center" width="130">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.modelName }}</span>
+                  <span class="bluezi" @click="lookTops(scope.row)">{{ scope.row.topName }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="车架号" align="center">
+              <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
+              <el-table-column prop="money" label="厂家结算价" align="center" width="130" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.vinNo }}</span>
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="厂家结算价" prop="money" align="center">
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="saleTypeValue" label="销售订单类型" align="center" width="150" />
+              <el-table-column prop="settlementStatusValue" label="买断状态" align="center" width="120" />
+              <el-table-column label="是否申请买断" align="center" width="140">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.money }}</span>
+                  <el-radio-group v-if="scope.row.settlementStatusValue != '已买断'" v-model="scope.row.isSettle">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                  <span v-else>{{ scope.row.isSettle }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -199,59 +205,121 @@
       </div>
     </div>
     <!--End 添加修改部分-->
-    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>
+    <!-- 主车车辆列表选择车辆 -->
+    <vehcile v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="resetState"/>
+    <!-- 付款明细表新增关联付款信息 -->
+    <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
+      <el-form class="formaddcopy02">
+        <div class="title titleOne">
+          <div>关联付款信息列表</div>
+          <el-button type="primary" size="mini" class="btntopblueline" v-show="paymentBtn" @click="paymentAdd">新增</el-button>
+        </div>
+        <el-table :key="paymentKey" :data="paymentInformation.list" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" width="180" align="center">
+            <template slot-scope="scope">
+              <el-button size="mini" type="danger" v-show="paymentBtn" @click="paymentDelete(scope.$index)">删除</el-button>
+              <el-button size="mini" type="primary" @click="paymentLook(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="costTitleValue" label="款项名称" align="center" width="120" />
+          <el-table-column prop="paymentType" label="付款方式" align="center" width="120" />
+          <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="160" />
+          <el-table-column prop="bank" label="开户行" align="center" width="120" />
+          <el-table-column prop="receivingAccount" label="银行账号" align="center" width="120" />
+          <el-table-column prop="payAccount" label="付款金额" align="center" width="120" />
+          <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+          <el-table-column prop="isPay" label="后期是否有平仓付款" align="center" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.isPay == '1' ? '是' : '否' }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" type="primary" v-show="paymentBtn" @click="paymentSave">保存</el-button>
+        <el-button size="small" @click="paymentClose">关闭</el-button>
+      </div>
+    </el-dialog>
+    <!-- 关联付款信息新增 -->
+    <paymentInformationAdd v-show="viewState == 3" ref="divPaymentInformation" @backInformation="backInformation" @doback="resetStateByInformation" />
+    <!-- 关联付款信息详情 -->
+    <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
+    <!-- 查看上装配置信息 -->
+    <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getOrgSidByPath, fetchBySid, getGysByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
+import paymentInformationAdd from './relation/paymentInformationAdd'
+import paymentInformationInfo from './relation/paymentInformationInfo'
+import tops from '@/views/workFlow/publicPage/tops'
+
 export default {
-  name: 'fukuanEdit',
+  name: 'FuKuanEdit',
   components: {
-    vehcile
+    vehcile,
+    paymentInformationAdd,
+    paymentInformationInfo,
+    tops
   },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
       tableKey: 0,
-      index: 0,
       vehicleKey: 1,
-      viewState: 1,
+      paymentKey: 2,
+      index: 0,
       carBrand_list: [],
+      costRange_list: [],
       costType_list: [],
       costTitle_list: [],
       payCompany_list: [],
-      receiveCompany_list: [],
       payment_list: [],
       actualPay_list: [],
       formobj: {
-        busSid: '',
-        comment: '',
-        costTitleKey: '',
-        costTitleValue: '',
-        costTypeKey: '',
-        costTypeValue: '',
-        createBySid: '',
-        instanceId: '',
-        name: '',
-        payCompany: '',
-        payCompanySid: '',
-        receiveCompany: '',
-        receiveCompanySid: '',
-        remarks: '',
-        sid: '',
-        taskId: '',
-        isVeh: '',
-        carBrandName: '',
-        carBrandSid: '',
-        orgPath: '',
+        billNo: '', // 申请编号
+        name: '', // 申请人姓名
+        deptSid: '', // 申请部门sid
+        deptName: '', // 申请部门名称
+        createTime: '', // 申请日期
+        costRangeKey: '', // 款项范围Key
+        costRangeValue: '', // 款项范围value
+        isLeaderSp: '', // 是否事业部领导审批，1是0否
+        isSales: '', // 是否已销售
+        isSettle: '', // 款项是否已交清
+        costTypeKey: '', // 款项类别key
+        costTypeValue: '', // 款项类别value
+        cost: '', // 金额
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        busSid: '', // 关联业务sid
+        createOrgSid: '', // 创建组织
+        useOrgSid: '', // 使用组织
+        procInstId: '', // 流程实例id
+        taskId: '', // 任务id
+        isVeh: '', // 是否涉及车辆，1是，0否
+        paymentTotal: '', // 付款明细合计
+        carTotal: '', // 车辆金额合计
+        carBrandSid: '', // 品牌sid
+        carBrandName: '', // 品牌名称
+        orgSidPath: '',
         detailsList: [],
         vehicleList: []
       },
       rules: {},
-      submitdisabled: false
+      paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
+      paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
+      paymentInformation: { // 关联付款信息列表
+        index: '',
+        liquidationPayment: '', // 平仓款名称
+        list: []
+      }
     }
   },
   created() {
@@ -272,18 +340,31 @@ export default {
     }, '*')
   },
   methods: {
-    UpNumberOne(e, row) {
-      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
-      if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
-        // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
-        console.log(e.target.value)
-        e.target.value = parseFloat(e.target.value)
-      }
-      row.payAccount = e.target.value
-    },
-    DataDictionary() {
-      typeValues({ type: 'payCostType' }).then((res) => {
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    init() {
+      typeValues({ type: 'paymentScope' }).then((res) => {
+        if (res.success) {
+          this.costRange_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentCategory' }).then((res) => {
         if (res.success) {
           this.costType_list = res.data
         }
@@ -304,30 +385,8 @@ export default {
         }
       })
     },
-    getPathSidByUserSid() {
-      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
-        if (response.success) {
-          getGysByOrgSid({ orgSid: response.data }).then((resp) => {
-            if (resp.success) {
-              this.formobj.payCompanySid = response.data
-              this.receiveCompany_list = resp.data
-            }
-          })
-          fetchBySid(response.data).then((res) => {
-            if (res.success) {
-              this.formobj.payCompany = res.data.name
-            }
-          })
-          brandDown({ useOrg: response.data }).then((res) => {
-            if (res.success) {
-              this.carBrand_list = res.data
-            }
-          })
-        }
-      })
-    },
     showInfo(sid) {
-      this.DataDictionary()
+      this.init()
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -341,156 +400,244 @@ export default {
               this.actualPay_list = res.data
             }
           })
+          brandDown({ useOrg: this.formobj.useOrgSid }).then((res) => {
+            if (res.success) {
+              this.carBrand_list = res.data
+            }
+          })
         }
       }).catch((e) => {
         this.formobj = {}
       })
     },
+    changeCarBrand(value) {
+      const choose = this.carBrand_list.filter((item) => item.brandName === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.carBrandSid = choose[0].sid
+        selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
+          if (res.success) {
+            this.actualPay_list = res.data
+          }
+        })
+      } else {
+        this.formobj.carBrandSid = ''
+        this.actualPay_list = []
+      }
+    },
+    changeCostRange(value) {
+      const choose = this.costRange_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.costRangeKey = choose[0].dictKey
+      } else {
+        this.formobj.costRangeKey = ''
+      }
+    },
+    changeCostType(value) {
+      const choose = this.costType_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.costTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.costTypeKey = ''
+      }
+    },
+    changePayCompany(value) {
+      const choose = this.payCompany_list.filter((item) => item.name === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.payCompanySid = choose[0].sid
+      } else {
+        this.formobj.payCompanySid = ''
+      }
+    },
     handleAdd() {
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
         return
       }
       this.formobj.detailsList.push({
+        costTitleKey: '',
+        costTitleValue: '',
+        paymentType: '',
+        paymentTypeKey: '',
         actualPay: '',
+        receiveCompany: '',
+        receiveCompanySid: '',
         bank: '',
+        receivingAccount: '',
         payAccount: '',
         remarks: '',
-        paymentType: '',
-        paymentTypeKey: '',
-        receivingAccount: ''
+        isPay: '',
+        payAccountTotal: '',
+        finPaymentapplyDetailsBelowList: []
       })
     },
     handleDelete(index) {
       this.formobj.detailsList.splice(index, 1)
     },
-    handleselect() {
+    handleAddPayment(row, index) {
+      if (row.paymentType === '') {
+        this.$message({ showClose: true, type: 'error', message: '付款方式不能为空' })
+        return
+      }
+      this.paymentVisible = true
+      this.paymentBtn = true
+      this.paymentInformation.index = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    handleLookPayment(row, index) {
+      this.paymentVisible = true
+      this.paymentBtn = false
+      this.paymentInformation.inde = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    paymentAdd() {
+      this.paymentVisible = false
+      this.viewState = 3
+      this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid, this.paymentInformation.liquidationPayment)
+    },
+    backInformation(value) {
+      this.viewState = 1
+      this.paymentVisible = true
+      value = JSON.parse(JSON.stringify(value))
+      this.paymentInformation.list.push({
+        sid: '', // sid
+        costTitleKey: value.costTitleKey, // 款项名称，数据字典
+        costTitleValue: value.costTitleValue, // 款项名称
+        paymentTypeKey: value.paymentTypeKey, // 付款方式key
+        paymentType: value.paymentType, // 付款方式value
+        receiveCompany: value.receiveCompany, // 收款单位名称
+        receiveCompanySid: value.receiveCompanySid, // 收款单位sid
+        bank: value.bank, // 开户行
+        receivingAccount: value.receivingAccount, // 收款银行账号
+        payAccount: value.payAccount, // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: value.isPay, // 后期是否有平仓付款
+        remarks: value.remarks, // 付款备注
+        finPaymentapplyDetailsBelowEveList: value.finPaymentapplyDetailsBelowEveList
+      })
+    },
+    resetStateByInformation() {
+      this.viewState = 1
+      this.paymentVisible = true
+    },
+    paymentDelete(index) {
+      this.paymentInformation.list.splice(index, 1)
+    },
+    paymentLook(row) {
+      this.paymentVisible = false
+      this.viewState = 4
+      this.$refs['divPaymentInformationInfo'].showInfo(row)
+    },
+    paymentSave() {
+      if (this.formobj.detailsList.length > 0) {
+        this.formobj.detailsList[this.paymentInformation.index].finPaymentapplyDetailsBelowList = this.paymentInformation.list
+        this.formobj.detailsList.forEach((e) => {
+          if (e.finPaymentapplyDetailsBelowList.length > 0) {
+            e.finPaymentapplyDetailsBelowList.forEach((k) => {
+              e.payAccountTotal = Math.round((parseFloat(e.payAccountTotal !== '' ? e.payAccountTotal : 0) + parseFloat(k.payAccount !== '' ? k.payAccount : 0)) * 100) / 100
+            })
+          } else {
+            e.payAccountTotal = ''
+          }
+        })
+      }
+      this.paymentClose()
+    },
+    paymentClose() {
+      this.paymentVisible = false
+      this.paymentBtn = false
+      this.paymentInformation = {
+        index: '',
+        liquidationPayment: '',
+        list: []
+      }
+    },
+    toSelect() {
+      if (this.formobj.isSettle !== '' && this.formobj.isSales !== '') {
         this.viewState = 2
-      this.$refs['divVehicle'].showData(this.formobj.vehicleList)
+        this.$refs['divVehicle'].showData(this.formobj.vehicleList, this.formobj.useOrgSid, this.formobj.isSales, this.formobj.isSettle)
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '是否已销售和款项是否已交清，请选择是或否' })
+      }
     },
-    Delete(index) {
+    toDelete(index) {
       this.formobj.vehicleList.splice(index, 1)
     },
-    // 车型常用配置列表--新增确定返回的数据
+    // 选择车辆--确定返回的数据
     backData(value) {
       this.viewState = 1
+      value = JSON.parse(JSON.stringify(value))
       if (value.length > 0) {
         value.forEach((e) => {
           this.formobj.vehicleList.push({
-            vinNo: e.vinNo,
-            vehiSid: e.vehiSid,
-            modelName: e.modelName,
+            applySid: '',
+            modelName: e.vehicleAlias,
             modelSid: e.modelSid,
+            vinNo: e.vinNo,
+            vehiSid: e.sid,
             money: e.money,
-            configSid: e.configSid
+            configSid: e.configSid,
+            marketSegmentsValue: e.marketSegmentsValue,
+            carColor: e.carColor,
+            emissionStandardValue: e.emissionStandardValue,
+            tranCaseTypeValue: e.tranCaseTypeValue,
+            rearAxleValue: e.rearAxleValue,
+            libraryAge: e.libraryAge,
+            orgLibraryAge: e.orgLibraryAge,
+            topName: e.topName,
+            topSid: e.topSid,
+            insideCode: e.insideCode,
+            contractNo: e.contractNo,
+            saleBillNo: e.saleBillNo,
+            customerName: e.customerName,
+            saleTypeValue: e.saleTypeValue,
+            settlementStatusValue: e.settlementStatusValue,
+            isSettle: e.settlementStatusValue === '已买断' ? '——' : ''
           })
         })
       }
     },
-    changeCarBrand(value) {
-      let bb = null
-      this.carBrand_list.forEach((e) => {
-        if (e.brandName === value) {
-          bb = {
-            name: e.brandName,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.carBrandSid = bb.sid
-      selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
-        if (res.success) {
-          this.actualPay_list = res.data
+    lookTops(row) {
+      this.viewState = 5
+      this.$refs['divTops'].showInfo({ sid: row.topSid })
+    },
+    changeCostTitle(value, row) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.costTitleKey = choose[0].dictKey
+      } else {
+        row.costTitleKey = ''
       }
-      })
     },
     changePaymentType(value, row) {
-      let bb = null
-      this.payment_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            value: e.dictValue,
-            key: e.dictKey
-          }
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.paymentTypeKey = choose[0].dictKey
+      } else {
+        row.paymentTypeKey = ''
       }
-      })
-      row.paymentTypeKey = bb.key
     },
     changeActualPay(value, row) {
-      let bb = null
-      this.actualPay_list.forEach((e) => {
-        if (e.actualPay === value) {
-          bb = {
-            actualPay: e.actualPay,
-            bankAccount: e.bankAccount,
-            depositBank: e.depositBank
-          }
-        }
-      })
-      row.actualPay = bb.actualPay
-      row.bank = bb.depositBank
-      row.receivingAccount = bb.bankAccount
-    },
-    changeCostType(value) {
-      let bb = null
-      this.costType_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            key: e.dictKey,
-            value: e.dictValue
-          }
-        }
-      })
-      this.formobj.costTypeKey = bb.key
-    },
-    changeCostTitle(value) {
-      let bb = null
-      this.costTitle_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            key: e.dictKey,
-            value: e.dictValue
-          }
-        }
-      })
-      this.formobj.costTitleKey = bb.key
-    },
-    changePayCompany(value) {
-      let bb = null
-      this.payCompany_list.forEach((e) => {
-        if (e.name === value) {
-          bb = {
-            name: e.name,
-            sid: e.sid
-          }
-        }
-      })
-      this.formobj.payCompanySid = bb.sid
-    },
-    changeReceiveCompany(value) {
-      let bb = null
-      this.receiveCompany_list.forEach((e) => {
-        if (e.manufacturerName === value) {
-          bb = {
-            manufacturerName: e.manufacturerName,
-            sid: e.sid
-          }
+      const choose = this.actualPay_list.filter((item) => item.actualPay === value)
+      if (choose.length > 0 && choose !== null) {
+        row.actualPay = choose[0].actualPay
+        row.receiveCompany = choose[0].manufacturerName
+        row.bank = choose[0].depositBank
+        row.receivingAccount = choose[0].bankAccount
+      } else {
+        row.actualPay = ''
+        row.bank = ''
+        row.receivingAccount = ''
       }
-      })
-      this.formobj.receiveCompanySid = bb.sid
     },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
           req.saveOrUpdate(this.formobj).then((resp) => {
-            this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               // 子页面向父级页面传递值
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -509,17 +656,16 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (this.formobj.isVeh === '') {
+        this.$message({ showClose: true, type: 'error', message: '是否涉及车辆请选择是或否' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
           req.submitVehicleApply(this.formobj, this.formobj.sid).then((resp) => {
-            this.submitdisabled = false
             if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
               // 子页面向父级页面传递值
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -537,6 +683,7 @@ export default {
         }
       })
     },
+    // 合计
     getSummaries(param) {
       const { columns, data } = param
       const sums = []
@@ -556,7 +703,7 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.payAccountAll = sums[index] += ''
+          this.formobj.paymentTotal = sums[index] += ''
         } else if (column.property === 'money') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
@@ -567,27 +714,12 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.money = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
+          this.formobj.carTotal = sums[index] += ''
         }
       })
       return sums
     },
-    closePage() {
+    resetState() {
       this.viewState = 1
     }
   }
@@ -600,11 +732,41 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
-.title {
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
+/deep/ .el-form-item__error {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+.titleOne {
   padding: 7px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
 }
+/* 覆盖element-ui的单选按钮样式 */
+/deep/.titleOne .el-radio__input.is-checked .el-radio__inner {
+  border-color: #409EFF; /* 未选中状态下的边框颜色 */
+  background-color: #409EFF; /* 选中后的背景色 */
+}
+/* 如果需要改变选中后对勾的颜色 */
+/deep/.titleOne .el-radio__input.is-checked .el-radio__inner:after {
+  background-color: #000000; /* 对勾的颜色 */
+}
+/deep/.titleOne .el-radio__input.is-checked+.el-radio__label {
+  color: #000000; /* 选中后的字体颜色 */
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -1,165 +1,219 @@
 <template>
   <div class="app-container">
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
-      <div>付款详情</div>
+        <div>{{ viewTitle }}</div>
         <div>
           <el-button type="danger" size="small" @click="openRevoke()">撤 回 </el-button>
         </div>
       </div>
       <div class="">
-      <div class="titwu"><span>付款申请</span></div>
-      <el-form ref="dataForm" :model="formobj" class="formadd">
+        <div class="titwu"><span>{{ viewTitle }}</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
-          <el-col :span="4" class="tleftb">
-            <span>申请日期</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.createTime }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>申请人</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.name }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>款项类别</span>
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTypeValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>款项名称</span>
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.costTitleValue }}</span></el-form-item>
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>业务编号</span>
+            <el-col :span="6">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.busSid }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">款项范围</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costRangeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="4" class="tleftb">
+            <el-col :span="6">
+              <div class="span-sty">款项类别</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTypeValue }}</span></el-form-item>
             </el-col>
-          <el-col :span="8">
+            <el-col :span="6">
+              <div class="span-sty">是否涉及车辆</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isVeh == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款单位名称</span>
-          </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.payCompany }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>收款单位名称</span>
+              <div class="span-sty">付款单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.receiveCompany }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>付款备注</span>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item><span>{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="4" class="tleftb">
-            <span>品牌</span>
+              <div class="span-sty">付款申请备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-            <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="4" class="tleftb">
-            <span>是否涉及车辆</span>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
+              <div class="span-sty">是否事业部领导审批</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
             </el-col>
           </el-row>
-        <div class="title">
-          <div>付款明细</div>
-        </div>
+          <div class="title">付款明细</div>
           <el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="付款方式" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.paymentType }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="厂家回款通路" align="center">
+            <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
+            <el-table-column prop="paymentType" label="付款方式" align="center" width="200" />
+            <el-table-column prop="actualPay" label="厂家回款通路" align="center" width="200" />
+            <el-table-column prop="receiveCompany" label="收款单位" align="center" width="150" />
+            <el-table-column prop="bank" label="开户行" align="center" width="140" />
+            <el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="160" />
+            <el-table-column prop="payAccount" label="付款金额(元)" align="center" width="150" />
+            <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+            <el-table-column label="关联付款详情" align="center" width="120">
               <template slot-scope="scope">
-              <span>{{ scope.row.actualPay }}</span>
+                <el-button type="primary" size="mini" v-show="scope.row.finPaymentapplyDetailsBelowList.length > 0" @click="handleLookPayment(scope.row, scope.$index)">查看</el-button>
               </template>
             </el-table-column>
-          <el-table-column label="开户行" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.bank }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="收款银行账号" align="center">
+            <el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
+          </el-table>
+          <div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
+            <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              <div>车辆列表</div>
+              <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+                <div style="margin-right: 10px">
+                  <span>是否已销售：{{ formobj.isSales == '1' ? '是' : '否' }}</span>
+                </div>
+                <div>
+                  <span>款项是否已交清：{{ formobj.isSettle == '1' ? '是' : '否' }}</span>
+                </div>
+              </div>
+            </div>
+            <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="modelName" label="车型" align="center" min-width="180" />
+              <el-table-column prop="vinNo" label="车架号" align="center" width="160" />
+              <el-table-column prop="marketSegmentsValue" label="版本" align="center" width="100" />
+              <el-table-column prop="carColor" label="颜色" align="center" width="100" />
+              <el-table-column prop="emissionStandardValue" label="排放" align="center" width="100" />
+              <el-table-column prop="tranCaseTypeValue" label="变速箱" align="center" width="110" />
+              <el-table-column prop="rearAxleValue" label="后桥" align="center" width="100" />
+              <el-table-column prop="libraryAge" label="厂家库龄" align="center" width="120" />
+              <el-table-column prop="orgLibraryAge" label="公司库龄" align="center" width="120" />
+              <el-table-column prop="topName" label="上装名称" align="center" width="130">
                 <template slot-scope="scope">
-              <span>{{ scope.row.receivingAccount }}</span>
+                  <span class="bluezi" @click="lookTops(scope.row)">{{ scope.row.topName }}</span>
                 </template>
               </el-table-column>
-          <el-table-column prop="payAccount" label="付款金额(元)" align="center">
+              <el-table-column prop="insideCode" label="内部编码" align="center" width="120" />
+              <el-table-column prop="money" label="厂家结算价" align="center" width="130" />
+              <el-table-column label="合同/销售订单编号" align="center" width="180">
                 <template slot-scope="scope">
-              <span>{{ scope.row.payAccount }}</span>
+                  <span>{{ scope.row.contractNo }}/{{ scope.row.saleBillNo }}</span>
                 </template>
               </el-table-column>
-          <el-table-column label="付款备注" align="center">
+              <el-table-column prop="customerName" label="客户名称" align="center" width="120" />
+              <el-table-column prop="saleTypeValue" label="销售订单类型" align="center" width="150" />
+              <el-table-column prop="settlementStatusValue" label="买断状态" align="center" width="120" />
+              <el-table-column label="是否申请买断" align="center" width="140">
                 <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
+                  <span>{{ scope.row.isSettle == '1' ? '是' : scope.row.isSettle == '0' ? '否' : scope.row.isSettle == '——' ? '——' : '' }}</span>
                 </template>
               </el-table-column>
             </el-table>
-        <div v-show="formobj.isVeh === '1'">
-          <div class="title">
-            <div>车辆列表</div>
           </div>
-          <el-table :key="vehicleKey" :data="formobj.vehicleList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="车型" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="车架号" align="center">
+        </el-form>
+      </div>
+    </div>
+    <!-- 付款明细表新增关联付款信息 -->
+    <el-dialog :visible.sync="paymentVisible" width="70%" :show-close="false">
+      <el-form class="formaddcopy02">
+        <div class="title">关联付款信息列表</div>
+        <el-table :key="paymentKey" :data="paymentInformation.list" :index="index" border style="width: 100%">
+          <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+          <el-table-column fixed label="操作" width="180" align="center">
             <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+              <el-button size="mini" type="primary" @click="paymentLook(scope.row)">查看</el-button>
             </template>
           </el-table-column>
-            <el-table-column label="厂家结算价" prop="money" align="center">
+          <el-table-column prop="costTitleValue" label="款项名称" align="center" width="120" />
+          <el-table-column prop="paymentType" label="付款方式" align="center" width="120" />
+          <el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="160" />
+          <el-table-column prop="bank" label="开户行" align="center" width="120" />
+          <el-table-column prop="receivingAccount" label="银行账号" align="center" width="120" />
+          <el-table-column prop="payAccount" label="付款金额" align="center" width="120" />
+          <el-table-column prop="remarks" label="付款备注" align="center" min-width="200" />
+          <el-table-column prop="isPay" label="后期是否有平仓付款" align="center" width="180">
             <template slot-scope="scope">
-                <span>{{ scope.row.money }}</span>
+              <span>{{ scope.row.isPay == '1' ? '是' : '否' }}</span>
             </template>
           </el-table-column>
         </el-table>
-        </div>
       </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" @click="paymentClose">关闭</el-button>
       </div>
+    </el-dialog>
+    <!-- 关联付款信息详情 -->
+    <paymentInformationInfo v-show="viewState == 4" ref="divPaymentInformationInfo" @doback="resetStateByInformation" />
+    <!-- 查看上装配置信息 -->
+    <tops v-show="viewState == 5" ref="divTops" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
+import paymentInformationInfo from './relation/paymentInformationInfo'
+import tops from '@/components/publicPage/tops'
 
 export default {
-  name: 'fukuanshenqingInfo',
+  name: 'FuKuanYiBanInfo',
+  components: {
+    paymentInformationInfo,
+    tops
+  },
   data() {
     return {
-      formobj: {},
+      viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       vehicleKey: 1,
+      paymentKey: 2,
       index: 0,
+      formobj: {
+        billNo: '', // 申请编号
+        name: '', // 申请人姓名
+        deptSid: '', // 申请部门sid
+        deptName: '', // 申请部门名称
+        createTime: '', // 申请日期
+        costRangeKey: '', // 款项范围Key
+        costRangeValue: '', // 款项范围value
+        isLeaderSp: '', // 是否事业部领导审批，1是0否
+        isSales: '', // 是否已销售
+        isSettle: '', // 款项是否已交清
+        costTypeKey: '', // 款项类别key
+        costTypeValue: '', // 款项类别value
+        cost: '', // 金额
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        busSid: '', // 关联业务sid
+        createOrgSid: '', // 创建组织
+        useOrgSid: '', // 使用组织
+        procInstId: '', // 流程实例id
+        taskId: '', // 任务id
+        isVeh: '', // 是否涉及车辆，1是，0否
+        paymentTotal: '', // 付款明细合计
+        carTotal: '', // 车辆金额合计
+        carBrandSid: '', // 品牌sid
+        carBrandName: '', // 品牌名称
+        orgSidPath: '',
+        detailsList: [],
+        vehicleList: []
+      },
+      rules: {},
+      paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
+      paymentInformation: { // 关联付款信息列表
+        index: '',
+        liquidationPayment: '', // 平仓款名称
+        list: []
+      },
       // 环节所需参数
       linkByParameter: {
         businessSid: '',
@@ -200,12 +254,53 @@ export default {
   },
   methods: {
     showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '付款申请详情'
       req.fetchBySid(sid).then((resp) => {
+        if (resp.success) {
           this.formobj = resp.data
+          if (this.formobj.vehicleList.length > 0) {
+            for (var i = 0; i < this.formobj.vehicleList.length; i++) {
+              if (this.formobj.vehicleList[i].isSettle === '是') {
+                this.viewTitle = '付款买断申请'
+                return
+              }
+            }
+          }
+        }
       }).catch((e) => {
         this.formobj = {}
       })
     },
+    handleLookPayment(row, index) {
+      this.paymentVisible = true
+      this.paymentInformation.inde = index
+      this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
+      this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
+    },
+    resetStateByInformation() {
+      this.viewState = 1
+      this.paymentVisible = true
+    },
+    paymentLook(row) {
+      this.paymentVisible = false
+      this.viewState = 4
+      this.$refs['divPaymentInformationInfo'].showInfo(row)
+    },
+    paymentClose() {
+      this.paymentVisible = false
+      this.paymentInformation = {
+        index: '',
+        liquidationPayment: '',
+        list: []
+      }
+    },
+    lookTops(row) {
+      this.viewState = 5
+      this.$refs['divTops'].showInfo({ sid: row.topSid })
+    },
     // 合计
     getSummaries(param) {
       const { columns, data } = param
@@ -226,7 +321,7 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.payAccountAll = sums[index] += ''
+          this.formobj.paymentTotal = sums[index] += ''
         } else if (column.property === 'money') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
@@ -237,26 +332,14 @@ export default {
             }
           }, 0)
           sums[index] += ''
-          this.formobj.money = sums[index] += ''
-        } else {
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.amount = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
+          this.formobj.carTotal = sums[index] += ''
         }
       })
       return sums
     },
+    resetState() {
+      this.viewState = 1
+    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {
@@ -303,4 +386,10 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationAdd.vue

@@ -0,0 +1,397 @@
+<temp<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>款项名称</div>
+              <el-form-item prop="costTitleValue">
+                <el-select class="addinputInfo" v-model="formobj.costTitleValue" placeholder="请选择" @change="costTitleChange" clearable filterable>
+                  <el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>付款方式</div>
+              <el-form-item prop="paymentType">
+                <el-select class="addinputInfo" v-model="formobj.paymentType" placeholder="请选择" @change="paymentChange" clearable filterable>
+                  <el-option v-for="item in payment_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>收款单位名称</div>
+              <el-form-item prop="receiveCompany">
+                <el-select class="addinputInfo" v-model="formobj.receiveCompany" placeholder="请选择" @change="receiveCompanyChange" clearable filterable>
+                  <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.companyName" :value="item.companyName"></el-option>
+                </el-select>
+                <el-button style="margin-left: 10px" type="primary" size="mini" @click="receiveCompanyAdd">添加</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">银行账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivingAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">开户行</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bank }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>付款金额</div>
+              <el-form-item prop="payAccount"><el-input class="addinputInfo addinputw" @keyup.native="formobj.payAccount = getNumber(formobj.payAccount, 2)" v-model="formobj.payAccount" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">付款备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty"><span class="icon">*</span>后期是否有平仓付款</div>
+              <el-form-item prop="isPay">
+                <el-radio-group class="addinputInfo" v-model="formobj.isPay">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.isPay == '1'">
+            <div class="title titleOne">
+              <div>平仓信息</div>
+              <el-button type="primary" size="mini" class="btntopblueline" @click="toAdd">添加</el-button>
+            </div>
+            <el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column fixed label="操作" width="100" align="center">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
+              <el-table-column label="期数" align="center">
+                <template slot-scope="scope">
+                  <el-input @keyup.native="scope.row.period = getNumber(scope.row.period, 2)" v-model="scope.row.period" clearable placeholder="" />
+                </template>
+              </el-table-column>
+              <el-table-column label="平仓付款日期" align="center">
+                <template slot-scope="scope">
+                  <el-date-picker v-model="scope.row.exePayDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="平仓付款金额" align="center">
+                <template slot-scope="scope">
+                  <el-input @keyup.native="scope.row.exePayPrice = getNumber(scope.row.exePayPrice, 2)" v-model="scope.row.exePayPrice" clearable placeholder="" />
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.remarks" clearable placeholder="" />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="50%" :show-close="false">
+      <el-form ref="temp_obj" :model="temp" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty">单位编码</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.companyCode" clearable  placeholder=""/></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">单位名称</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.companyName" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">开户行</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.bank" clearable  placeholder=""/></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">银行账号</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.receivingAccount" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">业务类型</div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="temp.businessTypeValue" placeholder="请选择" @change="businessTypeChange" clearable filterable>
+                <el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="temp.remarks" clearable  placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div style="text-align: center;padding-top: 5px">
+        <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+        <el-button size="small" @click="handleClose">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/anruifinmanagement/payment'
+import { typeValues } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PaymentInformationAdd',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      costTitle_list: [],
+      payment_list: [],
+      receiveCompany_list: [],
+      businessType_list: [],
+      liquidationPayment: '', // 平仓款名称
+      formobj: {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      },
+      dialogVisible: false,
+      temp: {
+        companyCode: '', // 单位编码
+        companyName: '', // 单位名称
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        businessTypeKey: '', // 业务类型key
+        businessTypeValue: '', // 业务类型value
+        remarks: '', // 备注
+        useOrgSid: '', // 分公司sid
+        useOrgName: ''
+      },
+      rules: {
+        costTitleValue: [{ required: true, message: '款项名称不能为空', trigger: 'change' }],
+        paymentType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
+        receiveCompany: [{ required: true, message: '收款单位名称不能为空', trigger: 'change' }],
+        payAccount: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }],
+        isPay: [{ required: true, message: '后期是否有平仓付款不能为空', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'payCostTitle' }).then((res) => {
+        if (res.success) {
+          this.costTitle_list = res.data
+        }
+      })
+      typeValues({ type: 'paymentType' }).then((res) => {
+        if (res.success) {
+          this.payment_list = res.data
+        }
+      })
+      typeValues({ type: 'cw_businessType' }).then((res) => {
+        if (res.success) {
+          this.businessType_list = res.data
+        }
+      })
+    },
+    showAdd(useOrgSid, liquidationPayment) {
+      this.viewTitle = '【新增】付款信息'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      this.liquidationPayment = liquidationPayment
+      this.temp.useOrgSid = useOrgSid
+      this.selectByUseOrgSid(useOrgSid)
+    },
+    selectByUseOrgSid(value) {
+      req.selectByUseOrgSid({ useOrgSid: value }).then((res) => {
+        if (res.success) {
+          this.receiveCompany_list = res.data
+        }
+      })
+    },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    costTitleChange(value) {
+      const choose = this.costTitle_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.costTitleKey = choose[0].dictKey
+      } else {
+        this.formobj.costTitleKey = ''
+      }
+    },
+    paymentChange(value) {
+      const choose = this.payment_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.paymentTypeKey = choose[0].dictKey
+      } else {
+        this.formobj.paymentTypeKey = ''
+      }
+    },
+    receiveCompanyChange(value) {
+      const choose = this.receiveCompany_list.filter((item) => item.companyName === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.receiveCompanySid = choose[0].sid
+        this.formobj.receivingAccount = choose[0].companyName
+        this.formobj.bank = choose[0].bank
+      } else {
+        this.formobj.receiveCompanySid = ''
+        this.formobj.receivingAccount = ''
+        this.formobj.bank = ''
+      }
+    },
+    receiveCompanyAdd() {
+      this.dialogVisible = true
+    },
+    handleSave() {
+      req.paymentSave(this.temp).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.selectByUseOrgSid(this.temp.useOrgSid)
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.temp.companyCode = '' // 单位编码
+      this.temp.companyName = '' // 单位名称
+      this.temp.bank = '' // 开户行
+      this.temp.receivingAccount = '' // 收款银行账号
+      this.temp.businessTypeKey = '' // 业务类型key
+      this.temp.businessTypeValue = '' // 业务类型value
+      this.temp.remarks = '' // 备注
+    },
+    toAdd() {
+      this.formobj.finPaymentapplyDetailsBelowEveList.push({
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: this.liquidationPayment, // 款项名称
+        detailSid: '', // 付款申请明细的明细sid
+        openDate: '', // 融资付款开通日期
+        period: '', // 期数
+        payCompanySid: '', // 付款单位sid
+        payCompany: '', // 付款单位名称
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        receivingAccount: '', // 收款银行账号
+        actualPay: '', // 厂家销售通路
+        bank: '', // 开户行
+        exePayDate: '', // 平仓付款日期
+        exePayPrice: '', // 平仓付款金额
+        remarks: ''
+      })
+    },
+    toDelete(index) {
+      this.formobj.finPaymentapplyDetailsBelowEveList.splice(index, 1)
+    },
+    businessTypeChange(value) {
+      const choose = this.businessType_list.filter((item) => item.dictValue === value)
+      if (choose !== null && choose.length > 0) {
+        this.temp.businessTypeKey = choose[0].dictKey
+      } else {
+        this.temp.businessTypeKey = ''
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.$emit('backInformation', this.formobj)
+          this.handleReturn()
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+/deep/ .el-form-item__error {
+  margin-left: 140px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationInfo.vue

@@ -0,0 +1,135 @@
+<temp<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="12">
+              <div class="span-sty">款项名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.costTitleValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentType }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">收款单位名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receiveCompany }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">银行账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivingAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">开户行</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bank }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">付款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payAccount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">付款备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">后期是否有平仓付款</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isPay == '1' ? '是' : '否' }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.isPay == '1'">
+            <div class="title">平仓信息</div>
+            <el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
+              <el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
+              <el-table-column prop="period" label="期数" align="center" />
+              <el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
+              <el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />
+              <el-table-column prop="remarks" label="备注" align="center" />
+            </el-table>
+          </div>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'PaymentInformationInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      tableKey: 0,
+      index: 0,
+      formobj: {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '付款信息'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      const value = JSON.parse(JSON.stringify(row))
+      this.formobj = row
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '', // sid
+        costTitleKey: '', // 款项名称，数据字典
+        costTitleValue: '', // 款项名称
+        paymentTypeKey: '', // 付款方式key
+        paymentType: '', // 付款方式value
+        receiveCompany: '', // 收款单位名称
+        receiveCompanySid: '', // 收款单位sid
+        bank: '', // 开户行
+        receivingAccount: '', // 收款银行账号
+        payAccount: '', // 付款金额
+        detailSid: '', // 付款申请明细sid
+        isPay: '', // 后期是否有平仓付款
+        finPaymentapplyDetailsBelowEveList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 150px !important;
+}
+.addinputInfo {
+  margin-left: 140px !important;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue

@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="颜色" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.color }}</span>
+                <span>{{ scope.row.carColor }}</span>
               </template>
             </el-table-column>
             <el-table-column label="存放地点" align="center">
@@ -109,7 +109,7 @@
             </el-table-column>
             <el-table-column label="厂家结算价" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.money }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -130,7 +130,7 @@ import req from '@/api/anruifinmanagement/payment'
 import { typeValues, brandDown, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
 
 export default {
-  name: 'xianchechaxun',
+  name: 'Vehcile',
   components: {
     Pagination
   },
@@ -149,6 +149,7 @@ export default {
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
+      multipleSelection: [],
       list: [],
       number: '',
       listLoading: false,
@@ -168,7 +169,10 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
+          orgSid: '',
           orderingNo: '',
+          isSales: '',
+          isSettle: '',
           vinSidList: []
         },
         total: 0
@@ -193,6 +197,7 @@ export default {
     getPathSid() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
+          // 下拉框-品牌
           brandDown({ useOrg: res.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -203,45 +208,43 @@ export default {
       })
     },
     shujuzidian() {
-      // 下拉框-品牌
-
       typeValues({ type: 'vehicleFunction' }).then((res) => {
         if (res.success) {
           this.vehicleType_list = res.data
         }
       })
       typeValues({ type: 'productLine' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.productLine_list = res.data
         }
       })
       typeValues({ type: 'driver' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.driveForm_list = res.data
         }
       })
       typeValues({ type: 'horsepower' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.power_list = res.data
         }
       })
       typeValues({ type: 'vehicleVersion' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.vehicleVersion_list = res.data
         }
       })
       typeValues({ type: 'fuelType' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.fuelType_list = res.data
         }
       })
       typeValues({ type: 'gearbox' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.gearboxType_list = res.data
         }
       })
       typeValues({ type: 'emissionStandard' }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.emissionStandard_list = res.data
         }
       })
@@ -293,21 +296,9 @@ export default {
       this.getList()
     },
     handleSelectionChange(row) {
-      this.sids = []
-      const aa = []
-      row.forEach((element) => {
-        aa.push({
-          vinNo: element.vinNo,
-          vehiSid: element.sid,
-          modelName: element.vehicleAlias,
-          modelSid: element.modelSid,
-          money: element.priced,
-          configSid: element.configSid
-        })
-      })
-      this.sids = aa
+      this.multipleSelection = row
     },
-    showData(value) {
+    showData(value, useOrgSid, isSales, isSettle) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -317,19 +308,17 @@ export default {
       } else {
         this.listQuery.params.vinSidList = []
       }
+      this.listQuery.params.isSales = isSales
+      this.listQuery.params.isSettle = isSettle
+      this.listQuery.params.orgSid = useOrgSid
       this.init()
     },
     // 添加修改返回
     AddUpdateReturn() {
-      if (this.sids.length > 0) {
-        this.$emit('backData', this.sids)
+      if (this.multipleSelection.length > 0) {
+        this.$emit('backData', this.multipleSelection)
       } else {
-        this.$notify({
-          title: '提示',
-          message: '请选择至少一条车型记录!',
-          type: 'error',
-          duration: 2000
-        })
+        this.$notify({ title: '提示', message: '请选择至少一条记录!', type: 'error', duration: 2000 })
       }
     }
   }

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

@@ -0,0 +1,142 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>上装配置信息</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>车辆功能</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.vehicleTypeValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>上装名称</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.installNameValue }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>委改方式</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refitMethodValue }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>供应商</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formobj.installNameKey == '08'">
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>冷机型号</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <div v-if="formobj.installNameKey != '08'">
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
+              <el-form-item>
+                <div class="addinputInfo addinputwOne">
+                  长<span class="inputStyle">{{ formobj.wk_long }}</span>mm,
+                  宽<span class="inputStyle">{{ formobj.wk_wide }}</span>mm,
+                  高<span class="inputStyle">{{ formobj.wk_high }}</span>mm
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>颜色</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.colorValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>板材材质</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.plateMaterialValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>板材厚度</span></div>
+              <el-form-item>
+                <div class="addinputInfo addinputwOne">
+                  底<span class="inputStyle">{{ formobj.plateThicknessBottom }}</span>mm,
+                  边<span class="inputStyle">{{ formobj.plateThicknessEdge }}</span>mm
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.selfUnHyCoPl }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>底板加热</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>更多配置</span></div>
+              <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.moreConfig }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { fetchBySidByTops } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'ShangZhuangInfo',
+  data() {
+    return {
+      formobj: {}
+    }
+  },
+  methods: {
+    handleReturn() {
+      this.$emit('doback')
+    },
+    showInfo(row) {
+      fetchBySidByTops(row.sid).then((resp) => {
+        this.formobj = resp.data
+      }).catch((e) => {
+        this.formobj = row
+      })
+      console.log('这里是详情回显', row)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.spanOneWidth {
+  width: 110px !important;
+}
+.addinputwOne {
+  margin-left: 110px !important;
+}
+.inputStyle {
+  display: inline-block;
+  margin: 0 5px;
+}
+</style>