From 10942b3fae8da8263144cbd58258fa655235633e Mon Sep 17 00:00:00 2001
From: quu <quu@qq.com>
Date: Wed, 30 Apr 2025 17:26:51 +0900
Subject: [PATCH 1/3] =?UTF-8?q?crm=20=E6=8A=A5=E4=BB=B7=20=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=20=E5=90=88=E5=90=8C=20=E4=B8=89=E5=9D=97=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                                    |   2 +-
 .env.test                                     |   2 +-
 .../components/QuotationProductForm.vue       | 132 ++++--------------
 3 files changed, 31 insertions(+), 105 deletions(-)

diff --git a/.env.local b/.env.local
index b42d84dec..35765584d 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://172.22.3.168:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/.env.test b/.env.test
index 2252e146d..e911da88a 100644
--- a/.env.test
+++ b/.env.test
@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='http://172.22.3.168:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/crm/quotation/components/QuotationProductForm.vue b/src/views/crm/quotation/components/QuotationProductForm.vue
index 9307087ba..dc0482552 100644
--- a/src/views/crm/quotation/components/QuotationProductForm.vue
+++ b/src/views/crm/quotation/components/QuotationProductForm.vue
@@ -9,6 +9,13 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="产品编号" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
+            <el-input v-model="row.productId" placeholder="请输入产品编号" disabled />
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column label="产品名称" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productName`" :rules="formRules.productName" class="mb-0px!">
@@ -16,123 +23,73 @@
           </el-form-item>
         </template>
       </el-table-column>
-       <el-table-column label="产品类型" min-width="150">
+      <el-table-column label="产品类别" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.category`" :rules="formRules.category" class="mb-0px!">
-            <el-select v-model="row.category" placeholder="请选择状态" disabled class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_CATEGORY)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+            <el-input v-model="row.category" placeholder="请输入产品类别" disabled />
           </el-form-item>
         </template>
       </el-table-column>
-      
-      <el-table-column label="产品明细类型" min-width="150">
+      <el-table-column label="产品明细" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
-            <el-select v-model="row.detailType" placeholder="请选择状态" disabled class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+            <el-input v-model="row.detailType" placeholder="产品明细" disabled />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="产品单位" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productUnit`" :rules="formRules.productUnit" class="mb-0px!">
-            <el-select v-model="row.productUnit" placeholder="请选择状态" disabled class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_UNIT)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+            <el-input v-model="row.productUnit" placeholder="请输入产品单位" disabled />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="线上价格" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!">
-            <el-input v-model="row.onlinePrice" placeholder="请输入线上价格" disabled />
+            <el-input v-model="row.onlinePrice" placeholder="请输入线上价格" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="线下价格" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!">
-            <el-input v-model="row.offlinePrice" placeholder="请输入线下价格" disabled />
+            <el-input v-model="row.offlinePrice" placeholder="请输入线下价格" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="总计价格" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.totalPrice`" :rules="formRules.totalPrice" class="mb-0px!">
-            <el-input v-model="row.totalPrice" placeholder="请输入总计价格" disabled />
+            <el-input v-model="row.totalPrice" placeholder="请输入总计价格" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="产品票据" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productInvoice`" :rules="formRules.productInvoice" class="mb-0px!">
-            <el-select v-model="row.productInvoice" placeholder="请选择状态" clearable class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_INVOICE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+            <el-input v-model="row.productInvoice" placeholder="请输入产品票据" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="产品开具项目" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.productInvoiceItems`" :rules="formRules.productInvoiceItems" class="mb-0px!">
-            <el-select v-model="row.productInvoiceItems" placeholder="请选择状态" clearable class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_INVOICE_ITEMS)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+          <el-form-item :prop="`${$index}.productInvoiceItem`" :rules="formRules.productInvoiceItem" class="mb-0px!">
+            <el-input v-model="row.productInvoiceItem" placeholder="请输入产品开具项目" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="服务费票据" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.serviceFeeInvoice`" :rules="formRules.serviceFeeInvoice" class="mb-0px!">
-            <el-select v-model="row.serviceFeeInvoice" placeholder="请选择状态" clearable class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_SERVICE_FEE_INVOICE)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+          <el-form-item :prop="`${$index}.serviceInvoice`" :rules="formRules.serviceInvoice" class="mb-0px!">
+            <el-input v-model="row.serviceInvoice" placeholder="请输入服务费票据" />
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="服务开具项目" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.serviceFeeInvoiceItems`" :rules="formRules.serviceFeeInvoiceItems" class="mb-0px!">
-            <el-select v-model="row.serviceFeeInvoiceItems" placeholder="请选择状态" clearable class="!w-240px">
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.CRM_SERVICE_FEE_INVOICE_ITEMS)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
+          <el-form-item :prop="`${$index}.serviceInvoiceItem`" :rules="formRules.serviceInvoiceItem" class="mb-0px!">
+            <el-input v-model="row.serviceInvoiceItem" placeholder="请输入服务开具项目" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -149,14 +106,11 @@
 </template>
 <script setup lang="ts">
 import { QuotationApi } from '@/api/crm/quotation'
