Explorar o código

会员可视化进度表

dev01 hai 1 mes
pai
achega
2cb0e81c30

+ 42 - 48
js/component/manageCenter/channelList/channelunit/addchannel.jsx

@@ -52,33 +52,31 @@ const AchievementDetailForm = Form.create()(
           message.warning("请选择渠道类别");
           return false;
         }
-        if (values.channelType != 1) {
-          if (!values.ProvinceCity[1]) {
-            message.warning("请选择地区");
-            return false;
-          }
-          if (/.*[\u4e00-\u9fa5]+.*$/.test(values.contacts)) {
-          } else {
-            message.error("请填写正确的联系人,且至少包含一个汉字");
-            return false;
-          }
-          if (values.contacts.length > 32) {
-            message.warning("联系人字数不超过32个");
-            return false;
-          }
-          if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
-          } else {
-            message.error("请填写正确的职位,且至少包含一个汉字");
-            return false;
-          }
-          if (values.contactMobile.length > 13) {
-            message.warning("联系电话字数不超过13个");
-            return false;
-          }
-          if (values.introduction.length === 0) {
-            message.warning("请填写渠道简介");
-            return false;
-          }
+        if (!values.ProvinceCity[1]) {
+          message.warning("请选择地区");
+          return false;
+        }
+        if (/.*[\u4e00-\u9fa5]+.*$/.test(values.contacts)) {
+        } else {
+          message.error("请填写正确的联系人,且至少包含一个汉字");
+          return false;
+        }
+        if (values.contacts.length > 32) {
+          message.warning("联系人字数不超过32个");
+          return false;
+        }
+        if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
+        } else {
+          message.error("请填写正确的职位,且至少包含一个汉字");
+          return false;
+        }
+        if (values.contactMobile.length > 13) {
+          message.warning("请填写正确的联系电话");
+          return false;
+        }
+        if (values.introduction.length === 0) {
+          message.warning("请填写渠道简介");
+          return false;
         }
         // let arr = [];
         // for (let i of this.state.selectCooperationProjects) {
@@ -88,22 +86,18 @@ const AchievementDetailForm = Form.create()(
           this.setState({
             loading: true,
           });
-          let info = values.channelType != 1 ?
-            {
-              name: values.name,
-              channelType: values.channelType,
-              province: values.ProvinceCity[0], //省
-              city: values.ProvinceCity[1], //市
-              area: values.ProvinceCity[2], //区
-              contacts: values.contacts,
-              position: values.position,
-              contactMobile: values.contactMobile,
-              introduction: values.introduction,
-            } :
-            {
-              name: values.name,
-              channelType: values.channelType,
-            }
+          let info =
+          {
+            name: values.name,
+            channelType: values.channelType,
+            province: values.ProvinceCity[0], //省
+            city: values.ProvinceCity[1], //市
+            area: values.ProvinceCity[2], //区
+            contacts: values.contacts,
+            position: values.position,
+            contactMobile: values.contactMobile,
+            introduction: values.introduction,
+          }
           $.ajax({
             method: "POST",
             dataType: "json",
@@ -363,7 +357,7 @@ const AchievementDetailForm = Form.create()(
                   </FormItem>
                 </div>
                 {
-                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  !!getFieldsValue().channelType &&
                   <div className="clearfix">
                     <FormItem {...formItemLayout} label="省-市-区">
                       {getFieldDecorator("ProvinceCity", {
@@ -376,7 +370,7 @@ const AchievementDetailForm = Form.create()(
                   </div>
                 }
                 {
-                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  !!getFieldsValue().channelType &&
                   <div className="clearfix">
                     <FormItem
                       className="mid-item"
@@ -391,7 +385,7 @@ const AchievementDetailForm = Form.create()(
                   </div>
                 }
                 {
-                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  !!getFieldsValue().channelType &&
                   <div className="clearfix">
                     <FormItem
                       className="mid-item"
@@ -406,7 +400,7 @@ const AchievementDetailForm = Form.create()(
                   </div>
                 }
                 {
-                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  !!getFieldsValue().channelType &&
                   <div className="clearfix">
                     <FormItem
                       className="mid-item"
@@ -423,7 +417,7 @@ const AchievementDetailForm = Form.create()(
                   </div>
                 }
                 {
-                  !!getFieldsValue().channelType && getFieldsValue().channelType != 1 &&
+                  !!getFieldsValue().channelType &&
                   <div className="clearfix">
                     <FormItem
                       className="mid-item"

+ 10 - 1
js/component/manageCenter/project/content.jsx

@@ -53,7 +53,7 @@ class Content extends Component {
       //人员评分表
       case "score":
         require.ensure([], () => {
-          const ProjectScore= require("./project/score")
+          const ProjectScore = require("./project/score")
             .default;
           this.setState({
             component: <ProjectScore ApiUrl={""} />
@@ -331,6 +331,15 @@ class Content extends Component {
           });
         });
         break;
+      // 会员进度表
+      case "membershipTable":
+        require.ensure([], () => {
+          const MembershipTable = require("./task/membershipTable").default;
+          this.setState({
+            component: <MembershipTable ApiUrl={""} />
+          });
+        });
+        break;
       default:
         require.ensure([], () => {
           const Module = require("../module").default;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1414 - 0
js/component/manageCenter/project/task/membershipTable.jsx


+ 105 - 0
js/component/manageCenter/project/task/membershipTable.less

@@ -0,0 +1,105 @@
+.membershipTable {
+
+  .ant-table-bordered .ant-table-header>table,
+  .ant-table-bordered .ant-table-body>table,
+  .ant-table-bordered .ant-table-fixed-left table,
+  .ant-table-bordered .ant-table-fixed-right table {
+    border: 1px solid #000;
+    border-right: 0;
+    border-bottom: 0;
+  }
+
+  .ant-table-tbody>tr>td {
+    border-bottom: 1px solid #000;
+  }
+
+  .ant-table-bordered .ant-table-thead>tr>th,
+  .ant-table-bordered .ant-table-tbody>tr>td {
+    border-right: 1px solid #000;
+  }
+
+  .ant-table-bordered .ant-table-thead>tr>th,
+  .ant-table-bordered .ant-table-tbody>tr>td {
+    border-right: 1px solid #000;
+  }
+
+  .ant-table-bordered .ant-table-thead>tr>th {
+    border-bottom: 1px solid #000;
+  }
+
+  .ant-table-middle .ant-table-thead>tr>th:not(.ant-table-selection-column) {
+    padding: 0;
+    height: 40px;
+  }
+
+  .color0 {
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .ant-table-thead>tr>th {
+    span {
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+
+    }
+  }
+
+
+  .color1 {
+    background: #fff3ca;
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .color2 {
+    background: #a8eae4;
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .color3 {
+    background: #ffff00;
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+  }
+
+  .color4 {
+    background: #b5c6ea;
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .color5 {
+    background: #f9cbaa;
+    padding: 10px 8px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+}

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.3.37",
+  "version": "1.3.38",
   "description": "",
   "main": "index.js",
   "scripts": {