修改投票

src/pages/SystemManagement/Information/index.jsx

@@ -308,11 +308,11 @@ class TreeItem extends React.Component {
                     className={Styles.pmEditIcon}
                     onClick={() => this.showModal("2")}
                   />
-                  <Icon
+                  {/* <Icon
                     type="delete"
                     className={Styles.pmEditIcon}
                     onClick={() => this.onDelete()}
-                  />
+                  /> */}
                 </span>
               )
             : ""}
@@ -868,7 +868,7 @@ class Information extends React.Component {
                   parentID={this.state.ificationList}
                   postAddNewsLists={this.AddNewsList}
                   postEditNewsLists={this.EditNewsLists}
-                  newsDelete={this.onNewsDelete}
+                  // newsDelete={this.onNewsDelete}
                   onTableList={this.onTableList}
                 />
               }
@@ -888,7 +888,7 @@ class Information extends React.Component {
                 parentID={this.state.ificationList}
                 postAddNewsLists={this.AddNewsList}
                 postEditNewsLists={this.EditNewsLists}
-                newsDelete={this.onNewsDelete}
+                // newsDelete={this.onNewsDelete}
                 onTableList={this.onTableList}
               />
             }
@@ -909,7 +909,7 @@ class Information extends React.Component {
                   parentID={this.state.ificationList}
                   postAddNewsLists={this.AddNewsList}
                   postEditNewsLists={this.EditNewsLists}
-                  newsDelete={this.onNewsDelete}
+                  // newsDelete={this.onNewsDelete}
                   onTableList={this.onTableList}
                 />
               }
@@ -929,7 +929,7 @@ class Information extends React.Component {
                 parentID={this.state.ificationList}
                 postAddNewsLists={this.AddNewsList}
                 postEditNewsLists={this.EditNewsLists}
-                newsDelete={this.onNewsDelete}
+                // newsDelete={this.onNewsDelete}
                 onTableList={this.onTableList}
               />
             }
@@ -950,7 +950,7 @@ class Information extends React.Component {
                   parentID={this.state.ificationList}
                   postAddNewsLists={this.AddNewsList}
                   postEditNewsLists={this.EditNewsLists}
-                  newsDelete={this.onNewsDelete}
+                  // newsDelete={this.onNewsDelete}
                   onTableList={this.onTableList}
                 />
               }
@@ -972,7 +972,7 @@ class Information extends React.Component {
                   parentID={this.state.ificationList}
                   postAddNewsLists={this.AddNewsList}
                   postEditNewsLists={this.EditNewsLists}
-                  newsDelete={this.onNewsDelete}
+                  // newsDelete={this.onNewsDelete}
                   onTableList={this.onTableList}
                 />
               }

src/pages/TrainingPrograms/ProgeamsManage/Plan/Addactivity/SurveyAddactivity.jsx

@@ -62,8 +62,8 @@ class SurveyAddactivity extends React.Component {
     this.props.onGetSurveyList({
       pageNo: this.state.page,
       pageSize: this.state.pageSize,
-      name: this.state.value,
-      state: this.state.state,
+      name: '',
+      state: 1,
       bizType: 2,
     });
   }
@@ -141,9 +141,9 @@ class SurveyAddactivity extends React.Component {
     });
   }
   render() {
-    const { surveylist, activitylist } = this.props;
+    const { surveylist, activitylist} = this.props;
     const { selectedRowKeys } = this.state;
-    console.log(activitylist,surveylist,'222222222222');
+    console.log(activitylist,surveylist,'jiancce222222222222');
     const rowSelection = {
       selectedRowKeys,
       onChange: this.onSelectChange,

src/pages/TrainingPrograms/ProgeamsManage/Plan/Content.jsx

@@ -532,7 +532,8 @@ class DragSortingTable extends React.Component {
     ];
     console.log(
       "检测打印变量6666=this.state.activitylist ",
-      this.state.activitylist
+      this.state.activitylist,
+      this.props.plansForTablePageData
     );
     return (
       <div>

src/pages/TrainingPrograms/ProgeamsManage/Plan/Plan.jsx

@@ -195,7 +195,7 @@ class DragSortingTable extends React.Component {
           pagePre: _this.props.planlist.slice(0, (pageNo - 1) * pageSize),
           pageAfter: _this.props.planlist.slice(pageNo * pageSize),
         });
-        console.log(_this.props.planlist,'_this.props.planlist')
+        console.log(_this.props.planlist, '_this.props.planlist')
       }
     );
   }
