From 8b39b241513b8a7c804aa59828066505429124fe Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 29 Apr 2024 16:57:18 +0800
Subject: [PATCH] '123'

---
 .../ruoyi/common/constant/WebsocketConst.java |  2 +-
 .../src/views/customer/customer/index.vue     | 48 +++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/WebsocketConst.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/WebsocketConst.java
index 7649d2c..1b1f458 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/WebsocketConst.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/WebsocketConst.java
@@ -5,7 +5,7 @@ package com.ruoyi.common.constant;
  *
  * @author ruoyi
  */
-public class WebsocketConst {
+public class Const {
     /** 消息ID */
     public static final String MSG_ID = "noticeId";
 
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index a4489cc..5bd93db 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -161,19 +161,19 @@
               </el-col>
             </el-row>
             <el-row :gutter="8">
-              <el-col :span="8">
+              <el-col :span="12">
                 <el-form-item label="客户名称" prop="cusName">
-                  <el-input v-model="form.cusName" placeholder="企查查查询" :disabled="true">
+                  <el-input v-model="form.cusName" placeholder="企查查带出" :disabled="true">
                     <el-button slot="append" icon="el-icon-search" @click="openQcc" v-hasPermi="['customer:customer:qcclist']"></el-button>
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="12">
                 <el-form-item label="街道/门牌号" prop="cusStreet">
                   <el-input v-model="form.cusStreet" placeholder="请输入街道/门牌号" :disabled="isDis"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <!--<el-col :span="8">
                 <el-form-item label="付款条件" prop="cusPaymentTerms">
                   <el-select v-model="form.cusPaymentTerms" placeholder="请选择付款条件"  style="width: 100%;" :disabled="isDis">
                     <el-option
@@ -184,6 +184,18 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+              </el-col>-->
+            </el-row>
+            <el-row :gutter="8">
+              <el-col :span="12">
+                <el-form-item label="街道" prop="cusQccStreet">
+                  <el-input v-model="form.cusQccStreet" placeholder="企查查带出" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="增值税号" prop="cusVatNo">
+                  <el-input v-model="form.cusVatNo" placeholder="企查查带出" :disabled="true"/>
+                </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="8">
@@ -192,18 +204,6 @@
                   <el-input v-model="form.cusPhoneNumber" placeholder="请输入电话号码" :disabled="isDis"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="增值税号" prop="cusVatNo">
-                  <el-input v-model="form.cusVatNo" placeholder="企查查查询带出" :disabled="true"/>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="行业代码" prop="cusIndustryCode">
-                  <el-input v-model="form.cusIndustryCode" placeholder="请输入行业代码" :disabled="isDis"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="8">
               <el-col :span="8">
                 <el-form-item label="客户组类别" prop="cusGroup">
                   <el-select v-model="form.cusGroup" placeholder="请选择客户组类别" style="width: 100%;" :disabled="isDis">
@@ -227,7 +227,12 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <!--<el-form-item label="行业代码" prop="cusIndustryCode">
+                  <el-input v-model="form.cusIndustryCode" placeholder="请输入行业代码" :disabled="isDis"/>
+                </el-form-item>-->
               </el-col>
+            </el-row>
+            <el-row :gutter="8">
               <el-col :span="8">
                 <el-form-item label="国家" prop="cusCountry">
                   <el-select v-model="form.cusCountry" placeholder="请选择国家" style="width: 100%;" :disabled="isDis">
@@ -240,8 +245,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="8">
               <el-col :span="8">
                 <el-form-item label="语言" prop="cusLanguage">
                   <el-select v-model="form.cusLanguage" placeholder="请选择语言" style="width: 100%;" :disabled="isDis">
@@ -254,6 +257,13 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+
+              </el-col>
+            </el-row>
+<!--            <el-row :gutter="8">
+              <el-col :span="8">
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="客户标签" prop="cusLabel">
                   <el-input v-model="form.cusLabel" placeholder="请输入客户标签" :disabled="isDis"/>
@@ -281,7 +291,7 @@
                   <el-input v-model="form.cusRecipientPhone" placeholder="请输入收件人电话" :disabled="isDis"/>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row>-->
             <el-row :gutter="8">
               <el-col :span="24">
                 <el-form-item label="备注" prop="cusRemark">