From 5ec8e6e5b7f6aa94976ed618a3fb81fa48671b90 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Tue, 23 Apr 2024 16:57:58 +0800
Subject: [PATCH] '123'

---
 .../java/com/ruoyi/customer/domain/Bank.java  |   3 -
 .../com/ruoyi/customer/domain/qcc/Qcc.java    |  40 --
 .../src/views/customer/customer/index.vue     | 358 ++++++++++--------
 3 files changed, 191 insertions(+), 210 deletions(-)
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java

diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/Bank.java b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/Bank.java
index 2d9efb5..ab913b3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/Bank.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/Bank.java
@@ -19,15 +19,12 @@ public class Bank extends BaseEntity
     private String bankId;
 
     /** 银行名称 */
-    @Excel(name = "银行名称")
     private String bankName;
 
     /** 银行账户 */
-    @Excel(name = "银行账户")
     private String bankAccount;
 
     /** 客户ID */
-    @Excel(name = "客户ID")
     private String cusId;
 
     public void setBankId(String bankId)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java
deleted file mode 100644
index 4a660c1..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.customer.domain.qcc;
-
-public class Qcc {
-    private String qccCustomerName;
-    private String qccLegalPerson;
-    private String qccRegistrationTime;
-    private String qccVatNO;
-
-    public String getQccCustomerName() {
-        return qccCustomerName;
-    }
-
-    public void setQccCustomerName(String qccCustomerName) {
-        this.qccCustomerName = qccCustomerName;
-    }
-
-    public String getQccLegalPerson() {
-        return qccLegalPerson;
-    }
-
-    public void setQccLegalPerson(String qccLegalPerson) {
-        this.qccLegalPerson = qccLegalPerson;
-    }
-
-    public String getQccRegistrationTime() {
-        return qccRegistrationTime;
-    }
-
-    public void setQccRegistrationTime(String qccRegistrationTime) {
-        this.qccRegistrationTime = qccRegistrationTime;
-    }
-
-    public String getQccVatNO() {
-        return qccVatNO;
-    }
-
-    public void setQccVatNO(String qccVatNO) {
-        this.qccVatNO = qccVatNO;
-    }
-}
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index ad0228d..a4489cc 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -146,172 +146,187 @@
     <!-- 添加或修改客户管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1050px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="8">
