Merge remote-tracking branch 'origin/wuguojie' into dev

src/components/UserDetail/index.vue

@@ -265,7 +265,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" id="password">
           <el-form-item label="密码" prop="password">
             <input type="text" style="display:none" autocomplete="off" />
             <el-input
@@ -624,6 +624,9 @@ export default {
   methods: {
     submit() {
       this.formData.identityTime = this.formData.identityTimeArr ? this.formData.identityTimeArr.join(',') : []
+      if(!this.formData.password) {
+        document.getElementById('password').scrollIntoView()
+      }
       this.$refs.formData.validate((valid) => {
         let valids;
         valids = valid;

src/views/Core/components/detailsDialog.vue

@@ -259,7 +259,7 @@
               <span slot="extension" style="color: #2D4D89;margin-right: 10px;"
                 @click="imageQuery('imageUploaddialogVisible')">全部影像</span>
                 <!-- @click="imageQuery('allImageVisible')">全部影像</span> -->
-                
+
               <div slot="boby">
                 <div class="quotation-style kind-arrears">
                   <b>产品类型</b>
@@ -392,7 +392,7 @@
                   <el-col :span="6" v-if="orderInfo.ubiPredictedInfoScore"><span>紫金能源车（鼎然-车辆风险评分）：</span>{{ orderInfo.ubiPredictedInfoScore }}</el-col>
                   <el-col :span="6" v-if="orderInfo.mergeCostRate"><span>交商合并经营成本率：</span>{{ orderInfo.mergeCostRate }}</el-col>
                 </el-row>
-              </div> 
+              </div>
             </OpenCloseBox>
             <!-- <OpenCloseBox id="yxzl" v-if="Object.keys(obj).length != 0">
               <span slot="title">影像资料</span>
@@ -1610,7 +1610,7 @@ export default {
       }
       this[Visible] = true;
     },
-    
+
     imageEcho(quotenos) {
       //影像查询
       this.$api.letter.findByQuoteNo(quotenos).then((res) => {
@@ -1724,7 +1724,7 @@ export default {
       });
     },
 
-    
+
     tabLiScroll(id, idx) {
       this.tabLiIndex = idx;
       document.getElementById(id).scrollIntoView({ behavior: "smooth" });
@@ -1920,6 +1920,10 @@ export default {
     },
     //预览文件
     viewfile(index) {
+      if(!index.fileurl) {
+        this.$message.error('保单正在生成中')
+        return;
+      }
       let name = index.fileurl.lastIndexOf("/");
       fetch(index.fileurl)
         .then((response) => response.blob())

src/views/PeopleManage/Agent/AgentManage.vue

@@ -351,7 +351,7 @@
             <!-- <el-button size="small" type="primary" @click="activeName = '1'"
               >上一步</el-button
             > -->
-            <el-button size="small" type="primary" @click="activeName = '3'"
+            <el-button size="small" type="primary" @click="detailInfoNext"
               >下一步</el-button
             >
           </div>
@@ -1093,6 +1093,11 @@ export default {
     },
     valids(data) {
       this.detailValid = data;
+      if(this.detailValid) {
+        this.activeName = '3'
+      } else {
+        this.$message.error('请填写必填项！')
+      }
     },
     // 提交
     submitForm() {
@@ -1180,14 +1185,21 @@ export default {
         });
       }, 500);
     },
-    // 下一步
+    // 下一步（基本信息）
     nextStep() {
       this.$refs.formData.validate((valid) => {
+        console.log(111111111, valid)
         if (valid) {
           this.activeName = "2";
+        } else {
+          this.$message.error('请填写必填项！')
         }
       });
     },
+    // 下一步（详细信息）
+    detailInfoNext() {
+      this.$refs['formDataDetails'].submit()
+     },
     //查看人员修改记录
     async checkHistory(row) {
       let userId = row.userId;

src/views/Task/DaikeLetter.vue

@@ -289,6 +289,8 @@ export default {
               }
             })
           } else {
+            this.salespersonForm.userId = ''
+            this.$message.error('未查询到相关信息，请重新填写！')
             this.$refs.Ktletter.userId = this.salespersonForm.userId
           }
           loading.close();