-import { BillTemplateApi, BillTemplateVO } from '@/api/crm/billtemplate'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as BusinessApi from '@/api/crm/business'
 
 const props = defineProps<{
   quotationId: undefined, // 报价编号（主表的关联字段）
-  businessId: undefined,
-  billTemplateId: undefined
+  businessId: undefined
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
@@ -164,8 +118,8 @@ const formRules = reactive({
   quotationId: [{ required: true, message: '报价编号不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品编号不能为空', trigger: 'blur' }],
   productName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  category: [{ required: true, message: '产品类型不能为空', trigger: 'blur' }],
-  detailType: [{ required: true, message: '产品明细类型不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '产品类别不能为空', trigger: 'blur' }],
+  detailType: [{ required: true, message: '产品明细不能为空', trigger: 'blur' }],
   productUnit: [{ required: true, message: '产品单位不能为空', trigger: 'blur' }],
   onlinePrice: [{ required: true, message: '线上价格不能为空', trigger: 'blur' }],
   offlinePrice: [{ required: true, message: '线下价格不能为空', trigger: 'blur' }],
@@ -198,49 +152,21 @@ watch(
   { immediate: true }
 )
 
-watch(
-  () => props.billTemplateId,
-  async (val) => {
-    // 1. 重置表单
-    formData.value = []
-    // 2. val 非空，则加载数据
-    if (!val) {
-      return;
-    }
-    try {
-      formLoading.value = true
-      // if(val.quotationId) {
-        // formData.value = await QuotationApi.getQuotationProductListByQuotationId(val.quotationId)
-      // } else if(val.businessId) {
-        const business = await BillTemplateApi.getTemplateProduct({
-          businessId: props.businessId,
-          billTemplateId: val,
-        });
-        console.log('%csrc/views/crm/quotation/components/QuotationProductForm.vue:167 business.data', 'color: #007acc;', business.data);
-        formData.value = business
-      // }
-    } finally {
-      formLoading.value = false
-    }
-  },
-  { immediate: true }
-)
-
 /** 新增按钮操作 */
 const handleAdd = () => {
   const row = {
     quotationId: undefined,
     productId: undefined,
     productName: undefined,
-    detailType: undefined,
+    productCategoryId: undefined,
     productUnit: undefined,
     onlinePrice: undefined,
     offlinePrice: undefined,
     totalPrice: undefined,
     productInvoice: undefined,
-    productInvoiceItems: undefined,
-    serviceFeeInvoice: undefined,
-    serviceFeeInvoiceItems: undefined
+    productInvoiceItem: undefined,
+    serviceInvoice: undefined,
+    serviceInvoiceItem: undefined
   }
   row.quotationId = props.quotationId
   formData.value.push(row)

From f66a939237b17a4a1f9ed2c2c158ab9e929e779a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Thu, 1 May 2025 15:26:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=8F=AF=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/business/BusinessForm.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
index 733820b2c..0cfbf4c67 100644
--- a/src/views/crm/business/BusinessForm.vue
+++ b/src/views/crm/business/BusinessForm.vue
@@ -14,11 +14,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="负责人" prop="ownerUserId">
+          <el-form-item label="线索拓展人" prop="ownerUserId">
             <el-select
               v-model="formData.ownerUserId"
               disabled
-              placeholder="请选择负责人"
+              placeholder="请选择线索拓展人"
               class="w-1/1"
             >
               <el-option
@@ -55,6 +55,7 @@
               :disabled="formData.customerDefault || type"
               v-model="formData.customerId"
               clearable
+              filterable
               placeholder="请选择客户"
               class="w-1/1"
             >

From 7d7333532c7d458ccea0f3bbba3cd0e4d19633e0 Mon Sep 17 00:00:00 2001
From: quu <quu@qq.com>
Date: Thu, 1 May 2025 17:41:17 +0900
Subject: [PATCH 3/3] =?UTF-8?q?crm=20=E6=8A=A5=E4=BB=B7=20=E5=95=86?=
 =?UTF-8?q?=E6=9C=BA=20=E5=90=88=E5=90=8C=20=E4=B8=89=E5=9D=97=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/permission/index.ts               |  3 ++-
 .../bpm/processInstance/detail/index.vue      |  6 ++---
 src/views/crm/quotation/index.vue             | 26 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/api/crm/permission/index.ts b/src/api/crm/permission/index.ts
index 4f88b14fc..9352abbba 100644
--- a/src/api/crm/permission/index.ts
+++ b/src/api/crm/permission/index.ts
@@ -34,7 +34,8 @@ export enum BizTypeEnum {
   CRM_CONTRACT = 5, // 合同
   CRM_PRODUCT = 6, // 产品
   CRM_RECEIVABLE = 7, // 回款
-  CRM_RECEIVABLE_PLAN = 8 // 回款计划
+  CRM_RECEIVABLE_PLAN = 8, // 回款计划
+  CRM_QUOTATION = 9 // 报价
 }
 
 /**
diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue
index c5436820a..831aa2129 100644
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -42,7 +42,7 @@
             <div class="form-scroll-area">
               <el-scrollbar>
                 <el-row>
-                  <el-col :span="20" class="!flex !flex-col formCol">
+                  <el-col :span="17" class="!flex !flex-col formCol">
                     <!-- 表单信息 -->
                     <div
                       v-loading="processInstanceLoading"
@@ -63,7 +63,7 @@
                       </div>
                     </div>
                   </el-col>
-                  <el-col :span="4">
+                  <el-col :span="7">
                     <!-- 审批记录时间线 -->
                     <ProcessInstanceTimeline :activity-nodes="activityNodes" />
                   </el-col>
@@ -238,7 +238,7 @@ const getApprovalDetail = async () => {
       })
     } else {
       // 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
-      BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
+      BusinessFormComponent.value = registerComponent('data.processDefinition.formCustomViewPath')
     }
 
     // 获取审批节点，显示 Timeline 的数据
diff --git a/src/views/crm/quotation/index.vue b/src/views/crm/quotation/index.vue
index 122242847..b84e09d18 100644
--- a/src/views/crm/quotation/index.vue
+++ b/src/views/crm/quotation/index.vue
@@ -84,8 +84,19 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="我负责的" name="1" />
+      <el-tab-pane label="我参与的" name="2" />
+      <el-tab-pane label="下属负责的" name="3" />
+    </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="报价单编号" align="center" prop="no" width="200" />
+      <el-table-column label="报价单编号" align="center" prop="no" width="200" >
+        <template #default="scope">
+          <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
+            {{ scope.row.no }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="客户名称" align="center" prop="customerId" width="220">
         <template #default="scope">
           <!-- <el-link
@@ -205,6 +216,7 @@ import { QuotationApi, QuotationVO } from '@/api/crm/quotation'
 import * as CustomerApi from '@/api/crm/customer'
 import * as UserApi from '@/api/system/user'
 import * as DeptApi from '@/api/system/dept'
+import { TabsPaneContext } from 'element-plus'
 import { checkPermi } from '@/utils/permission'
 
 /** CRM 方案报价 列表 */
@@ -224,6 +236,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   no: undefined,
+  sceneType: '1', // 默认和 activeName 相等
   customerId: undefined,
   ownerUserId: undefined,
   partnerCompanyId: undefined,
@@ -231,6 +244,7 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
+const activeName = ref('1') // 列表 tab
 
 /** 查询列表 */
 const getList = async () => {
@@ -250,12 +264,22 @@ const handleQuery = () => {
   getList()
 }
 
+const openDetail = (id: number) => {
+  push({ name: 'QuotationDetail', params: { id } })
+}
+
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
 
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.sceneType = tab.paneName
+  handleQuery()
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openFormEdit =  (row: Object) => {