Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/4

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

src/api/clue/sign.js

@@ -51,3 +51,13 @@ export const updateProduceSort = (data) => {
 export const getSignProfit = (params) => {
   return request.get({ url: '/admin-api/crm/sign/profit', params })
 }
+
+// 新增产品
+export const addOrderProduct = (data) => {
+  return request.post({ url: '/admin-api/crm/sign-prodcut/create', data })
+}
+
+// 新增产品
+export const removeOrderProduct = (id) => {
+  return request.delete({ url: '/admin-api/crm/sign-prodcut/delete?id=' + id })
+}

src/api/school/setting/supplier.js

@@ -0,0 +1,33 @@
+import request from '@/config/axios'
+// 查询列表
+export const getSupplierPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/page', params })
+}
+
+export const getSupplierSimpleList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/simple-list', params })
+}
+
+// 查询详情
+export const getSupplier = async (id) => {
+  return await request.get({ url: '/admin-api/crm/erp-supplier/get?id=' + id })
+}
+
+// 新增
+export const createSupplier = async (data) => {
+  return await request.post({
+    url: '/admin-api/crm/erp-supplier/create',
+    data: data,
+    isSubmitForm: true
+  })
+}
+
+// 修改
+export const updateSupplier = async (params) => {
+  return await request.put({ url: '/admin-api/crm/erp-supplier/update', data: params })
+}
+
+// 删除
+export const deleteSupplier = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/erp-supplier/delete?id=' + id })
+}

src/views/Clue/Order/Comp/DialogAddProduct.vue

@@ -0,0 +1,130 @@
+<template>
+  <Dialog title="添加产品" v-model="show" width="800px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
+          <el-form-item label="成交产品" prop="productId">
+            <el-select
+              v-model="form.productId"
+              placeholder="选择成交产品"
+              filterable
+              @change="form.specsId = undefined"
+            >
+              <el-option
+                v-for="item in prodOptions"
+                :key="item.productId"
+                :label="item.productName"
+                :value="item.productId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="产品规格" prop="specsId">
+            <el-select
+              v-model="form.specsId"
+              placeholder="选择规格"
+              filterable
+              :disabled="!form.productId"
+            >
+              <el-option
+                v-for="item in specsOptions(form.productId)"
+                :key="item.specsId"
+                :label="item.specsName"
+                :value="item.specsId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="成交数量" prop="signNum">
+            <el-input-number v-model="form.signNum" :min="1" :controls="false" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="生产状态" prop="isProduced">
+            <el-radio-group v-model="form.isProduced">
+              <el-radio :label="0">待生产</el-radio>
+              <el-radio :label="1">已生产</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              :autoSize="{ minRows: 3 }"
+              v-model="form.remark"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span>
+        <el-button @click="show = false">取 消</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </Dialog>
+</template>
+
+<script setup name="DialogProduct">
+import { addOrderProduct } from '@/api/clue/sign'
+
+const message = useMessage() // 消息弹窗
+
+const specsOptions = computed({
+  get() {
+    return (prodId) => {
+      if (prodId) {
+        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
+      }
+      return []
+    }
+  }
+})
+
+const show = ref(false)
+const form = ref({})
+const rules = {
+  productId: { required: true, message: '成交产品不可为空', trigger: 'change' },
+  specsId: { required: true, message: '产品规格不可为空', trigger: 'change' },
+  signNum: { required: true, message: '成交数量不可为空', trigger: 'blur' }
+}
+
+const prodOptions = ref([])
+
+function open(signId, arr) {
+  prodOptions.value = arr
+  form.value.signId = signId
+  form.value.isProduced = 0
+  show.value = true
+}
+defineExpose({ open })
+
+const emit = defineEmits(['success'])
+const formRef = ref()
+const formLoading = ref(false)
+async function handleSave() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    await addOrderProduct(form.value)
+    message.success('新增成功！')
+    show.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Clue/Order/Comp/DialogDelivery.vue

@@ -28,9 +28,9 @@
               <el-select v-model="form.supplier" placeholder="选择供应商" filterable>
                 <el-option
                   v-for="item in supplierOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.id"
+                  :label="item.supplierName"
+                  :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -141,15 +141,18 @@
 import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/warehouse'
 import { createDelivery } from '@/api/clue/delivery'
 import { getConfigList } from '@/api/system/set'
-import { getDictOptions } from '@/utils/dict'
+import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
 
 const message = useMessage() // 消息弹窗
 
 const warehouseOptions = ref([])
 const extraPayOptions = ref([])
