样式及页面调整,上传验证更加显目添加

src/views/base/company-detail.vue

@@ -24,7 +24,7 @@
             <a :href="companyData.usccFiles" target="_blank">查看附件</a>
           </td>
           <td width="10%"></td>
-          <td ></td>
+          <td></td>
         </tr>
         <tr>
           <td>联系人</td>
@@ -55,19 +55,19 @@
       <table border="1" style="border-collapse:collapse;width: 100%;">
         <tr>
           <td colspan="4">
-            <el-avatar :size="50" :src="'http://vod.wzgh.org/picc/company/2020/2/123.jpg'"></el-avatar>
-            <span class="bind-von">绑定微信<p>Auxzzz</p></span>
+            <el-avatar :size="50" :src="avatar_url"></el-avatar>
+            <!-- <span class="bind-von">绑定微信<p>Auxzzz</p></span> -->
           </td>
         </tr>
         <tr>
-          <td width="5%">用户名</td>
-          <td width="20%">Jpsoft</td>
+          <td width="5%">用户名{{companyUserData.avatar}}</td>
+          <td width="20%">{{companyUserData.userName}}</td>
           <td width="5%">职业</td>
-          <td width="20%">办公室</td>
+          <td width="20%">{{companyUserData.profession}}</td>
         </tr>
         <tr>
           <td>简介</td>
-          <td colspan="3">很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介很长很长很长的简介</td>
+          <td colspan="3">{{companyUserData.summary}}</td>
         </tr>
       </table>
     </div>
