Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -80,7 +80,7 @@
       </Split>
     </el-main>
     <!-- 新增协议的对话框 -->
-    <el-dialog :title="dialogTitle" v-dialogDrag :visible.sync="agreementdialogVisible" width="60%"
+    <el-dialog :title="dialogTitle" v-dialogDrag :visible.sync="agreementdialogVisible" width="70%"
     :close-on-click-modal="false" :close-on-press-escape="false"
       style="margin-top: -8vh;" @close="closeDialog()">
       <el-row style="margin-bottom: 10px;" v-if="agreement.agreestatuButtonSizes == '2'">
@@ -1213,10 +1213,10 @@
         </el-tab-pane>
         <el-tab-pane label="保险公司账号配置" name="inscommany">
           <el-form class="demo-ruleForm wrap-scrollbar scroll-style" :model="attributionform" ref="attributionform"
-            label-width="170px" size="small">
+            label-width="auto" size="small">
             <el-row>
               <el-col :span="12">
-                <el-form-item label="api类型：">
+                <el-form-item class="apistyle" label="api类型：">
                   <el-select class="widths1" v-model="attributionform.apiType" @change="apiChange">
                     <el-option label="API" :value="1"></el-option>
                     <el-option label="python" :value="2"></el-option>
@@ -1229,12 +1229,12 @@
                     <h4>账号配置</h4>
                   </div>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="11">
                   <el-form-item label="用户名：" prop="username">
                     <el-input v-model="attributionform.username" placeholder="请输入用户名"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="11">
                   <el-form-item label="密码：" prop="password">
                     <el-input v-model="attributionform.password" placeholder="请输入密码"></el-input>
                   </el-form-item>
@@ -1246,9 +1246,9 @@
                     <h4>配置参数</h4>
                   </div>
                 </el-col>
-                <el-col :span="10" v-for="(domain, index) in  attributionform.fields" :key="domain.index">
+                <el-col :span="11" v-for="(domain, index) in  attributionform.fields" :key="domain.index">
                   <el-form-item :label="domain.label + ':'" :prop="'fields.' + index + '.value'" :rules="{
-                    required: true, message: domain.label + '不能为空', trigger: 'blur'
+                    required: domain.isEdit, message: domain.label + '不能为空', trigger: 'blur'
                   }">
                     <el-input class="widths1" v-model="domain.value" :type="domain.type"></el-input>
                   </el-form-item>
@@ -3073,6 +3073,11 @@ export default {
     //-- formatter end--
     // 选择合作公司Start
     handleChange(value) {
+      if(!value){ //没数
+        return
+      }
+      this.attributionform.apiType=''; //每次更改公司选择后清除保险公司账号配置
+      this.attributionform.fields = [] //每次更改公司选择后清除保险公司账号配置参数
       this.agreement.partnerCompaniesId = value[value.length - 1];
       if (this.supplierType == '1') {
         this.agreement.agreementType = "1";
@@ -3392,5 +3397,7 @@ export default {
     }
   }
 }
+.apistyle /deep/ .el-form-item__label{
+  min-width: 180px;
+}
 </style>
-

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -770,9 +770,7 @@ export default {
                 (ele) => ele.value == val.status
               ).label;
             }
-            if (val.roleId && val.roleId !== "" && val.roleId !== null) {
-              val.roleId = this.roles.find((ele) => ele.id == val.roleId).name;
-            }
+            val.roleId=val.roleName
           });
           this.pageResult = res.data;
         });

src/views/PeopleManage/Agent/AgentManage.vue

@@ -660,9 +660,7 @@ export default {
               if (val.status && val.status !== '' && val.status !== null) {
                 val.status = this.user_statusoptions.find(ele => ele.value == val.status).label
               }
-              if (val.roleId && val.roleId !== '' && val.roleId !== null) {
-                val.roleId = this.roles.find(ele => ele.id == val.roleId).name
-              }
+              val.roleId=val.roleName
             })
           }
           this.tableConfig.loading = false;

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -567,14 +567,10 @@ export default {
             if (val.status && val.status !== '' && val.status !== null) {
               val.status = this.user_statusoptions.find(ele => ele.value == val.status).label
             }
-            if (val.roleId && val.roleId !== '' && val.roleId !== null) {
-              val.roleId = this.roles.find(ele => ele.id == val.roleId).name
-            }
-
+            val.roleId=val.roleName
           })
           this.pageResult = res.data;
         })
-
     },
     closeDialog() {
       this.$refs["formData"].resetFields();

src/views/PeopleManage/Staff/StaffManage.vue

@@ -710,9 +710,7 @@ export default {
             if(val.status&& val.status!==''&& val.status!==null){
               val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
             }
-            if(val.roleId&& val.roleId!==''&& val.roleId!==null){
-              val.roleId=val.roleName
-            }
+            val.roleId=val.roleName
           })
           this.pageResult = res.data;
         })

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -589,14 +589,10 @@ export default {
             if(val.status&& val.status!==''&& val.status!==null){
               val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
             }
-            if(val.roleId&& val.roleId!==''&& val.roleId!==null){
-              val.roleId=this.roles.find(ele=>ele.id==val.roleId).name
-            }
-            
+            val.roleId=val.roleName
           })
           this.pageResult = res.data;
         })
-       
     },
     closeDialog() {
       this.$refs["formData"].resetFields();

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -659,14 +659,10 @@ export default {
             if(val.status&& val.status!==''&& val.status!==null){
               val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
             }
-            if(val.roleId&& val.roleId!==''&& val.roleId!==null){
-              val.roleId=this.roles.find(ele=>ele.id==val.roleId).name
-            }
-            
+            val.roleId=val.roleName
           })
           this.pageResult = res.data;
         })
-       
     },
     beforeTabLeave(){
       // let p = new Promise((resolve, reject) => {