流程逻辑完善。

src/views/business/insuranceFirst-firstApproval.vue

@@ -35,6 +35,7 @@
                       v-model="formModel.processStatus"
                       placeholder="请选择"
                       filterable
+                      size="mini"
                       style="position: absolute;width: 70%;right: 0;"
                     >
                       <el-option label="通过" value="正常"></el-option>

src/views/business/insuranceFirst-firstDetails.vue

@@ -17,8 +17,10 @@
       <el-tab-pane label="投保信息" name="0">
         <table border="1" style="border-collapse:collapse;">
           <tr>
-            <td colspan="2" class="table-bak">投保人名称</td>
-            <td colspan="3">{{insureData.insuredName}}</td>
+            <td colspan="2" class="table-bak">投保单号</td>
+            <td>{{insureData.policyNo}}</td>
+            <td class="table-bak">投保人名称</td>
+            <td>{{insureData.insuredName}}</td>
             <td class="table-bak">联系电话</td>
             <td>{{insureData.insuredTel}}</td>
           </tr>

src/views/business/insuranceFirst-issued.vue

@@ -24,6 +24,7 @@
             <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>
             <el-form-item label="应收保费" style="text-align:left;">{{policy.insuranceFee}}</el-form-item>
@@ -53,6 +54,9 @@
                 <div slot="tip" class="el-upload__tip"></div>
               </el-upload>
             </el-form-item>
+            <el-form-item prop="opinion">
+              <el-input type="textarea" :rows="4" placeholder="请输入处理意见" v-model="formModel.opinion"></el-input>
+            </el-form-item>
             <el-form-item label="下一步骤" style="text-align:left;">已出单</el-form-item>
             <el-form-item>
               <el-button size="mini" type="success" @click="downloadFiles()">打包下载申请资料</el-button>

src/views/business/insuranceFirst-leftTab.vue

@@ -7,11 +7,15 @@
           <div class="title-von">
             <h4>投保信息</h4>
           </div>
-          <table border="1" style="border-collapse:collapse;width: 100%;">
+          <table class="table-info" border="1" style="border-collapse:collapse;width: 100%;">
+            <tr>
+              <td colspan="2" class="table-bak">投保单号</td>
+              <td colspan="5">{{insureData.policyNo}}</td>
+            </tr>
             <tr>
               <td colspan="2" class="table-bak">投保人名称</td>
               <td colspan="3">{{insureData.insuredName}}</td>
-              <td width="90" class="table-bak">联系电话</td>
+              <td class="table-bak">联系电话</td>
               <td>{{insureData.insuredTel}}</td>
             </tr>
             <tr>
