From ca7337801a7d5782248e30c76d8f39df87eed55f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 4 Sep 2026 14:05:43 +0800
Subject: [PATCH] =?UTF-8?q?2026-09-04=20=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_projectInfo-add-or-update.vue         | 66 ++++---------------
 .../project/projectInfo/projectInfo.vue       | 24 +++----
 2 files changed, 22 insertions(+), 68 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 50b610a..964d32d 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -19,8 +19,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item prop="projectSource" :rules="projectRole.projectSourceDesc" label="项目来源">
-              <dict-data-select dict-type="project_info_source" v-if="visible" v-model="dataForm.projectSource"></dict-data-select>
+            <el-form-item prop="industry" label="行业">
+              <dict-data-select dict-type="project_info_industry" v-if="visible" v-model="dataForm.industry"></dict-data-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -28,26 +28,15 @@
               <dict-data-select dict-type="project_info_priority" v-if="visible" v-model="dataForm.priority"></dict-data-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="需求日期：" prop="needDate">
-              <el-date-picker
-                style="width: 100%"
-                v-model="dataForm.needDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item prop="projectManagerName" :rules="projectRole.projectManagerName">
+          <el-col :span="6">
+            <el-form-item prop="projectManagerName">
               <span slot="label" style="" @click="managerChooseModal()"><a herf="#">项目经理</a></span>
               <el-input v-model="dataForm.projectManagerName" readonly ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item prop="projectOwnerName" :rules="projectRole.projectOwnerName">
-              <span slot="label" style="" @click="ownerChooseModal()"><a herf="#">项目负责人</a></span>
+              <span slot="label" style="" @click="ownerChooseModal()"><a herf="#">项目审批人</a></span>
               <el-input v-model="dataForm.projectOwnerName" readonly></el-input>
             </el-form-item>
           </el-col>
@@ -69,11 +58,6 @@
 <!--              <dict-data-select v-model="dataForm.finalCustomerId" clearable filterable dict-type="finalCustomer" :use-default-value="true"></dict-data-select>-->
 <!--            </el-form-item>-->
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="Product set">
-              <dict-data-select v-model="dataForm.productSet" clearable filterable dict-type="productSet" :use-default-value="true"></dict-data-select>
-            </el-form-item>
-          </el-col>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="终端客户名称：">-->
 <!--              <el-input v-model="dataForm.finalCustomerName" disabled ></el-input>-->
@@ -84,12 +68,12 @@
               <el-input v-model="dataForm.customerProjectNo"  ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
-            <el-form-item label="项目金额">
+          <el-col :span="6">
+            <el-form-item label="项目年销售额">
               <el-input v-model="dataForm.projectAmount" @input="dataForm.projectAmount = dataForm.projectAmount.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace(/^(\d+\.\d{1,6}).*$/, '$1')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="12">
             <el-form-item label="直接客户">
               <el-input v-model="dataForm.finalCustomerId"></el-input>
             </el-form-item>
@@ -134,7 +118,7 @@
 
     <el-dialog
       width="530px"
-      title="项目负责人"
+      title="项目审批人"
       :close-on-click-modal="false"
       :visible.sync="ownerFlag">
       <el-transfer class="rq" filterable v-model="projectOwnerList"  :props="{
@@ -315,8 +299,10 @@
           needDate:'',
           priority:'',
           projectSource:'',
+          industry:'',
           priorityDesc:'',
           projectSourceDesc:'',
+          industryDesc:'',
           projectManagerName:'',
           projectOwnerName:'',
           customerRemark:'',
@@ -364,20 +350,6 @@
               trigger: ['change','blur']
             }
           ],
