Merge remote-tracking branch 'origin/master'

src/api/crm/billtemplate/index.ts

@@ -34,6 +34,11 @@ export const BillTemplateApi = {
     return await request.delete({ url: `/crm/bill-template/delete?id=` + id })
   },
 
+  // 获得 票据模版列表（精简）
+  getSimpleList : async () => {
+    return await request.get({ url: `/crm/bill-template/simple-list` })
+  },
+
   // 导出票据模版 Excel
   exportBillTemplate: async (params) => {
     return await request.download({ url: `/crm/bill-template/export-excel`, params })

src/views/crm/billtemplate/components/index.vue

@@ -159,7 +159,6 @@ const getList = (val: []) => {
 //     id: undefined,
 //     productId: undefined,
 //     productName: undefined,
-//     productCategoryId: undefined, //产品分类编号
 //     productUnit: undefined, // 产品单位
 //     productNo: undefined, // 产品条码
 //     productPrice: undefined, // 产品价格

src/views/crm/business/components/BusinessProductForm.vue

@@ -85,8 +85,7 @@ const formLoading = ref(false); // 表单的加载中
 const formData = ref([]); // 表单数据
 const formRules = reactive({
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  businessPrice: [{ required: true, message: '合同价格不能为空', trigger: 'blur' }],
-  count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
+  businessPrice: [{ required: true, message: '合同价格不能为空', trigger: 'blur' }]
 });
 const formRef = ref(null); // 表单 Ref
 const productList = ref<ProductApi.ProductVO[]>([]); // 产品列表
@@ -128,7 +127,6 @@ watch(
 //     id: undefined,
 //     productId: undefined,
 //     productName: undefined,
-//     productCategoryId: undefined, // 产品分类编号
 //     productUnit: undefined, // 产品单位
 //     productNo: undefined, // 产品条码
 //     productPrice: undefined, // 产品价格
@@ -155,8 +153,7 @@ const getList = (val: []) => {
         "detailType": item.detailType,
         "productUnit": item.unit,
         "onlinePrice": '',
-        "offlinePrice": '',
-        "count": ''
+        "offlinePrice": ''
       })
     }
   })

src/views/crm/contract/components/ContractBAuthorizedPersonForm.vue

@@ -9,10 +9,10 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
-       <el-table-column label="用户ID" min-width="150">
+       <el-table-column label="用户" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.userId`" :rules="formRules.userId" class="mb-0px!">
-            <el-input v-model="row.userId" placeholder="请输入用户ID" />
+            <el-input v-model="row.userId" placeholder="请输入用户" />
           </el-form-item>
         </template>
       </el-table-column>

src/views/crm/contract/components/ContractProductForm.vue

@@ -24,10 +24,17 @@
           </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}.productCategoryId`" :rules="formRules.productCategoryId" class="mb-0px!">
-            <el-input v-model="row.productCategoryId" placeholder="请输入产品分类编号" disabled />
+          <el-form-item :prop="`${$index}.category`" :rules="formRules.category" class="mb-0px!">
+            <dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="row.category" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品明细" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
+            <dict-tag :type="DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE" :value="row.detailType" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -131,8 +138,7 @@ const handleAdd = () => {
     productUnit: undefined, // 产品单位
     productNo: undefined, // 产品条码
     productPrice: undefined, // 产品价格
-    contractPrice: undefined,
-    count: 1
+    contractPrice: undefined
   }
   formData.value.push(row)
 }

src/views/crm/quotation/QuotationForm.vue

@@ -182,9 +182,9 @@
         <el-form-item label="票据模板" prop="invoiceTemplateId">
           <el-select v-model="formData.invoiceTemplateId" placeholder="请选择票据模板">
             <el-option
-              v-for="dict in userOptions"
+              v-for="dict in invoiceTemplateList"
               :key="dict.id"
-              :label="dict.nickname"
+              :label="dict.name"
               :value="dict.id"
             />
           </el-select>
@@ -361,6 +361,7 @@ import * as CustomerApi from '@/api/crm/customer'
 import * as UserApi from '@/api/system/user'
 import * as DeptApi from '@/api/system/dept'
 import * as BusinessApi from '@/api/crm/business'
+import {BillTemplateApi } from '@/api/crm/billtemplate'
 import { erpPriceMultiply, erpPriceInputFormatter } from '@/utils'
 
 /** CRM 方案报价 表单 */
@@ -530,6 +531,8 @@ const open = async (type: string, id?: number) => {
   // 获得部门树
   deptTree.value = handleTree(await DeptApi.getSimpleDeptList())
   deptList.value = await DeptApi.getSimpleDeptList()
+  // 获得用户列表
+  invoiceTemplateList.value = await BillTemplateApi.getSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

src/views/crm/quotation/components/QuotationProductForm.vue

@@ -23,10 +23,17 @@
           </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}.productCategoryId`" :rules="formRules.productCategoryId" class="mb-0px!">
-            <el-input v-model="row.productCategoryId" placeholder="请输入产品分类编号" disabled />
+          <el-form-item :prop="`${$index}.category`" :rules="formRules.category" class="mb-0px!">
+            <el-input v-model="row.category" 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}.detailType`" :rules="formRules.detailType" class="mb-0px!">
+            <el-input v-model="row.detailType" placeholder="产品明细" disabled />
           </el-form-item>
         </template>
       </el-table-column>
@@ -111,7 +118,8 @@ const formRules = reactive({
   quotationId: [{ required: true, message: '报价编号不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品编号不能为空', trigger: 'blur' }],
   productName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  productCategoryId: [{ 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' }],