@@ -431,7 +431,7 @@ class DragSortingTable extends React.Component {
       this.setState({ loading: false });
       return;
     }
-    console.log(this.state.plantype,'查看是否为关键数据')
+    console.log(this.state.plantype, '查看是否为关键数据')
     if (this.state.plantype === "新增计划") {
       this.props.onSavePaln(tpPlan, (code, msg) => {
         if (code === "1000") {
@@ -688,60 +688,23 @@ class DragSortingTable extends React.Component {
         key: "actions",
         render: (text, record, index) => {
           return (
-            (this.props.title !== "查看项目" && (
-              <div>
-                <a
-                  style={{ marginLeft: "10px", color: "#00CCFF" }}
-                  onClick={() => this.handleNew(record)}
-                >
-                  {intl.get("Change") || "修改"}
-                </a>
-                <Popconfirm
-                  title="确定要删除吗?"
-                  okText={intl.get("Delete") || "删除"}
-                  cancelText={intl.get("Cancel").d("取消")}
-                  onConfirm={() => this.onDelete(record)}
-                >
-                  <a style={{ marginLeft: "10px", color: "#00CCFF" }}>
-                    {intl.get("Delete") || "删除"}
-                  </a>
-                </Popconfirm>
-                {this.state.pageNo == 1 && index == 0 ? (
-                  <a style={{ marginLeft: "10px", color: "#D9D9D9" }}>上移</a>
-                ) : (
-                  <a
-                    style={{ marginLeft: "10px", color: "#00CCFF" }}
-                    onClick={() => this.handleMove(record, "up")}
-                  >
-                    上移
-                  </a>
-                )}
-                {index == this.props.planlist.length - 1 ? (
-                  <a style={{ marginLeft: "10px", color: "#D9D9D9" }}>下移</a>
-                ) : (
-                  <a
-                    style={{ marginLeft: "10px", color: "#00CCFF" }}
-                    onClick={() => this.handleMove(record, "down")}
-                  >
-                    下移
-                  </a>
-                )}
-              </div>
-            )) ||
-            (this.props.title === "查看项目" && (
-              <div>
-                <a
-                  style={{ marginLeft: "10px", color: "#00CCFF" }}
-                  onClick={() => this.handleNew(record)}
-                >
-                  查看
+            <div>
+              <Popconfirm
+                title="确定要删除吗?"
+                okText={intl.get("Delete") || "删除"}
+                cancelText={intl.get("Cancel").d("取消")}
+                onConfirm={() => this.onDelete(record)}
+              >
+                <a style={{ marginLeft: "10px", color: "#00CCFF" }}>
+                  {intl.get("Delete") || "删除"}
                 </a>
-              </div>
-            ))
+              </Popconfirm>
+            </div>
           );
         },
       },
     ];
+    console.log(this.state.plansForTablePageData,'检测打印变量6666=this.state.plansForTablePageData ')
     return (
       <div>
         {(this.state.addnew === 1 && (

src/pages/TrainingTools/Survey/Create/TestModal.jsx

@@ -114,10 +114,6 @@ class TestModal extends Component {
                 required: true,
                 message: "请输入问题内容",
               },
-              {
-                max: 200,
-                message: "不能超过200个字符",
-              },
             ],
           })(<TextArea rows={4} disabled={status === "look"} />)}
         </FormItem>