Преглед изворни кода

首付款显示,流程显示修复,巴主显示

dev01 пре 2 година
родитељ
комит
6b1cff33c8
22 измењених фајлова са 393 додато и 237 уклоњено
  1. 2 0
      js/component/common/imgList/index.js
  2. 48 50
      js/component/common/projectOperation/newAddProject.jsx
  3. 58 62
      js/component/common/projectOperation/newEditProject.jsx
  4. 1 1
      js/component/dataDic.js
  5. 1 0
      js/component/login/adminLogin.jsx
  6. 148 92
      js/component/manageCenter/order/orderNew/addService.jsx
  7. 8 8
      js/component/manageCenter/order/orderNew/approvedvipproject.jsx
  8. 23 6
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  9. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  10. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  11. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  12. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  13. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  14. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  15. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  16. 5 0
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  17. 7 2
      js/component/manageCenter/order/orderNew/contractYxy.js
  18. 1 0
      js/component/manageCenter/order/orderNew/examine.jsx
  19. 3 1
      js/component/manageCenter/order/source/index.jsx
  20. 1 1
      js/component/manageCenter/set/userManagementS/newUser.jsx
  21. 35 0
      js/component/manageCenter/topTab.jsx
  22. 17 14
      js/component/tools.js

+ 2 - 0
js/component/common/imgList/index.js