@@ -85,7 +85,8 @@ export default {
       loading: false,
       submitting: false,
       companyData: "",
-      companyUserData: ""
+      companyUserData: "",
+      avatar: ""
     };
   },
   methods: {
@@ -126,9 +127,9 @@ export default {
 
     companyApi.companyUserDetail(formData).then(function(response) {
       var jsonData = response.data;
-
       if (jsonData.result) {
         self.companyUserData = jsonData.data;
+        self.avatarUrl = jsonData.data.avatar;
       }
     });
   }
@@ -164,8 +165,8 @@ export default {
   vertical-align: initial;
 }
 
-.application-panel table{
-  border:0
+.application-panel table {
+  border: 0;
 }
 
 .el-tabs.el-tabs--card.el-tabs--top {
@@ -215,19 +216,19 @@ export default {
   font-size: 14px;
 }
 
-.application-panel td{
-  position:relative
+.application-panel td {
+  position: relative;
 }
 
-.bind-von{
-    display: block;
-    position: absolute;
-    left: 70px;
-    top: 50%;
-    margin-top: -19px;
+.bind-von {
+  display: block;
+  position: absolute;
+  left: 70px;
+  top: 50%;
+  margin-top: -19px;
 }
 
-.bind-von p{
-  margin:0
+.bind-von p {
+  margin: 0;
 }
 </style>

src/views/base/insuranceAgent-list.vue

@@ -61,7 +61,7 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="name" label="姓名" width="180"></el-table-column>
-      <el-table-column prop="type" label="类型" width="180"></el-table-column>
+      <el-table-column prop="typeN" label="类型" width="180"></el-table-column>
       <el-table-column prop="status" label="审核状态" :sortable="true" width="180">
         <template slot-scope="{row}">{{row.status == 0 ? "审核未通过" : "审核通过"}}</template>
       </el-table-column>

src/views/business/insuranceFirst-issued.vue

@@ -20,24 +20,20 @@
       <el-container>
         <el-main>
           <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="当前步骤" style="text-align:left;">{{policy.statusN}}</el-form-item>
             <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>
+            <el-form-item label="应收保费" style="text-align:left;">{{policy.insuranceFee}}</el-form-item>
             <el-form-item label="投保人名称" style="text-align:left;">{{insureData.insuredName}}</el-form-item>
             <el-form-item label="出账银行" style="text-align:left;">{{policy.issuingBank}}</el-form-item>
             <el-form-item label="入账银行" style="text-align:left;">{{policy.accountBank}}</el-form-item>
             <el-form-item label="转账单号" style="text-align:left;">{{policy.singlNumber}}</el-form-item>
             <el-form-item label="保险代理人" style="text-align:left;">{{agent.name}}</el-form-item>
-            <el-form-item label="上传保单" style="text-align:left;">
+            <el-form-item label="上传保单" style="text-align:left;" prop="uploadUrl" ref="uploadUrlImg">
               <el-upload
                 class="upload-demo"
                 :action="uploadUrl"
@@ -58,9 +54,7 @@
                 <div slot="tip" class="el-upload__tip"></div>
               </el-upload>
             </el-form-item>
-            <el-form-item label="下一步骤" style="text-align:left;">
-              已出单
-            </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>
               <el-button size="mini" type="primary" :loading="submiting" @click="saveApproval()">提交</el-button>
@@ -84,14 +78,12 @@ import leftTab from "./insurancePolicy-leftTab.vue";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
-
 export default {
   components: {
     leftTab: leftTab
   },
   data() {
     var self = this;
-    var token = getToken();
 
     return {
       queryModel: {
@@ -104,6 +96,13 @@ export default {
             message: "请选择处理类型",
             trigger: "blur"
           }
+        ],
+        uploadUrl: [
+          {
+            required: true,
+            message: "请上传保单",
+            trigger: "blur"
+          }
         ]
       },
       loading: false,
@@ -123,7 +122,7 @@ export default {
       definitionId: "",
       policyId: "",
       insureData: {
-        insurancePolicy:{}
+        insurancePolicy: {}
       },
       acceptData: [],
       formModel: {
@@ -148,7 +147,7 @@ export default {
       uploadData: {
         subFolder: "isuued"
       },
-      fileUrl:'',
+      fileUrl: "",
       headers: {
         Authorization: getToken()
       },
@@ -195,11 +194,14 @@ export default {
       var self = this;
 
       this.$refs["form"].validate(valid => {
+        if (self.fileUrl) {
+          //该值判断附件路径下是否有值即是否有上传
+          self.$refs.uploadUrlImg.clearValidate();
+        }
         if (valid) {
-          var self = this;
           var formModel = this.formModel;
 
-          if(self.fileUrl.length==0 && formModel.processStatus=="正常"){
+          if (self.fileUrl.length == 0 && formModel.processStatus == "正常") {
             self.$message.error("请先上传保单!");
             return;
           }
@@ -250,10 +252,10 @@ export default {
     handleUploadFileSuccess(response, file, fileList) {
       console.log(response);
 
-      if(response.result){
+      if (response.result) {
         this.fileUrl = response.data;
-      }
-      else{
+        this.$refs.uploadUrlImg.clearValidate();
+      } else {
         this.$message.error(response.message || "上传文件失败!");
       }
     },

src/views/business/insurancePolicy-issued.vue

@@ -20,23 +20,19 @@
       <el-container>
         <el-main>
           <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="当前步骤" style="text-align:left;">{{policy.statusN}}</el-form-item>
             <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>
+            <el-form-item label="应收保费" style="text-align:left;">{{policy.insuranceFee}}</el-form-item>
             <el-form-item label="出账银行" style="text-align:left;">{{policy.issuingBank}}</el-form-item>
             <el-form-item label="入账银行" style="text-align:left;">{{policy.accountBank}}</el-form-item>
             <el-form-item label="转账单号" style="text-align:left;">{{policy.singlNumber}}</el-form-item>
             <el-form-item label="保险代理人" style="text-align:left;">{{agent.name}}</el-form-item>
-            <el-form-item label="上传保单" style="text-align:left;">
+            <el-form-item label="上传保单" style="text-align:left;" prop="uploadUrl" ref="uploadUrlImg">
               <el-upload
                 class="upload-demo"
                 :action="uploadUrl"
@@ -57,9 +53,7 @@
                 <div slot="tip" class="el-upload__tip"></div>
               </el-upload>
             </el-form-item>
-            <el-form-item label="下一步骤" style="text-align:left;">
-              已出单
-            </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>
               <el-button size="mini" type="primary" :loading="submiting" @click="saveApproval()">提交</el-button>
@@ -85,7 +79,6 @@ export default {
   },
   data() {
     var self = this;
-    var token = getToken;
     return {
       queryModel: {
         id: ""
@@ -97,6 +90,13 @@ export default {
             message: "请选择处理类型",
             trigger: "blur"
           }
+        ],
+        uploadUrl: [
+          {
+            required: true,
+            message: "请上传保单",
+            trigger: "blur"
+          }
         ]
       },
       loading: false,
@@ -133,10 +133,10 @@ export default {
       filesData: [],
       insuranceAgentlist: "",
       policy: {},
-      agent:"",
+      agent: "",
       //上传地址
       uploadUrl: Constant.serverUrl + "/base/attachment/upload",
-      fileUrl:'',
+      fileUrl: "",
       uploadData: {
         subFolder: "isuued"
       },
@@ -179,7 +179,7 @@ export default {
             approvalApi.otherDetail(formData).then(response => {
               var jsonData = response.data;
               this.policy = jsonData.data.policy;
-              this.agent =  jsonData.data.policy.agent;
+              this.agent = jsonData.data.policy.agent;
             });
           } else {
             self.$message.error(jsonData.message + "");
@@ -193,11 +193,15 @@ export default {
       var self = this;
 
       this.$refs["form"].validate(valid => {
+        if (self.fileUrl) {
+          //该值判断附件路径下是否有值即是否有上传
+          self.$refs.uploadUrlImg.clearValidate();
+        }
         if (valid) {
           var self = this;
           var formModel = this.formModel;
 
-          if(self.fileUrl.length==0 && formModel.processStatus=="正常"){
+          if (self.fileUrl.length == 0 && formModel.processStatus == "正常") {
             self.$message.error("请先上传保单!");
             return;
           }
@@ -261,10 +265,10 @@ export default {
     handleUploadFileSuccess(response, file, fileList) {
       console.log(response);
 
-      if(response.result){
+      if (response.result) {
         this.fileUrl = response.data;
-      }
-      else{
+        this.$refs.uploadUrlImg.clearValidate();
+      } else {
         this.$message.error(response.message || "上传文件失败!");
       }
     },