-          needDate: [
-            {
-              required: true,
-              message: ' ',
-              trigger: ['change','blur']
-            }
-          ],
-          projectManagerName: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
           projectOwnerName: [
             {
               required: true,
@@ -592,8 +564,10 @@
             needDate: '',
             priority: '',
             projectSource: '',
+            industry: '',
             priorityDesc: '',
             projectSourceDesc: '',
+            industryDesc: '',
             projectManagerName: '',
             projectOwnerName: '',
             customerRemark: '',
@@ -916,20 +890,8 @@
             //   })
             //   return false;
             // }
-            if(!this.dataForm.needDate){
-              this.$alert('请选择需求日期！', '错误', {
-                confirmButtonText: '确定'
-              })
-              return false;
-            }
-            if(!this.dataForm.projectManagerName){
-              this.$alert('请选择项目经理！', '错误', {
-                confirmButtonText: '确定'
-              })
-              return false;
-            }
             if(!this.dataForm.projectOwnerName){
-              this.$alert('请选择项目负责人！', '错误', {
+              this.$alert('请选择项目审批人！', '错误', {
                 confirmButtonText: '确定'
               })
               return false;
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index ea2914e..38fdfde 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -9,7 +9,7 @@
         <el-input v-model="searchData.projectName" clearable style="width: 150px"></el-input>
 <!--        <dict-data-select dict-type="project_info_type_db" filterable clearable :use-default-value="false" v-model="searchData.projectType"></dict-data-select>-->
       </el-form-item>
-      <el-form-item :label="'项目负责人'">
+      <el-form-item :label="'项目审批人'">
         <el-input v-model="searchData.projectOwnerName" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'客户项目编码'">
@@ -109,8 +109,8 @@
               </el-form-item>
             </div></el-col>
             <el-col :span="3"><div class="grid-content bg-purple">
-              <el-form-item :label="'项目来源'">
-                <el-input v-model="projectData.projectSourceDesc" readonly  ></el-input>
+              <el-form-item :label="'行业'">
+                <el-input v-model="projectData.industryDesc" readonly  ></el-input>
               </el-form-item>
             </div></el-col>
             <el-col :span="3"><div class="grid-content bg-purple">
@@ -118,13 +118,8 @@
                 <el-input v-model="projectData.priorityDesc" readonly></el-input>
               </el-form-item>
             </div></el-col>
-            <el-col :span="3"><div class="grid-content bg-purple">
-              <el-form-item :label="'需求日期'">
-                <el-input v-model="projectData.needDate" readonly  ></el-input>
-              </el-form-item>
-            </div></el-col>
             <el-col :span="4"><div class="grid-content bg-purple">
-              <el-form-item :label="'项目金额'">
+              <el-form-item :label="'项目年销售额'">
                 <el-input v-model="projectData.projectAmount" readonly style=""></el-input>
               </el-form-item>
             </div></el-col>
@@ -158,11 +153,6 @@
                 <el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
               </el-form-item>
             </div></el-col>
-            <el-col :span="4"><div class="grid-content bg-purple">
-              <el-form-item :label="'产品分类/Product Set'">
-                <el-input v-model="projectData.productSet" readonly style="" ></el-input>
-              </el-form-item>
-            </div></el-col>
             <el-col :span="5"><div class="grid-content bg-purple">
 <!--            <el-col :span="8"><div class="grid-content bg-purple">-->
               <el-form-item :label="'项目经理'">
@@ -173,7 +163,7 @@
 
           <el-row :gutter="20">
             <el-col :span="8"><div class="grid-content bg-purple">
-              <el-form-item :label="'项目负责人'">
+              <el-form-item :label="'项目审批人'">
                 <el-input v-model="projectData.projectOwnerName" readonly style="" ></el-input>
               </el-form-item>
             </div></el-col>
@@ -616,7 +606,7 @@
             columnProp: "projectOwnerName",
             headerAlign: "center",
             align: "left",
-            columnLabel: "项目负责人",
+            columnLabel: "项目审批人",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -984,8 +974,10 @@
           needDate:'',
           priority:'',
           projectSource:'',
+          industry:'',
           priorityDesc:'',
           projectSourceDesc:'',
+          industryDesc:'',
           projectManagerName:'',
           projectOwnerName:'',
           customerRemark:'',