src/api/business/approval.js

@@ -63,8 +63,13 @@ function uploadFiles(formData) {
     }
   });
 }
+function loadInsuranceAgent(formData) {
+  //读取每月投保单
+  return request.post(constant.serverUrl + "/insurancePolicy/loadInsuranceAgent", formData);
+}
+
 
 
 export default {
-  pageList, acceptDetail, firstApproval, secondApproval, transfer, policyRecordPageList, attachmentList, issued, otherPageList, otherDetail, uploadFiles
+  pageList, acceptDetail, firstApproval, secondApproval, transfer, policyRecordPageList, attachmentList, issued, otherPageList, otherDetail, uploadFiles, loadInsuranceAgent
 }

src/views/business/insuranceFirst-firstApproval.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">初审</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -194,7 +165,7 @@
               </div>
               <div class="application-panel" v-loading="loading">
                 <!-- 推广信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <!-- <table border="1" style="border-collapse:collapse;">
                   <tr>
                     <td>人员类型</td>
                     <td>姓名</td>
@@ -213,7 +184,7 @@
                     <td></td>
                     <td></td>
                   </tr>
-                </table>
+                </table>-->
               </div>
             </div>
           </el-tab-pane>
@@ -275,7 +246,7 @@
               </tr>
               <tr>
                 <td>下一步骤</td>
-                <td>投保-人保专员复审</td>
+                <td>复审</td>
               </tr>
               <tr>
                 <td>