@@ -201,8 +205,8 @@
             <span>{{(pageIndexRecord - 1) * pageSizeRecord + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processStatus" label="审核状态" width="100"></el-table-column>
         <el-table-column prop="statusN" label="审核步骤" width="100"></el-table-column>
+        <el-table-column prop="processStatus" label="处理类型" width="100"></el-table-column>
         <el-table-column prop="opinion" label="意见" width="500"></el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="150"></el-table-column>
       </el-table>
@@ -536,8 +540,14 @@ export default {
   padding: 20px;
 }
 
-.table-bak {
+.table-info td{
+  text-align:left;
+  padding-left:5px;
+}
+
+.table-info .table-bak {
   background: #f6f6f6;
+  text-align:center;
 }
 
 .el-tab-pane .title-von {

src/views/business/insuranceFirst-list.vue

@@ -84,23 +84,23 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="statusN" label="投保单状态" width="100"></el-table-column>
-        <el-table-column prop="definitionName" label="保险种类" width="180"></el-table-column>
-        <el-table-column prop="policyNo" label="投保单号" width="180"></el-table-column>
-        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
+        <el-table-column prop="statusN" label="投保单状态" width="150"></el-table-column>
+        <el-table-column prop="definitionName" label="保险种类" width="150"></el-table-column>
+        <el-table-column prop="policyNo" label="投保单号" width="200"></el-table-column>
         <el-table-column prop="companyName" 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="insuredNumber" label="投保人数" width="80"></el-table-column>
-        <el-table-column prop="insuredNumber" label="投保人数" width="80"></el-table-column>
         <el-table-column label="投保期间" width="200">
-          <template slot-scope="{row}">{{row.startTime}}-{{row.endTime}}</template>
+          <template slot-scope="{row}">{{row.startTime}}至{{row.endTime}}</template>
         </el-table-column>
         <el-table-column prop="insuranceFee" label="保险费合计" width="100">
           <template slot-scope="scope">
             <span class="insure-money">￥{{scope.row.insuranceFee}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" width="180"></el-table-column>
+        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
         <el-table-column label="操作" width="250" fixed="right">
           <template slot-scope="{row}">
             <el-button size="mini" @click="openFirstDetails(row)">查看详情</el-button>&#12288;&#12288;
@@ -339,17 +339,20 @@ export default {
       formData.append("policyId", "");
       formData.append("status", status);
 
-      approvalApi.rollbackOrder(formData).then(function(response) {
+      approvalApi.rollbackOrder(formData).then((response)=>{
         var jsonData = response.data;
 
         if (jsonData.result) {
-          self.changePage(self.pageIndex);
+          this.changePage(this.pageIndex);
 
-          self.$message({
+          this.$message({
             type: "success",
             message: "返回成功!"
           });
         }
+        else{
+          this.$message.error(jsonData.message);
+        }
       });
     }
   },

src/views/business/insuranceFirst-listPicc.vue

@@ -73,22 +73,23 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="statusN" label="投保单状态" width="100"></el-table-column>
-        <el-table-column prop="definitionName" label="保险种类" width="180"></el-table-column>
-        <el-table-column prop="policyNo" label="投保单号" width="180"></el-table-column>
-        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
+        <el-table-column prop="statusN" label="投保单状态" width="150"></el-table-column>
+        <el-table-column prop="definitionName" label="保险种类" width="150"></el-table-column>
+        <el-table-column prop="policyNo" label="投保单号" width="200"></el-table-column>
         <el-table-column prop="companyName" 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="insuredTel" label="联系电话" width="180"></el-table-column>-->
         <el-table-column prop="insuredNumber" label="投保人数" width="80"></el-table-column>
         <el-table-column label="投保期间" width="200">
-          <template slot-scope="{row}">{{row.startTime}}-{{row.endTime}}</template>
+          <template slot-scope="{row}">{{row.startTime}}至{{row.endTime}}</template>
         </el-table-column>
         <el-table-column prop="insuranceFee" label="保险费合计" width="100">
           <template slot-scope="scope">
             <span class="insure-money">￥{{scope.row.insuranceFee}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" width="180"></el-table-column>
+        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
         <el-table-column label="操作" width="300" fixed="right">
           <template slot-scope="{row}">
             <el-button size="mini" @click="openFirstDetails(row)">查看详情</el-button>&#12288;&#12288;

src/views/business/insuranceFirst-secondApproval.vue

@@ -28,7 +28,7 @@
               {{policy.statusN}}
             </el-form-item>
             <el-form-item label="处理类型" prop="processStatus">
-              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable size="mini">
                 <el-option label="通过" value="正常"></el-option>
                 <el-option label="返回上一步" value="回退"></el-option>
               </el-select>

src/views/business/insuranceFirst-transfer.vue

@@ -22,7 +22,8 @@
           <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
             <el-form-item label="当前步骤" style="text-align:left;">{{policy.statusN}}</el-form-item>
             <el-form-item label="处理类型" prop="processStatus">
-              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable 
+                size="mini">
                 <el-option label="通过" value="正常"></el-option>
               </el-select>
             </el-form-item>
@@ -38,7 +39,7 @@
                 <el-option
                   v-for="result in issuingBankData"
                   :key="result.id"
-                  :label="result.name"
+                  :label="result.name + ':' + result.value"
                   :value="result.value"
                 ></el-option>
               </el-select>
@@ -54,20 +55,22 @@
                 <el-option
                   v-for="result in accountBankData"
                   :key="result.id"
-                  :label="result.name"
+                  :label="result.name + ':' + result.value"
                   :value="result.value"
                 ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="转账单号" prop="singlNumber">
-              <el-input placeholder="请输入转账单号" v-model="formModel.singlNumber" style="width:50%"></el-input>
+              <el-input placeholder="请输入转账单号" size="mini" 
+              v-model="formModel.singlNumber"></el-input>
             </el-form-item>
             <el-form-item label="保险代理人" prop="agentId">
               <el-select
                 v-model="formModel.agentId"
                 filterable
                 placeholder="请选择"
-                style="width:300px"
+                style="width:200px"
+                size="mini"
               >
                 <el-option
                   v-for="agent in agentData"
@@ -174,7 +177,8 @@ export default {
         opinion: "",
         accountBank: "",
         issuingBank: "",
-        singlNumber: ""
+        singlNumber: "",
+        agentId: ""
       },
       recordData: [],
       pageIndexRecord: 1,
@@ -187,7 +191,7 @@ export default {
       agentData: [],
       submiting: false,
       accountBankData: [],
-      issuingBank: []
+      issuingBankData: []
     };
   },
   methods: {
@@ -219,14 +223,10 @@ export default {
               self.$refs.leftTab.insureDetail();
             });
 
-            var formData = new FormData();
-
-            formData.append("type", "1");
-
-            insuranceAgentApi.list(formData).then(response => {
-              var jsonData = response.data;
-              this.agentData = jsonData.data;
-            });
+            self.formModel.accountBank = self.policy.accountBank;
+            self.formModel.issuingBank = self.policy.issuingBank;
+            self.formModel.singlNumber = self.policy.singlNumber;
+            self.formModel.agentId = self.policy.agentId;
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -317,12 +317,22 @@ export default {
     downloadFiles() {
       approvalApi.downloadPolicyZip(this.policyId);
     },
+    loadAgentList() {
+        var formData = new FormData();
+
+        formData.append("type", "1");
+
+        return insuranceAgentApi.list(formData).then(response => {
+          var jsonData = response.data;
+          this.agentData = jsonData.data;
+        });
+    },
     loadAccountBank() {
       var formData = new FormData();
 
       formData.append("catalogName", "入账银行");
 
-      dataDictionaryApi.findByCatalogName(formData).then(response => {
+      return dataDictionaryApi.findByCatalogName(formData).then(response => {
         var jsonData = response.data;
         this.accountBankData = jsonData.data;
       });
@@ -332,7 +342,7 @@ export default {
 
       formData.append("catalogName", "出账银行");
 
-      dataDictionaryApi.findByCatalogName(formData).then(response => {
+      return dataDictionaryApi.findByCatalogName(formData).then(response => {
         var jsonData = response.data;
         this.issuingBankData = jsonData.data;
       });
@@ -344,9 +354,11 @@ export default {
 
     self.id = this.$route.query.id;
     self.formModel.processStatus = "正常";
+    await this.loadIssuingBank();
+    await this.loadAccountBank();
+    await this.loadAgentList();
+
     this.insureDetail();
-    this.loadIssuingBank();
-    this.loadAccountBank();
   }
 };
 </script>

src/views/business/insurancePolicy-firstDetails.vue

@@ -17,8 +17,10 @@
       <el-tab-pane label="投保信息" name="0">
         <table border="1" style="border-collapse:collapse;">
           <tr>
-            <td colspan="2" class="table-bak">投保人名称</td>
-            <td colspan="3">{{insureData.insuredName}}</td>
+            <td colspan="2" class="table-bak">投保单号</td>
+            <td>{{insureData.policyNo}}</td>
+            <td class="table-bak">投保人名称</td>
+            <td>{{insureData.insuredName}}</td>
             <td class="table-bak">联系电话</td>
             <td>{{insureData.insuredTel}}</td>
           </tr>

src/views/business/insurancePolicy-issued.vue

@@ -24,6 +24,7 @@
             <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>
             <el-form-item label="应收保费" style="text-align:left;">{{policy.insuranceFee}}</el-form-item>
@@ -52,6 +53,9 @@
                 <div slot="tip" class="el-upload__tip"></div>
               </el-upload>
             </el-form-item>
+            <el-form-item prop="opinion">
+              <el-input type="textarea" :rows="4" placeholder="请输入处理意见" v-model="formModel.opinion"></el-input>
+            </el-form-item>
             <el-form-item label="下一步骤" style="text-align:left;">已出单</el-form-item>
             <el-form-item>
               <el-button size="mini" type="success" @click="downloadFiles()">打包下载申请资料</el-button>

src/views/business/insurancePolicy-leftTab.vue

@@ -7,11 +7,15 @@
           <div class="title-von">
             <h4>投保信息</h4>
           </div>
-          <table border="1" style="border-collapse:collapse;width: 100%;">
+          <table border="1" class="table-info">
+            <tr>
+              <td colspan="2" class="table-bak">投保单号</td>
+              <td colspan="5">{{insureData.policyNo}}</td>
+            </tr>
             <tr>
               <td colspan="2" class="table-bak">投保人名称</td>
               <td colspan="3">{{insureData.insuredName}}</td>
-              <td width="90" class="table-bak">联系电话</td>
+              <td class="table-bak">联系电话</td>
               <td>{{insureData.insuredTel}}</td>
             </tr>
             <tr>
@@ -203,8 +207,8 @@
             <span>{{(pageIndexRecord - 1) * pageSizeRecord + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processStatus" label="审核状态" width="100"></el-table-column>
         <el-table-column prop="statusN" label="审核步骤" width="100"></el-table-column>
+        <el-table-column prop="processStatus" label="处理类型" width="100"></el-table-column>
         <el-table-column prop="opinion" label="意见" width="500"></el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="150"></el-table-column>
       </el-table>
@@ -535,8 +539,19 @@ export default {
   padding: 20px;
 }
 
-.table-bak {
+.table-info{
+  border-collapse:collapse;
+  width: 100%;
+}
+
+.table-info td{
+  text-align:left;
+  padding-left:5px;
+}
+
+.table-info .table-bak {
   background: #f6f6f6;
+  text-align:center;
 }
 
 .el-tab-pane .title-von {

src/views/business/insurancePolicy-list.vue

@@ -78,21 +78,22 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="policy.statusN" label="投保单状态" width="150"></el-table-column>
         <el-table-column prop="application.definitionName" label="保险种类" width="180"></el-table-column>
-        <el-table-column prop="policyNo" label="投保单号" width="180"></el-table-column>
-        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
+        <el-table-column prop="policy.policyNo" label="投保单号" width="200"></el-table-column>
         <el-table-column prop="application.companyName" 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 label="投保期间" width="200">
-          <template slot-scope="{row}">{{row.policy.startTime}}-{{row.policy.endTime}}</template>
+        <el-table-column label="投保期间" width="280">
+          <template slot-scope="{row}">{{row.policy.startTime}}至{{row.policy.endTime}}</template>
         </el-table-column>
         <el-table-column prop="insuranceFee" label="保险费合计" width="100">
           <template slot-scope="scope">
             <span class="insure-money">￥{{scope.row.policy.insuranceFee}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="policy.statusN" label="投保单状态" width="180"></el-table-column>
+        <el-table-column prop="policy.createTime" label="创建时间" width="180"></el-table-column>
+        <el-table-column prop="policy.finishTime" label="出单时间" width="180"></el-table-column>
         <el-table-column label="操作" width="320" fixed="right">
           <template slot-scope="{row}">
             <el-button size="mini" @click="openPolicyDetails(row)">查看详情</el-button>&#12288;&#12288;

src/views/business/insurancePolicy-listPicc.vue

@@ -73,20 +73,22 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="policy.statusN" label="投保单状态" width="150"></el-table-column>
         <el-table-column prop="application.definitionName" label="保险种类" width="180"></el-table-column>
-        <el-table-column prop="policyNo" label="投保单号" width="180"></el-table-column>
-        <el-table-column prop="finishTime" label="出单时间" width="180"></el-table-column>
+        <el-table-column prop="policy.policyNo" label="投保单号" width="200"></el-table-column>
         <el-table-column prop="application.companyName" 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 label="投保期间" width="280">
-          <template slot-scope="{row}">{{row.policy.startTime}}-{{row.policy.endTime}}</template>
+          <template slot-scope="{row}">{{row.policy.startTime}}至{{row.policy.endTime}}</template>
         </el-table-column>
         <el-table-column prop="insuranceFee" label="保险费合计" width="100">
           <template slot-scope="scope">
             <span class="insure-money">￥{{scope.row.policy.insuranceFee}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="policy.createTime" label="创建时间" width="180"></el-table-column>
+        <el-table-column prop="policy.finishTime" label="出单时间" width="180"></el-table-column>
         <el-table-column prop="policy.statusN" label="投保单状态" width="180"></el-table-column>
         <el-table-column label="操作" width="300" fixed="right">
           <template slot-scope="{row}">

src/views/business/insurancePolicy-transfer.vue

@@ -23,7 +23,7 @@
           <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
             <el-form-item label="当前步骤" style="text-align:left;">{{policy.statusN}}</el-form-item>
             <el-form-item label="处理类型" prop="processStatus">
-              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable>
+              <el-select v-model="formModel.processStatus" placeholder="请选择" filterable size="mini">
                 <el-option label="通过" value="正常"></el-option>
               </el-select>
             </el-form-item>
@@ -39,7 +39,7 @@
                 <el-option
                   v-for="result in issuingBankData"
                   :key="result.id"
-                  :label="result.name"
+                  :label="result.name + ':' + result.value"
                   :value="result.value"
                 ></el-option>
               </el-select>
@@ -55,20 +55,21 @@
                 <el-option
                   v-for="result in accountBankData"
                   :key="result.id"
-                  :label="result.name"
+                  :label="result.name + ':' + result.value"
                   :value="result.value"
                 ></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="转账单号" prop="singlNumber">
-              <el-input placeholder="请输入转账单号" v-model="formModel.singlNumber" style="width:50%"></el-input>
+              <el-input placeholder="请输入转账单号" v-model="formModel.singlNumber" size="mini"></el-input>
             </el-form-item>
             <el-form-item label="保险代理人" prop="agentId">
               <el-select
                 v-model="formModel.agentId"
                 filterable
                 placeholder="请选择"
-                style="width:300px"
+                style="width:200px"
+                size="mini"
               >
                 <el-option
                   v-for="agent in agentData"
@@ -173,7 +174,8 @@ export default {
         opinion: "",
         accountBank: "",
         issuingBank: "",
-        singlNumber: ""
+        singlNumber: "",
+        agentId: ""
       },
       recordData: [],
       pageIndexRecord: 1,
@@ -186,7 +188,7 @@ export default {
       agentData: [],
       submiting: false,
       accountBankData: [],
-      issuingBank: []
+      issuingBankData: []
     };
   },
   methods: {
@@ -221,13 +223,11 @@ export default {
             approvalApi.otherDetail(formData).then(response => {
               var jsonData = response.data;
               self.policy = jsonData.data.policy;
-            });
-
-            formData.append("type", "1");
 
-            insuranceAgentApi.list(formData).then(response => {
-              var jsonData = response.data;
-              this.agentData = jsonData.data;
+              self.formModel.accountBank = self.policy.accountBank;
+              self.formModel.issuingBank = self.policy.issuingBank;
+              self.formModel.singlNumber = self.policy.singlNumber;
+              self.formModel.agentId = self.policy.agentId;
             });
           } else {
             self.$message.error(jsonData.message + "");
@@ -338,7 +338,17 @@ export default {
         var jsonData = response.data;
         this.issuingBankData = jsonData.data;
       });
-    }
+    },
+    loadAgentList() {
+        var formData = new FormData();
+
+        formData.append("type", "1");
+
+        return insuranceAgentApi.list(formData).then(response => {
+          var jsonData = response.data;
+          this.agentData = jsonData.data;
+        });
+    },
   },
   async mounted() {
     var self = this;
@@ -347,9 +357,12 @@ export default {
     self.id = this.$route.query.id;
     self.policyId = this.$route.query.policyId;
     self.formModel.processStatus = "正常";
+
+    await this.loadIssuingBank();
+    await this.loadAccountBank();
+    await this.loadAgentList();
+
     this.insureDetail();
-    this.loadIssuingBank();
-    this.loadAccountBank();
   }
 };
 </script>