针对下月投保合并后页面显示修改。

src/api/business/approval.js

@@ -6,9 +6,13 @@ function pageList(formData) {
   return request.post(constant.serverUrl + "/insurancePolicyMember/pageList", formData);
 }
 
+function insureDetail(formData) {
+  return request.post(constant.serverUrl + "/insurancePolicy/insureDetail", formData);
+}
+
 function acceptDetail(formData) {
   //获取承保信息
-  return request.post(constant.serverUrl + "/insuranceApplication/acceptDetail", formData);
+  return request.post(constant.serverUrl + "/insurancePolicy/acceptDetail", formData);
 }
 
 function firstApproval(formData) {
@@ -84,7 +88,7 @@ function downloadIdCardZip(policyId) {
 
 
 export default {
-  pageList, acceptDetail, firstApproval, secondApproval, transfer, 
+  pageList, insureDetail,acceptDetail, firstApproval, secondApproval, transfer, 
   policyRecordPageList, attachmentList, issued, otherPageList, 
   otherDetail, uploadFiles, loadInsuranceAgent, 
   downloadPolicyPdf, downloadIdCardZip, downloadPolicyZip

src/api/business/insuranceApplication.js

@@ -45,7 +45,12 @@ function insureDetail(formData) {
   return request.post(constant.serverUrl + "/insuranceApplication/insureDetail", formData);
 }
 
+function acceptDetail(formData) {
+  //获取承保信息
+  return request.post(constant.serverUrl + "/insuranceApplication/acceptDetail", formData);
+}
+
 
 export default {
-  pageList, create, edit, add, update, remove, batchRemove, insureDetail
+  pageList, create, edit, add, update, remove, batchRemove, insureDetail,acceptDetail
 }

src/views/Login.vue

@@ -134,9 +134,7 @@ export default {
           self.$store
             .dispatch("user/login", self.loginForm)
             .then(() => {
-              self.loading = false;
-              self.$message.success("登录成功!");
-              
+              self.loading = false;              
               self.$router.push({ path: this.redirect || "/home" });
             })
             .catch(error => {

src/views/base/insuranceDefinitionLimit-detail.vue

@@ -32,6 +32,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="序号" prop="sortNo">
+          <el-input type="number" v-model="formModel.sortNo" placeholder="请输入序号" style="width:150px;"></el-input>
+        </el-form-item>
         <el-form-item label="责任限额/免赔额" prop="limit">
           <el-input v-model="formModel.limit" placeholder="请输入责任限额/免赔额" style="width:300px"></el-input>
         </el-form-item>

src/views/base/insuranceDefinitionLimit-list.vue

@@ -70,10 +70,11 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="definition.name" sort-by="definition_id" label="险种名称" width="180"></el-table-column>
-      <el-table-column prop="name" sort-by="name_" label="限额名称" width="260"></el-table-column>
-      <el-table-column prop="limit" sort-by="limit_" label="责任限额/免赔额" width="180"></el-table-column>
-      <el-table-column prop="unit" sort-by="unit_" label="计算单位(次/元/人/万)" width="260"></el-table-column>
-      <el-table-column label="操作">
+      <el-table-column prop="sortNo" sort-by="sort_no" label="序号" width="50"></el-table-column>
+      <el-table-column prop="name" sort-by="name_" label="限额名称" width="200"></el-table-column>
+      <el-table-column prop="limit" sort-by="limit_" label="责任限额/免赔额" width="150"></el-table-column>
+      <el-table-column prop="unit" sort-by="unit_" label="计算单位(次/元/人/万)" width="180"></el-table-column>
+      <el-table-column label="操作" fixed="right">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>

src/views/base/jobs-detail.vue

@@ -14,6 +14,9 @@
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
+        <el-form-item label="序号" prop="sortNo">
+          <el-input type="number" v-model="formModel.sortNo" placeholder="请输入序号" style="width:150px;"></el-input>
+        </el-form-item>
         <el-form-item label="行业名称" prop="name">
           <el-input v-model="formModel.name" placeholder="请输入行业名称" style="width:300px"></el-input>
         </el-form-item>

src/views/base/jobs-list.vue

@@ -69,10 +69,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="sortNo" sort-by="sort_no" label="序号" width="60"></el-table-column>
       <el-table-column prop="name" sort-by="name_" label="行业" width="260"></el-table-column>
-      <el-table-column prop="content" sort-by="content_" label="详细信息" width="380"></el-table-column>
+      <el-table-column prop="content" sort-by="content_" label="详细信息" width="320"></el-table-column>
       <el-table-column prop="status" sort-by="status_" label="状态" width="150"></el-table-column>
-      <el-table-column label="操作">
+      <el-table-column label="操作" fixed="right">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>

src/views/business/insuranceFirst-firstApproval.vue

@@ -143,8 +143,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
+          formData.append("applicationId", self.id);
+          // formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()

src/views/business/insuranceFirst-firstDetails.vue

@@ -80,14 +80,16 @@
           <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="scope">
-              <a :href="scope.row.companyMember.cardFiles" target="_blank">
-                <el-avatar
-                  size="small"
-                  :src="scope.row.companyMember.cardFiles+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
-                ></el-avatar>
-              </a>
+          <el-table-column prop="companyMember.cardFiles" label="身份证" width="120">
+            <template slot-scope="{row}">
+              <template v-for="url in splitSep(row.companyMember.cardFiles,'|')">
+                <a :href="url" target="_blank" :key="url">
+                  <el-avatar
+                    size="small"
+                    :src="url+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
+                  ></el-avatar>
+                </a>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -204,6 +206,14 @@ export default {
     };
   },
   methods: {
+    splitSep(arrStr,sep) {
+      if(arrStr==null || arrStr.length==0){
+        return [];
+      }
+      else{
+        return arrStr.split(sep);
+      }
+    },
     closeDialog() {
       this.$emit("close", false);
     },
@@ -263,8 +273,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
+          formData.append("applicationId", self.id);
+          // formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()
@@ -295,7 +305,7 @@ export default {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
         } else {
-          return approvalApi.acceptDetail(formData);
+          return insuranceApplicationApi.acceptDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insuranceFirst-issued.vue

@@ -161,8 +161,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
+          formData.append("applicationId", self.id);
+          // formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()

src/views/business/insuranceFirst-leftTab.vue

@@ -69,7 +69,7 @@
             <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="statusN" label="审核状态" width="100"></el-table-column>
             <el-table-column prop="companyMember.sex" label="性别" width="80">
               <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
             </el-table-column>
@@ -182,18 +182,6 @@
               <td class="table-bak">联系方式</td>
               <td class="table-bak">注册账号</td>
             </tr>
-            <tr>
-              <td>社会推广员</td>
-              <td>赵磊</td>
-              <td>18600001111</td>
-              <td>zhaolei001</td>
-            </tr>
-            <tr>
-              <td>保险代理人</td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
           </table>
         </div>
       </div>
@@ -343,8 +331,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
+          formData.append("applicationId", self.id);
+          
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()
@@ -371,15 +359,15 @@ export default {
       var self = this;
 
       var formData = new FormData();
-      formData.append("definitionId", self.definitionId);
-      formData.append("applicationId", self.id);
+      // formData.append("definitionId", self.definitionId);
+      // formData.append("applicationId", self.id);
       formData.append("policyId", self.policyId);
 
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");
         } else {
-          return approvalApi.acceptDetail(formData);
+          return insuranceApplicationApi.acceptDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insuranceFirst-secondApproval.vue

@@ -123,8 +123,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "0");
+          formData.append("applicationId", self.id);
+          // formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()

src/views/business/insuranceFirst-transfer.vue

@@ -173,8 +173,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "0");
+          formData.append("applicationId", self.id);
+          // formData.append("no", "1");
           return insuranceApplicationApi.insureDetail(formData);
         }
       })()

src/views/business/insurancePolicy-firstApproval.vue

@@ -124,9 +124,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
-          return insuranceApplicationApi.insureDetail(formData);
+          formData.append("policyId", self.policyId);
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insurancePolicy-firstDetails.vue

@@ -45,7 +45,7 @@
             <td class="table-bak">雇员人数</td>
             <td width="110">{{insureData.employeesNumber}}</td>
             <td width="90" class="table-bak">投保人数</td>
-            <td width="110">{{insureData.insuredNumber}}</td>
+            <td width="110">{{insureData.insurancePolicy.number}}</td>
             <td class="table-bak">联系电话</td>
             <td>{{insureData.tel}}</td>
           </tr>
@@ -80,14 +80,16 @@
           <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="scope">
-              <a :href="scope.row.companyMember.cardFiles" target="_blank">
-                <el-avatar
-                  size="small"
-                  :src="scope.row.companyMember.cardFiles+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
-                ></el-avatar>
-              </a>
+          <el-table-column prop="companyMember.cardFiles" label="身份证" width="120">
+            <template slot-scope="{row}">
+              <template v-for="url in splitSep(row.companyMember.cardFiles,'|')">
+                <a :href="url" target="_blank" :key="url">
+                  <el-avatar
+                    size="small"
+                    :src="url+'?x-oss-process=image/resize,m_lfit,h_100,w_100'"
+                  ></el-avatar>
+                </a>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -143,7 +145,7 @@
           </tr>
           <tr>
             <td colspan="2" class="table-bak">保险期间</td>
-            <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
+            <td colspan="4">自 {{insureData.insurancePolicy.startTime}} 零时起 至 {{insureData.insurancePolicy.endTime}} 二十四时止。</td>
           </tr>
         </table>
       </el-tab-pane>
@@ -203,6 +205,14 @@ export default {
     };
   },
   methods: {
+    splitSep(arrStr,sep) {
+      if(arrStr==null || arrStr.length==0){
+        return [];
+      }
+      else{
+        return arrStr.split(sep);
+      }
+    },
     closeDialog() {
       this.$emit("close", false);
     },
@@ -273,9 +283,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
-          return insuranceApplicationApi.insureDetail(formData);
+          formData.append("policyId", self.policyId);
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insurancePolicy-issued.vue

@@ -154,10 +154,8 @@ export default {
         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);
+          formData.append("policyId", self.policyId);
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insurancePolicy-leftTab.vue

@@ -69,7 +69,7 @@
             <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="statusN" label="审核状态" width="100"></el-table-column>
             <el-table-column prop="companyMember.sex" label="性别" width="80">
               <template slot-scope="{row}">{{row.companyMember.sex ? "男" : "女"}}</template>
             </el-table-column>
@@ -145,7 +145,7 @@
             </tr>
             <tr>
               <td colspan="2" class="table-bak">保险期间</td>
-              <td colspan="4">自 {{insureData.startTime}} 零时起 至 {{insureData.endTime}} 二十四时止。</td>
+              <td colspan="4">自 {{insureData.insurancePolicy.startTime}} 零时起 至 {{insureData.insurancePolicy.endTime}} 二十四时止。</td>
             </tr>
           </table>
         </div>
@@ -182,18 +182,6 @@
               <td class="table-bak">联系方式</td>
               <td class="table-bak">注册账号</td>
             </tr>
-            <tr>
-              <td>社会推广员</td>
-              <td>赵磊1</td>
-              <td>18600001111</td>
-              <td>zhaolei001</td>
-            </tr>
-            <tr>
-              <td>保险代理人</td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
           </table>
         </div>
       </div>
@@ -263,7 +251,9 @@ export default {
       id: "",
       definitionId: "",
       policyId: "",
-      insureData: "",
+      insureData: {
+        insurancePolicy: {}
+      },
       acceptData: [],
       formModel: {
         processStatus: "",
@@ -345,9 +335,9 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
-          return insuranceApplicationApi.insureDetail(formData);
+          formData.append("policyId", self.policyId);
+
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {
@@ -370,9 +360,10 @@ export default {
       var self = this;
 
       var formData = new FormData();
-      formData.append("definitionId", self.definitionId);
-      formData.append("applicationId", self.id);
+      // formData.append("definitionId", self.definitionId);
+      // formData.append("applicationId", self.id);
       formData.append("policyId", self.policyId);
+
       (function() {
         if (self.definitionId.length == 0) {
           self.$message.error("没有险种");

src/views/business/insurancePolicy-secondApproval.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">复审</a>
+        <a href="/businessInsuranceApplication">下月投保复审</a>
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
@@ -118,9 +118,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
-          return insuranceApplicationApi.insureDetail(formData);
+          formData.append("policyId", self.policyId);
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {

src/views/business/insurancePolicy-transfer.vue

@@ -174,9 +174,8 @@ export default {
           self.$message.error("没有传递ID");
         } else {
           var formData = new FormData();
-          formData.append("id", self.id);
-          formData.append("no", "1");
-          return insuranceApplicationApi.insureDetail(formData);
+          formData.append("policyId", self.policyId);
+          return approvalApi.insureDetail(formData);
         }
       })()
         .then(response => {