-          <el-col :span="8">
-            <el-form-item label="客户编码" prop="cusCode">
-              <el-input v-model="form.cusCode" placeholder="系统自动生成" :disabled="true"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="SAP客户编码" prop="cusSapCode">
-              <el-input v-model="form.cusSapCode" placeholder="审批通过自动生成" :disabled="true"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="客户名称" prop="cusName">
-              <el-input v-model="form.cusName" placeholder="企查查查询" :disabled="true">
-                <el-button icon="el-icon-search" @click="openQcc" v-if="buttonShow"></el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="8">
-          <el-col :span="12">
-            <el-form-item label="街道/门牌号" prop="cusStreet">
-              <el-input v-model="form.cusStreet" placeholder="请输入街道/门牌号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="付款条件" prop="cusPaymentTerms">
-              <el-select v-model="form.cusPaymentTerms" placeholder="请选择付款条件"  style="width: 100%;">
-                <el-option
-                  v-for="dict in dict.type.cus_payment_terms"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话号码" prop="cusPhoneNumber">
-              <el-input v-model="form.cusPhoneNumber" placeholder="请输入电话号码" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="8">
-          <el-col :span="6">
-            <el-form-item label="增值税号" prop="cusVatNo">
-              <el-input v-model="form.cusVatNo" placeholder="企查查查询带出" :disabled="true"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="行业代码" prop="cusIndustryCode">
-              <el-input v-model="form.cusIndustryCode" placeholder="请输入行业代码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户组类别" prop="cusGroup">
-              <el-select v-model="form.cusGroup" placeholder="请选择客户组类别" style="width: 100%;">
-                <el-option
-                  v-for="dict in dict.type.cus_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户类型" prop="cusType">
-              <el-select v-model="form.cusType" placeholder="请选择客户类型" style="width: 100%;">
-                <el-option
-                  v-for="dict in dict.type.cus_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="8">
-          <el-col :span="6">
-            <el-form-item label="国家" prop="cusCountry">
-              <el-select v-model="form.cusCountry" placeholder="请选择国家" style="width: 100%;">
-                <el-option
-                  v-for="dict in dict.type.cus_country"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="语言" prop="cusLanguage">
-              <el-select v-model="form.cusLanguage" placeholder="请选择语言" style="width: 100%;">
-                <el-option
-                  v-for="dict in dict.type.cus_language"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户标签" prop="cusLabel">
-              <el-input v-model="form.cusLabel" placeholder="请输入客户标签" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户分类" prop="cusClassification">
-              <el-input v-model="form.cusClassification" placeholder="请输入客户分类" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="8">
-          <el-col :span="6">
-            <el-form-item label="电子发票邮箱" prop="cusReceivingEmail">
-              <el-input v-model="form.cusReceivingEmail" placeholder="请输入电子发票接收邮箱" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="收件人" prop="cusRecipient">
-              <el-input v-model="form.cusRecipient" placeholder="请输入收件人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="收件人电话" prop="cusRecipientPhone">
-              <el-input v-model="form.cusRecipientPhone" placeholder="请输入收件人电话" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="8">
-          <el-col :span="24">
-            <el-form-item label="备注" prop="cusRemark">
-              <el-input type="textarea" autosize v-model="form.cusRemark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-divider content-position="center">银行信息</el-divider>
-        <el-row class="mb8" :gutter="8" v-if="buttonShow">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddBank">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBank">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="bankList" :row-class-name="rowBankIndex" @selection-change="handleBankSelectionChange" ref="bank">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="银行名称" prop="bankName">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.bankName" placeholder="请输入银行名称" />
-            </template>
-          </el-table-column>
-          <el-table-column label="银行账户" prop="bankAccount">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.bankAccount" placeholder="请输入银行账户" />
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-tabs v-model="activeName" tab-position="left" style="margin-left: 15px; margin-right: 15px;height: 480px;">
+          <el-tab-pane label="基本信息" name="customerInfo">
+            <el-row :gutter="8">
+              <el-col :span="12">
+                <el-form-item label="客户编码" prop="cusCode">
+                  <el-input v-model="form.cusCode" placeholder="系统自动生成" :disabled="true"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="SAP客户编码" prop="cusSapCode">
+                  <el-input v-model="form.cusSapCode" placeholder="审批通过自动生成" :disabled="true"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="8">
+              <el-col :span="8">
+                <el-form-item label="客户名称" prop="cusName">
+                  <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-form-item label="街道/门牌号" prop="cusStreet">
+                  <el-input v-model="form.cusStreet" placeholder="请输入街道/门牌号" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="付款条件" prop="cusPaymentTerms">
+                  <el-select v-model="form.cusPaymentTerms" placeholder="请选择付款条件"  style="width: 100%;" :disabled="isDis">
+                    <el-option
+                      v-for="dict in dict.type.cus_payment_terms"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="8">
+              <el-col :span="8">
+                <el-form-item label="电话号码" prop="cusPhoneNumber">
+                  <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">
+                    <el-option
+                      v-for="dict in dict.type.cus_group"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="客户类型" prop="cusType">
+                  <el-select v-model="form.cusType" placeholder="请选择客户类型" style="width: 100%;" :disabled="isDis">
+                    <el-option
+                      v-for="dict in dict.type.cus_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="国家" prop="cusCountry">
+                  <el-select v-model="form.cusCountry" placeholder="请选择国家" style="width: 100%;" :disabled="isDis">
+                    <el-option
+                      v-for="dict in dict.type.cus_country"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </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">
+                    <el-option
+                      v-for="dict in dict.type.cus_language"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="客户标签" prop="cusLabel">
+                  <el-input v-model="form.cusLabel" placeholder="请输入客户标签" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="客户分类" prop="cusClassification">
+                  <el-input v-model="form.cusClassification" placeholder="请输入客户分类" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="8">
+              <el-col :span="8">
+                <el-form-item label="电子发票邮箱" prop="cusReceivingEmail">
+                  <el-input v-model="form.cusReceivingEmail" placeholder="请输入电子发票接收邮箱" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人" prop="cusRecipient">
+                  <el-input v-model="form.cusRecipient" placeholder="请输入收件人" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="收件人电话" prop="cusRecipientPhone">
+                  <el-input v-model="form.cusRecipientPhone" placeholder="请输入收件人电话" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="8">
+              <el-col :span="24">
+                <el-form-item label="备注" prop="cusRemark">
+                  <el-input type="textarea" autosize v-model="form.cusRemark" placeholder="请输入备注" :disabled="isDis"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="开票银行" name="bankInfo">
+            <el-row class="mb8" :gutter="8">
+              <el-col :span="1.5">
+                <div v-hasPermi="['customer:customer:bankAdd']">
+                  <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddBank" v-if="buttonShow">添加</el-button>
+                </div>
+              </el-col>
+              <el-col :span="1.5">
+                <div v-hasPermi="['customer:customer:bankDel']">
+                  <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBank" v-if="buttonShow">删除</el-button>
+                </div>
+              </el-col>
+            </el-row>
+            <el-table :data="bankList" :row-class-name="rowBankIndex" @selection-change="handleBankSelectionChange" ref="bank">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column label="序号" align="center" prop="index" width="50"/>
+              <el-table-column label="银行名称" prop="bankName">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.bankName" placeholder="请输入银行名称" />
+                </template>
+              </el-table-column>
+              <el-table-column label="银行账户" prop="bankAccount">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.bankAccount" placeholder="请输入银行账户" />
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
       </el-form>
