dev01 2 years ago
parent
commit
99c5a412b6

+ 1 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2093,7 +2093,7 @@ const NewService = Form.create()(
               visible: false,
               loading: false,
             });
-            this.loadData();
+            this.props.closeDesc(false);
           }
         }.bind(this),
       }).always(

+ 91 - 51
js/component/manageCenter/project/summary/highTech.jsx

@@ -72,7 +72,6 @@ class HighTech extends Component {
     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.loadData = this.loadData.bind(this);
     this.selectSuperId = this.selectSuperId.bind(this);
   }
@@ -259,17 +258,12 @@ class HighTech extends Component {
       }.bind(this),
     }).always();
   }
-
+  // 老版导出
   exportPending() {
     let url = `/api/admin/statistis/exporTaskList?status=${this.state.status}`;
     let dep = this.state.departmentArr.filter((e) => e.id === this.state.depId); //订单部门名称
-    let thchDep = this.state.departmentArr.filter(
-      (e) => e.id === this.state.thchDepId
-    ); //责任部门名称
-    let option = this.state.contactsOptionData.filter(
-      (e) => e.id === this.state.projectStatus
-    ); //项目类别名称
-
+    let thchDep = this.state.departmentArr.filter((e) => e.id === this.state.thchDepId); //责任部门名称
+    let option = this.state.contactsOptionData.filter((e) => e.id === this.state.projectStatus); //项目类别名称
     if (dep.length > 0) {
       url = url + `&depName=${dep[0].name}`;
     }
@@ -347,6 +341,69 @@ class HighTech extends Component {
     });
   }
 