@@ -338,7 +309,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: ""
@@ -348,7 +319,8 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData: []
+      filesData: [],
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -378,7 +350,6 @@ export default {
         .pageList(formData)
         .then(function(response) {
           self.loading = false;
-
           var jsonData = response.data.data;
 
           self.memberData = jsonData.data;
@@ -410,20 +381,21 @@ export default {
         } else {
           var formData = new FormData();
           formData.append("id", self.id);
-          formData.append("no", "0");
+          formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()
         .then(response => {
           var jsonData = response.data;
           self.loading = false;
-
           if (jsonData.result) {
             self.insureData = jsonData.data;
+            
             this.definitionId = self.insureData.definitionId;
             this.policyId = self.insureData.insurancePolicy.id;
             this.acceptDetail();
-            this.changePage(1);
+            //this.loadInsuranceAgentlist();
+            //this.changePage(1);
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -437,6 +409,8 @@ export default {
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
 
       (function() {
         if (self.definitionId.length == 0) {
@@ -499,9 +473,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 
@@ -581,6 +553,30 @@ export default {
           self.loading = false;
           // self.$message.error(error + "");
         });
+    },
+    loadInsuranceAgentlist() {
+      var self = this;
+
+      self.loading = true;
+      var formData = new FormData();
+
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
+      formData.append("id", self.formData);
+
+      approvalApi
+        .loadInsuranceAgent(self.policyId)
+        .then(function(response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.insuranceAgentlist = jsonData.data;
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
     }
   },
   async mounted() {
@@ -588,6 +584,7 @@ export default {
     self.loading = true;
 
     self.id = this.$route.query.id;
+
     this.insureDetail();
   }
 };

src/views/business/insuranceFirst-issued.vue

@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -251,6 +222,16 @@
                 <td>当前步骤</td>
                 <td>{{insureData.statusN}}</td>
               </tr>
+              <tr>
+                <td colspan="2">
+                  <el-form-item label="处理类型" prop="processStatus">
+                    <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+                      <el-option label="通过" value="正常"></el-option>
+                      <el-option label="退回" value="回退"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+              </tr>
               <tr>
                 <td colspan="2">
                   <el-form-item label="应收保费">{{insureData.insuranceFee}}</el-form-item>
@@ -301,7 +282,6 @@
                     :multiple="false"
                     :limit="1"
                     :on-exceed="handleExceed"
-                    :file-list="fileList"
                     :before-upload="beforeUpload"
                   >
                     <el-button size="small" type="primary">点击上传</el-button>
@@ -309,6 +289,10 @@
                   </el-upload>
                 </td>
               </tr>
+              <tr>
+                <td>下一步骤</td>
+                <td>已出单</td>
+              </tr>
               <tr>
                 <td>
                   <el-button
@@ -346,7 +330,15 @@ export default {
       queryModel: {
         id: ""
       },
-      ruleValidate: {},
+      ruleValidate: {
+        processStatus: [
+          {
+            required: true,
+            message: "请选择处理类型",
+            trigger: "blur"
+          }
+        ]
+      },
       loading: false,
       memberData: [],
       pageIndex: 1,
@@ -364,7 +356,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: "",
@@ -379,7 +371,8 @@ export default {
       totalElementsRecord: 0,
       filesData: [],
       fileList: [],
-      myHeaders: { Authorization: token }
+      myHeaders: { Authorization: token },
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -441,7 +434,7 @@ export default {
         } else {
           var formData = new FormData();
           formData.append("id", self.id);
-          formData.append("no", "0");
+          formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()
@@ -468,7 +461,8 @@ export default {
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -502,8 +496,9 @@ export default {
 
             formData.append("applicationId", self.id);
             formData.append("policyId", self.policyId);
-            formData.append("processStatus", "正常");
+            formData.append("processStatus", self.formModel.processStatus);
             formData.append("opinion", self.formModel.opinion);
+            formData.append("insurancePolicyFile", self.fileUrl);
 
             return approvalApi.issued(formData);
           })().then(function(response) {
@@ -530,10 +525,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-    
-    
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 
@@ -611,7 +603,7 @@ export default {
         })
         .catch(error => {
           self.loading = false;
-          // self.$message.error(error + ""); 
+          // self.$message.error(error + "");
         });
     },
     handleRemove(file, fileList) {
@@ -639,7 +631,7 @@ export default {
 
       self.loading = true;
 
-      const IMG_ALLOWD = ['image/jpeg', 'image/jpg', 'image/gif', 'image/png'];
+      const IMG_ALLOWD = ["image/jpeg", "image/jpg", "image/gif", "image/png"];
       //const isLt2M = file.size / 1024 / 1024 < 2;
       if (IMG_ALLOWD.indexOf(file.type) === -1) {
         this.$message.error("上传文件只能为图片格式!");
@@ -656,7 +648,7 @@ export default {
           .then(function(response) {
             self.loading = false;
 
-            var jsonData = response.data.data;
+            var jsonData = response.data;
 
             self.fileUrl = jsonData.data;
           })

src/views/business/insuranceFirst-list.vue

@@ -3,10 +3,10 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">人才超市</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">初次投保代办</a>
+        <a href="/businessInsuranceApplication">新增投保审批</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>

src/views/business/insuranceFirst-listPicc.vue

@@ -3,10 +3,10 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">PICC审批</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">PICC代办</a>
+        <a href="/businessInsuranceApplication">新增投保审批</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -20,9 +20,9 @@
       <el-form-item label="投保人名称" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
       </el-form-item>
-      <el-form-item label="投保期间" prop="companyId">
+      <!-- <el-form-item label="投保期间" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"

src/views/business/insuranceFirst-secondApproval.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">复审</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -194,7 +165,7 @@
               </div>
               <div class="application-panel" v-loading="loading">
                 <!-- 推广信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <!-- <table border="1" style="border-collapse:collapse;">
                   <tr>
                     <td>人员类型</td>
                     <td>姓名</td>
@@ -213,7 +184,7 @@
                     <td></td>
                     <td></td>
                   </tr>
-                </table>
+                </table>-->
               </div>
             </div>
           </el-tab-pane>
@@ -275,7 +246,7 @@
               </tr>
               <tr>
                 <td>下一步骤</td>
-                <td>投保-人保专员复审</td>
+                <td>缴费</td>
               </tr>
               <tr>
                 <td>
@@ -338,7 +309,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: ""
@@ -348,7 +319,8 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData: []
+      filesData: [],
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -437,7 +409,8 @@ export default {
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -499,9 +472,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 

src/views/business/insuranceFirst-transfer.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">提交投保申请并转账</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -194,7 +165,7 @@
               </div>
               <div class="application-panel" v-loading="loading">
                 <!-- 推广信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <!-- <table border="1" style="border-collapse:collapse;">
                   <tr>
                     <td>人员类型</td>
                     <td>姓名</td>
@@ -213,7 +184,7 @@
                     <td></td>
                     <td></td>
                   </tr>
-                </table>
+                </table>-->
               </div>
             </div>
           </el-tab-pane>
@@ -251,6 +222,16 @@
                 <td>当前步骤</td>
                 <td>{{insureData.statusN}}</td>
               </tr>
+              <tr>
+                <td colspan="2">
+                  <el-form-item label="处理类型" prop="processStatus">
+                    <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+                      <el-option label="通过" value="正常"></el-option>
+                      <el-option label="退回" value="回退"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </td>
+              </tr>
               <tr>
                 <td colspan="2">
                   <el-form-item label="应收保费">{{insureData.insuranceFee}}</el-form-item>
@@ -303,6 +284,10 @@
                   </el-form-item>
                 </td>
               </tr>
+              <tr>
+                <td>下一步骤</td>
+                <td>出单</td>
+              </tr>
               <tr>
                 <td>
                   <el-button
@@ -359,6 +344,13 @@ export default {
             message: "请填写转账单号",
             trigger: "blur"
           }
+        ],
+        processStatus: [
+          {
+            required: true,
+            message: "请选择处理类型",
+            trigger: "blur"
+          }
         ]
       },
       loading: false,
@@ -378,7 +370,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: "",
@@ -391,7 +383,8 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData: []
+      filesData: [],
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -480,7 +473,8 @@ export default {
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -514,7 +508,7 @@ export default {
 
             formData.append("applicationId", self.id);
             formData.append("policyId", self.policyId);
-            formData.append("processStatus", "正常");
+            formData.append("processStatus", self.formModel.processStatus);
             formData.append("opinion", self.formModel.opinion);
 
             formData.append("accountBank", self.formModel.accountBank);
@@ -546,9 +540,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 

src/views/business/insurancePolicy-firstApproval.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">二次投保初审</a>
+        <a href="/businessInsuranceApplication">初审</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -275,7 +246,7 @@
               </tr>
               <tr>
                 <td>下一步骤</td>
-                <td>投保-人保专员复审</td>
+                <td>复审</td>
               </tr>
               <tr>
                 <td>
@@ -338,7 +309,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: ""
@@ -348,7 +319,8 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData: []
+      filesData: [],
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -405,15 +377,38 @@ export default {
     insureDetail() {
       var self = this;
       self.definitionId = self.id;
-      this.acceptDetail();
-      this.changePage(1);
+      (function() {
+        if (self.id.length == 0) {
+          self.$message.error("没有传递ID");
+        } else {
+          var formData = new FormData();
+          formData.append("id", self.id);
+          formData.append("no", "1");
+          return insuranceApplicationApi.insureDetail(formData);
+        }
+      })()
+        .then(response => {
+          var jsonData = response.data;
+          self.loading = false;
+          if (jsonData.result) {
+            self.insureData = jsonData.data;
+            this.acceptDetail();
+            this.changePage(1);
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
+        })
+        .catch(error => {
+          self.$message.error(error + "");
+        });
     },
     acceptDetail() {
       var self = this;
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -460,7 +455,7 @@ export default {
                 type: "success"
               });
 
-              self.$router.push("/business/insuranceFirst/list");
+              self.$router.push("/business/insurancePolicy/list");
             } else {
               self.$message({
                 message: jsonData.message + "",
@@ -475,9 +470,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 

src/views/business/insurancePolicy-issued.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">出单</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -190,7 +161,7 @@
                   <el-table-column prop="insuredNumber" label="附件类型" width="100"></el-table-column>
                   <el-table-column prop="insuredNumber" label="附件名称" width="100"></el-table-column>
                   <el-table-column prop="insuredNumber" label="操作" width="100"></el-table-column>
-                </el-table> -->
+                </el-table>-->
               </div>
               <div class="application-panel" v-loading="loading">
                 <!-- 推广信息 -->
@@ -249,34 +220,36 @@
             <table>
               <tr>
                 <td>当前步骤</td>
-                <td>{{insureData.statusN}}</td>
+                <td>{{policy.statusN}}</td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item label="应收保费">
-                    {{insureData.insuranceFee}}
+                  <el-form-item label="处理类型" prop="processStatus">
+                    <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+                      <el-option label="通过" value="正常"></el-option>
+                      <el-option label="退回" value="回退"></el-option>
+                    </el-select>
                   </el-form-item>
                 </td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item label="出账银行">
-                    {{insureData.insurancePolicy.issuingBank}}
-                  </el-form-item>
+                  <el-form-item label="应收保费">{{policy.insuranceFee}}</el-form-item>
                 </td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item label="入账银行">
-                    {{insureData.insurancePolicy.accountBank}}
-                  </el-form-item>
+                  <el-form-item label="出账银行">{{policy.issuingBank}}</el-form-item>
                 </td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item label="转账单号">
-                    {{insureData.insurancePolicy.singlNumber}}
-                  </el-form-item>
+                  <el-form-item label="入账银行">{{policy.accountBank}}</el-form-item>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2">
+                  <el-form-item label="转账单号">{{policy.singlNumber}}</el-form-item>
                 </td>
               </tr>
               <!-- <tr>
@@ -288,23 +261,31 @@
               </tr>-->
               <tr>
                 <td colspan="2">
-                  <el-form-item label="保险代理人">
-                    {{insureData.insurancePolicy.agentId}}
-                  </el-form-item>
+                  <el-form-item label="保险代理人">{{policy.agentId}}</el-form-item>
                 </td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item prop="opinion">
-                    <el-input
-                      type="textarea"
-                      :rows="8"
-                      placeholder="请输入处理意见"
-                      v-model="formModel.opinion"
-                    ></el-input>
-                  </el-form-item>
+                  <el-upload
+                    class="upload-demo"
+                    :action="uploadUrl()"
+                    :on-preview="handlePreview"
+                    :on-remove="handleRemove"
+                    :before-remove="beforeRemove"
+                    :multiple="false"
+                    :limit="1"
+                    :on-exceed="handleExceed"
+                    :before-upload="beforeUpload"
+                  >
+                    <el-button size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传图片文件</div>
+                  </el-upload>
                 </td>
               </tr>
+              <tr>
+                <td>下一步骤</td>
+                <td>已出单</td>
+              </tr>
               <tr>
                 <td>
                   <el-button
@@ -341,6 +322,13 @@ export default {
         id: ""
       },
       ruleValidate: {
+        processStatus: [
+          {
+            required: true,
+            message: "请选择处理类型",
+            trigger: "blur"
+          }
+        ]
       },
       loading: false,
       memberData: [],
@@ -359,7 +347,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: "",
@@ -372,7 +360,9 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData:[]
+      filesData: [],
+      insuranceAgentlist: "",
+      policy: ""
     };
   },
   methods: {
@@ -428,11 +418,15 @@ export default {
     },
     insureDetail() {
       var self = this;
+      self.definitionId = self.id;
       (function() {
         if (self.id.length == 0) {
           self.$message.error("没有传递ID");
         } else {
-          return insuranceApplicationApi.insureDetail(self.id);
+          var formData = new FormData();
+          formData.append("id", self.id);
+          formData.append("no", "1");
+          return insuranceApplicationApi.insureDetail(formData);
         }
       })()
         .then(response => {
@@ -441,10 +435,18 @@ export default {
 
           if (jsonData.result) {
             self.insureData = jsonData.data;
-            this.definitionId = self.insureData.definitionId;
-            this.policyId = self.insureData.insurancePolicy.id;
             this.acceptDetail();
             this.changePage(1);
+
+            var formData = new FormData();
+
+            formData.append("applicationId", self.id);
+            formData.append("policyId", self.policyId);
+
+            approvalApi.otherDetail(formData).then(response => {
+              var jsonData = response.data;
+              this.policy = jsonData.data.policy;
+            });
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -453,12 +455,14 @@ export default {
           self.$message.error(error + "");
         });
     },
-    acceptDetail(definitionId) {
+    acceptDetail() {
       var self = this;
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
 
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -492,8 +496,10 @@ export default {
 
             formData.append("applicationId", self.id);
             formData.append("policyId", self.policyId);
-            formData.append("processStatus", "正常");
+            formData.append("processStatus", self.formModel.processStatus);
             formData.append("opinion", self.formModel.opinion);
+            
+            formData.append("insurancePolicyFile", self.fileUrl);
 
             return approvalApi.issued(formData);
           })().then(function(response) {
@@ -505,7 +511,7 @@ export default {
                 type: "success"
               });
 
-              self.$router.push("/business/insuranceFirst/listPicc");
+              self.$router.push("/business/insurancePolicy/listPicc");
             } else {
               self.$message({
                 message: jsonData.message + "",
@@ -520,10 +526,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-      this.changePageRecord(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 
@@ -603,6 +606,58 @@ export default {
           self.loading = false;
           // self.$message.error(error + "");
         });
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 1 个文件，本次选择了 ${
+          files.length
+        } 个文件，共选择了 ${files.length + fileList.length} 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    uploadUrl: function() {
+      var url = Constant.serverUrl + "/base/attachment/upload";
+      return url;
+    },
+    beforeUpload(file) {
+      var self = this;
+
+      self.loading = true;
+
+      const IMG_ALLOWD = ["image/jpeg", "image/jpg", "image/gif", "image/png"];
+      //const isLt2M = file.size / 1024 / 1024 < 2;
+      if (IMG_ALLOWD.indexOf(file.type) === -1) {
+        this.$message.error("上传文件只能为图片格式!");
+        self.loading = false;
+        return false;
+      } else {
+        var formData = new FormData();
+        formData.append("uploadFile", file);
+        formData.append("fileName", "");
+        formData.append("subFolder", "issued");
+
+        approvalApi
+          .uploadFiles(formData)
+          .then(function(response) {
+            self.loading = false;
+
+            var jsonData = response.data;
+
+            self.fileUrl = jsonData.data;
+          })
+          .catch(error => {
+            self.loading = false;
+            // self.$message.error(error + "");
+          });
+      }
     }
   },
   async mounted() {
@@ -610,6 +665,7 @@ export default {
     self.loading = true;
 
     self.id = this.$route.query.id;
+    self.policyId = this.$route.query.policyId;
     this.insureDetail();
     //this.attachmentList();
   }

src/views/business/insurancePolicy-list.vue

@@ -3,10 +3,10 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">人才超市审批</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">二次投保代办</a>
+        <a href="/businessInsuranceApplication">下月投保审批</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -20,9 +20,9 @@
       <el-form-item label="投保人名称" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
       </el-form-item>
-      <el-form-item label="投保期间" prop="companyId">
+      <!-- <el-form-item label="投保期间" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -64,7 +64,7 @@
         <el-table-column prop="application.startTime" label="保障开始时间" width="180"></el-table-column>
         <el-table-column prop="application.endTime" label="保障结束时间" width="180"></el-table-column>
         <el-table-column prop="application.insuranceFee" label="保险费合计" width="180"></el-table-column>
-        <el-table-column prop="policy.status" label="状态" width="180"></el-table-column>
+        <el-table-column prop="policy.statusN" label="状态" width="100"></el-table-column>
         <el-table-column label="操作" fixed="right" width="120">
           <template slot-scope="{row}">
             <!-- <el-button size="mini" type="warning" @click="openFirstDetails(row)">查看详情</el-button> -->
@@ -224,7 +224,7 @@ export default {
     openTransfer(record) {
       this.$router.push({
         path: "/business/insurancePolicy/transfer",
-        query: { id: record.id }
+        query: { id: record.application.id,policyId:record.policy.id }
       });
     },
     handleDelete(record) {

src/views/business/insurancePolicy-listPicc.vue

@@ -3,10 +3,10 @@
     <el-breadcrumb separator=">">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="#">系统管理</a>
+        <a href="#">PICC审批</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">PICC代办</a>
+        <a href="/businessInsuranceApplication">下月投保审批</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -20,9 +20,9 @@
       <el-form-item label="投保人名称" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
       </el-form-item>
-      <el-form-item label="投保期间" prop="companyId">
+      <!-- <el-form-item label="投保期间" prop="companyId">
         <el-input type="text" size="mini" v-model="queryModel.companyId"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -54,20 +54,20 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="definitionName" label="保险种类" width="180"></el-table-column>
-        <el-table-column prop="insuredName" label="投保人姓名" width="180"></el-table-column>
-        <el-table-column prop="insuredTel" label="联系电话" width="180"></el-table-column>
-        <el-table-column prop="startTime" label="保障开始时间" width="180"></el-table-column>
-        <el-table-column prop="endTime" label="保障结束时间" width="180"></el-table-column>
-        <el-table-column prop="insuranceFee" label="保险费合计" width="180"></el-table-column>
-        <el-table-column prop="statusN" label="状态" width="180"></el-table-column>
+        <el-table-column prop="application.definitionName" label="保险种类" width="180"></el-table-column>
+        <el-table-column prop="application.insuredName" label="投保人姓名" width="180"></el-table-column>
+        <el-table-column prop="application.insuredTel" label="联系电话" width="180"></el-table-column>
+        <el-table-column prop="application.startTime" label="保障开始时间" width="180"></el-table-column>
+        <el-table-column prop="application.endTime" label="保障结束时间" width="180"></el-table-column>
+        <el-table-column prop="application.insuranceFee" label="保险费合计" width="180"></el-table-column>
+        <el-table-column prop="policy.statusN" label="状态" width="180"></el-table-column>
         <el-table-column label="操作" fixed="right" width="120">
           <template slot-scope="{row}">
             <!-- <el-button size="mini" type="warning" @click="openFirstDetails(row)">查看详情</el-button> -->
-            <span v-if="row.status=='30'">
+            <span v-if="row.policy.status=='30'">
               <el-button size="mini" type="primary" @click="openSecondApproval(row)">处理</el-button>
             </span>
-            <span v-if="row.status=='60'">
+            <span v-if="row.policy.status=='60'">
               <el-button size="mini" type="primary" @click="openIssued(row)">处理</el-button>
             </span>
             <!-- <el-button size="mini" @click="handleDelete(row)">退回理由</el-button>
@@ -96,6 +96,7 @@
 import Constant from "@/constant";
 import firstDetails from "./insuranceFirst-firstDetails";
 import insuranceApplicationApi from "@/api/business/insuranceApplication";
+import approvalApi from "@/api/business/approval";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
@@ -163,8 +164,8 @@ export default {
         formData.append("direction", this.direction);
       }
 
-      insuranceApplicationApi
-        .pageList(formData)
+      approvalApi
+        .otherPageList(formData)
         .then(function(response) {
           self.loading = false;
 
@@ -211,14 +212,14 @@ export default {
     },
     openSecondApproval(record) {
       this.$router.push({
-        path: "/business/insuranceFirst/secondApproval",
-        query: { id: record.id }
+        path: "/business/insurancePolicy/secondApproval",
+        query: { id: record.application.id,policyId:record.policy.id }
       });
     },
     openIssued(record) {
       this.$router.push({
-        path: "/business/insuranceFirst/issued",
-        query: { id: record.id }
+        path: "/business/insurancePolicy/issued",
+        query: { id: record.application.id,policyId:record.policy.id }
       });
     },
     handleDelete(record) {

src/views/business/insurancePolicy-secondApproval.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">复审</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -275,7 +246,7 @@
               </tr>
               <tr>
                 <td>下一步骤</td>
-                <td>投保-人保专员复审</td>
+                <td>缴费</td>
               </tr>
               <tr>
                 <td>
@@ -338,7 +309,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: ""
@@ -348,7 +319,8 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData: []
+      filesData: [],
+      insuranceAgentlist: ""
     };
   },
   methods: {
@@ -404,11 +376,15 @@ export default {
     },
     insureDetail() {
       var self = this;
+      self.definitionId = self.id;
       (function() {
         if (self.id.length == 0) {
           self.$message.error("没有传递ID");
         } else {
-          return insuranceApplicationApi.insureDetail(self.id);
+          var formData = new FormData();
+          formData.append("id", self.id);
+          formData.append("no", "1");
+          return insuranceApplicationApi.insureDetail(formData);
         }
       })()
         .then(response => {
@@ -417,8 +393,6 @@ export default {
 
           if (jsonData.result) {
             self.insureData = jsonData.data;
-            this.definitionId = self.insureData.definitionId;
-            this.policyId = self.insureData.insurancePolicy.id;
             this.acceptDetail();
             this.changePage(1);
           } else {
@@ -429,12 +403,13 @@ export default {
           self.$message.error(error + "");
         });
     },
-    acceptDetail(definitionId) {
+    acceptDetail() {
       var self = this;
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -481,7 +456,7 @@ export default {
                 type: "success"
               });
 
-              self.$router.push("/business/insuranceFirst/listPicc");
+              self.$router.push("/business/insurancePolicy/listPicc");
             } else {
               self.$message({
                 message: jsonData.message + "",
@@ -496,9 +471,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 
@@ -582,9 +555,10 @@ export default {
   },
   async mounted() {
     var self = this;
-    self.loading = true;
+    //self.loading = true;
 
     self.id = this.$route.query.id;
+    self.policyId = this.$route.query.policyId;
     this.insureDetail();
   }
 };

src/views/business/insurancePolicy-transfer.vue

@@ -6,7 +6,7 @@
         <a href="#">系统管理</a>
       </el-breadcrumb-item>
       <el-breadcrumb-item>
-        <a href="/businessInsuranceApplication">新增投保初审</a>
+        <a href="/businessInsuranceApplication">提交投保申请并转账</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -76,15 +76,19 @@
                   @sort-change="sortChange"
                   @selection-change="handleSelectionChange"
                 >
-                  <el-table-column prop="companyMember.name" label="姓名" width="100"></el-table-column>
-                  <el-table-column prop="cardType" label="证件类型" width="100"></el-table-column>
-                  <el-table-column prop="cardNo" label="证件号码" width="100"></el-table-column>
-                  <el-table-column prop="status" label="审核状态" width="100"></el-table-column>
-                  <el-table-column prop="sex" label="性别" width="100"></el-table-column>
-                  <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                  <el-table-column prop="jobName" label="岗位/工种" width="100"></el-table-column>
-                  <el-table-column prop="healthStatus" label="健康状况" width="100"></el-table-column>
-                  <el-table-column prop="cardFiles" label="身份证正面照" width="120"></el-table-column>
+                  <el-table-column prop="companyMember.name" label="姓名" width="80"></el-table-column>
+                  <el-table-column prop="companyMember.cardType" label="证件类型" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardNo" label="证件号码" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.status" label="审核状态" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.sex" label="性别" width="100">
+                    <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
+                  </el-table-column>
+                  <el-table-column prop="companyMember.age" label="年龄" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.jobName" label="岗位/工种" width="200"></el-table-column>
+                  <el-table-column prop="companyMember.healthStatus" label="健康状况" width="100"></el-table-column>
+                  <el-table-column prop="companyMember.cardFiles" label="身份证正面照" width="120">
+                    <template slot-scope="{row}">{{row.companyMember.cardFiles}}</template>
+                  </el-table-column>
                 </el-table>
                 <el-pagination
                   :current-page.sync="pageIndex"
@@ -97,37 +101,27 @@
               </div>
               <div class="accept-panel" v-loading="loading">
                 <!-- 承保信息 -->
-                <table border="1" style="border-collapse:collapse;">
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">险种</td>
                     <td colspan="2">限额名称</td>
                     <td colspan="2">责任限额/免赔额</td>
                   </tr>
                   <tr>
-                    <td rowspan="6" colspan="2">雇主责任险</td>
-                    <td colspan="2">限额名称</td>
-                    <td colspan="2">责任限额/免赔额</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">伤亡责任限额</td>
-                    <td colspan="2">60万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">医疗费用限额</td>
-                    <td colspan="2">5万/人</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">每次事故责任限额</td>
-                    <td colspan="2">240万/次（按4人计算）</td>
+                    <td rowspan="6" colspan="2">{{insureData.definitionName}}</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">累计责任限额</td>
-                    <td colspan="2">1800万/年（按30人计算）</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">累计法律诉讼费用限额</td>
-                    <td colspan="2">2万元/年（赠送）</td>
+                  <tr
+                    v-for="(acceot,index) in acceptData.insuranceDefinitionLimitList"
+                    :key="index"
+                  >
+                    <td colspan="2">{{ acceot.name }}</td>
+                    <td colspan="2">
+                      {{ acceot.limit }}
+                      {{ acceot.unit }}
+                    </td>
                   </tr>
+                </table>
+                <table border="1" style="border-collapse:collapse;" width="800px;">
                   <tr>
                     <td colspan="2">行业/职业类型</td>
                     <td>收费标准(年)</td>
@@ -135,44 +129,21 @@
                     <td>投保人数</td>
                     <td>保险费</td>
                   </tr>
-                  <tr>
-                    <td colspan="2">
-                      一类职业：企业的行管人员
-                      （管理人员，财务人员，以及公司行政辅助人员）
-                    </td>
-                    <td>408元/年/人</td>
-                    <td>34元/月/人</td>
-                    <td>10</td>
-                    <td>4080</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      二类职业：企业的外勤人员
-                      （销售人员，项目施工人员，项目服务人员）
-                    </td>
-                    <td>564/年/人</td>
-                    <td>47/月/人</td>
-                    <td>10</td>
-                    <td>5640</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2">
-                      三类职业：企业的生产人员
-                      （企业司机、流水线工人等）
-                    </td>
-                    <td>804/年/人</td>
-                    <td>67/月/人</td>
-                    <td>10</td>
-                    <td>8040</td>
+                  <tr v-for="(job,index) in acceptData.jobsList" :key="index">
+                    <td colspan="2">{{ job.name }}({{job.content}})</td>
+                    <td>{{ job.chargesY }}元/年/人</td>
+                    <td>{{ job.charges }}元/月/人</td>
+                    <td>{{ job.number }}</td>
+                    <td>{{ job.money }}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险费合计(人民币)</td>
-                    <td colspan="2">(大写)：壹万柒仟柒佰陆拾圆</td>
-                    <td colspan="2">(小写)：￥ 17760</td>
+                    <td colspan="2">(大写)：{{acceptData.cnMontrayUnit}}</td>
+                    <td colspan="2">(小写)：￥ {{acceptData.totalAmount}}</td>
                   </tr>
                   <tr>
                     <td colspan="2">保险期间</td>
-                    <td colspan="4">自 2020 年 2 月 1 日 零时起 至 2021 年 1 月 31 日 二十四时止。</td>
+                    <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
                   </tr>
                 </table>
               </div>
@@ -190,7 +161,7 @@
                   <el-table-column prop="insuredNumber" label="附件类型" width="100"></el-table-column>
                   <el-table-column prop="insuredNumber" label="附件名称" width="100"></el-table-column>
                   <el-table-column prop="insuredNumber" label="操作" width="100"></el-table-column>
-                </el-table> -->
+                </el-table>-->
               </div>
               <div class="application-panel" v-loading="loading">
                 <!-- 推广信息 -->
@@ -249,15 +220,23 @@
             <table>
               <tr>
                 <td>当前步骤</td>
-                <td>{{insureData.statusN}}</td>
+                <td>{{policy.statusN}}</td>
               </tr>
               <tr>
                 <td colspan="2">
-                  <el-form-item label="应收保费" prop="issuingBank">
-                    {{insureData.insuranceFee}}
+                  <el-form-item label="处理类型" prop="processStatus">
+                    <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+                      <el-option label="通过" value="正常"></el-option>
+                      <el-option label="退回" value="回退"></el-option>
+                    </el-select>
                   </el-form-item>
                 </td>
               </tr>
+              <tr>
+                <td colspan="2">
+                  <el-form-item label="应收保费" prop="issuingBank">{{policy.insuranceFee}}</el-form-item>
+                </td>
+              </tr>
               <tr>
                 <td colspan="2">
                   <el-form-item label="出账银行" prop="issuingBank">
@@ -305,6 +284,10 @@
                   </el-form-item>
                 </td>
               </tr>
+              <tr>
+                <td>下一步骤</td>
+                <td>出单</td>
+              </tr>
               <tr>
                 <td>
                   <el-button
@@ -361,6 +344,13 @@ export default {
             message: "请填写转账单号",
             trigger: "blur"
           }
+        ],
+        processStatus: [
+          {
+            required: true,
+            message: "请选择处理类型",
+            trigger: "blur"
+          }
         ]
       },
       loading: false,
@@ -380,7 +370,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: "",
-      acceptData: "",
+      acceptData: [],
       formModel: {
         processStatus: "",
         opinion: "",
@@ -393,7 +383,9 @@ export default {
       pageSizeRecord: 10,
       totalPagesRecord: 0,
       totalElementsRecord: 0,
-      filesData:[]
+      filesData: [],
+      insuranceAgentlist: "",
+      policy:""
     };
   },
   methods: {
@@ -449,11 +441,15 @@ export default {
     },
     insureDetail() {
       var self = this;
+      self.definitionId = self.id;
       (function() {
         if (self.id.length == 0) {
           self.$message.error("没有传递ID");
         } else {
-          return insuranceApplicationApi.insureDetail(self.id);
+          var formData = new FormData();
+          formData.append("id", self.id);
+          formData.append("no", "1");
+          return insuranceApplicationApi.insureDetail(formData);
         }
       })()
         .then(response => {
@@ -462,10 +458,17 @@ export default {
 
           if (jsonData.result) {
             self.insureData = jsonData.data;
-            this.definitionId = self.insureData.definitionId;
-            this.policyId = self.insureData.insurancePolicy.id;
             this.acceptDetail();
             this.changePage(1);
+            var formData = new FormData();
+
+            formData.append("applicationId", self.id);
+            formData.append("policyId", self.policyId);
+
+            approvalApi.otherDetail(formData).then(response => {
+              var jsonData = response.data;
+              this.policy = jsonData.data.policy;
+            });
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -474,12 +477,13 @@ export default {
           self.$message.error(error + "");
         });
     },
-    acceptDetail(definitionId) {
+    acceptDetail() {
       var self = this;
 
       var formData = new FormData();
       formData.append("definitionId", self.definitionId);
-
+      formData.append("applicationId", self.id);
+      formData.append("policyId", self.policyId);
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
@@ -513,7 +517,7 @@ export default {
 
             formData.append("applicationId", self.id);
             formData.append("policyId", self.policyId);
-            formData.append("processStatus", "正常");
+            formData.append("processStatus", self.formModel.processStatus);
             formData.append("opinion", self.formModel.opinion);
 
             formData.append("accountBank", self.formModel.accountBank);
@@ -530,7 +534,7 @@ export default {
                 type: "success"
               });
 
-              self.$router.push("/business/insuranceFirst/list");
+              self.$router.push("/business/insurancePolicy/list");
             } else {
               self.$message({
                 message: jsonData.message + "",
@@ -545,10 +549,7 @@ export default {
         }
       });
     },
-    downloadFiles() {
-      alert(1);
-      this.changePageRecord(1);
-    },
+    downloadFiles() {},
     changePageRecord(pageIndexRecord) {
       var self = this;
 
@@ -635,6 +636,7 @@ export default {
     self.loading = true;
 
     self.id = this.$route.query.id;
+    self.policyId = this.$route.query.policyId;
     this.insureDetail();
     //this.attachmentList();
   }