From 102f51f7e6bdaaa62737982b661427e5da90cba7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 16 Mar 2026 18:13:41 +0800
Subject: [PATCH] =?UTF-8?q?1.0.91=20=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=9C=B0=E6=94=B9=E4=B8=BA=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/crm/customerInfo/index.vue       | 135 +++++++++---------
 .../erp/contractInfo/contractOrderIndex.vue   |  11 +-
 2 files changed, 72 insertions(+), 74 deletions(-)

diff --git a/src/views/oa/crm/customerInfo/index.vue b/src/views/oa/crm/customerInfo/index.vue
index e3854e7..dde29ec 100644
--- a/src/views/oa/crm/customerInfo/index.vue
+++ b/src/views/oa/crm/customerInfo/index.vue
@@ -110,7 +110,11 @@
         </el-table-column>
         <el-table-column label="客户经理" align="center" prop="ownerName" width="120" v-if="columns[9].visible" show-overflow-tooltip />
         <el-table-column label="办公地" align="center" prop="detailedAddress" width="200" v-if="columns[10].visible" show-overflow-tooltip />
-        <el-table-column label="注册地" align="center" prop="registeredAddress" width="200" v-if="columns[28].visible" show-overflow-tooltip />
+        <el-table-column label="税号" align="center" prop="taxNumber" width="150" v-if="columns[16].visible" show-overflow-tooltip />
+        <el-table-column label="单位地址" align="center" prop="registeredAddress" width="200" v-if="columns[28].visible" show-overflow-tooltip />
+        <el-table-column label="电话号码" align="center" prop="phoneNumber" width="150" v-if="columns[33].visible" show-overflow-tooltip />
+        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" width="180" v-if="columns[17].visible" show-overflow-tooltip />
+        <el-table-column label="银行账号" align="center" prop="bankNumber" width="180" v-if="columns[18].visible" show-overflow-tooltip />
         <el-table-column label="商务联系人" align="center" prop="businessContact" width="120" v-if="columns[29].visible" show-overflow-tooltip />
         <el-table-column
           label="商务联系人电话"
@@ -145,9 +149,6 @@
           v-if="columns[15].visible"
           show-overflow-tooltip
         />
-        <el-table-column label="税号" align="center" prop="taxNumber" width="150" v-if="columns[16].visible" show-overflow-tooltip />
-        <el-table-column label="开户银行" align="center" prop="bankAccountOpening" width="180" v-if="columns[17].visible" show-overflow-tooltip />
-        <el-table-column label="银行账号" align="center" prop="bankNumber" width="180" v-if="columns[18].visible" show-overflow-tooltip />
         <el-table-column label="附件ID" align="center" prop="ossId" width="100" v-if="columns[19].visible" />
         <el-table-column label="备注" align="center" prop="remark" width="200" v-if="columns[20].visible" show-overflow-tooltip />
         <el-table-column label="激活标识" align="center" prop="activeFlag" width="100" v-if="columns[21].visible">
@@ -230,6 +231,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业规模" prop="customerScale">
+              <el-select v-model="form.customerScale" placeholder="请选择企业规模" style="width: 100%">
+                <el-option v-for="dict in customer_scale" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="客户经理" prop="ownerId">
               <el-select
@@ -249,18 +257,58 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="办公地" prop="detailedAddress">
-              <el-input v-model="form.detailedAddress" placeholder="请输入办公地" />
+          <el-col :span="12">
+            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
+              <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="税号" prop="taxNumber">
+              <el-input v-model="form.taxNumber" placeholder="请输入税号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位地址" prop="registeredAddress">
+              <el-input v-model="form.registeredAddress" placeholder="请输入单位地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话号码" prop="phoneNumber">
+              <el-input v-model="form.phoneNumber" placeholder="请输入电话号码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户银行" prop="bankAccountOpening">
+              <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行账号" prop="bankNumber">
+              <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法定代表人" prop="legalRepresentative">
+              <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
+            </el-form-item>
+          </el-col>
+          <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="注册地" prop="registeredAddress">
-              <el-input v-model="form.registeredAddress" placeholder="请输入注册地" />
+            <el-form-item label="开票附件" prop="ossId">
+              <div>
+                <FileUpload v-model="ossIdString" :limit="5" />
+                <div style="margin-top: 4px; color: #909399; font-size: 20px">
+                  请及时上传营业执照与开票资料！
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+          <el-col :span="24">
+            <el-form-item label="办公地" prop="detailedAddress">
+              <el-input v-model="form.detailedAddress" placeholder="请输入办公地" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -289,13 +337,6 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="企业规模" prop="customerScale">
-              <el-select v-model="form.customerScale" placeholder="请选择企业规模" style="width: 100%">
-                <el-option v-for="dict in customer_scale" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="上级客户" prop="parentCustomerId">
               <el-select