+  // 导出excel
+  exportExec() {
+    message.config({
+      duration: 20,
+    });
+    let loading = message.loading("下载中...");
+    this.setState({
+      exportPendingLoading: true,
+    });
+    let data = {
+      startDate:
+        this.state.releaseDate.length > 0
+          ? this.state.releaseDate[0]
+          : undefined, //开始时间
+      endDate:
+        this.state.releaseDate.length > 0
+          ? this.state.releaseDate[1]
+          : undefined, //结束时间
+      depId: this.state.depId || undefined, //部门ID
+      thchDepId: this.state.thchDepId || undefined, //责任部门ID
+      projectStatus: this.state.projectStatus || undefined, //项目类别
+      projectType:
+        typeof this.state.projectType === "number"
+          ? this.state.projectType
+          : undefined, //项目分类
+      orderNo: this.state.searchOrderNo || undefined, //订单编号
+      contractNo: this.state.searchContractNo || undefined, //合同编号
+      userName: this.state.searchEnterpriseName || undefined, //企业名称
+      declarationBatch: this.state.declarationBatch || undefined, //申报批次
+      // projectSituation:
+      //   typeof this.state.projectSituation === "number"
+      //     ? this.state.projectSituation
+      //     : undefined, //项目情况
+      projectAmount: this.state.projectAmount || undefined, //项目金额
+    };
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: "/api/admin/statistis/exporTaskList",
+      data,
+      success: function (data) {
+        if (data.error.length === 0) {
+          this.download(data.data);
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        loading();
+        this.setState({
+          exportPendingLoading: false,
+        });
+      }.bind(this)
+    );
+  }
+  // 下载
+  download(fileName) {
+    window.location.href =
+      globalConfig.context + "/open/download?fileName=" + fileName;
+  }
+
   componentWillMount() {
     this.defaultcolumns();
     this.loadData();
@@ -408,9 +465,8 @@ class HighTech extends Component {
                   <Input
                     placeholder="订单编号"
                     style={{
-                      width: 100,
+                      width: 150,
                       marginRight: "10px",
-                      marginBottom: "10px",
                     }}
                     value={this.state.searchOrderNo}
                     onChange={(e) => {
@@ -420,9 +476,8 @@ class HighTech extends Component {
                   <Input
                     placeholder="合同编号"
                     style={{
-                      width: 100,
+                      width: 150,
                       marginRight: "10px",
-                      marginBottom: "10px",
                     }}
                     value={this.state.searchContractNo}
                     onChange={(e) => {
@@ -432,9 +487,8 @@ class HighTech extends Component {
                   <Input
                     placeholder="企业名称"
                     style={{
-                      width: 100,
+                      width: 150,
                       marginRight: "10px",
-                      marginBottom: "10px",
                     }}
                     value={this.state.searchEnterpriseName}
                     onChange={(e) => {
@@ -442,7 +496,7 @@ class HighTech extends Component {
                     }}
                   />
                   <span style={{ display: "inline-block" }}>
-                    <span style={{ marginRight: "10px", marginBottom: "10px" }}>
+                    <span style={{ marginRight: "10px" }}>
                       项目类别 :
                     </span>
                     <Select
@@ -450,9 +504,8 @@ class HighTech extends Component {
                       placeholder="请选择项目类别"
                       notFoundContent="未获取到上级品类列表"
                       style={{
-                        width: 100,
+                        width: 150,
                         marginRight: "10px",
-                        marginBottom: "10px",
                       }}
                       onChange={(e) => {
                         let infor = this.state.contactsOptionData.filter(
@@ -503,29 +556,21 @@ class HighTech extends Component {
                       }
                       placeholder="请选择项目分类"
                       style={{
-                        width: 100,
+                        width: 150,
                         marginRight: "10px",
-                        marginBottom: "10px",
                       }}
                       onChange={(e) => {
                         this.setState(
                           {
                             columns:
                               e === 0
-                                ? currency
-                                : e === 1
-                                  ? patent
-                                  : e === 2
-                                    ? softWriting
-                                    : e === 3
-                                      ? currency
-                                      : e === 4
-                                        ? doubleSoft
-                                        : e === 5
-                                          ? highTechColumns
-                                          : e === 6
-                                            ? currency
-                                            : currency,
+                                ? currency : e === 1
+                                  ? patent : e === 2
+                                    ? softWriting : e === 3
+                                      ? currency : e === 4
+                                        ? doubleSoft : e === 5
+                                          ? highTechColumns : e === 6
+                                            ? currency : currency,
                             changeList: [],
                             projectType: e,
                             status:
@@ -539,10 +584,11 @@ class HighTech extends Component {
                                       ? 1
                                       : 0,
                             dataSource: [],
+                          },
+                          () => {
+                            this.defaultcolumns();
+                            this.loadData();
                           }
-                          //   () => {
-                          //     this.loadData();
-                          //   }
                         );
                       }}
                     >
@@ -560,7 +606,6 @@ class HighTech extends Component {
                     style={{
                       display: "inline-block",
                       marginRight: "10px",
-                      marginBottom: "10px",
                     }}
                   >
                     <span>订单部门:</span>
@@ -570,7 +615,6 @@ class HighTech extends Component {
                         width: 200,
                         marginRight: "10px",
                         marginLeft: "10px",
-                        marginBottom: "10px",
                       }}
                       value={this.state.depId || undefined}
                       onChange={(e) => {
@@ -590,7 +634,6 @@ class HighTech extends Component {
                     style={{
                       display: "inline-block",
                       marginRight: "10px",
-                      marginBottom: "10px",
                     }}
                   >
                     <span>负责部门:</span>
@@ -600,7 +643,6 @@ class HighTech extends Component {
                         width: 200,
                         marginRight: "10px",
                         marginLeft: "10px",
-                        marginBottom: "10px",
                       }}
                       value={this.state.thchDepId || undefined}
                       onChange={(e) => {
@@ -624,9 +666,8 @@ class HighTech extends Component {
                       value={this.state.declarationBatch || undefined}
                       placeholder="请选择批次"
                       style={{
-                        width: 100,
+                        width: 150,
                         marginRight: "10px",
-                        marginBottom: "10px",
                       }}
                       onChange={(e) => {
                         this.setState({
@@ -641,16 +682,15 @@ class HighTech extends Component {
                     </Select>
                   </span>
                   <span style={{ display: "inline-block" }}>
-                    <span style={{ marginRight: "10px", marginBottom: "10px" }}>
+                    <span style={{ marginRight: "10px" }}>
                       项目金额 :
                     </span>
                     <Select
                       value={this.state.projectAmount || undefined}
                       placeholder="请选择项目金额"
                       style={{
-                        width: 100,
+                        width: 150,
                         marginRight: "10px",
-                        marginBottom: "10px",
                       }}
                       onChange={(e) => {
                         this.setState({
@@ -691,11 +731,11 @@ class HighTech extends Component {
                   {/*    </Select>*/}
                   {/*</span>*/}
                   <span style={{ display: "inline-block" }}>
-                    <span style={{ marginRight: "10px", marginBottom: "10px" }}>
+                    <span style={{ marginRight: "10px" }}>
                       派单时间 :
                     </span>
                     <RangePicker
-                      style={{ marginRight: "10px", marginBottom: "10px" }}
+                      style={{ marginRight: "10px" }}
                       value={[
                         this.state.releaseDate[0]
                           ? moment(this.state.releaseDate[0])
@@ -741,9 +781,9 @@ class HighTech extends Component {
                 <Button
                   type="primary"
                   style={{ margin: "10px" }}
-                  onClick={this.exportPending}
+                  onClick={this.exportExec.bind(this)}
                 >
-                  导出
+                  导出excel
                 </Button>
               </TabPane>
             </Tabs>
@@ -762,7 +802,7 @@ class HighTech extends Component {
                 y: 0,
               }}
               columns={
-                this.state.changeList
+                (this.state.changeList && this.state.changeList.length != 0)
                   ? this.state.changeList
                   : this.state.columns
               }

+ 122 - 56
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -7,6 +7,7 @@ const highTechColumns = [
         title: "序号",
         dataIndex: "key",
         key: "key",
+        isNoD: true,
     },
     {
         title: "派单时间",
@@ -21,7 +22,8 @@ const highTechColumns = [
     {
         title: "订单部门",
         dataIndex: "depName",
-        key: "depName"
+        key: "depName",
+        isNoD: true,
     },
     {
         title: "营销员",
@@ -61,7 +63,8 @@ const highTechColumns = [
     {
         title: "负责部门",
         dataIndex: "techDepName",
-        key: "techDepName"
+        key: "techDepName",
+        isNoD: true,
     },
     {
         title: "咨询师/咨询经理",
@@ -119,22 +122,34 @@ const highTechColumns = [
         )
     },
     {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        // render: (v) => (
+        //     <Tooltip placement="topRight" title={v} overlayStyle={{
+        //         wordBreak: 'break-all'
+        //     }}>
+        //         <div style={{
+        //             maxWidth: '120px',
+        //             overflow: "hidden",
+        //             textOverflow: "ellipsis",
+        //             whiteSpace: "nowrap",
+        //         }}>{v}</div>
+        //     </Tooltip>
+        // )
+    },
+    {
         title: "特别说明",
         dataIndex: "specialComment",
         key: "specialComment",
-        render: (v) => (
-            <Tooltip placement="topRight" title={v} overlayStyle={{
-                wordBreak: 'break-all'
-            }}>
-                <div style={{
-                    maxWidth: '120px',
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                }}>{v}</div>
-            </Tooltip>
-        )
+        isNoD: true,
     },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
+    }
 ];
 
 // 双软
@@ -143,6 +158,7 @@ const doubleSoft = [
         title: "序号",
         dataIndex: "key",
         key: "key",
+        isNoD: true,
     },
     {
         title: "派单时间",
@@ -157,7 +173,8 @@ const doubleSoft = [
     {
         title: "订单部门",
         dataIndex: "depName",
-        key: "depName"
+        key: "depName",
+        isNoD: true,
     },
     {
         title: "营销员",
@@ -197,7 +214,8 @@ const doubleSoft = [
     {
         title: "负责部门",
         dataIndex: "techDepName",
-        key: "techDepName"
+        key: "techDepName",
+        isNoD: true,
     },
     {
         title: "咨询师/咨询经理",
@@ -227,22 +245,34 @@ const doubleSoft = [
         )
     },
     {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        // render: (v) => (
+        //     <Tooltip placement="topRight" title={v} overlayStyle={{
+        //         wordBreak: 'break-all'
+        //     }}>
+        //         <div style={{
+        //             maxWidth: '120px',
+        //             overflow: "hidden",
+        //             textOverflow: "ellipsis",
+        //             whiteSpace: "nowrap",
+        //         }}>{v}</div>
+        //     </Tooltip>
+        // )
+    },
+    {
         title: "特别说明",
         dataIndex: "specialComment",
         key: "specialComment",
-        render: (v) => (
-            <Tooltip placement="topRight" title={v} overlayStyle={{
-                wordBreak: 'break-all'
-            }}>
-                <div style={{
-                    maxWidth: '120px',
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                }}>{v}</div>
-            </Tooltip>
-        )
+        isNoD: true,
     },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
+    }
 ];
 
 // 软著
@@ -251,6 +281,7 @@ const softWriting = [
         title: "序号",
         dataIndex: "key",
         key: "key",
+        isNoD: true,
     },
     {
         title: "派单时间",
@@ -265,7 +296,8 @@ const softWriting = [
     {
         title: "订单部门",
         dataIndex: "depName",
-        key: "depName"
+        key: "depName",
+        isNoD: true,
     },
     {
         title: "营销员",
@@ -300,7 +332,8 @@ const softWriting = [
     {
         title: "负责部门",
         dataIndex: "techDepName",
-        key: "techDepName"
+        key: "techDepName",
+        isNoD: true,
     },
     {
         title: "咨询师/咨询经理",
@@ -369,22 +402,34 @@ const softWriting = [
         )
     },
     {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        // render: (v) => (
+        //     <Tooltip placement="topRight" title={v} overlayStyle={{
+        //         wordBreak: 'break-all'
+        //     }}>
+        //         <div style={{
+        //             maxWidth: '120px',
+        //             overflow: "hidden",
+        //             textOverflow: "ellipsis",
+        //             whiteSpace: "nowrap",
+        //         }}>{v}</div>
+        //     </Tooltip>
+        // )
+    },
+    {
         title: "特别说明",
         dataIndex: "specialComment",
         key: "specialComment",
-        render: (v) => (
-            <Tooltip placement="topRight" title={v} overlayStyle={{
-                wordBreak: 'break-all'
-            }}>
-                <div style={{
-                    maxWidth: '120px',
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                }}>{v}</div>
-            </Tooltip>
-        )
+        isNoD: true,
     },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
+    }
 ];
 
 // 专利
@@ -393,6 +438,7 @@ const patent = [
         title: "序号",
         dataIndex: "key",
         key: "key",
+        isNoD: true,
     },
     {
         title: "派单时间",
@@ -407,7 +453,8 @@ const patent = [
     {
         title: "订单部门",
         dataIndex: "depName",
-        key: "depName"
+        key: "depName",
+        isNoD: true,
     },
     {
         title: "营销员",
@@ -442,7 +489,8 @@ const patent = [
     {
         title: "负责部门",
         dataIndex: "techDepName",
-        key: "techDepName"
+        key: "techDepName",
+        isNoD: true,
     },
     {
         title: "咨询师/咨询经理",
@@ -523,21 +571,33 @@ const patent = [
         )
     },
     {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        // render: (v) => (
+        //     <Tooltip placement="topRight" title={v} overlayStyle={{
+        //         wordBreak: 'break-all'
+        //     }}>
+        //         <div style={{
+        //             maxWidth: '120px',
+        //             overflow: "hidden",
+        //             textOverflow: "ellipsis",
+        //             whiteSpace: "nowrap",
+        //         }}>{v}</div>
+        //     </Tooltip>
+        // )
+    },
+    {
         title: "特别说明",
         dataIndex: "specialComment",
         key: "specialComment",
-        render: (v) => (
-            <Tooltip placement="topRight" title={v} overlayStyle={{
-                wordBreak: 'break-all'
-            }}>
-                <div style={{
-                    maxWidth: '120px',
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                }}>{v}</div>
-            </Tooltip>
-        )
+        isNoD: true,
+    },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
     }
 ];
 
@@ -649,6 +709,12 @@ const currency = [
         dataIndex: "specialComment",
         key: "specialComment",
         isNoD: true,
+    },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
     }
 ];
 

+ 104 - 105
js/component/manageCenter/project/summary/projecCount.jsx

@@ -36,7 +36,7 @@ class ProjecCount extends Component {
     super(props);
     this.state = {
       loading: false,
-      changeList: [],
+      changeList: undefined,
       columns: currency((v, screen) => {
         this.openProjectSummary(v, screen);
       }),
@@ -261,22 +261,21 @@ class ProjecCount extends Component {
     if (typeof this.state.projectType === "number") {
       url =
         url +
-        `&projectTypeName=${
-          this.state.projectType === 0
-            ? "通用"
-            : this.state.projectType === 1
+        `&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
-            ? "商标"
-            : ""
+              ? "软著"
+              : this.state.projectType === 3
+                ? "审计"
+                : this.state.projectType === 4
+                  ? "双软"
+                  : this.state.projectType === 5
+                    ? "高新"
+                    : this.state.projectType === 6
+                      ? "商标"
+                      : ""
         }`;
     }
     if (this.state.commodityName) {
@@ -360,18 +359,18 @@ class ProjecCount extends Component {
         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
-          ? "商标"
-          : "", //项目分类(中文)
+            ? "专利"
+            : 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,
@@ -383,20 +382,20 @@ class ProjecCount extends Component {
         this.state.projectType === 4
           ? 2
           : this.state.projectType === 2
-          ? 3
-          : this.state.projectType === 1
-          ? 4
-          : this.state.projectType === 5
-          ? 1
-          : this.state.contactsOptionData.filter(
-              (v) => v.id === this.state.taberProjectStatus
-            ).length > 0
-          ? this.state.contactsOptionData.filter(
-              (v) => v.id === this.state.taberProjectStatus
-            )[0].cname === "高新"
-            ? 1
-            : 0
-          : 0,
+            ? 3
+            : this.state.projectType === 1
+              ? 4
+              : this.state.projectType === 5
+                ? 1
+                : this.state.contactsOptionData.filter(
+                  (v) => v.id === this.state.taberProjectStatus
+                ).length > 0
+                  ? this.state.contactsOptionData.filter(
+                    (v) => v.id === this.state.taberProjectStatus
+                  )[0].cname === "高新"
+                    ? 1
+                    : 0
+                  : 0,
       screen: this.state.screen.toString(), //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
 
 
@@ -408,7 +407,7 @@ class ProjecCount extends Component {
 
 
 
-      
+
     };
 
     for (let key in data) {
@@ -549,12 +548,12 @@ class ProjecCount extends Component {
             {this.state.status === 2
               ? "专利"
               : this.state.status === 4
-              ? "软著"
-              : this.state.status === 1
-              ? "高新"
-              : this.state.status === 5
-              ? "商标"
-              : "通用"}
+                ? "软著"
+                : this.state.status === 1
+                  ? "高新"
+                  : this.state.status === 5
+                    ? "商标"
+                    : "通用"}
             )
           </span>
         </div>
@@ -677,44 +676,44 @@ class ProjecCount extends Component {
                         columns:
                           e === 0
                             ? currency((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
+                              this.openProjectSummary(v, screen);
+                            })
                             : e === 1
-                            ? invention((v, screen) => {
+                              ? invention((v, screen) => {
                                 this.openProjectSummary(v, screen);
                               })
-                            : e === 2
-                            ? softWriting((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
-                            : e === 3
-                            ? currency((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
-                            : e === 4
-                            ? currency((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
-                            : e === 5
-                            ? highTechColumns((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
-                            : e === 6
-                            ? otherTrademarks((v, screen) => {
-                                this.openProjectSummary(v, screen);
-                              })
-                            : [],
+                              : e === 2
+                                ? softWriting((v, screen) => {
+                                  this.openProjectSummary(v, screen);
+                                })
+                                : e === 3
+                                  ? currency((v, screen) => {
+                                    this.openProjectSummary(v, screen);
+                                  })
+                                  : e === 4
+                                    ? currency((v, screen) => {
+                                      this.openProjectSummary(v, screen);
+                                    })
+                                    : e === 5
+                                      ? highTechColumns((v, screen) => {
+                                        this.openProjectSummary(v, screen);
+                                      })
+                                      : e === 6
+                                        ? otherTrademarks((v, screen) => {
+                                          this.openProjectSummary(v, screen);
+                                        })
+                                        : [],
                         changeList: [],
                         status:
                           e === 1
                             ? 2
                             : e === 2
-                            ? 4
-                            : e === 5
-                            ? 1
-                            : e === 6
-                            ? 5
-                            : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
+                              ? 4
+                              : e === 5
+                                ? 1
+                                : e === 6
+                                  ? 5
+                                  : 0, // 0通用 1高新 2发明专利 3实用新型 4软著 5商标
                       }
                       // () => {
                       //   this.loadData();
@@ -867,7 +866,7 @@ class ProjecCount extends Component {
               size="middle"
               scroll={{ x: 800, y: 0 }}
               columns={
-                this.state.changeList.length > 0
+                this.state.changeList
                   ? this.state.changeList
                   : this.state.columns
               }
@@ -919,20 +918,20 @@ class ProjecCount extends Component {
                   this.state.projectType === 4
                     ? 2
                     : this.state.projectType === 2
-                    ? 3
-                    : this.state.projectType === 1
-                    ? 4
-                    : this.state.projectType === 5
-                    ? 1
-                    : this.state.contactsOptionData.filter(
-                        (v) => v.id === this.state.taberProjectStatus
-                      ).length > 0
-                    ? this.state.contactsOptionData.filter(
-                        (v) => v.id === this.state.taberProjectStatus
-                      )[0].cname === "高新"
-                      ? 1
-                      : 0
-                    : 0,
+                      ? 3
+                      : this.state.projectType === 1
+                        ? 4
+                        : this.state.projectType === 5
+                          ? 1
+                          : this.state.contactsOptionData.filter(
+                            (v) => v.id === this.state.taberProjectStatus
+                          ).length > 0
+                            ? this.state.contactsOptionData.filter(
+                              (v) => v.id === this.state.taberProjectStatus
+                            )[0].cname === "高新"
+                              ? 1
+                              : 0
+                            : 0,
                 screen: this.state.screen, //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
               }}
               introduce={() => (
@@ -1022,18 +1021,18 @@ class ProjecCount extends Component {
                         {this.state.taberProjectType === 0
                           ? "通用"
                           : this.state.taberProjectType === 1
-                          ? "专利"
-                          : this.state.taberProjectType === 2
-                          ? "软著"
-                          : this.state.taberProjectType === 3
-                          ? "审计"
-                          : this.state.taberProjectType === 4
-                          ? "双软"
-                          : this.state.taberProjectType === 5
-                          ? "高新"
-                          : this.state.taberProjectType === 6
-                          ? "商标"
-                          : ""}
+                            ? "专利"
+                            : this.state.taberProjectType === 2
+                              ? "软著"
+                              : this.state.taberProjectType === 3
+                                ? "审计"
+                                : this.state.taberProjectType === 4
+                                  ? "双软"
+                                  : this.state.taberProjectType === 5
+                                    ? "高新"
+                                    : this.state.taberProjectType === 6
+                                      ? "商标"
+                                      : ""}
                       </span>
                     </span>
                   ) : null}

+ 1 - 1
package.json

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