收入分析

server/api/v1/crm/demand.go

@@ -44,6 +44,7 @@ func (da *DemandApi) CreateDemand(c *gin.Context) {
 func (da *DemandApi) UpdateDemand(c *gin.Context) {
 	var demand crm.Demand
 	err := c.ShouldBindJSON(&demand)
+	fmt.Println(demand)
 	if err != nil {
 		response.FailWithMessage("参数错误", c)
 		global.GVA_LOG.Error("UpdateDemand ====== " + err.Error())

server/dao/crm/demand.go

@@ -1,6 +1,9 @@
 package crm
 
-import "server/global"
+import (
+	"fmt"
+	"server/global"
+)
 
 type Demand struct {
 	global.GVA_MODEL
@@ -24,7 +27,8 @@ func (d Demand) CreateDemand() error {
 }
 
 func (d Demand) UpdateDemand() error {
-	return global.GVA_DB.Model(&Demand{}).Where("id = ?", d.ID).Updates(&d).Error
+	fmt.Print("测试数据", d)
+	return global.GVA_DB.Model(&d).Select("propose_time", "customer_id", "content", "is_finish").Where("id = ?", d.ID).Updates(&d).Error
 }
 
 func DeleteDemand(id int) error {

server/initialize/gorm.go

@@ -89,6 +89,7 @@ func RegisterTables() {
 		crm.Customer{},
 		crm.CustomerGenre{},
 		crm.Progress{},
+		crm.Demand{},
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))

web/src/pinia/customer/customer.js

@@ -27,7 +27,6 @@ export const useCustomer = defineStore('customer', () => {
       isFinish: false
     }
   ])
-  const demandId = ref(0)
   const getDemandList = (id) => {
     getUserDemand(id).then(res => {
       if (res.code === 0) {
@@ -36,18 +35,13 @@ export const useCustomer = defineStore('customer', () => {
       }
     })
   }
-  const changeDemandId = (id) => {
-    demandId.value = id
-  }
   return {
     progressList,
     getProgressList,
     customerId,
     changeCustomerId,
     demandList,
-    demandId,
     getDemandList,
-    changeDemandId
   }
 })
 

web/src/view/customer/component/demand.vue

@@ -24,8 +24,13 @@
           label="是否完成"
           align="center"
           width="150px"
-          prop="isFinish"
-        />
+        >
+          <template #default="scope">
+            <el-text :type="scope.row.isFinish ? 'success' : 'danger'">
+              {{ scope.row.isFinish ? '已完成' : '未完成' }}
+            </el-text>
+          </template>
+        </el-table-column>
         <el-table-column
           label="需求内容"
           align="center"
@@ -67,7 +72,7 @@
     <el-dialog
       v-model="addDemandShow"
       width="35%"
-      title="新增客户进度"
+      title="新增客户需求"
     >
       <el-form label-width="100px">
         <el-form-item label="提出时间：">
@@ -118,7 +123,7 @@
     <el-dialog
       v-model="editDemandShow"
       width="35%"
-      title="新增客户进度"
+      title="编辑客户需求"
     >
       <el-form label-width="100px">
         <el-form-item label="提出时间：">
@@ -162,7 +167,7 @@
         <el-button
           type="primary"
           size="large"
-          @click="addDemand"
+          @click="editDemand"
         >确定</el-button>
       </template>
     </el-dialog>
@@ -173,7 +178,7 @@
 import { ref, reactive } from 'vue'
 import { useCustomer } from '@/pinia/customer/customer'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { postUserDemand, delUserDemand } from '@/api/demand'
+import { postUserDemand, delUserDemand, putUserDemand } from '@/api/demand'
 defineOptions({
   name: 'DemandUnit'
 })
@@ -199,11 +204,12 @@ const addDemand = () => {
       return
     }
   }
+  console.log(addDemandData)
   postUserDemand(addDemandData).then(res => {
-    console.log(res)
     if (res.code === 0) {
       ElMessage.success(res.msg)
-      customerData.getDemandList(customerData.demandId)
+      customerData.getDemandList(customerData.customerId)
+      addDemandShow.value = false
     }
   })
 }
@@ -211,18 +217,33 @@ const addDemand = () => {
 // 编辑需求
 const editDemandShow = ref(false)
 const editDemandData = reactive({
+  id: 0,
   proposeTime: '',
   content: '',
   isFinish: false,
   customerId: customerData.customerId
 })
 const demandEdit = (row) => {
-  console.log(row)
+  editDemandShow.value = true
+  editDemandData.id = row.ID
+  editDemandData.proposeTime = row.proposeTime
+  editDemandData.isFinish = row.isFinish
+  editDemandData.content = row.content
+}
+
+const editDemand = () => {
+  console.log(editDemandData)
+  putUserDemand(editDemandData).then(res => {
+    if (res.code === 0) {
+      ElMessage.success(res.msg)
+      editDemandShow.value = false
+      customerData.getDemandList(customerData.customerId)
+    }
+  })
 }
 
 // 删除需求
 const deleteDemand = (row) => {
-  console.log(row)
   ElMessageBox.confirm(
     '确定删除此客户进度吗?',
     '删除',
@@ -236,7 +257,7 @@ const deleteDemand = (row) => {
       delUserDemand(row.ID).then(res => {
         if (res.code === 0) {
           ElMessage.success(res.msg)
-          customerData.getProgressList(customerData.customerId)
+          customerData.getDemandList(customerData.customerId)
         }
       })
     })

web/src/view/customer/customer.vue

@@ -6,11 +6,12 @@
           <div class="customerSearch">
             <div>
               <el-select
-                v-model="customerType"
+                v-model="customerGenre"
                 placeholder="类型"
                 style="width: 120px"
                 clearable
                 @change="changeCustomerType"
+                @clear="clearCustomerType"
               >
                 <el-option
                   v-for="item in userTypeList"
@@ -384,12 +385,24 @@ defineOptions({
 })
 const customerData = useCustomer()
 
-const customerType = ref('')
-
 const changeCustomerType = (val) => {
-  console.log(val)
+  userJson.genre = val
+  userTypeList.forEach((item) => {
+    if (item.ID === val) {
+      customerGenre.value = item.name
+    }
+  })
+  queryCustomerList()
+}
+
+const clearCustomerType = () => {
+  userJson.genre = 0
+  customerGenre.value = ''
+  queryCustomerList()
 }
 // 客户类型
+const customerGenre = ref('')
+
 const userTypeList = reactive([])
 
 // 查询客户类型
@@ -397,6 +410,7 @@ const queryUserTypeList = () => {
   getCustomerType().then(res => {
     if (res.code === 0) {
       userTypeList.length = 0
+      console.log(res.data)
       userTypeList.push(...res.data)
     }
   })
@@ -461,7 +475,8 @@ const userJson = reactive({
     page: 1,
     pageSize: 10
   },
-  name: ''
+  name: '',
+  genre: 0
 })
 
 const customerTotal = ref(0)