Merge pull request '补充' (#21) from zzw into main

Reviewed-on: http://120.46.37.243:3000/scrm/alikeSCRM/pulls/21

ruoyi-ui/src/views/crm/business/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标题" prop="title">
+<!--      <el-form-item label="标题" prop="title">-->
-        <el-input
+<!--        <el-input-->
-          v-model="queryParams.title"
+<!--          v-model="queryParams.title"-->
-          placeholder="请输入标题"
+<!--          placeholder="请输入标题"-->
-          clearable
+<!--          clearable-->
-          @keyup.enter.native="handleQuery"
+<!--          @keyup.enter.native="handleQuery"-->
-        />
+<!--        />-->
-      </el-form-item>
+<!--      </el-form-item>-->
 <!--      <el-form-item label="关联客户" prop="customerId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.customerId"-->
@@ -334,9 +334,9 @@
     <!-- 添加或修改商机对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="title">
+<!--        <el-form-item label="标题" prop="title">-->
-          <el-input v-model="form.title" placeholder="请输入标题" />
+<!--          <el-input v-model="form.title" placeholder="请输入标题" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item label="关联客户" prop="customerId">
           <el-select v-model="form.customerId" placeholder="请输入关联客户" @change="doChangeCustomerNumber" >
             <el-option

ruoyi-ui/src/views/crm/clues/person-list.vue

@@ -60,6 +60,7 @@
           <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleTransfer(scope.row)" v-hasPermi="['crm:clues:transfer']">转移</el-button>
           <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleToCustomer(scope.row)" v-hasPermi="['crm:clues:tocustomer']">转成客户</el-button>
           <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleAddAssociation(scope.row)" v-hasPermi="['crm:clues:tocustomer']">添加关联</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleRollback(scope.row)" v-hasPermi="['crm:clues:edit']">退回</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['crm:clues:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['crm:clues:remove']">删除</el-button>
         </template>
@@ -297,6 +298,23 @@
           this.title = '修改线索'
         })
       },
+      /** 退回按钮操作 */
+      handleRollback (row) {
+        this.reset();
+        this.form.owner = '';
+        this.form.id = row.id;
+        const that = this
+        this.$modal
+          .confirm('是否确认退回线索？')
+          .then(function () {
+            return updateClues(that.form)
+          })
+          .then(() => {
+            this.getList()
+            this.$modal.msgSuccess('已退回线索')
+          })
+          .catch(() => { })
+      },
       /** 提交按钮 */
       submitForm () {
         this.$refs['form'].validate((valid) => {

ruoyi-ui/src/views/crm/customer/list.vue

@@ -70,6 +70,7 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleComment(scope.row)" v-hasPermi="['crm:customer:followup']">写跟进</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleTransfer(scope.row)" v-hasPermi="['crm:customer:transfer']">转移</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleToBusiness(scope.row)" v-hasPermi="['crm:customer:transfer']">转为商机</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['crm:customer:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['crm:customer:remove']">删除</el-button>
         </template>
@@ -161,6 +162,7 @@ import {
   addCustomer,
   updateCustomer,
 } from '@/api/crm/customer'
+import { addBusiness } from "@/api/crm/business";
 
 import TransferCustomerComponent from './Transfer'
 import ToPoolComponent from './ToPool'
@@ -223,6 +225,8 @@ export default {
       },
       // 表单参数
       form: {},
+      //新增商机参数
+      businessForm: {},
       // 表单校验
       rules: {
         name: [
@@ -370,6 +374,27 @@ export default {
         this.$refs.transferCustomer.open(ids)
       })
     },
+    //转为商机按钮
+    handleToBusiness (row) {
+      this.businessForm.customerId = row.id
+      this.businessForm.businessName = '由客户转换而来'
+      this.businessForm.stageType = 0
+      this.businessForm.forecastBusinessPrice = 0
+      const that = this
+      getCustomer(this.businessForm.customerId).then((response) => {
+        this.businessForm.customerNumber = response.data.code
+      })
+      this.$modal
+        .confirm('是否确认转为商机？')
+        .then(function () {
+          return addBusiness(that.businessForm)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('已成功转为商机')
+        })
+        .catch(() => { })
+    },
     handleTransferCustomerClose () {
       this.transferCustomer = false;
       this.getList();

ruoyi-ui/src/views/crm/customer/person-list.vue

@@ -70,6 +70,7 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleComment(scope.row)" v-hasPermi="['crm:customer:comment']">写跟进</el-button>
           <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleTransfer(scope.row)" v-hasPermi="['crm:customer:transfer']">转移</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleToBusiness(scope.row)" v-hasPermi="['crm:customer:transfer']">转为商机</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['crm:customer:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['crm:customer:remove']">删除</el-button>
         </template>
@@ -161,6 +162,7 @@ import {
   addCustomer,
   updateCustomer,
 } from '@/api/crm/customer'
+import { addBusiness } from "@/api/crm/business";
 
 import TransferCustomerComponent from './Transfer'
 import ToPoolComponent from './ToPool'
@@ -370,6 +372,27 @@ export default {
         this.$refs.transferCustomer.open(ids)
       })
     },
+    //转为商机按钮
+    handleToBusiness (row) {
+      this.businessForm.customerId = row.id
+      this.businessForm.businessName = '由客户转换而来'
+      this.businessForm.stageType = 0
+      this.businessForm.forecastBusinessPrice = 0
+      const that = this
+      getCustomer(this.businessForm.customerId).then((response) => {
+        this.businessForm.customerNumber = response.data.code
+      })
+      this.$modal
+        .confirm('是否确认转为商机？')
+        .then(function () {
+          return addBusiness(that.businessForm)
+        })
+        .then(() => {
+          this.getList()
+          this.$modal.msgSuccess('已成功转为商机')
+        })
+        .catch(() => { })
+    },
     handleTransferCustomerClose () {
       this.transferCustomer = false;
       this.getList();

ruoyi-ui/src/views/login.vue

@@ -2,8 +2,7 @@
   <div class="login">
     <img src="@/assets/left-img.png">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title"></h3>
+      <el-form-item prop="tenant" style="margin-top: 44px">
-      <el-form-item prop="tenant">
         <el-input v-model="loginForm.tenant" type="text" auto-complete="off" placeholder="租户编号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>