@@ -256,12 +256,14 @@ class ImgList extends Component {
                         status="active"
                         percent={parseFloat(this.state.percent * 100).toFixed(0)}
                     />
+                    
                     <div className='promptText'>文件上传中...</div>
                 </div> : <div />}
                 {
                     // PDF文件预览弹窗
                     this.state.isPDF &&
                     <Modal
+                        // maskClosable={false}
                         wrapClassName={"pdfmodal"}
                         visible={this.state.isPDF}
                         className="admin-desc-content"

+ 48 - 50
js/component/common/projectOperation/newAddProject.jsx

@@ -745,12 +745,10 @@ class NewAddProject extends Component {
               {!this.state.patentTransfer &&
                 <FormItem
                   className="half-item"
-                  labelCol={{ span: 4 }}
-                  wrapperCol={{ span: 14 }}
+                  {...formItemLayout}
                   label="专利类型:"
                   style={{
                     display: this.state.displayFees,
-                    marginLeft: "63px",
                   }}
                 >
                   {
@@ -778,63 +776,63 @@ class NewAddProject extends Component {
                     *
                   </span>
                 </FormItem>}
-              <FormItem
-                className="half-item"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 14 }}
-                label="官费:"
-                style={{
-                  display: this.state.displayFees,
-                  marginLeft: "63px",
-                }}
-              >
-                {
-                  <Radio.Group
-                    value={this.state.officialCost}
-                    onChange={(e) => {
-                      this.setState({ officialCost: e.target.value });
-                      if (e.target.value === 0) {
-                        this.setState({
-                          costReduction: ''
-                        })
-                      }
-                    }}
-                  >
-                    <Radio value={1}>含官费</Radio>
-                    <Radio value={0}>不含官费</Radio>
-                  </Radio.Group>
-                }
-                <span style={{ color: "red", marginLeft: "8px" }}>
-                  *
-                </span>
-              </FormItem>
-              {
-                (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1 &&
+              <div className="clearfix">
                 <FormItem
                   className="half-item"
-                  labelCol={{ span: 3 }}
-                  wrapperCol={{ span: 14 }}
-                  label="费减:"
+                  {...formItemLayout}
+                  label="官费:"
                   style={{
                     display: this.state.displayFees,
-                    marginLeft: "63px",
                   }}
                 >
-                  {/*不含官费或者专利类型不为复审或者申请时置灰*/}
-                  <Radio.Group
-                    disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
-                    value={this.state.costReduction}
-                    onChange={(e) => {
-                      this.setState({ costReduction: e.target.value });
-                    }}
-                  >
-                    <Radio value={1}>有费减</Radio>
-                    <Radio value={0}>无费减</Radio>
-                  </Radio.Group>
+                  {
+                    <Radio.Group
+                      value={this.state.officialCost}
+                      onChange={(e) => {
+                        this.setState({ officialCost: e.target.value });
+                        if (e.target.value === 0) {
+                          this.setState({
+                            costReduction: ''
+                          })
+                        }
+                      }}
+                    >
+                      <Radio value={1}>含官费</Radio>
+                      <Radio value={0}>不含官费</Radio>
+                    </Radio.Group>
+                  }
                   <span style={{ color: "red", marginLeft: "8px" }}>
                     *
                   </span>
                 </FormItem>
+              </div>
+              {
+                (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1 &&
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="费减:"
+                    style={{
+                      display: this.state.displayFees,
+                    }}
+                  >
+                    {/*不含官费或者专利类型不为复审或者申请时置灰*/}
+                    <Radio.Group
+                      disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
+                      value={this.state.costReduction}
+                      onChange={(e) => {
+                        this.setState({ costReduction: e.target.value });
+                      }}
+                    >
+                      <Radio value={1}>有费减</Radio>
+                      <Radio value={0}>无费减</Radio>
+                    </Radio.Group>
+                    <span style={{ color: "red", marginLeft: "8px" }}>
+                      *
+                    </span>
+                  </FormItem>
+                </div>
               }
               {
                 //审计

+ 58 - 62
js/component/common/projectOperation/newEditProject.jsx

@@ -463,9 +463,6 @@ class newEditProject extends Component {
       message.warning("请选择本次派单年份!");
       return
     }
-    this.setState({
-      loading: true,
-    });
     let info = {
       tid: this.state.tid,
       serviceYear: this.state.serviceYear,
@@ -480,6 +477,9 @@ class newEditProject extends Component {
       this.updateMemberSonProject(this.state.recoveryId, this.state.taskComment)
       return
     }
+    this.setState({
+      loading: true,
+    });
     $.ajax({
       method: "POST",
       dataType: "json",
@@ -615,12 +615,10 @@ class newEditProject extends Component {
                 !this.state.patentTransfer &&
                 <FormItem
                   className="half-item"
-                  labelCol={{ span: 4 }}
-                  wrapperCol={{ span: 14 }}
+                  {...formItemLayout}
                   label="专利类型:"
                   style={{
                     display: this.state.displayFees,
-                    marginLeft: "63px",
                   }}
                 >
                   {readOnly ? this.state.patentTypeName :
@@ -648,46 +646,44 @@ class newEditProject extends Component {
                   </span>
                 </FormItem>
               }
-              <FormItem
-                className="half-item"
-                labelCol={{ span: 3 }}
-                wrapperCol={{ span: 14 }}
-                label="官费:"
-                style={{
-                  display: this.state.displayFees,
-                  marginLeft: "63px",
-                }}
-              >
-                {readOnly
-                  ? (this.state.officialCost === 1 ? '含官费' : this.state.officialCost === 0 ? '不含官费' : '')
-                  : <Radio.Group
-                    value={this.state.officialCost}
-                    onChange={(e) => {
-                      this.setState({ officialCost: e.target.value });
-                      if (e.target.value === 0) {
-                        this.setState({
-                          costReduction: ''
-                        })
-                      }
-                    }}
-                  >
-                    <Radio value={1}>含官费</Radio>
-                    <Radio value={0}>不含官费</Radio>
-                  </Radio.Group>}
-                <span style={{ color: "red", marginLeft: "8px" }}>
-                  *
-                </span>
-              </FormItem>
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="官费:"
+                  style={{
+                    display: this.state.displayFees,
+                  }}
+                >
+                  {readOnly
+                    ? (this.state.officialCost === 1 ? '含官费' : this.state.officialCost === 0 ? '不含官费' : '')
+                    : <Radio.Group
+                      value={this.state.officialCost}
+                      onChange={(e) => {
+                        this.setState({ officialCost: e.target.value });
+                        if (e.target.value === 0) {
+                          this.setState({
+                            costReduction: ''
+                          })
+                        }
+                      }}
+                    >
+                      <Radio value={1}>含官费</Radio>
+                      <Radio value={0}>不含官费</Radio>
+                    </Radio.Group>}
+                  <span style={{ color: "red", marginLeft: "8px" }}>
+                    *
+                  </span>
+                </FormItem>
+              </div>
               {
                 readOnly ?
                   <FormItem
                     className="half-item"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 14 }}
+                    {...formItemLayout}
                     label="费减:"
                     style={{
                       display: this.state.displayFees,
-                      marginLeft: "63px",
                     }}
                   >
                     {this.state.costReduction === 1 ? '有费减' : this.state.costReduction === 0 ? '无费减' : ''}
@@ -697,31 +693,31 @@ class newEditProject extends Component {
                   </FormItem>
                   :
                   (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1 &&
-                  <FormItem
-                    className="half-item"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 14 }}
-                    label="费减:"
-                    style={{
-                      display: this.state.displayFees,
-                      marginLeft: "63px",
-                    }}
-                  >
-                    {/*不含官费或者专利类型不为复审或者申请时置灰*/}
-                    <Radio.Group
-                      disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
-                      value={this.state.costReduction}
-                      onChange={(e) => {
-                        this.setState({ costReduction: e.target.value });
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="费减:"
+                      style={{
+                        display: this.state.displayFees,
                       }}
                     >
-                      <Radio value={1}>有费减</Radio>
-                      <Radio value={0}>无费减</Radio>
-                    </Radio.Group>
-                    <span style={{ color: "red", marginLeft: "8px" }}>
-                      *
-                    </span>
-                  </FormItem>
+                      {/*不含官费或者专利类型不为复审或者申请时置灰*/}
+                      <Radio.Group
+                        disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
+                        value={this.state.costReduction}
+                        onChange={(e) => {
+                          this.setState({ costReduction: e.target.value });
+                        }}
+                      >
+                        <Radio value={1}>有费减</Radio>
+                        <Radio value={0}>无费减</Radio>
+                      </Radio.Group>
+                      <span style={{ color: "red", marginLeft: "8px" }}>
+                        *
+                      </span>
+                    </FormItem>
+                  </div>
               }
               {
                 //审计

+ 1 - 1
js/component/dataDic.js

@@ -4125,6 +4125,6 @@ module.exports = {
     {value: "4", key: "战区总",},
     {value: "5", key: "巴主",},
     {value: "6", key: "小巴主",},
-    {value: "7", key: "巴员",},
+    // {value: "7", key: "巴员",},
   ],
 };

+ 1 - 0
js/component/login/adminLogin.jsx

@@ -35,6 +35,7 @@ var Login = React.createClass({
                 }
             }).done(function (data) {
                 if (!data.error.length) {
+                    localStorage.setItem("userId", data.data.id)
                     window.location.href = globalConfig.context + "/admin/index.html";
                 } else {
                     message.warning(data.error[0].message);

+ 148 - 92
js/component/manageCenter/order/orderNew/addService.jsx

@@ -3063,9 +3063,9 @@ const NewService = Form.create()(
                   });
                 } else {
                   this.setState({
-                    listFlag: true,
-                    hetongFlag: true,
-                    listCuiFlag: true,
+                    hetongFlag: false,
+                    listFlag: false,
+                    listCuiFlag: false,
                     tuiKuanFlag: false,
                     displayList: false,
                   });
@@ -3723,90 +3723,135 @@ const NewService = Form.create()(
       this.setState({
         loading: true,
       });
-      if (this.state.typeChange == 0) {
-        $.ajax({
-          method: "post",
-          dataType: "json",
-          crossDomain: false,
-          url: globalConfig.context + "/api/admin/orderChange/addOrderChange",
-          data: {
-            orderNo: this.state.orderNo, //订单编号
-            processState: 1,
-            status: 1,
-            startRemarks: this.state.startRemarks,
-            remarks: this.state.remarksC,
-            voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
-            totalAmount: this.state.totalAmount,
-            firstAmount: this.state.firstAmount,
-            settlementAmount: this.state.settlementAmount,
-            changeAmount: this.state.changeAmount,
-            applicant: this.state.salesmanName,
-            depName: this.state.depName,
-            type: this.state.typeChange,
-            contractPictureUrl: this.state.isNew
-              ? newContractUrl : undefined,//合同替换件
-          },
-        }).done(
-          function (data) {
-            this.setState({
-              loading: false,
-            });
-            if (!data.error.length) {
-              message.success("发起变更成功");
-              this.handleCancelclose();
-            } else {
-              message.warning(data.error[0].message);
-              this.setState({
+
+      $.ajax({
+        method: "post",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/orderChange/addOrderChange",
+        data: {
+          orderNo: this.state.orderNo, //订单编号
+          processState: 0,
+          status: 0,
+          startRemarks: this.state.startRemarks,
+          remarks: this.state.remarksC,
+          voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
+          totalAmount: this.state.totalAmount,
+          firstAmount: this.state.firstAmount,
+          settlementAmount: this.state.settlementAmount,
+          changeAmount: this.state.changeAmount,
+          applicant: this.state.salesmanName,
+          depName: this.state.depName,
+          type: this.state.typeChange,
+          contractPictureUrl: this.state.isNew
+            ? newContractUrl : undefined,//合同替换件
+        },
+      }).done(
+        function (data) {
+          this.setState({
+            loading: false,
+          });
+          if (!data.error.length) {
+            message.success("发起变更草稿");
+            this.setState(
+              {
+                isCaoGao: true,
                 loading: false,
-              });
-            }
-          }.bind(this)
-        );
-      } else {
-        $.ajax({
-          method: "post",
-          dataType: "json",
-          crossDomain: false,
-          url: globalConfig.context + "/api/admin/orderChange/addOrderChange",
-          data: {
-            orderNo: this.state.orderNo, //订单编号
-            processState: 0,
-            status: 0,
-            startRemarks: this.state.startRemarks,
-            remarks: this.state.remarksC,
-            voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
-            totalAmount: this.state.totalAmount,
-            firstAmount: this.state.firstAmount,
-            settlementAmount: this.state.settlementAmount,
-            changeAmount: this.state.changeAmount,
-            applicant: this.state.salesmanName,
-            depName: this.state.depName,
-            type: this.state.typeChange,
-            contractPictureUrl: this.state.isNew
-              ? newContractUrl : undefined,//合同替换件
-          },
-        }).done(
-          function (data) {
-            this.setState({
-              loading: false,
-            });
-            if (!data.error.length) {
-              message.success("发起变更草稿");
-              this.setState(
-                {
-                  isCaoGao: true,
-                  loading: false,
-                },
-                () => {
-                  this.callback("2");
-                }
-              );
-            } else {
-              message.warning(data.error[0].message);
-            }
-          }.bind(this)
-        );
-      }
+              },
+              () => {
+                this.callback("2");
+              }
+            );
+          } else {
+            message.warning(data.error[0].message);
+          }
+        }.bind(this)
+      );
+
+      // if (this.state.typeChange == 0) {
+      //   $.ajax({
+      //     method: "post",
+      //     dataType: "json",
+      //     crossDomain: false,
+      //     url: globalConfig.context + "/api/admin/orderChange/addOrderChange",
+      //     data: {
+      //       orderNo: this.state.orderNo, //订单编号
+      //       processState: 1,
+      //       status: 1,
+      //       startRemarks: this.state.startRemarks,
+      //       remarks: this.state.remarksC,
+      //       voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
+      //       totalAmount: this.state.totalAmount,
+      //       firstAmount: this.state.firstAmount,
+      //       settlementAmount: this.state.settlementAmount,
+      //       changeAmount: this.state.changeAmount,
+      //       applicant: this.state.salesmanName,
+      //       depName: this.state.depName,
+      //       type: this.state.typeChange,
+      //       contractPictureUrl: this.state.isNew
+      //         ? newContractUrl : undefined,//合同替换件
+      //     },
+      //   }).done(
+      //     function (data) {
+      //       this.setState({
+      //         loading: false,
+      //       });
+      //       if (!data.error.length) {
+      //         message.success("发起变更成功");
+      //         this.handleCancelclose();
+      //       } else {
+      //         message.warning(data.error[0].message);
+      //         this.setState({
+      //           loading: false,
+      //         });
+      //       }
+      //     }.bind(this)
+      //   );
+      // } else {
+      //   $.ajax({
+      //     method: "post",
+      //     dataType: "json",
+      //     crossDomain: false,
+      //     url: globalConfig.context + "/api/admin/orderChange/addOrderChange",
+      //     data: {
+      //       orderNo: this.state.orderNo, //订单编号
+      //       processState: 0,
+      //       status: 0,
+      //       startRemarks: this.state.startRemarks,
+      //       remarks: this.state.remarksC,
+      //       voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
+      //       totalAmount: this.state.totalAmount,
+      //       firstAmount: this.state.firstAmount,
+      //       settlementAmount: this.state.settlementAmount,
+      //       changeAmount: this.state.changeAmount,
+      //       applicant: this.state.salesmanName,
+      //       depName: this.state.depName,
+      //       type: this.state.typeChange,
+      //       contractPictureUrl: this.state.isNew
+      //         ? newContractUrl : undefined,//合同替换件
+      //     },
+      //   }).done(
+      //     function (data) {
+      //       this.setState({
+      //         loading: false,
+      //       });
+      //       if (!data.error.length) {
+      //         message.success("发起变更草稿");
+      //         this.setState(
+      //           {
+      //             isCaoGao: true,
+      //             loading: false,
+      //           },
+      //           () => {
+      //             this.callback("2");
+      //           }
+      //         );
+      //       } else {
+      //         message.warning(data.error[0].message);
+      //       }
+      //     }.bind(this)
+      //   );
+      // }
     },
 
     reset() {
@@ -7426,9 +7471,9 @@ const NewService = Form.create()(
                                       });
                                     } else {
                                       this.setState({
-                                        listFlag: true,
-                                        hetongFlag: true,
-                                        listCuiFlag: true,
+                                        hetongFlag: false,
+                                        listFlag: false,
+                                        listCuiFlag: false,
                                         tuiKuanFlag: false,
                                         displayList: false,
                                       });
@@ -7578,7 +7623,7 @@ const NewService = Form.create()(
                                   项目业务
                                 </span>
                                 <span style={{ color: "red" }}>
-                                  (注:项目删除后,此项目的全部节点、全部工时,全部被删除,请谨慎删除!双击可修改对应金额数量!
+                                  (注:项目删除后,此项目的全部节点、全部工时,全部被删除,请谨慎删除!)
                                 </span>
                                 <Button
                                   type="primary"
@@ -7773,11 +7818,12 @@ const NewService = Form.create()(
                                   }
                                 }}
                               >
-                                {this.state.isCaoGao
+                                {/* {this.state.isCaoGao
                                   ? "发起变更申请"
                                   : this.state.typeChange == 0
                                     ? "发起变更申请"
-                                    : "下一步"}
+                                    : "下一步"} */}
+                                {this.state.isCaoGao ? "发起变更申请" : "下一步"}
                               </Button>
                             </div>
                             {/* ) : (
@@ -7958,6 +8004,16 @@ const NewService = Form.create()(
                                 style={{ height: "auto" }}
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 18 }}
+                                label="首付款(万元)"
+                              >
+                                <span>{this.state.detailChange.firstAmount}</span>
+                              </FormItem>
+                            </div>
+                            <div className="clearfix">
+                              <FormItem
+                                style={{ height: "auto" }}
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 18 }}
                                 label="变更原因"
                               >
                                 <span>{this.state.detailChange.remarksC}</span>

+ 8 - 8
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -89,12 +89,12 @@ const ApprovedVipProject = React.createClass({
                   <div style={{ display: "flex" }}>
                     <OrderItemStatus deleteSign={record.deleteSign} />
                     {
-                        record.approval == 1
-                          ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
-                            ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
-                              ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
-                                ? <Tag color="#ff0000">特批通过</Tag> : ""
-                      }
+                      record.approval == 1
+                        ? <Tag color="#faa755">特批待审</Tag> : record.approval == 2
+                          ? <Tag color="#ff0000">特批通过</Tag> : record.approval == 4
+                            ? <Tag color="#faa755">特批待审</Tag> : record.approval == 5
+                              ? <Tag color="#ff0000">特批通过</Tag> : ""
+                    }
                   </div>
                 </div>
               </Tooltip>
@@ -172,7 +172,7 @@ const ApprovedVipProject = React.createClass({
             return (
               <div>
                 {text}
-                {(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}
+                <div>{(record.memberType == 1 || record.memberType == 2) && <Tag color="#ff0000">特批项目</Tag>}</div>
               </div>
             )
           }
@@ -198,7 +198,7 @@ const ApprovedVipProject = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },

+ 23 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -1832,13 +1832,30 @@ class ChangeApply extends Component {
         tuiKuanFlag: true,
         displayList: false
       });
-    } else {
+    } else if (e == 6) {
       this.setState({
         listFlag: true,
+        listCuiFlag: true,
         hetongFlag: true,
+        tuiKuanFlag: true,
+        displayList: false,
+      });
+    } else if (e == 7) {
+      this.setState({
+        listFlag: true,
         listCuiFlag: true,
+        hetongFlag: true,
+        tuiKuanFlag: true,
+        displayList: false,
+        isNew: true,
+      });
+    } else {
+      this.setState({
+        listFlag: false,
+        listCuiFlag: false,
+        hetongFlag: false,
         tuiKuanFlag: false,
-        displayList: false
+        displayList: false,
       });
     }
   }
@@ -2387,9 +2404,9 @@ class ChangeApply extends Component {
                     });
                   } else {
                     this.setState({
-                      listFlag: true,
-                      hetongFlag: true,
-                      listCuiFlag: true,
+                      listFlag: false,
+                      listCuiFlag: false,
+                      hetongFlag: false,
                       tuiKuanFlag: false,
                       displayList: false,
                     });
@@ -2556,7 +2573,7 @@ class ChangeApply extends Component {
                 项目业务
               </span>
               <span style={{ color: "red" }}>
-                (注:项目删除后,此项目的全部节点、全部工时,全部被删除,请谨慎删除!双击可修改对应金额数量!
+                (注:项目删除后,此项目的全部节点、全部工时,全部被删除,请谨慎删除!)
               </span>
               <Button
                 type="primary"

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -944,6 +944,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount)
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -376,6 +376,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount)
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -998,6 +998,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount)
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -270,6 +270,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount),
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks,

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -255,6 +255,11 @@ class ChangeDetail extends Component {
         dataB: "***",
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:"***",
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks,

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -273,6 +273,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount),
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks,

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -325,6 +325,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount),
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks,

+ 5 - 0
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -359,6 +359,11 @@ class ChangeDetail extends Component {
         dataB: changeColor(this.props.data.changeAmount)
       },
       {
+        labelA: "首付款(万元)",
+        formItemLayoutA: formItemLayout,
+        dataA:changeColor(this.props.data.firstAmount),
+      },
+      {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
         dataA: this.props.data.remarks

+ 7 - 2
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -663,9 +663,14 @@ const contractChange = Form.create()(
 
     search(obj) {
       if (obj.reset) {
-        this.state.searchData.deps = [];
         this.Cascaders.empty();
-        this.loadData(1);
+        this.setState({
+          searchData: {
+            releaseDate: [],
+          }
+        }, () => {
+          this.loadData(1);
+        })
       } else {
         this.setState(
           {

+ 1 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -164,6 +164,7 @@ const IntentionCustomer = Form.create()(
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
                 processStatus: thisdata.processStatus, //流程状态
+                examineName: thisdata.examineName,
                 liquidationStatus: thisdata.liquidationStatus, //结算状态
                 approval: thisdata.approval, //特批状态
                 signDate: thisdata.signDate, //签单时间

+ 3 - 1
js/component/manageCenter/order/source/index.jsx

@@ -491,7 +491,9 @@ class Source extends Component {
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
-          <span style={{ fontWeight: 900, fontSize: 16, }}>销售来源统计表 &nbsp;<spn style={{ color: "rgb(49,49,255)" }}>注:可通过签单数、签单金额查询统计</spn></span>
+          <span style={{ fontWeight: 900, fontSize: 16, }}>销售来源统计表
+            &nbsp;<spn style={{ color: "rgb(49,49,255)", fontSize: 15, }}>注:可通过签单数、签单金额查询统计</spn>
+          </span>
         </div>
         <Tabs defaultActiveKey="1" onChange={() => { }}>
           <TabPane tab="搜索" key="1">

+ 1 - 1
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -154,7 +154,7 @@ const Newuser = Form.create()(React.createClass({
                     district: this.state.district,
                     headPortraitUrl: theorgCodeUrl.length ? theorgCodeUrl : '',
                     entryTime: this.state.selTime,
-                    ambId: this.state.ambId,
+                    ambId: !!this.state.ambId ? this.state.ambId : null,
                 })
             }
         }).done(function (data) {

+ 35 - 0
js/component/manageCenter/topTab.jsx

@@ -658,6 +658,7 @@ const TopTab = React.createClass({
       username: "请登录!",
       defaultActiveKey: "-1",
       htmlMenus: [],
+      count: 0,
     };
   },
   logOut() {
@@ -752,6 +753,40 @@ const TopTab = React.createClass({
       this.loadData();
     }
   },
+
+  //定时任务
+  componentDidMount() {
+    clearInterval(this.timerID)
+    this.timerID = setInterval(
+      () => this.tick(),
+      3000
+    );
+  },
+
+  componentWillUnmount() {
+    clearInterval(this.timerID)
+  },
+
+  // 解决同时登录多个账号没有刷新页面操作的问题
+  tick() {
+    if (adminData.uid != localStorage.getItem("userId")) {
+      Modal.error({
+        title: '登录失效',
+        content: (
+          <div>
+            <p>同一浏览器不能同时登录多个账号,</p>
+            <p>如需登录多个账号请用不同浏览器打开登录!!!</p>
+          </div>
+        ),
+        okText: '重新登录',
+        onOk() {
+          window.location.href = globalConfig.context + "/admin/login.html";
+        },
+      });
+      clearInterval(this.timerID)
+    }
+  },
+
   render() {
     return (
       <div className="account-top">

+ 17 - 14
js/component/tools.js

@@ -1838,13 +1838,14 @@ const obj = {
           theType = item.key;
         }
       });
-      if (state == "1" || state == "2" || state == "3") {
-        theName = "(总裁)"
-      } else if (state == "4" || state == "5" || state == "6") {
-        theName = "(董事长)"
-      }
-      if (e == 5 || e == 6 || !name) {
+      if (e == 0 || e == 5 || e == 6 || !name) {
         theName = ""
+      } else if (e == 7) {
+        if (state == "1" || state == "2" || state == "3") {
+          theName = "(总裁)"
+        } else if (state == "4" || state == "5" || state == "6") {
+          theName = "(董事长)"
+        }
       }
       return theType + theName;
     }
@@ -2026,7 +2027,7 @@ const obj = {
     //     return theType;
     // }
     let names = "(" + name + ")";
-    if (!name) {
+    if (!name || pro == 0 || pro == 7 || pro == 8) {
       names = ""
     }
     let str = "";
@@ -2198,14 +2199,16 @@ const obj = {
   // 获取巴权限
   getRole: function (e) {
     if (e || e == 0) {
-      let str = e.toString();
-      let theType = "";
-      roleList.map(function (item) {
-        if (item.value == str) {
-          theType = item.key;
+      let arr = e.split(',')
+      let theType = [];
+      for (var i = 0; i < roleList.length; i++) {
+        for (var j = 0; j < arr.length; j++) {
+          if (roleList[i].value == arr[j]) {
+            theType.push(roleList[i].key)
+          }
         }
-      });
-      return theType;
+      }
+      return theType.toString();
     }
   },
 };