dev01 2 years ago
parent
commit
44a0e65c62

+ 22 - 24
js/component/manageCenter/channelList/channelunit/addchannel.jsx

@@ -211,7 +211,7 @@ const AchievementDetailForm = Form.create()(
             message.warning(data.error[0].message);
           }
         }.bind(this),
-      }).always(function () {}.bind(this));
+      }).always(function () { }.bind(this));
     },
     onSelect(value) {
       let arr = this.state.cooperationProjects.filter((v) => v.id === value);
@@ -273,7 +273,7 @@ const AchievementDetailForm = Form.create()(
             message.warning(data.error[0].message);
           }
         }.bind(this),
-      }).always(function () {}.bind(this));
+      }).always(function () { }.bind(this));
     },
 
     render() {
@@ -335,6 +335,26 @@ const AchievementDetailForm = Form.create()(
                   </FormItem>
                 </div>
                 <div className="clearfix">
+                  <FormItem
+                    className="mid-item"
+                    {...formItemLayout}
+                    label="渠道类别"
+                  >
+                    {getFieldDecorator("channelType", {
+                      rules: [{ required: true, message: "此项为必填项!" }],
+                      initialValue: this.state.channelType,
+                    })(
+                      <Select placeholder="请选择">
+                        <Select.Option value={1}>政府部门</Select.Option>
+                        <Select.Option value={2}>民主党派</Select.Option>
+                        <Select.Option value={3}>园区</Select.Option>
+                        <Select.Option value={4}>民间组织</Select.Option>
+                        <Select.Option value={5}>其他战略合作单位</Select.Option>
+                      </Select>
+                    )}
+                  </FormItem>
+                </div>
+                <div className="clearfix">
                   <FormItem {...formItemLayout} label="省-市-区">
                     {getFieldDecorator("ProvinceCity", {
                       rules: [{ required: true, message: "此项为必填项!" }],
@@ -372,28 +392,6 @@ const AchievementDetailForm = Form.create()(
                   <FormItem
                     className="mid-item"
                     {...formItemLayout}
-                    label="渠道类别"
-                  >
-                    {getFieldDecorator("channelType", {
-                      rules: [{ required: true, message: "此项为必填项!" }],
-                      initialValue: this.state.channelType,
-                    })(
-                      <Select placeholder="请选择">
-                        <Select.Option value={1}>政府部门</Select.Option>
-                        <Select.Option value={2}>民主党派</Select.Option>
-                        <Select.Option value={3}>园区</Select.Option>
-                        <Select.Option value={4}>民间组织</Select.Option>
-                        <Select.Option value={5}>
-                          其他战略合作单位
-                        </Select.Option>
-                      </Select>
-                    )}
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  <FormItem
-                    className="mid-item"
-                    {...formItemLayout}
                     label="联系电话"
                   >
                     {getFieldDecorator("contactMobile", {

+ 9 - 0
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -47,6 +47,7 @@ class ChannelUnit extends Component {
           title: "地区",
           dataIndex: "province",
           key: "province",
+          width: 250,
           render: (text, record) => {
             return record.province + "-" + record.city + "-" + record.area;
           },
@@ -55,6 +56,7 @@ class ChannelUnit extends Component {
           title: "渠道类别",
           dataIndex: "type",
           key: "type",
+          width: 120,
           render: (text) =>
             [
               "",
@@ -69,6 +71,7 @@ class ChannelUnit extends Component {
           title: "初始时间",
           dataIndex: "createTime",
           key: "createTime",
+          width: 160,
         },
         {
           title: "跟进人",
@@ -79,6 +82,7 @@ class ChannelUnit extends Component {
           title: "剩余天数",
           dataIndex: "remainingDays",
           key: "remainingDays",
+          width: 80,
         },
         {
           title: "跟进操作",
@@ -374,6 +378,7 @@ class ChannelUnit extends Component {
               auto: "",
               loading: false,
               selectedRowKeys: [],
+              selectedRows: [],
             });
           } else {
             message.warning(data.error[0].message);
@@ -428,6 +433,10 @@ class ChannelUnit extends Component {
             id: deletedIds,
           },
           success: function (data) {
+            _this.setState({
+              selectedRowKeys: [],
+              selectedRows: [],
+            });
             let thedata = data.data;
             if (!thedata) {
               if (data.error && data.error.length) {

+ 2 - 0
js/component/manageCenter/channelList/channelunit/publist.jsx

@@ -54,6 +54,7 @@ class ChannelUnit extends Component {
           title: "渠道类别",
           dataIndex: "type",
           key: "type",
+          width: 200,
           render: (text) =>
             [
               "",
@@ -68,6 +69,7 @@ class ChannelUnit extends Component {
           title: "初始时间",
           dataIndex: "createTime",
           key: "createTime",
+          width: 200,
         },
         {
           title: "操作",

+ 52 - 1
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Cascader, Input, Select, Spin, Table, message, Form, Tabs } from 'antd';
+import { Button, Cascader, Input, Select, Spin, Table, message, Form, Tabs, Modal } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
@@ -133,9 +133,17 @@ const QueryCustomer = React.createClass({
 				title: '操作',
 				dataIndex: 'abc',
 				key: 'abc',
+				width: 250,
 				render: (text, record, index) => {
 					return <div>
 						<Button onClick={(e) => { e.stopPropagation(), this.receive(record) }} type="primary">领取</Button>
+						<Button
+							onClick={(e) => {
+								e.stopPropagation(),
+									this.rTips(record)
+							}}
+							style={{ marginLeft: 10 }}
+							type="primary">领取为私有渠道信息</Button>
 					</div>
 				}
 			}
@@ -168,6 +176,49 @@ const QueryCustomer = React.createClass({
 			this.loadData(this.state.ispage);
 		}.bind(this));
 	},
+	rTips(e) {
+		let _this = this;
+		Modal.confirm({
+			title: "温馨提示",
+			content: (
+				<span style={{ color: "red" }}>
+					<p>名称中含“协会”“商会”等名称为渠道信息!</p>
+					<p>您是否确定将客户信息,领取为“私有渠道”信息,领取后,该信息即成为渠道信息不可再修改!!!</p>
+					<p>领取成功后,您可以通过:渠道管理-渠道列表-私有渠道,查询到此条信息</p>
+				</span>
+			),
+			onOk() {
+				_this.receiveNew(e)
+			},
+			onCancel() { },
+		});
+	},
+	/*领取为私有渠道信息*/
+	receiveNew(e) {
+		this.setState({
+			loading: true,
+			selectedRowKeys: [],
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/customer/receiveAsChannel",
+			data: {
+				uid: e.id,
+			}
+		}).done(function (data) {
+			if (!data.error.length) {
+				message.success('领取成功!');
+				this.setState({
+					loading: false,
+				});
+			} else {
+				message.warning(data.error[0].message);
+			};
+			this.loadData(this.state.ispage);
+		}.bind(this));
+	},
 	closeDesc(e) {
 		this.state.visitModul = e;
 	},

+ 12 - 1
js/component/manageCenter/order/orderNew/billing.jsx

@@ -502,6 +502,7 @@ const MyService = Form.create()(
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
+            width: 110,
             render: (text) => {
               return (
                 <Tooltip
@@ -530,6 +531,7 @@ const MyService = Form.create()(
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo",
+            width: 140,
             render: (text) => {
               return (
                 <Tooltip
@@ -639,17 +641,23 @@ const MyService = Form.create()(
             title: "订单部门",
             dataIndex: "depName",
             key: "depName",
-            // fixed: 'left'
           },
           {
             title: "下单时间",
             dataIndex: "createDate",
             key: "createTime",
+            width: 80,
+            render: (text) => {
+              return <div style={{ textAlign: "center" }}>{text}</div>
+            },
           },
           {
             title: "合同签订时间",
             dataIndex: "signDate",
             key: "signDate",
+            render: (text) => {
+              return <div style={{ textAlign: "center" }}>{text}</div>
+            },
           },
           {
             title: "流程状态",
@@ -663,16 +671,19 @@ const MyService = Form.create()(
             title: "签单金额(万元)",
             dataIndex: "totalAmount",
             key: "totalAmount",
+            width: 80,
           },
           {
             title: "开票金额(万元)",
             dataIndex: "invoiceAmount",
             key: "invoiceAmount",
+            width: 80,
           },
           {
             title: "已收款(万元)",
             dataIndex: "settlementAmount",
             key: "settlementAmount",
+            width: 80,
           },
           {
             title: "结算状态",