-      <div slot="footer" class="dialog-footer" v-if="buttonShow">
-        <el-button @click="saveForm" v-hasPermi="['customer:customer:save']">保 存</el-button>
-        <el-button type="primary" plain  @click="commitForm" v-hasPermi="['customer:customer:commit']">提 交</el-button>
+      <div slot="footer" class="dialog-footer">
+        <span v-hasPermi="['customer:customer:save']">
+          <el-button @click="saveForm" v-if="buttonShow">保 存</el-button>
+        </span>
+        <span style="margin-left: 10px"  v-hasPermi="['customer:customer:commit']">
+          <el-button type="primary" plain  @click="commitForm" v-if="buttonShow">提 交</el-button>
+        </span>
       </div>
     </el-dialog>
 
@@ -326,7 +341,7 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button v-hasPermi="['customer:customer:qcclist']" type="primary" icon="el-icon-search" size="mini" @click="handleQccQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQccQuery">搜索</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="qccLoading" ref="qccTable" :data="qccCustomerList" @selection-change="handleSelectionQccChange" height="300">
@@ -335,6 +350,7 @@
         <el-table-column label="法人" align="center" prop="operName" />
         <el-table-column label="注册时间" align="center" prop="startDate" />
         <el-table-column label="增值税号" align="center" prop="creditCode" />
+
       </el-table>
       <!--<pagination
         v-show="qccTotal>0"
@@ -363,12 +379,15 @@
 </style>
 <script>
 import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer, commitCustomer, qccListCustomer } from "@/api/customer/customer";
-
+import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 export default {
   name: "Customer",
   dicts: ['cus_country', 'cus_payment_terms', 'cus_group', 'cus_approval_status', 'cus_language', 'cus_type', 'common_state'],
   data() {
     return {
+      //选项卡默认
+      activeName: 'customerInfo',
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -435,6 +454,8 @@ export default {
       },
       // 保存\提交,明细添加、删除 按钮显示
       buttonShow: true,
+      // 审批中 设置禁用
+      isDis: false,
 
       /*****************************企查查查询模块*************************************/
       // 遮罩层
@@ -464,6 +485,8 @@ export default {
     this.getList();
   },
   methods: {
+    checkPermi,
+    checkRole,
     /** 查询客户管理列表 */
     getList() {
       this.loading = true;
@@ -540,6 +563,7 @@ export default {
       getCustomer(cusId).then(response => {
         this.form = response.data;
         this.buttonShow = this.form.cusApprovalStatus == '0'?true:false;
+        this.isDis = this.form.cusApprovalStatus == '0'?false:true;
         this.bankList = response.data.bankList;
         this.open = true;
         this.title = "修改客户信息";