dev01 3 years ago
parent
commit
56bb3bc2df

File diff suppressed because it is too large
+ 759 - 568
js/component/manageCenter/project/summary/highTech.jsx


+ 87 - 48
js/component/manageCenter/project/summary/projecCount.jsx

@@ -27,7 +27,7 @@ import {
 import HighTech from "./highTech";
 import "./index.less";
 
-const { TabPane } = Tabs;  
+const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 const { Option } = Select;
 
@@ -77,13 +77,14 @@ class ProjecCount extends Component {
       commodityName: "",
       kid: "",
       status: 0,
+      searchValues: this.props.searchConfig || {},
     };
     this.loadData = this.loadData.bind(this);
     this.resetAll = this.resetAll.bind(this);
     this.changeList = this.changeList.bind(this);
     this.departmentList = this.departmentList.bind(this);
     this.exportPending = this.exportPending.bind(this);
-    this.exportExcel = this.exportExcel.bind(this); 
+    this.exportExcel = this.exportExcel.bind(this);
     this.selectSuperId = this.selectSuperId.bind(this);
     this.supervisorCui = this.supervisorCui.bind(this);
     this.httpChangeCui = this.httpChangeCui.bind(this);
@@ -333,6 +334,12 @@ class ProjecCount extends Component {
   }
 
   exportExcel() {
+    let dep = this.state.departmentArr.filter(
+      (v) => v.id === this.state.taberdepId
+    )[0].name; //责任部门名称
+    let option = this.state.contactsOptionData.filter(
+      (v) => v.id === this.state.taberProjectStatus
+    )[0].cname; //项目类别名称
     let data = {
       pageNo: this.state.pageNo || 1,
       pageSize: 9999,
@@ -344,12 +351,30 @@ class ProjecCount extends Component {
         this.state.releaseDate.length > 0
           ? this.state.releaseDate[1]
           : undefined, //结束时间
-      projectType:
-        typeof this.state.projectType === "number"
-          ? this.state.projectType
-          : undefined, //项目分类
+      projectType: this.state.projectType.toString(), //项目分类
+      // typeof this.state.projectType === "number"
+      //   ? this.state.projectType
+      //   : undefined,
+      thchDepName: dep || undefined, //咨询师部门名称
+      projectTypeName:
+        this.state.projectType === 0
+          ? "通用"
+          : this.state.projectType === 1
+          ? "专利"
+          : this.state.projectType === 2
+          ? "软著"
+          : this.state.projectType === 3
+          ? "审计"
+          : this.state.projectType === 4
+          ? "双软"
+          : this.state.projectType === 5
+          ? "高新"
+          : this.state.projectType === 6
+          ? "商标"
+          : "", //项目分类(中文)
+      projectStatusName: option || undefined, //项目品类(中文)
+      provinceName: getNewDiccityArr(this.state.taberProvince) || undefined, //省份(中文)
       projectId: this.state.kid || undefined,
-
       province: this.state.taberProvince || undefined,
       projectStatus: this.state.taberProjectStatus || undefined, //项目类别
       thchDepId: this.state.taberdepId || undefined,
@@ -372,7 +397,18 @@ class ProjecCount extends Component {
             ? 1
             : 0
           : 0,
-      screen: this.state.screen, //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
+      screen: this.state.screen.toString(), //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
+
+
+
+
+
+
+
+
+
+
+      
     };
 
     for (let key in data) {
@@ -380,6 +416,7 @@ class ProjecCount extends Component {
         delete data[key];
       }
     }
+
     window.location.href =
       globalConfig.context +
       "/api/admin/statistis/exporTaskList?" +
@@ -575,42 +612,42 @@ class ProjecCount extends Component {
                     this.setState(
                       {
                         projectStatus: e,
-                      },
-                      () => {
-                        if (
-                          infor.length &&
-                          infor[0].cname === "高新" &&
-                          typeof this.state.projectType !== "number"
-                        ) {
-                          this.setState(
-                            {
-                              columns: highTechColumns((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              }),
-                              changeList: [],
-                              status: 1,
-                            },
-                            () => {
-                              this.loadData();
-                            }
-                          );
-                        } else if (typeof this.state.projectType !== "number") {
-                          this.setState(
-                            {
-                              columns: currency((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              }),
-                              changeList: [],
-                              status: 0,
-                            },
-                            () => {
-                              this.loadData();
-                            }
-                          );
-                        } else {
-                          this.loadData();
-                        }
                       }
+                      // () => {
+                      //   if (
+                      //     infor.length &&
+                      //     infor[0].cname === "高新" &&
+                      //     typeof this.state.projectType !== "number"
+                      //   ) {
+                      //     this.setState(
+                      //       {
+                      //         columns: highTechColumns((v, screen) => {
+                      //           this.openProjectSummary(v, screen);
+                      //         }),
+                      //         changeList: [],
+                      //         status: 1,
+                      //       },
+                      //       () => {
+                      //         this.loadData();
+                      //       }
+                      //     );
+                      //   } else if (typeof this.state.projectType !== "number") {
+                      //     this.setState(
+                      //       {
+                      //         columns: currency((v, screen) => {
+                      //           this.openProjectSummary(v, screen);
+                      //         }),
+                      //         changeList: [],
+                      //         status: 0,
+                      //       },
+                      //       () => {
+                      //         this.loadData();
+                      //       }
+                      //     );
+                      //   } else {
+                      //     this.loadData();
+                      //   }
+                      // }
                     );
                   }}
                 >
@@ -636,6 +673,7 @@ class ProjecCount extends Component {
                   onChange={(e) => {
                     this.setState(
                       {
+                        projectType: e,
                         columns:
                           e === 0
                             ? currency((v, screen) => {
@@ -667,7 +705,6 @@ class ProjecCount extends Component {
                               })
                             : [],
                         changeList: [],
-                        projectType: e,
                         status:
                           e === 1
                             ? 2
@@ -678,10 +715,10 @@ class ProjecCount extends Component {
                             : e === 6
                             ? 5
                             : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
-                      },
-                      () => {
-                        this.loadData();
                       }
+                      // () => {
+                      //   this.loadData();
+                      // }
                     );
                   }}
                 >
@@ -1017,7 +1054,9 @@ class ProjecCount extends Component {
                     </span>
                   ) : null}
 
-                  <Button type="primary" onClick={this.exportExcel}>导出EXCEL</Button>
+                  <Button type="primary" onClick={this.exportExcel}>
+                    导出EXCEL
+                  </Button>
                 </div>
               )}
             />

+ 1 - 1
package.json

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