HW 3 years ago
parent
commit
f2916a336b

+ 15 - 5
js/component/dataDic.js

@@ -1530,7 +1530,7 @@ module.exports = {
     },
   ],
   //渠道分配状态
-  //0未分配  1已分配 2已存在私有 3已存在公共 4已存在签单 5回退
+  //0未分配  1已分配经理 2已分配营销员 3已存在私有 4已存在公共 5已存在签单 6回退 7已签单
   channelAllocationStatus:[
     {
       value: "0",
@@ -1539,29 +1539,39 @@ module.exports = {
     },
     {
       value: "1",
-      key: "已分配",
+      key: "已分配经理",
       color:'#87d068'
     },
     {
       value: "2",
+      key: "已分配营销员",
+      color:'#385a2f'
+    },
+    {
+      value: "3",
       key: "已存在私有",
       color:'#108ee9'
     },
     {
-      value: "3",
+      value: "4",
       key: "已存在公共",
       color:'#63aade'
     },
     {
-      value: "4",
+      value: "5",
       key: "已存在签单",
       color:'#316388'
     },
     {
-      value: "5",
+      value: "6",
       key: "回退",
       color:'#f00'
     },
+    {
+      value: "7",
+      key: "已签单",
+      color:'#fa0e84'
+    },
   ],
   //账户状态
   statuslist: [

+ 31 - 19
js/component/manageCenter/customer/NEW/intentionCustomer/channel.jsx

@@ -33,6 +33,8 @@ import DuplicateData from './duplicateData';
 import OperationTips from './operationTips';
 import ShowModalDiv from "@/showModal.jsx";
 
+import './channel.less';
+
 const {TabPane} = Tabs;
 const { RangePicker } = DatePicker;
 
@@ -40,6 +42,7 @@ class Channel extends Component{
     constructor(props) {
         super(props);
         this.state={
+            channelAllocationStatusList : channelAllocationStatus.slice(0,channelAllocationStatus.length-1),
             columns: [
                 {
                     title: "客户名称",
@@ -144,15 +147,15 @@ class Channel extends Component{
                 onChange: info => {
                     if (info.file.status === "done") {
                         if (info.file.response && info.file.response.error.length === 0) {
-                            if(info.file.response.data.list.length > 0){
+                            if(info.file.response.data === 1){
+                                message.success("导入成功!");
+                                this.loadData();
+                            }else if(info.file.response.data.list.length > 0){
                                 message.warning('已成功导入!错误/重复客户无法导入,请查看错误渠道数据!');
                                 this.setState({
                                     duplicateData: [],
                                     duplicateDataVisible: true
                                 })
-                            }else{
-                                message.success("导入成功!");
-                                this.loadData();
                             }
                         } else {
                             message.warning(info.file.response.error[0].message);
@@ -223,6 +226,7 @@ class Channel extends Component{
                             alignItems:'center',
                         }}>
                             <Button
+                                disabled={record.status === 2 && this.props.isEditGuidanceLv}
                                 onClick={(e) => {
                                     e.stopPropagation();
                                     if(this.props.isEditGuidanceLv){
@@ -310,6 +314,8 @@ class Channel extends Component{
     loadData(pageNo) {
         this.setState({
             listLoading: true,
+            selectedRows: [],
+            selectedRowKeys: [],
         });
         $.ajax({
             method: "post",
@@ -547,13 +553,19 @@ class Channel extends Component{
     }
 
     changeAssigner(remarks,type,lv) {
+        //type   0 总监分配 1经理分配 2回收
         let arr = this.state.selectedRows.filter(v=>v.status === 1);
-        if(type === 0 && arr.length>0){
+        let arr1 = this.state.selectedRows.filter(v=>v.status === 2);
+        if(type === 0 && (arr.length>0 || arr1.length>0)){
             message.warning('选中的信息中存在“已分配”数据,请取消这些选项后重新提交')
             return;
         }
+        if(type === 1 && arr1.length>0){
+            message.warning('选中的信息中存在“经理已分配”数据,请取消这些选项后重新提交')
+            return;
+        }
         if(!remarks){
-            message.warning(type === 1 ? "请输入转交原因" : type === 2 ? "请输入回收原因" : type === 0 ? "请输入分配原因" : "");
+            message.warning(type === 1 ? "请输入分配原因" : type === 2 ? "请输入回收原因" : type === 0 ? "请输入分配原因" : "");
             return;
         }
         if (this.state.theTypes || lv) {
@@ -564,7 +576,7 @@ class Channel extends Component{
                 if(rowItem.recovery === 1 && type === 2){
                     let arr = this.state.selectedRows.filter(v => v.recovery === 1)
                     Modal.info({
-                        title: '以下数据属于回收再分配资源,无法再次回收,请前往列表取消掉标识了“回收”标识的选项',
+                        title: '以下数据属于回收再分配资源,无法再次回收',
                         content: (
                             <div>
                                 {
@@ -583,6 +595,7 @@ class Channel extends Component{
                     changeIds = this.state.selectedRows.length-1 === idx ? changeIds +rowItem.id : changeIds + rowItem.id + ',' ;
                 }
             }
+
             $.ajax({
                 method: "post",
                 dataType: "json",
@@ -590,14 +603,14 @@ class Channel extends Component{
                 url: globalConfig.context + "/api/admin/customer/channelCustomerDeliver",
                 data: {
                     userIds: changeIds, //这一行数据的ID
-                    receiveId: this.state.theTypes, //指定转交人的ID
+                    receiveId: this.state.theTypes, //指定分配人的ID
                     remarks: remarks,
-                    type,// 0分配 1转交 2回退
+                    type,           //0总监分配  1经理分配 2回收
                 },
             }).done(
                 function (data) {
                     if (!data.error.length) {
-                        message.success(type === 1 ? "转交成功!" : type === 2 ? "回收成功!" : type === 0 ? "分配成功!" : "");
+                        message.success(type === 1 ? "分配成功!" : type === 2 ? "回收成功!" : type === 0 ? "分配成功!" : "");
                         this.setState({
                             auto: "",
                             loading: false,
@@ -618,7 +631,7 @@ class Channel extends Component{
                 }.bind(this)
             );
         } else {
-            message.warning("请输入转交人姓名");
+            message.warning("请输入分配人姓名");
         }
     }
 
@@ -666,17 +679,16 @@ class Channel extends Component{
                                     this.setState({ nameSearch: e.target.value });
                                 }}
                             />
-                            {/*0未分配  1已分配 2已存在私有 3已存在公共 4已存在签单*/}
                             <Select
                                 placeholder="分配状态"
-                                style={{ width: 80 }}
+                                style={{ width: 100 }}
                                 value={this.state.statusSearch}
                                 onChange={(e) => {
                                     this.setState({ statusSearch: e });
                                 }}
                             >
                                 {
-                                    channelAllocationStatus.map((v,key)=>(
+                                    this.state.channelAllocationStatusList.map((v,key)=>(
                                         <Select.Option value={v.value} key={key}>
                                             {v.key}
                                         </Select.Option>
@@ -736,7 +748,7 @@ class Channel extends Component{
                                     dropdownStyle={{ width: 120 }}
                                     style={{ width: "120px" }}
                                     dataSource={options}
-                                    placeholder={this.props.deliver === 1 ? '输入分配人姓名' : '输入转交人姓名'}
+                                    placeholder={this.props.deliver === 1 ? '输入分配人姓名' : '输入分配人姓名'}
                                     value={this.state.auto}
                                     onChange={this.httpChange}
                                     filterOption={true}
@@ -757,7 +769,7 @@ class Channel extends Component{
                                     disabled={!hasSelected}
                                     style={{ marginRight: 10 }}
                                 >
-                                    {this.props.deliver === 1 ? '分配' : '转交'}
+                                    {this.props.deliver === 1 ? '分配' : '分配'}
                                 </Button> : ''}
                                 {this.props.recovery ? <Button
                                     type="primary"
@@ -900,13 +912,13 @@ class Channel extends Component{
                         })
                     }}
                 /> : '' }
-                {/*渠道客户转交*/}
+                {/*渠道客户分配*/}
                 {this.state.visible ? <OperationTips
-                    title={'渠道客户转交'}
+                    title={'渠道客户分配'}
                     selectedRows={this.state.selectedRows}
                     visible={this.state.visible}
                     onOk={(value)=>{
-                        // 0分配 1转交 2回退
+                        // 0 总监分配 1经理分配 2回收
                         this.changeAssigner(value,this.props.deliver === 1 ? 0 : this.props.deliver === 2 ? 1 : '')
                     }}
                     onCancel={()=>{

+ 3 - 0
js/component/manageCenter/customer/NEW/intentionCustomer/channel.less

@@ -0,0 +1,3 @@
+.ant-upload-list{
+  display: none !important;
+}

+ 2 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/transferRecords.jsx

@@ -44,8 +44,8 @@ const TransferRecords = React.createClass({
                                               text === 6 ? "移除" :
                                                   text === 7 ? "转交签单客户" :
                                                       text === 8 ? "渠道录入" :
-                                                          text === 9 ? "渠道客户分配" :
-                                                              text === 10 ? "渠道客户转交" :
+                                                          text === 9 ? "渠道客户总监分配" :
+                                                              text === 10 ? "渠道客户经理分配" :
                                                                   text === 11 ? "渠道释放" :
                                                                       text === 12 ? '回收' : ""
                   }

+ 3 - 1
js/component/manageCenter/order/orderNew/reject.jsx

@@ -299,7 +299,7 @@ const IntentionCustomer = Form.create()(
                 <div>
                   {this.state.processStatus == 0 ? (
                     <Popconfirm
-                      title="是否删除?"
+                      title="是否删除?如果删除此项目业务,对应的催款节点也会删除!"
                       onConfirm={() => {
                         this.delectRow(record);
                       }}
@@ -864,6 +864,8 @@ const IntentionCustomer = Form.create()(
               loading: false,
             });
             this.xiangmu(this.state.orderNo);
+            this.jiedianNew(this.state.orderNo);
+            this.jiedian(this.state.orderNo);
             this.loadData();
           } else {
             message.warning(data.error[0].message);

+ 2 - 2
js/component/zhuanjiaoDetail.jsx

@@ -44,8 +44,8 @@ const ZhuanjiaoDetail = React.createClass({
                                             text === 6 ? "移除" :
                                                 text === 7 ? "转交签单客户" :
                                                     text === 8 ? "渠道录入" :
-                                                        text === 9 ? "渠道客户分配" :
-                                                            text === 10 ? "渠道客户转交" :
+                                                        text === 9 ? "渠道客户总监分配" :
+                                                            text === 10 ? "渠道客户经理分配" :
                                                                 text === 11 ? "渠道释放" :
                                                                     text === 12 ? '回收' :""