dev01 il y a 2 ans
Parent
commit
9a166db708

+ 4 - 8
js/component/common/projectOperation/index.jsx

@@ -620,8 +620,8 @@ class ProjectOperation extends Component {
                                         label="是否包含认证费用"
                                     >
                                         {readOnly ? (
-                                            this.state.ifCertificationFee === 1 ? '包含' :
-                                                this.state.ifCertificationFee === 0 ? '不包含' : '未知'
+                                            this.state.ifCertificationFee == "1" ? '包含' :
+                                                this.state.ifCertificationFee == "0" ? '不包含' : '未知'
                                         ) : <Select
                                             placeholder="请选择是否包含认证费用"
                                             style={{ width: "200px" }}
@@ -630,12 +630,8 @@ class ProjectOperation extends Component {
                                                 this.setState({ ifCertificationFee: e });
                                             }}
                                         >
-                                            <Select.Option value={0}>
-                                                否
-                                            </Select.Option>
-                                            <Select.Option value={1}>
-                                                是
-                                            </Select.Option>
+                                            <Select.Option value={"0"}>否</Select.Option>
+                                            <Select.Option value={"1"}>是</Select.Option>
                                         </Select>}
                                         <span className="mandatory">*</span>
                                     </FormItem>

+ 4 - 7
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2088,7 +2088,7 @@ const NewService = Form.create()(
               message.warning(data.error[0].message);
             }
           } else {
-            message.success("该订单已作废~");
+            message.success("操作成功~");
             this.setState({
               visible: false,
               loading: false,
@@ -7060,12 +7060,9 @@ const NewService = Form.create()(
                                   {this.state.detailChange.processState === 2 ||
                                     this.state.detailChange.processState === 3
                                     ? shenghePeo(
-                                      this.state.detailChange.processState ===
-                                        2
-                                        ? this.state.detailChange
-                                          .consultantExamine
-                                        : this.state.detailChange
-                                          .managerExamine,
+                                      this.state.detailChange.processState === 2
+                                        ? this.state.detailChange.consultantExamine
+                                        : this.state.detailChange.managerExamine,
                                       this.state.detailChange.processState
                                     )
                                     : getProcessStatusNew(

+ 28 - 31
js/component/manageCenter/project/summary/highTech.jsx

@@ -30,6 +30,7 @@ class HighTech extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      tbaindex: 1,
       loading: false,
       changeList: undefined,
       columns: currency,
@@ -48,7 +49,6 @@ class HighTech extends Component {
         },
       },
       dataSource: [],
-
       releaseDate: [],
       searchOrderNo: "",
       searchContractNo: "",
@@ -60,15 +60,11 @@ class HighTech extends Component {
       thchDepId: "",
       projectType: "",
       projectStatus: "",
-
       departmentArr: [],
-
       contactsOption: [],
       contactsOptionData: [],
-
       visible: false,
     };
-
     this.resetAll = this.resetAll.bind(this);
     this.changeList = this.changeList.bind(this);
     this.departmentList = this.departmentList.bind(this);
@@ -107,7 +103,8 @@ class HighTech extends Component {
           },
           this.props.searchData
         )
-        : {
+        :
+        {
           pageNo: pageNo || 1,
           pageSize: this.state.pagination.pageSize || 10,
           startDate:
@@ -189,11 +186,11 @@ class HighTech extends Component {
         status: 0,
       },
       () => {
+        this.defaultcolumns();
         this.loadData();
       }
     );
   }
-
   //部门
   departmentList() {
     $.ajax({
@@ -224,7 +221,6 @@ class HighTech extends Component {
       }.bind(this),
     });
   }
-
   //项目类别
   selectSuperId() {
     $.ajax({
@@ -340,7 +336,6 @@ class HighTech extends Component {
       changeList: newArr,
     });
   }
-
   // 导出excel
   exportExec() {
     message.config({
@@ -366,14 +361,11 @@ class HighTech extends Component {
         typeof this.state.projectType === "number"
           ? this.state.projectType
           : undefined, //项目分类
+      status: this.state.status,
       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({
@@ -452,7 +444,13 @@ class HighTech extends Component {
                 )
               </span>
             </div>
-            <Tabs defaultActiveKey="1" className="test">
+            <Tabs defaultActiveKey="1" className="test"
+              onChange={e => {
+                this.setState({
+                  tbaindex: e
+                })
+              }}
+            >
               <TabPane tab="搜索" key="1">
                 <div
                   className="user-search"
@@ -575,14 +573,10 @@ class HighTech extends Component {
                             projectType: e,
                             status:
                               e === 4
-                                ? 2
-                                : e === 2
-                                  ? 3
-                                  : e === 1
-                                    ? 4
-                                    : e === 5
-                                      ? 1
-                                      : 0,
+                                ? 2 : e === 2
+                                  ? 3 : e === 1
+                                    ? 4 : e === 5
+                                      ? 1 : 0,
                             dataSource: [],
                           },
                           () => {
@@ -767,15 +761,18 @@ class HighTech extends Component {
                 </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="2">
-                <div style={{ marginLeft: 10 }}>
-                  <ChooseList
-                    columns={this.state.columns}
-                    changeFn={this.changeList}
-                    changeList={this.state.changeList}
-                    top={55}
-                    margin={11}
-                  />
-                </div>
+                {
+                  this.state.tbaindex == 2 &&
+                  <div style={{ marginLeft: 10 }}>
+                    <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                    />
+                  </div>
+                }
               </TabPane>
               <TabPane tab="导出EXCEL" key="3">
                 <Button