-const supplierOptions = getDictOptions('erp_supplier')
+const supplierOptions = ref([])
 function getOptions() {
+  getSupplierSimpleList().then((data) => {
+    supplierOptions.value = data
+  })
   getSimpleWarehouseList().then((data) => {
     warehouseOptions.value = data
   })

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -61,14 +61,15 @@
           </el-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane
-        label="回款记录"
-        name="returnRecord"
-        v-if="checkPermi(['clue:order:return-list'])"
-      >
+      <el-tab-pane label="回款记录" name="returnRecord">
         <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
-          <el-table-column prop="money" label="回款金额" />
+          <el-table-column
+            v-if="checkPermi(['clue:order:return-list'])"
+            prop="money"
+            label="回款金额"
+          />
+          <el-table-column prop="personProfit" label="员工利润" />
           <el-table-column prop="applyTime" label="申请日期" />
           <el-table-column prop="isPayoff" label="是否结清" />
           <el-table-column prop="stateName" label="审核状态" />

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -74,8 +74,8 @@
       @get-checked-columns="getCheckedColumns"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="60" />
-      <el-table-column type="expand">
+      <el-table-column type="selection" width="60" fixed="left" />
+      <el-table-column type="expand" fixed="left">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
             <VueDraggable
@@ -91,8 +91,8 @@
                 stripe
                 style="width: 80%; margin: 0 auto"
               >
-                <el-table-column prop="productName" label="成交产品" />
-                <el-table-column prop="specsName" label="产品规格" />
+                <el-table-column prop="productName" label="成交产品" width="120px" />
+                <el-table-column prop="specsName" label="产品规格" width="120px" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
                 <el-table-column prop="remark" label="成交备注" width="100px" />
                 <el-table-column label="生产状态" width="160px">
@@ -147,6 +147,15 @@
                     >
                       发货
                     </el-button>
+                    <el-button
+                      type="danger"
+                      link
+                      style="padding: 0; margin-left: 0"
+                      v-hasPermi="['clue:order:remove-product']"
+                      @click="handleRemoveProduct(scope.row)"
+                    >
+                      删除
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -228,6 +237,16 @@
           >
             取消登记
           </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:add-product']"
+            @click="handleAddProduct(scope.row)"
+          >
+            添加产品
+          </el-button>
         </template>
       </el-table-column>
     </SSTable>
@@ -238,6 +257,7 @@
     <DialogAfterSale ref="afterSaleDialog" />
     <DialogExtraFee ref="extraFeeDialog" />
     <DialogDelivery ref="deliveryDialog" @success="getTableList" />
+    <DialogAddProduct ref="addProductDialog" @success="getTableList" />
   </div>
 </template>
 
@@ -252,6 +272,7 @@ import DialogFeeback from './DialogFeeback.vue'
 import DialogAfterSale from './DialogAfterSale.vue'
 import DialogExtraFee from './DialogExtraPay.vue'
 import DialogDelivery from './DialogDelivery.vue'
+import DialogAddProduct from './DialogAddProduct.vue'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
@@ -404,6 +425,11 @@ function handleDelivery(row) {
   deliveryDialog.value.open(row)
 }
 
+const addProductDialog = ref()
+function handleAddProduct(row) {
+  addProductDialog.value.open(row.signId, prodOptions.value)
+}
+
 const batchIds = ref([])
 function handleSelectionChange(val) {
   batchIds.value = val.map((it) => it.signId)
@@ -460,6 +486,18 @@ function handleBatchUpdateInstall() {
   }
 }
 
+async function handleRemoveProduct(row) {
+  try {
+    // 修改状态的二次确认
+    await message.confirm(`确认要删除${row.productName}吗?`)
+    // 发起修改状态
+    await SignApi.removeOrderProduct(row.id)
+    message.success('删除成功')
+    // 刷新列表
+    getTableList()
+  } catch {}
+}
+
 async function handleChangeProdoce(row) {
   try {
     // 修改状态的二次确认

src/views/Clue/Order/Comp/MallSettle.vue

@@ -116,9 +116,9 @@
         >
           <el-option
             v-for="item in supplierOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.supplierName"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -267,7 +267,7 @@ import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { getSimpleProductList } from '@/api/mall/product'
 import * as SettleApi from '@/api/clue/settle'
 
-import { getDictOptions } from '@/utils/dict'
+import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 import { removeNullField } from '@/utils/index'
 import { dateFormatter } from '@/utils/formatTime'
 
@@ -419,9 +419,12 @@ async function handleSaveSettle() {
 
 const userOptions = ref([])
 const prodOptions = ref([])
-const supplierOptions = getDictOptions('erp_supplier')
+const supplierOptions = ref([])
 
 function getOptions() {
+  getSupplierSimpleList().then((data) => {
+    supplierOptions.value = data
+  })
   // 产品
   getSimpleProductList().then((data) => {
     prodOptions.value = data

src/views/Clue/Order/Comp/Reback.vue

@@ -18,22 +18,83 @@
           <el-option label="已驳回" :value="4" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-select
-          v-model="searchForm.receiver"
-          placeholder="接待人"
-          clearable
-          filterable
-          style="width: 120px"
-        >
-          <el-option
-            v-for="item in allUserOptions"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
+      <template v-if="appStore.getAppInfo?.instanceType == 1">
+        <el-form-item>
+          <el-select
+            v-model="searchForm.receiver"
+            placeholder="接待人"
+            clearable
+            filterable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item in allUserOptions"
+              :key="item.id"
+              :label="item.nickname"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="searchForm.signSchool"
+            placeholder="选择驾校"
+            filterable
+            clearable
+            @change="changeSchool"
+          >
+            <el-option
+              v-for="item in schoolOptions"
+              :key="item.schoolId"
+              :label="item.schoolName"
+              :value="item.schoolId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="searchForm.signPlace"
+            placeholder="选择场地"
+            filterable
+            clearable
+            :disabled="!searchForm.signSchool"
+            @change="changePlace"
+          >
+            <el-option
+              v-for="item in placeOptions"
+              :key="item.placeId"
+              :label="item.name"
+              :value="item.placeId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="searchForm.signClass"
+            :disabled="!searchForm.signPlace"
+            placeholder="选择班型"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in classOptions"
+              :key="item.typeId"
+              :label="item.typeName"
+              :value="item.typeId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="searchForm.licenseType" placeholder="驾照类型" filterable clearable>
+            <el-option
+              v-for="item in getDictOptions(DICT_TYPE.LINCENSE_TYPE)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </template>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
         <el-select
           v-model="searchForm.convertPeople"
@@ -198,6 +259,30 @@
           <div v-else>{{ row.isPayoff }}</div>
         </template>
       </el-table-column>
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signSchool"
+        label="报名驾校"
+        min-width="90"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signPlace"
+        label="报名场地"
+        min-width="90"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signClass"
+        label="报名班型"
+        min-width="90"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="licenseType"
+        label="驾照类型"
+        min-width="90"
+      />
       <el-table-column
         v-if="appStore.getAppInfo?.instanceType == 1"
         prop="receiverName"
@@ -317,6 +402,9 @@
 <script setup name="Reback">
 import * as FeebackApi from '@/api/clue/payment'
 import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
+import { getPlaceList } from '@/api/school/place'
+import { getClassTypeList } from '@/api/school/class'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogFeebackAudit from './DialogFeebackAudit.vue'
@@ -352,6 +440,13 @@ const searchForm = ref({
 const userOptions = ref([])
 const allUserOptions = ref([])
 
+const schoolOptions = ref([])
+const allPlaceOptions = ref([])
+
+const placeOptions = computed(() => {
+  return allPlaceOptions.value.filter((it) => it.schoolId == searchForm.value.signSchool)
+})
+
 const tableList = ref([])
 const total = ref(0)
 
@@ -373,11 +468,30 @@ function handleReset() {
     applyUser: undefined,
     checkTime: [],
     mobile: undefined,
+    signSchool: undefined,
+    signPlace: undefined,
+    signClass: undefined,
     pageNo: 1,
     pageSize: 20
   }
 }
 
+function changeSchool() {
+  searchForm.value.signPlace = undefined
+  searchForm.value.signClass = undefined
+}
+
+function changePlace() {
+  searchForm.value.signClass = undefined
+  getClassTypeOptions()
+}
+
+const classOptions = ref([])
+async function getClassTypeOptions() {
+  const data = await getClassTypeList({ placeId: searchForm.value.signPlace, status: 0 })
+  classOptions.value = data
+}
+
 const totalInfo = ref({})
 const loading = ref(false)
 async function getList() {
@@ -428,6 +542,11 @@ function handleAudit(row) {
 }
 
 function getOptions() {
+  // 驾校
+  getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
+    schoolOptions.value = data.schoolList
+    allPlaceOptions.value = data.placeList
+  })
   getUserOption().then((data) => {
     userOptions.value = data
   })

src/views/Clue/Order/Comp/SchoolSettle.vue

@@ -248,6 +248,16 @@
         <el-form-item label="结算金额">
           {{ settleAmount }}
         </el-form-item>
+        <el-form-item label="结算日期">
+          <el-date-picker
+            v-model="form.settlementDate"
+            type="date"
+            placeholder="选择日期时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            :clearable="false"
+          />
+        </el-form-item>
         <el-form-item label="结算备注" prop="remark">
           <Editor v-model:modelValue="form.remark" />
         </el-form-item>
@@ -270,7 +280,7 @@ import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
 import * as SettleApi from '@/api/clue/settle'
 
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import { removeNullField } from '@/utils/index'
 
 const message = useMessage() // 消息弹窗
@@ -395,6 +405,7 @@ function batchSettle() {
     showDailog.value = true
     form.value = {
       settlementIds: selectList.value.map((it) => it.settlementId),
+      settlementDate: formatDate(new Date()),
       reamrk: undefined
     }
     settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)

src/views/Clue/Set/Comp/DialogSource.vue

@@ -7,30 +7,130 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-form-item v-if="formData.parentSource" label="上级来源">
-        <el-input v-model="formData.parentSource" disabled />
-      </el-form-item>
-      <el-form-item label="来源名称" prop="sourceName">
-        <el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio :label="0"> 启用 </el-radio>
-          <el-radio :label="1"> 禁用 </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          type="textarea"
-          v-model="formData.remark"
-          placeholder="请输入备注"
-          :autosize="{ minRows: 4, maxRows: 8 }"
-        />
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col v-if="formData.parentSource" :span="12" :offset="0">
+          <el-form-item label="上级来源">
+            <el-input v-model="formData.parentSource" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="来源名称" prop="sourceName">
+            <el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="排序" prop="sort">
+            <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio :label="0"> 启用 </el-radio>
+              <el-radio :label="1"> 禁用 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="开户费用" prop="accountFee">
+            <el-input-number
+              v-model="formData.accountFee"
+              :controls="false"
+              style="width: 100%"
+              :min="0"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="开户日期" prop="accountStartTime">
+            <el-date-picker
+              v-model="formData.accountStartTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="到期日期" prop="accountEndTime">
+            <el-date-picker
+              v-model="formData.accountEndTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期时间"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              placeholder="请输入备注"
+              :autosize="{ minRows: 4, maxRows: 8 }"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
+
+    <el-divider direction="horizontal" content-position="left">线索成本</el-divider>
+
+    <el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
+    <el-table :data="formData.sourceCostVOS" border>
+      <el-table-column label="年份" width="120">
+        <template #default="{ row }">
+          <el-date-picker
+            v-model="row.year"
+            type="year"
+            placeholder="选择年份"
+            size="small"
+            format="YYYY"
+            value-format="YYYY"
+            style="width: 100%"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
+        <el-table-column label="充值">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.monthData[col - 1].rechargeFee"
+              size="small"
+              :min="0"
+              :controls="false"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="消耗">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.monthData[col - 1].consumeFee"
+              size="small"
+              :controls="false"
+              :min="0"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="线索数">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.monthData[col - 1].clueNum"
+              size="small"
+              :controls="false"
+              style="width: 100%"
+              :min="0"
+            />
+          </template>
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -49,6 +149,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   sourceName: '',
+  accountFee: undefined,
   sort: 1,
   remark: ''
 })
@@ -111,8 +212,29 @@ const resetForm = () => {
     sourceName: '',
     status: 0,
     sort: 1,
-    remark: ''
+    remark: '',
+    costModel: 0,
+    sourceCostVOS: []
   }
   formRef.value?.resetFields()
 }
+
+function handleAddPrice() {
+  const obj = {
+    year: undefined,
+    monthData: []
+  }
+  for (let i = 1; i <= 12; i++) {
+    obj.monthData.push({
+      month: i,
+      consumeFee: 0,
+      rechargeFee: 0,
+      clueNum: 0
+    })
+  }
+  if (!formData.value.sourceCostVOS) {
+    formData.value.sourceCostVOS = []
+  }
+  formData.value.sourceCostVOS.push(obj)
+}
 </script>

src/views/Home/CloseRate.vue

@@ -23,7 +23,7 @@
 
       <el-table v-loading="loading" :data="tableList" border stripe>
         <el-table-column type="index" width="50" fixed="left" />
-        <el-table-column prop="nickname" label="姓名" width="80" />
+        <el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
         <el-table-column
           v-for="(item, index) in new Date().getMonth() + 1"
           :key="index"
@@ -102,8 +102,6 @@ function totalSort(pre, cur) {
 }
 
 function monthSort(pre, cur, idx) {
-  console.log(idx)
-
   return (
     Number(pre.monthClueSignRateReportList[idx].rate) -
     Number(cur.monthClueSignRateReportList[idx].rate)

src/views/Home/Comp/BarSalerClueReport.vue

@@ -0,0 +1,62 @@
+<template>
+  <Echart :options="optionsData" :width="400" :height="200" />
+</template>
+
+<script setup name="BarSalerClueReport">
+import { set } from 'lodash-es'
+
+onMounted(() => {
+  nextTick(() => {
+    getReportData()
+  })
+})
+
+const optionsData = ref({})
+
+const getReportData = async () => {
+  // const data = await HomeApi.getClueSignSignRate()
+  set(optionsData, 'radiusAxis', {
+    type: 'category',
+    data: ['宝典', '一点通', '抖音', '小红书'],
+    z: 10
+  })
+  set(optionsData, 'series', [
+    {
+      type: 'bar',
+      data: [1, 2, 3, 4],
+      coordinateSystem: 'polar',
+      name: '高意向A',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      }
+    },
+    {
+      type: 'bar',
+      data: [2, 4, 6, 8],
+      coordinateSystem: 'polar',
+      name: '中意向B',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      }
+    },
+    {
+      type: 'bar',
+      data: [1, 2, 3, 4],
+      coordinateSystem: 'polar',
+      name: '低意向C',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      }
+    }
+  ])
+}
+
+defineExpose({
+  getReportData
+})
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/DialogSalerReportDetail.vue

@@ -0,0 +1,353 @@
+<template>
+  <Dialog title="详情" v-model="dialogVisible" width="1000px">
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="选择日期"
+          end-placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="props.sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.cartype" placeholder="选择驾照类型" clearable>
+          <el-option
+            v-for="item in props.cartypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-tabs v-model="showPane" class="pb-10px">
+      <el-tab-pane label="详细数据" :name="1">
+        <el-table v-loading="loading" :data="tableList" border stripe>
+          <el-table-column prop="sourceName" label="渠道名称" width="100" fixed="left" />
+          <el-table-column prop="" label="新线索数" sortable />
+          <el-table-column prop="" label="成交数" sortable />
+          <el-table-column prop="" label="成交率" sortable />
+          <el-table-column prop="" label="成交周期" sortable />
+          <el-table-column prop="" label="毛利/单" sortable />
+          <el-table-column prop="" label="支出/单" sortable />
+          <el-table-column prop="" label="线索成本/条" sortable />
+          <el-table-column prop="" label="净利润/单" sortable />
+          <el-table-column label="总线索成本" prop="" sortable min-width="100" />
+          <el-table-column label="总支出" prop="" sortable min-width="100" />
+          <el-table-column label="总利润" prop="" sortable min-width="100" />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="图表展示" :name="2" lazy>
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-checkbox-group v-model="showChannel" @change="setReportData">
+              <el-checkbox v-for="(item, index) in channelArr" :key="index" :label="item" />
+            </el-checkbox-group>
+          </el-col>
+
+          <el-col :span="12" :offset="0">
+            <el-skeleton :loading="loading" animated>
+              <Echart :options="echart1Option" width="100%" :height="400" />
+            </el-skeleton>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <Echart :options="echart2Option" width="100%" :height="400" />
+          </el-col>
+          <el-col :span="24" :offset="0">
+            <Echart :options="echart3Option" width="100%" :height="400" />
+          </el-col>
+        </el-row>
+      </el-tab-pane>
+    </el-tabs>
+  </Dialog>
+</template>
+
+<script setup name="DialogSalerReportDetail">
+import { set } from 'lodash-es'
+import * as reportApi from '@/api/home/reportSignRate'
+import { removeNullField } from '@/utils'
+
+const props = defineProps({
+  cartypeOptions: {
+    type: Array,
+    default: () => []
+  },
+  sourceOptions: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const loading = ref(false)
+const searchForm = ref({})
+
+const showPane = ref(1)
+const showChannel = ref([])
+
+function handleReset() {
+  searchForm.value = {
+    nickname: undefined,
+    period: []
+  }
+}
+
+/** 打开弹窗 */
+const open = async (info, queryInfo) => {
+  showPane.value = 1
+  dialogVisible.value = true
+  dialogTitle.value = `销售详情-【${info.nickname}】`
+  searchForm.value.period = queryInfo.period
+  searchForm.value.cartype = queryInfo.cartype
+  showChannel.value = [...channelArr]
+
+  handleSearch()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const tableList = ref([])
+
+async function handleSearch() {
+  loading.value = true
+  try {
+    setReportData()
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data.map((item) => {
+      const count = item.monthClueSignRateReportList.reduce(
+        (pre, cur) => {
+          return {
+            signCount: pre.signCount + cur.clueSignNum,
+            clueCount: pre.clueCount + cur.followClueNum
+          }
+        },
+        { signCount: 0, clueCount: 0 }
+      )
+      const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
+      return {
+        ...item,
+        totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
+        totalRateNum: rate
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+const channelArr = ['美团', '高德', '线下渠道', '其他', '一点通', '抖音', '小红书', '宝典']
+
+const echart1Option = ref({
+  title: {
+    text: '线索分布图'
+  },
+  radiusAxis: {},
+  angleAxis: {},
+  tooltip: {
+    show: true,
+    formatter: '{b0}-{a}: {c}'
+  },
+  polar: {},
+  legend: {
+    show: true
+  }
+})
+
+const echart2Option = ref({
+  title: {
+    text: '成交分布图'
+  },
+  radiusAxis: {},
+  angleAxis: {},
+  tooltip: {
+    show: true,
+    formatter: '{b0}-{a}: {c}'
+  },
+  polar: {},
+  legend: {
+    show: true
+  }
+})
+
+const echart3Option = ref({
+  title: {
+    text: '销售雷达图'
+  },
+  radar: {
+    indicator: [
+      { name: '成交周期' },
+      { name: '毛利/单' },
+      { name: '支出/单' },
+      { name: '线索成本/条' },
+      { name: '净利润/单' },
+      { name: '线索总成本' },
+      { name: '总支出' },
+      { name: '总利润' }
+    ]
+  },
+  legend: {
+    show: true
+  }
+})
+
+const setReportData = async () => {
+  // const data = await HomeApi.getClueSignSignRate()
+
+  set(echart1Option.value, 'radiusAxis', {
+    type: 'category',
+    data: showChannel.value,
+    axisLabel: {
+      margin: 5,
+      fontSize: 10,
+      interval: 0
+    }
+  })
+
+  set(echart1Option.value, 'series', [
+    {
+      type: 'bar',
+      data: [2, 2, 3, 4, 10, 22, 43, 141],
+      coordinateSystem: 'polar',
+      name: '高意向A',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    },
+    {
+      type: 'bar',
+      data: [6, 6, 7, 8, 22, 14, 36, 128],
+      coordinateSystem: 'polar',
+      name: '中意向B',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    },
+    {
+      type: 'bar',
+      data: [1, 4, 7, 11, 16, 42, 13, 42],
+      coordinateSystem: 'polar',
+      name: '低意向C',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    }
+  ])
+
+  set(echart2Option.value, 'radiusAxis', {
+    type: 'category',
+    data: showChannel.value,
+    axisLabel: {
+      margin: 5,
+      fontSize: 10,
+      interval: 0
+    }
+  })
+  set(echart2Option.value, 'series', [
+    {
+      type: 'bar',
+      data: [2, 2, 3, 4, 1, 11, 23, 41],
+      coordinateSystem: 'polar',
+      name: 'C1',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    },
+    {
+      type: 'bar',
+      data: [6, 6, 7, 8, 12, 14, 6, 28],
+      coordinateSystem: 'polar',
+      name: 'C2',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    },
+    {
+      type: 'bar',
+      data: [1, 4, 7, 1, 6, 2, 23, 14],
+      coordinateSystem: 'polar',
+      name: 'D/E/F',
+      stack: 'a',
+      emphasis: {
+        focus: 'series'
+      },
+      label: {
+        show: true,
+        position: 'middle'
+      }
+    }
+  ])
+  set(echart3Option.value, 'series', [
+    {
+      type: 'radar',
+      data: [
+        {
+          value: [5.5, 1000, 200, 51, 666, 12345, 1245, 65478],
+          name: '平均',
+          label: {
+            show: true
+          }
+        },
+        {
+          value: [15, 800, 300, 66, 551, 23456, 2123, 25698],
+          name: '当前',
+          label: {
+            show: true
+          }
+        }
+      ]
+    }
+  ])
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/Home/Comp/SignListCard.vue

@@ -38,31 +38,42 @@
     </el-form>
     <el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
       <el-table-column label="周期" prop="period" width="110px" />
-      <el-table-column prop="signNumber" label="成交数" />
-      <el-table-column prop="signPrice" label="成交额" />
-      <el-table-column
-        prop="signPriceSequentialGrowth"
-        label="成交额环比增长"
-        :formatter="parseRate"
-      />
-      <el-table-column
-        prop="signPriceSamePeriodCompareGrowth"
-        label="成交额同比增长"
-        :formatter="parseRate"
-      />
-      <el-table-column prop="profit" label="利润" />
-      <el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
-      <el-table-column
-        prop="profitSamePeriodCompareGrowth"
-        label="利润同比增长"
-        :formatter="parseRate"
-      />
-      <el-table-column prop="notReceivedMoney" label="未到账金额" />
-      <el-table-column prop="receivedMoney" label="已到账金额" />
+      <el-table-column label="成交" align="center">
+        <el-table-column prop="signNumber" label="成交数" />
+        <el-table-column prop="signPrice" label="成交额" />
+        <el-table-column prop="signPriceSequentialGrowth" label="环比" :formatter="parseRate" />
+        <el-table-column
+          prop="signPriceSamePeriodCompareGrowth"
+          label="同比"
+          :formatter="parseRate"
+        />
+      </el-table-column>
+      <el-table-column label="利润" align="center">
+        <el-table-column prop="profit">
+          <template #header> <Tooltip message="公司利润" /> <span>利润</span> </template>
+        </el-table-column>
+        <el-table-column prop="profitSequentialGrowth" label="环比" :formatter="parseRate" />
+        <el-table-column prop="profitSamePeriodCompareGrowth" label="同比" :formatter="parseRate" />
+      </el-table-column>
+
+      <el-table-column prop="notReceivedMoney">
+        <template #header>
+          <Tooltip message="回款列表中未审核的公司利润" /> <span>未到账</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="receivedMoney">
+        <template #header>
+          <Tooltip message="回款列表中已审核的公司利润" /> <span>已到账</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="waitSettleMoney" label="待结算金额" />
       <el-table-column prop="settledMoney" label="已结算金额" />
       <el-table-column prop="refundAmount" label="已退款金额" />
-      <el-table-column prop="remainMoney" label="结余" />
+      <el-table-column prop="remainMoney">
+        <template #header>
+          <Tooltip message="已到账金额-已结算金额-已退款金额" /> <span>结余</span>
+        </template>
+      </el-table-column>
     </el-table>
   </ContentWrap>
 </template>
@@ -129,14 +140,16 @@ function getSummaries({ columns, data }) {
       if (column.property.includes('Growth')) {
         sums[index] = ''
       } else {
-        sums[index] = values.reduce((prev, curr) => {
-          const value = Number(curr)
-          if (!Number.isNaN(value)) {
-            return prev + curr
-          } else {
-            return prev
-          }
-        }, 0)
+        sums[index] = values
+          .reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!Number.isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          .toFixed(2)
       }
     } else {
       sums[index] = ''

src/views/Home/SalesReport.vue

@@ -0,0 +1,191 @@
+<template>
+  <ContentWrap>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.period"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="选择日期"
+          end-placeholder="选择日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-tree-select
+          v-model="searchForm.sourceId"
+          :data="sourceOptions"
+          :props="defaultProps"
+          check-strictly
+          node-key="sourceId"
+          placeholder="请选择渠道"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.cartype" placeholder="选择驾照类型" clearable>
+          <el-option
+            v-for="item in cartypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="tableList" border stripe>
+      <el-table-column type="index" width="50" fixed="left" />
+      <el-table-column prop="nickname" label="姓名" width="80" fixed="left">
+        <template #default="{ row }">
+          <el-button type="primary" style="padding: 0" text @click="handleDetail">{{
+            row.nickname
+          }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="咨询日期在所选周期内的线索总数" />
+          <span>新线索数</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="成交数" prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="成交日期在所选周期内的成交数" />
+          <span>成交数</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="成交率" prop="" sortable min-width="100" />
+      <el-table-column label="跟进数/日" prop="" sortable min-width="100" />
+      <el-table-column label="成交数/日" prop="" sortable min-width="100" />
+      <el-table-column label="平均成交周期" prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="平均每条成交的线索，从咨询开始到成交所需要的天数" />
+          <span>平均成交周期</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip
+            message="平均每笔成交订单的公司利润【按照登记，不按审核到账】=总公司利润/总成交数"
+          />
+          <span>毛利/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip
+            message="平均每笔成交订单的额外支出（返费等）【按照登记，不按审核到账】=总支出/总成交数"
+          />
+          <span>支出/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="平均每条线索的成本=总线索成本/新线索条数" />
+          <span>线索成本/条</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="=（总公司利润-总支出-总线索成本）/总成交数" />
+          <span>净利润/单</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总线索成本" prop="" sortable min-width="100" />
+      <el-table-column label="总支出" prop="" sortable min-width="100" />
+      <el-table-column label="总利润" prop="" sortable min-width="100" />
+      <el-table-column prop="" sortable min-width="100">
+        <template #header>
+          <Tooltip message="=总利润/(总成本+总支出)" />
+          <span>能效</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="撞单数" prop="" sortable min-width="100" />
+      <el-table-column label="撞单成交数" prop="" sortable min-width="100" />
+    </el-table>
+
+    <DialogSalerReportDetail ref="SalerDetailDialog" />
+  </ContentWrap>
+</template>
+
+<script setup name="SalesReport">
+import DialogSalerReportDetail from './Comp/DialogSalerReportDetail.vue'
+
+import * as reportApi from '@/api/home/reportSignRate'
+import { removeNullField } from '@/utils'
+
+onMounted(() => {
+  handleReset()
+  handleSearch()
+})
+
+const defaultProps = {
+  children: 'children',
+  label: 'sourceName',
+  value: 'sourceId',
+  isLeaf: 'leaf'
+}
+
+const sourceOptions = ref([])
+const cartypeOptions = ref([])
+
+const searchForm = ref({})
+
+function handleReset() {
+  searchForm.value = {
+    nickname: undefined,
+    period: []
+  }
+}
+
+const loading = ref(false)
+const tableList = ref([])
+async function handleSearch() {
+  loading.value = true
+  try {
+    const data = await reportApi.getList(removeNullField(searchForm.value))
+    tableList.value = data.map((item) => {
+      const count = item.monthClueSignRateReportList.reduce(
+        (pre, cur) => {
+          return {
+            signCount: pre.signCount + cur.clueSignNum,
+            clueCount: pre.clueCount + cur.followClueNum
+          }
+        },
+        { signCount: 0, clueCount: 0 }
+      )
+      const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
+      return {
+        ...item,
+        totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
+        totalRateNum: rate
+      }
+    })
+  } finally {
+    loading.value = false
+  }
+}
+
+const SalerDetailDialog = ref()
+function handleDetail(info) {
+  SalerDetailDialog.value.open(info, searchForm.value)
+}
+
+// function monthSort(pre, cur, idx) {
+
+//   return (
+//     Number(pre.monthClueSignRateReportList[idx].rate) -
+//     Number(cur.monthClueSignRateReportList[idx].rate)
+//   )
+// }
+</script>
+
+<style lang="scss" scoped></style>

src/views/MiniMall/MallSet/Comp/DialogSupplier.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -7,11 +7,17 @@
       :rules="formRules"
       label-width="80px"
     >
-      <el-form-item label="名称" prop="label">
-        <el-input v-model="formData.label" placeholder="请输入供应商名称" />
+      <el-form-item label="名称" prop="supplierName">
+        <el-input v-model="formData.supplierName" placeholder="请输入供应商名称" />
       </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
+      <el-form-item label="微信群" prop="wechatGroup">
+        <el-input v-model="formData.wechatGroup" placeholder="请输入微信群" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio :label="0"> 启用 </el-radio>
+          <el-radio :label="1"> 禁用 </el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
@@ -29,7 +35,7 @@
   </Dialog>
 </template>
 <script name="DialogSupplier" setup>
-import * as dictApi from '@/api/system/dict/dict.data'
+import * as SupplierApi from '@/api/school/setting/supplier'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -38,12 +44,12 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  label: '',
-  sort: 1,
+  supplierName: '',
+  wechatGroup: 1,
   remark: ''
 })
 const formRules = reactive({
-  label: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
+  supplierName: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -57,7 +63,7 @@ const open = async (type, id) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await dictApi.getDictData(id)
+      formData.value = await SupplierApi.getSupplier(id)
     } finally {
       formLoading.value = false
     }
@@ -75,14 +81,11 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    if (!formData.value.value) {
-      formData.value.value = formData.value.label
-    }
     if (formType.value === 'create') {
-      await dictApi.createDictData(formData.value)
+      await SupplierApi.createSupplier(formData.value)
       message.success(t('common.createSuccess'))
     } else {
-      await dictApi.updateDictData(formData.value)
+      await SupplierApi.updateSupplier(formData.value)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -96,10 +99,9 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    label: '',
-    sort: 1,
+    supplierName: '',
+    wechatGroup: '',
     status: 0,
-    dictType: 'erp_supplier',
     remark: ''
   }
   formRef.value?.resetFields()

src/views/MiniMall/MallSet/Comp/SupplierSet.vue

@@ -3,7 +3,7 @@
     <el-form ref="queryForm" :model="searchForm" label-width="0" inline>
       <el-form-item>
         <el-input
-          v-model="searchForm.name"
+          v-model="searchForm.supplierName"
           placeholder="请输入名称"
           clearable
           @keyup.enter="handleQuery"
@@ -16,8 +16,13 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="tableList">
-      <el-table-column prop="label" label="供应商名称" />
-      <el-table-column prop="sort" label="排序" width="100px" />
+      <el-table-column prop="supplierName" label="供应商名称" />
+      <el-table-column prop="wechatGroup" label="微信群名称" />
+      <el-table-column label="状态" min-width="150" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column prop="remark" label="备注" />
       <el-table-column
         label="创建时间"
@@ -46,16 +51,16 @@
 <script setup name="SupplierSet">
 import { dateFormatter } from '@/utils/formatTime'
 import DialogSupplier from './DialogSupplier.vue'
-import * as dictApi from '@/api/system/dict/dict.data'
+import * as SupplierApi from '@/api/school/setting/supplier'
+import { DICT_TYPE } from '@/utils/dict'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const searchForm = ref({
-  label: '',
+  supplierName: '',
   pageSize: 20,
-  pageNo: 1,
-  dictType: 'erp_supplier'
+  pageNo: 1
 })
 
 const total = ref(0)
@@ -69,10 +74,9 @@ function handleQuery() {
 }
 function resetQuery() {
   searchForm.value = {
-    label: '',
+    supplierName: '',
     pageSize: 20,
-    pageNo: 1,
-    dictType: 'erp_supplier'
+    pageNo: 1
   }
   getList()
 }
@@ -80,7 +84,7 @@ function resetQuery() {
 async function getList() {
   loading.value = true
   try {
-    const data = await dictApi.getDictDataPage(searchForm.value)
+    const data = await SupplierApi.getSupplierPage(searchForm.value)
     tableList.value = data.list
     total.value = data.total
   } finally {
@@ -97,7 +101,7 @@ async function handleDelete(id) {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await dictApi.deleteDictData(id)
+    await SupplierApi.deleteSupplier(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()

src/views/MiniMall/Product/index.vue

@@ -49,7 +49,7 @@
 
   <!-- 列表 -->
   <el-table v-loading="loading" class="mt-20px" :data="tableList" border>
-    <el-table-column type="expand" width="30">
+    <el-table-column type="expand" width="30" fixed="left">
       <template #default="{ row }">
         <div class="pl-100px pr-100px">
           <el-table :data="row.productSpecList">
@@ -71,16 +71,16 @@
       </template>
     </el-table-column>
     <el-table-column key="productId" label="产品编码" prop="productId" />
-    <el-table-column show-overflow-tooltip label="产品名称" min-width="200" prop="productName" />
-    <el-table-column label="分类" min-width="90" prop="productCategoryName" />
-    <el-table-column label="品牌" min-width="90" prop="productBrandName" />
+    <el-table-column show-overflow-tooltip label="产品名称" min-width="100" prop="productName" />
+    <el-table-column label="分类" width="90" prop="productCategoryName" />
+    <el-table-column label="品牌" width="90" prop="productBrandName" />
     <el-table-column label="商品图" min-width="80">
       <template #default="{ row }">
         <el-image :src="row.mainImage" @click="imagePreview(row.mainImage)" class="w-30px h-30px" />
       </template>
     </el-table-column>
-    <el-table-column label="简介" min-width="70" prop="productIntro" />
-    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="180" />
+    <el-table-column label="简介" min-width="200" prop="productIntro" />
+    <el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="120" />
     <el-table-column v-for="item in diyFieldList" :key="item.clueParamId" :label="item.label">
       <template #default="{ row }">
         <div v-if="item.component == 'DatePicker'">

src/views/MiniMall/Purchase/index.vue

@@ -37,9 +37,9 @@
         <el-select v-model="queryParams.supplier" placeholder="供应商" clearable filterable>
           <el-option
             v-for="item in opts.supplier"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            :key="item.id"
+            :label="item.supplierName"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -135,7 +135,7 @@ import { allSchemas } from './index.data.js'
 import DialogAdd from './Comp/DialogAdd.vue'
 import DialogAudit from './Comp/DialogAudit.vue'
 import * as PurchaseApi from '@/api/mall/purchase'
-import { getDictOptions } from '@/utils/dict'
+import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 
 const creatPurchase = ref()
 const auditPurchase = ref()
@@ -164,7 +164,9 @@ function getOptions() {
   ProductApi.getSimpleProductList().then((data) => {
     opts.value.product = data
   })
-  opts.value.supplier = getDictOptions('erp_supplier')
+  getSupplierSimpleList().then((data) => {
+    opts.value.supplier = data
+  })
 }
 
 function changeProd(val) {