@@ -313,51 +354,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="客户关系" prop="customerRelationship">
               <el-input v-model="form.customerRelationship" placeholder="请输入客户关系" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="法定代表人" prop="legalRepresentative">
-              <el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="营业执照号码" prop="businessLicenseNumber">
-              <el-input v-model="form.businessLicenseNumber" placeholder="请输入营业执照号码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="税号" prop="taxNumber">
-              <el-input v-model="form.taxNumber" placeholder="请输入税号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="开户银行" prop="bankAccountOpening">
-              <el-input v-model="form.bankAccountOpening" placeholder="请输入开户银行" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="银行账号" prop="bankNumber">
-              <el-input v-model="form.bankNumber" placeholder="请输入银行账号" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="附件" prop="ossId">
-              <FileUpload v-model="ossIdString" :limit="5" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
@@ -597,11 +598,6 @@ const columns = ref<FieldOption[]>([
   { key: 9, label: `客户经理`, visible: true },
   { key: 10, label: `办公地`, visible: true },
   { key: 11, label: `企业规模`, visible: true },
-  { key: 28, label: `注册地`, visible: true },
-  { key: 29, label: `商务联系人`, visible: true },
-  { key: 30, label: `商务联系人电话`, visible: true },
-  { key: 31, label: `技术联系人`, visible: true },
-  { key: 32, label: `技术联系人电话`, visible: true },
   { key: 12, label: `上级客户`, visible: true },
   { key: 13, label: `客户关系`, visible: true },
   { key: 14, label: `法定代表人`, visible: true },
@@ -617,7 +613,13 @@ const columns = ref<FieldOption[]>([
   { key: 24, label: `创建人`, visible: false },
   { key: 25, label: `创建时间`, visible: false },
   { key: 26, label: `更新人`, visible: false },
-  { key: 27, label: `更新时间`, visible: false }
+  { key: 27, label: `更新时间`, visible: false },
+  { key: 28, label: `单位地址`, visible: true },
+  { key: 29, label: `商务联系人`, visible: true },
+  { key: 30, label: `商务联系人电话`, visible: true },
+  { key: 31, label: `技术联系人`, visible: true },
+  { key: 32, label: `技术联系人电话`, visible: true },
+  { key: 33, label: `电话号码`, visible: true }
 ]);
 
 const initFormData: CustomerInfoForm = {
@@ -630,8 +632,9 @@ const initFormData: CustomerInfoForm = {
   customerLevel: undefined,
   customerSource: undefined,
   ownerId: undefined,
-  detailedAddress: undefined,
   registeredAddress: undefined,
+  phoneNumber: undefined,
+  detailedAddress: undefined,
   businessContact: undefined,
   businessContactPhone: undefined,
   technicalContact: undefined,
@@ -662,8 +665,8 @@ const data = reactive<PageData<CustomerInfoForm, CustomerInfoQuery>>({
     customerLevel: undefined,
     customerSource: undefined,
     ownerId: undefined,
-    detailedAddress: undefined,
     registeredAddress: undefined,
+    detailedAddress: undefined,
     businessContact: undefined,
     businessContactPhone: undefined,
     technicalContact: undefined,
diff --git a/src/views/oa/erp/contractInfo/contractOrderIndex.vue b/src/views/oa/erp/contractInfo/contractOrderIndex.vue
index 19d8c1f..f8dad1a 100644
--- a/src/views/oa/erp/contractInfo/contractOrderIndex.vue
+++ b/src/views/oa/erp/contractInfo/contractOrderIndex.vue
@@ -36,11 +36,6 @@
                 <el-option v-for="dict in project_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <!--            <el-form-item label="激活标识" prop="activeFlag">-->
-            <!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>-->
-            <!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -218,9 +213,9 @@ const columns = ref<FieldOption[]>([
   { key: 8, label: `订单类型`, visible: true },
   { key: 9, label: `付款方式`, visible: false },
   { key: 10, label: `部门`, visible: true },
-  { key: 11, label: `项目经理`, visible: true },
-  { key: 12, label: `部门负责人`, visible: true },
-  { key: 13, label: `分管副总`, visible: true },
+  { key: 11, label: `项目经理`, visible: false },
+  { key: 12, label: `部门负责人`, visible: false },
+  { key: 13, label: `分管副总`, visible: false },
   { key: 14, label: `抄送人员`, visible: false },
   { key: 15, label: `金额`, visible: true },
   { key: 16, label: `订单状态`, visible: true },