dev01 2 years ago
parent
commit
74f2a57b76

+ 6 - 8
js/component/manageCenter/channelList/channelunit/detail/contactPerson.jsx

@@ -132,7 +132,8 @@ const ContactPerson = React.createClass({
             return (
               !this.props.isCustomerAdmin && (
                 <div>
-                  {adminData.isSuperAdmin || !record.id ? (
+                  {/* 禁止管理员删除联系人 */}
+                  {/* {adminData.isSuperAdmin || !record.id ? (
                     <Popconfirm
                       title="是否删除?"
                       onConfirm={(e) => {
@@ -154,7 +155,7 @@ const ContactPerson = React.createClass({
                     </Popconfirm>
                   ) : (
                     ""
-                  )}
+                  )} */}
                   {record.major != 1 ? (
                     <Button
                       style={{
@@ -324,16 +325,13 @@ const ContactPerson = React.createClass({
       addcontactModul: true,
     });
   },
+  //
   componentWillMount() {
+    const { data } = this.props
     this.contactLists(this.props.data.id);
     this.setState({
       name: this.props.name,
-      locationProvince:
-        this.props.data.province +
-        "-" +
-        this.props.data.city +
-        "-" +
-        this.props.data.area,
+      locationProvince: (data.province || "") + (!data.city ? "" : "-") + (data.city || "") + (!data.area ? "" : "-") + (data.area || ""),
       introduction: this.props.data.introduction,
       type: this.props.data.type,
     });

+ 1 - 1
js/component/manageCenter/channelList/channelunit/detail/visit.jsx

@@ -165,7 +165,7 @@ const Visit = React.createClass({
           title: "指导时间",
           dataIndex: "guidanceTime",
           key: "guidanceTime",
-          width: 100,
+          width: 105,
           render: (text, record) => {
             return <span>{text ? text : ""}</span>;
           },

+ 1 - 1
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -49,7 +49,7 @@ class ChannelUnit extends Component {
           key: "province",
           width: 250,
           render: (text, record) => {
-            return (record.province || "") + " " + (record.city || "") + " " + (record.area || "");
+            return (record.province || "") + (!record.city ? "" : "-") + (record.city || "") + (!record.area ? "" : "-") + (record.area || "");
           },
         },
         {

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visit.jsx

@@ -217,7 +217,7 @@ const Visit = React.createClass({
 		  title: "指导时间",
 		  dataIndex: "guidanceTime",
 		  key: "guidanceTime",
-		  width: 100,
+		  width: 105,
 		  render: (text, record) => {
 			  return (
 				  <span>{text ? text : ''}</span>

+ 3 - 2
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx

@@ -121,7 +121,8 @@ const ContactPerson = React.createClass({
           render: (text, record, index) => {
             return (
               <div>
-                {adminData.isSuperAdmin || !record.id? (
+                {/* 禁止管理员删除联系人 */}
+                {/* {adminData.isSuperAdmin || !record.id? (
                   <Popconfirm
                     title="是否删除?"
                     onConfirm={e => {
@@ -143,7 +144,7 @@ const ContactPerson = React.createClass({
                   </Popconfirm>
                 ) : (
                   ""
-                )}
+                )} */}
                 {record.major!=1 ? (
                   <Button
                     style={{