Merge branch 'master' of http://223.75.76.159:9090/zq/picc-admin-portal

.env.development

@@ -1,2 +1,2 @@
-VUE_APP_BACKEND_URL=http://localhost:8081/picc-admin-server
-//VUE_APP_BACKEND_URL=http://gyxm.jing-zhou.gov.cn/picc-admin-server
+//VUE_APP_BACKEND_URL=http://localhost:8081/picc-admin-server
+VUE_APP_BACKEND_URL=http://gyxm.jing-zhou.gov.cn/picc-admin-server

src/api/base/company.js

@@ -9,7 +9,12 @@ function detail(id) {
   return request.get(constant.serverUrl + "/company/detail?companyId=" + id);
 }
 
+function companyUserDetail(formData) {
+  return request.post(constant.serverUrl + "/company/companyUserDetail", formData);
+}
+
+
 
 export default {
-  detail, pageList
+  detail, pageList, companyUserDetail
 }

src/views/base/company-detail.vue

@@ -83,7 +83,8 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      companyData: ""
+      companyData: "",
+      companyUserData: ""
     };
   },
   methods: {
@@ -118,6 +119,17 @@ export default {
       .catch(error => {
         self.$message.error(error + "");
       });
+
+    var formData = new FormData();
+    formData.append("companyId", self.companyId);
+
+    companyApi.companyUserDetail(formData).then(function(response) {
+      var jsonData = response.data;
+
+      if (jsonData.result) {
+        self.companyUserData = jsonData.data;
+      }
+    });
   }
 };
 </script>

src/views/business/insuranceFirst-issued.vue

@@ -67,13 +67,11 @@
                   </el-form-item>
                 </td>
               </tr>-->
-              <!-- <tr>
+              <tr>
                 <td colspan="2">
-                  <el-form-item label="保险代理人">
-                    {{insureData.insurancePolicy.agentId}}
-                  </el-form-item>
+                  <el-form-item label="保险代理人">{{agent.name}}</el-form-item>
                 </td>
-              </tr>-->
+              </tr>
               <tr>
                 <td colspan="2">
                   <el-form-item label="上传保单">
@@ -108,6 +106,11 @@
                   <el-button size="mini" type="success" @click="downloadFiles()">打包下载申请资料</el-button>
                 </td>
                 <td>
+                  <el-button size="mini" type="success" @click="downloadPDF()">下载电子保单版</el-button>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="2">
                   <el-button size="mini" type="primary" @click="saveApproval()">提交</el-button>
                 </td>
               </tr>
@@ -129,6 +132,7 @@ import leftTab from "./insuranceFirst-leftTab.vue";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
+
 export default {
   components: {
     leftTab: leftTab
@@ -183,6 +187,7 @@ export default {
       filesData: [],
       insuranceAgentlist: "",
       policy: "",
+      agent: "",
       //上传地址
       uploadUrl: Constant.serverUrl + "/base/attachment/upload",
       uploadData: {
@@ -212,6 +217,7 @@ export default {
 
           if (jsonData.result) {
             self.insureData = jsonData.data;
+            this.agent = self.insureData.insurancePolicy.agent;
             this.definitionId = self.insureData.definitionId;
             this.policyId = self.insureData.insurancePolicy.id;
           } else {

src/views/business/insuranceFirst-transfer.vue

@@ -71,7 +71,19 @@
               <tr>
                 <td colspan="2">
                   <el-form-item label="保险代理人" prop="agentId">
-                    <el-input placeholder="请输入保险代理人" v-model="formModel.agentId"></el-input>
+                    <el-select
+                      v-model="formModel.agentId"
+                      filterable
+                      placeholder="请选择"
+                      style="width:300px"
+                    >
+                      <el-option
+                        v-for="agent in agentData"
+                        :key="agent.id "
+                        :label="agent.name"
+                        :value="agent.id"
+                      ></el-option>
+                    </el-select>
                   </el-form-item>
                 </td>
               </tr>
@@ -110,7 +122,7 @@
 import Constant from "@/constant";
 import insuranceApplicationApi from "@/api/business/insuranceApplication";
 import approvalApi from "@/api/business/approval";
-
+import insuranceAgentApi from "@/api/base/insuranceAgent";
 import leftTab from "./insuranceFirst-leftTab.vue";
 
 import NProgress from "nprogress"; // progress bar
@@ -188,7 +200,9 @@ export default {
       totalPagesRecord: 0,
       totalElementsRecord: 0,
       filesData: [],
-      insuranceAgentlist: ""
+      insuranceAgentlist: "",
+      policy: "",
+      agentData: []
     };
   },
   methods: {
@@ -212,6 +226,15 @@ export default {
             self.insureData = jsonData.data;
             this.definitionId = self.insureData.definitionId;
             this.policyId = self.insureData.insurancePolicy.id;
+
+            var formData = new FormData();
+
+            formData.append("type", "1");
+
+            insuranceAgentApi.list(formData).then(response => {
+              var jsonData = response.data;
+              this.agentData = jsonData.data;
+            });
           } else {
             self.$message.error(jsonData.message + "");
           }
@@ -238,7 +261,7 @@ export default {
             formData.append("accountBank", self.formModel.accountBank);
             formData.append("issuingBank", self.formModel.issuingBank);
             formData.append("singlNumber", self.formModel.singlNumber);
-
+            formData.append("agentId", self.formModel.agentId);
             return approvalApi.transfer(formData);
           })().then(function(response) {
             var jsonData = response.data;

src/views/business/insurancePolicy-transfer.vue

@@ -235,10 +235,13 @@ export default {
               this.policy = jsonData.data.policy;
             });
 
-            insuranceAgentApi.list().then(response => {
+
+            
+            formData.append("type", "1");
+
+            insuranceAgentApi.list(formData).then(response => {
               var jsonData = response.data;
               this.agentData = jsonData.data;
-              console.log(jsonData);
             });
           } else {
             self.$message.error(jsonData.message + "");