浏览代码

0822需求添加

dev01 2 年之前
父节点
当前提交
f64a9dc594
共有 34 个文件被更改,包括 984 次插入316 次删除
  1. 220 216
      js/component/common/projectOperation/newAddProject.jsx
  2. 76 14
      js/component/common/projectOperation/newEditProject.jsx
  3. 13 2
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  4. 14 3
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  5. 13 2
      js/component/manageCenter/customerService/administration/order.jsx
  6. 2 5
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  7. 3 0
      js/component/manageCenter/order/orderNew/addService.jsx
  8. 1 1
      js/component/manageCenter/order/orderNew/approveds.jsx
  9. 2 6
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  10. 13 2
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  11. 13 2
      js/component/manageCenter/order/orderNew/contractCwjl.js
  12. 13 2
      js/component/manageCenter/order/orderNew/contractCwzj.js
  13. 13 2
      js/component/manageCenter/order/orderNew/contractCwzy.js
  14. 13 2
      js/component/manageCenter/order/orderNew/contractJsjl.js
  15. 13 2
      js/component/manageCenter/order/orderNew/contractJsy.js
  16. 13 2
      js/component/manageCenter/order/orderNew/contractJszj.js
  17. 13 2
      js/component/manageCenter/order/orderNew/contractYxgly.js
  18. 14 2
      js/component/manageCenter/order/orderNew/contractYxy.js
  19. 13 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  20. 13 2
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  21. 13 2
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  22. 13 2
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  23. 14 3
      js/component/manageCenter/project/project/projectQuery.jsx
  24. 14 9
      js/component/manageCenter/project/summary/highTech.jsx
  25. 263 6
      js/component/manageCenter/project/summary/highTechConfig.jsx
  26. 104 3
      js/component/manageCenter/project/summary/projectDetails.jsx
  27. 13 2
      js/component/manageCenter/project/task/myTask.jsx
  28. 13 2
      js/component/manageCenter/project/task/myTaskCount.jsx
  29. 13 2
      js/component/manageCenter/project/task/taskAssignment.jsx
  30. 13 2
      js/component/manageCenter/project/task/taskCount.jsx
  31. 19 8
      js/component/manageCenter/project/task/taskQuery.jsx
  32. 1 1
      package.json
  33. 1 1
      webpack-dll.config.js
  34. 2 2
      webpack.config.js

+ 220 - 216
js/component/common/projectOperation/newAddProject.jsx

@@ -18,6 +18,7 @@ const formItemLayout = {
 };
 
 const PicturesWall = React.createClass({
+
   getInitialState() {
     return {
       previewVisible: false,
@@ -25,28 +26,34 @@ const PicturesWall = React.createClass({
       fileList: this.props.pictureUrl,
     };
   },
+
   getDefaultProps() {
     return {
       changeClick: this.modifyChange,
     };
   },
+
   handleCancel() {
     this.setState({ previewVisible: false });
   },
+
   handlePreview(file) {
     this.setState({
       previewImage: file.url || file.thumbUrl,
       previewVisible: true,
     });
   },
+
   handleChange(info) {
     let fileList = info.fileList;
     this.setState({ fileList });
     this.props.fileList(fileList);
   },
+
   componentWillReceiveProps(nextProps) {
     this.state.fileList = nextProps.pictureUrl;
   },
+
   render() {
     const { fileList } = this.state;
     return (
@@ -67,6 +74,7 @@ const PicturesWall = React.createClass({
       </div>
     );
   },
+
 });
 
 /**
@@ -77,14 +85,16 @@ class NewAddProject extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      commodityName: '',
-      commodityQuantity: '',
+      commodityName: '',//项目名称
+      commodityQuantity: '',//项目数量
       patentType: 0,
       officialCost: '',
       costReduction: '',
-      commodityPrice: '',
-      main: '',
-      taskComment: '',
+      commodityPrice: '',//项目价格
+      main: '',//主要项目 0否 1是
+      lastYearCapital: '',//上年度总资本
+      lastYearIncome: '',//上年度总资本
+      taskComment: '',//项目说明
       declarationBatch: '',
       ifCertificationFee: '',
       displayFees: "none",
@@ -93,7 +103,7 @@ class NewAddProject extends Component {
       loading: false,
       orgCodeUrl: [],
       patentTransfer: 0, //收否为专利转让 0 否 1 是
-      serviceLife: [],
+      serviceLife: [],//服务年份
       isVip: undefined,
       histYear: [],
       editName: false,
@@ -170,7 +180,8 @@ class NewAddProject extends Component {
       message.warning("请输入正确的金额!");
       return false;
     }
-    if (this.state.addProjectType == "3") {// 3审计
+    // 3审计
+    if (this.state.addProjectType == "3") {
       if (this.state.serviceLife.length === 0) {
         message.warning("请选择服务年限!");
         return
@@ -179,12 +190,21 @@ class NewAddProject extends Component {
         message.warning("服务数量与服务年限不符!");
         return
       }
+      if (isNaN(parseFloat(this.state.lastYearCapital))) {
+        message.warning("请输入正确的企业上年度总资本!");
+        return
+      }
+      if (isNaN(parseFloat(this.state.lastYearIncome))) {
+        message.warning("请输入正确的企业上年度总收入!");
+        return
+      }
     }
     if (!this.state.main) {
       message.warning("请选择是否为主要项目!");
       return false;
     }
-    if (this.state.addProjectType === 5) {// 5高新
+    // 5高新
+    if (this.state.addProjectType === 5) {
       if (!this.state.declarationBatch) {
         message.warning("请选择企业要求申报批次!");
         return
@@ -243,7 +263,8 @@ class NewAddProject extends Component {
     }
     if (this.state.displayFees === 'block') {
       infor.officialCost = this.state.officialCost //是否有官费
-      infor.costReduction = (this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0//是否有费减
+      infor.costReduction = (this.state.patentType === 0 || this.state.patentType === 2) ?
+        (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0//是否有费减
       infor.patentType = this.state.patentType //专利类型
     }
     if (this.state.isIso) {
@@ -251,6 +272,9 @@ class NewAddProject extends Component {
     }
     if (this.state.addProjectType == "3") {//审计
       infor.serviceLife = JSON.stringify(this.state.serviceLife) //服务年限
+      infor.lastYear = new Date().getFullYear() - 1 //上年度年份
+      infor.lastYearCapital = this.state.lastYearCapital //上年度总资本
+      infor.lastYearIncome = this.state.lastYearIncome //上年度总收入
     }
     if (this.state.addProjectType == "5") {//高新
       infor.declarationBatch = this.state.declarationBatch || 1//申报批次
@@ -589,7 +613,7 @@ class NewAddProject extends Component {
       <Option key={its}>{its}</Option>
     ));
     const { RangePicker } = DatePicker;
-    const { readOnly, type = "" } = this.props;
+    const { type = "" } = this.props;
     const { isVip, histYear, isEdit } = this.state
     return (
       <Modal
@@ -598,7 +622,7 @@ class NewAddProject extends Component {
         onOk={this.props.onCancel}
         onCancel={this.props.onCancel}
         width="900px"
-        title={readOnly ? "项目任务详情" : "新增项目任务"}
+        title={"新增项目任务"}
         footer=""
         className="admin-desc-content"
       >
@@ -645,7 +669,7 @@ class NewAddProject extends Component {
                         >
                           <Input />
                         </AutoComplete>}
-                      {!readOnly && <span className="mandatory">*</span>}
+                      {<span className="mandatory">*</span>}
                     </FormItem>
                 }
 
@@ -656,7 +680,7 @@ class NewAddProject extends Component {
                     {...formItemLayout}
                     label="服务数量"
                   >
-                    {readOnly ? this.state.commodityQuantity :
+                    {
                       <Input
                         placeholder="请输入服务数量"
                         disabled={isVip == 6}
@@ -666,8 +690,9 @@ class NewAddProject extends Component {
                           this.setState({ commodityQuantity: e.target.value });
                         }}
                         ref="commodityQuantity"
-                      />}
-                    {!readOnly && <span className="mandatory">*</span>}
+                      />
+                    }
+                    {<span className="mandatory">*</span>}
                   </FormItem>
                 }
               </div>
@@ -676,7 +701,7 @@ class NewAddProject extends Component {
                 {...formItemLayout}
                 label="实签价格(万元)"
               >
-                {readOnly ? this.state.commodityPrice :
+                {
                   <Input
                     type='number'
                     placeholder="请输入实签价格"
@@ -687,15 +712,16 @@ class NewAddProject extends Component {
                       this.setState({ commodityPrice: e.target.value });
                     }}
                     ref="commodityPrice"
-                  />}
-                {!readOnly && <span className="mandatory">*</span>}
+                  />
+                }
+                {<span className="mandatory">*</span>}
               </FormItem>
               <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="主要业务"
               >
-                {readOnly ? getboutique(this.state.main) :
+                {
                   <Select
                     placeholder="选择是否为主要业务"
                     disabled={isEdit}
@@ -712,8 +738,9 @@ class NewAddProject extends Component {
                         </Select.Option>
                       );
                     })}
-                  </Select>}
-                {!readOnly && <span className="mandatory">*</span>}
+                  </Select>
+                }
+                {<span className="mandatory">*</span>}
               </FormItem>
               {!this.state.patentTransfer &&
                 <FormItem
@@ -726,7 +753,7 @@ class NewAddProject extends Component {
                     marginLeft: "63px",
                   }}
                 >
-                  {readOnly ? this.state.patentTypeName :
+                  {
                     <Select
                       placeholder="请选择专利类型"
                       style={{ width: "200px" }}
@@ -745,7 +772,8 @@ class NewAddProject extends Component {
                           <Select.Option key={k} value={v.id}>{v.name}</Select.Option>
                         );
                       })}
-                    </Select>}
+                    </Select>
+                  }
                   <span style={{ color: "red", marginLeft: "8px" }}>
                     *
                   </span>
@@ -760,9 +788,8 @@ class NewAddProject extends Component {
                   marginLeft: "63px",
                 }}
               >
-                {readOnly
-                  ? (this.state.officialCost === 1 ? '含官费' : this.state.officialCost === 0 ? '不含官费' : '')
-                  : <Radio.Group
+                {
+                  <Radio.Group
                     value={this.state.officialCost}
                     onChange={(e) => {
                       this.setState({ officialCost: e.target.value });
@@ -775,55 +802,39 @@ class NewAddProject extends Component {
                   >
                     <Radio value={1}>含官费</Radio>
                     <Radio value={0}>不含官费</Radio>
-                  </Radio.Group>}
+                  </Radio.Group>
+                }
                 <span style={{ color: "red", marginLeft: "8px" }}>
                   *
                 </span>
               </FormItem>
               {
-                readOnly ?
-                  <FormItem
-                    className="half-item"
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 14 }}
-                    label="费减:"
-                    style={{
-                      display: this.state.displayFees,
-                      marginLeft: "63px",
-                    }}
-                  >
-                    {this.state.costReduction === 1 ? '有费减' : this.state.costReduction === 0 ? '无费减' : ''}
-                    <span style={{ color: "red", marginLeft: "8px" }}>
-                      *
-                    </span>
-                  </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",
+                (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 });
                     }}
                   >
-                    {/*不含官费或者专利类型不为复审或者申请时置灰*/}
-                    <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>
+                    <Radio value={1}>有费减</Radio>
+                    <Radio value={0}>无费减</Radio>
+                  </Radio.Group>
+                  <span style={{ color: "red", marginLeft: "8px" }}>
+                    *
+                  </span>
+                </FormItem>
               }
               {
                 //审计
@@ -834,23 +845,21 @@ class NewAddProject extends Component {
                   label="服务年限"
                 >
                   {
-                    readOnly ?
-                      !!this.state.serviceLife ? this.state.serviceLife.toString() : "" :
-                      <Select
-                        mode="multiple"
-                        style={{ width: '200px' }}
-                        placeholder="请选择服务年限"
-                        value={this.state.serviceLife}
-                        onChange={(e) => {
-                          this.setState({
-                            serviceLife: e,
-                          })
-                        }}
-                      >
-                        {children}
-                      </Select>
+                    <Select
+                      mode="multiple"
+                      style={{ width: '200px' }}
+                      placeholder="请选择服务年限"
+                      value={this.state.serviceLife}
+                      onChange={(e) => {
+                        this.setState({
+                          serviceLife: e,
+                        })
+                      }}
+                    >
+                      {children}
+                    </Select>
                   }
-                  {!readOnly && <span className="mandatory">*</span>}
+                  {<span className="mandatory">*</span>}
                 </FormItem>
               }
               {
@@ -861,32 +870,30 @@ class NewAddProject extends Component {
                   label="会员服务年限"
                 >
                   {
-                    readOnly ?
-                      !!this.state.serviceLife ? this.state.serviceLife.toString() : "" :
-                      <div>
-                        {
-                          this.state.serviceLife.map((tag) =>
-                            <Tag closable={!isEdit} key={tag}
-                              afterClose={() => this.handleClose(tag)}
-                            >{tag}</Tag>
-                          )
-                        }
-                        {
-                          !isEdit && (this.state.serviceLife.length < 5) &&
-                          <Button
-                            size="small"
-                            type="primary"
-                            onClick={() => {
-                              this.setState({
-                                addYears: true,
-                                addyear: undefined,
-                                isGive: undefined,
-                              })
-                            }}>
-                            + 添加服务年限
-                          </Button>
-                        }
-                      </div>
+                    <div>
+                      {
+                        this.state.serviceLife.map((tag) =>
+                          <Tag closable={!isEdit} key={tag}
+                            afterClose={() => this.handleClose(tag)}
+                          >{tag}</Tag>
+                        )
+                      }
+                      {
+                        !isEdit && (this.state.serviceLife.length < 5) &&
+                        <Button
+                          size="small"
+                          type="primary"
+                          onClick={() => {
+                            this.setState({
+                              addYears: true,
+                              addyear: undefined,
+                              isGive: undefined,
+                            })
+                          }}>
+                          + 添加服务年限
+                        </Button>
+                      }
+                    </div>
                   }
                 </FormItem>
               }
@@ -898,7 +905,6 @@ class NewAddProject extends Component {
                   label="会员总服务年限"
                 >
                   {
-                    // readOnly ?
                     !this.state.yearSum ? "" :
                       [
                         { value: "0", key: "" },
@@ -908,37 +914,11 @@ class NewAddProject extends Component {
                         { value: "4", key: "四年" },
                         { value: "5", key: "五年" },
                       ][this.state.yearSum]["key"]
-                    // : <Select
-                    //   placeholder="请选择会员总服务年限"
-                    //   disabled={true}
-                    //   style={{ width: "200px" }}
-                    //   value={typeof (this.state.yearSum) === "number" ? this.state.yearSum.toString() : this.state.yearSum}
-                    //   onChange={(e) => {
-                    //     this.setState({
-                    //       yearSum: e,
-                    //       serviceLife: [],
-                    //       serviceYear: undefined,
-                    //     });
-                    //   }}
-                    // >
-                    //   {[
-                    //     { value: "1", key: "一年" },
-                    //     { value: "2", key: "二年" },
-                    //     { value: "3", key: "三年" },
-                    //     { value: "4", key: "四年" },
-                    //     { value: "5", key: "五年" },
-                    //   ].map(function (item) {
-                    //     return (
-                    //       <Select.Option key={item.value}>
-                    //         {item.key}
-                    //       </Select.Option>
-                    //     );
-                    //   })}
-                    // </Select>
                   }
                 </FormItem>
               }
               {
+                // 会员合同期
                 isVip == 6 &&
                 <div className="clearfix">
                   <FormItem
@@ -952,39 +932,68 @@ class NewAddProject extends Component {
                     label="合同期"
                   >
                     {
-                      readOnly ?
-                        !!this.state.contractTerm ? this.state.contractTerm.toString() : "" :
-                        <RangePicker
-                          style={{ width: 200 }}
-                          disabled={isEdit}
-                          value={[
-                            this.state.contractTerm[0]
-                              ? moment(this.state.contractTerm[0])
-                              : null,
-                            this.state.contractTerm[1]
-                              ? moment(this.state.contractTerm[1])
-                              : null,
-                          ]}
-                          onChange={(data, dataString) => {
-                            this.setState({ contractTerm: dataString });
-                          }}
-                        />
-                      // <Select
-                      //   mode="multiple"
-                      //   style={{ width: '200px' }}
-                      //   placeholder="请选择合同期"
-                      //   disabled={isEdit}
-                      //   value={this.state.contractTerm}
-                      //   onChange={e => {
-                      //     this.setState({
-                      //       contractTerm: e,
-                      //     })
-                      //   }}
-                      // >
-                      //   {children}
-                      // </Select>
+                      <RangePicker
+                        style={{ width: 200 }}
+                        disabled={isEdit}
+                        value={[
+                          this.state.contractTerm[0]
+                            ? moment(this.state.contractTerm[0])
+                            : null,
+                          this.state.contractTerm[1]
+                            ? moment(this.state.contractTerm[1])
+                            : null,
+                        ]}
+                        onChange={(data, dataString) => {
+                          this.setState({ contractTerm: dataString });
+                        }}
+                      />
                     }
-                    {!readOnly && <span className="mandatory">*</span>}
+                    {<span className="mandatory">*</span>}
+                  </FormItem>
+                </div>
+              }
+              {
+                // 审计
+                this.state.addProjectType == "3" &&
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label=""
+                  >
+                    <span style={{ color: "red" }}>注:派单年度的上年度总资产和收入。如,当前为2022年,那么需要填写2021年的总资产和收入!</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    label="企业上年度总资本(万元)"
+                    {...formItemLayout}
+                  >
+                    <Input
+                      type='number'
+                      placeholder=""
+                      value={this.state.lastYearCapital}
+                      style={{ width: "200px" }}
+                      onChange={(e) => {
+                        this.setState({ lastYearCapital: e.target.value });
+                      }}
+                    />
+                    {<span className="mandatory">*</span>}
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    label="企业上年度总收入(万元)"
+                    {...formItemLayout}
+                  >
+                    <Input
+                      type='number'
+                      placeholder=""
+                      value={this.state.lastYearIncome}
+                      style={{ width: "200px" }}
+                      onChange={(e) => {
+                        this.setState({ lastYearIncome: e.target.value });
+                      }}
+                    />
+                    {<span className="mandatory">*</span>}
                   </FormItem>
                 </div>
               }
@@ -997,16 +1006,17 @@ class NewAddProject extends Component {
                     wrapperCol={{ span: 16 }}
                     label="项目说明"
                   >
-                    {readOnly ? this.state.taskComment :
+                    {
                       <Input
                         type="textarea"
                         placeholder=""
-                        autosize={{ minRows: 4 }}
+                        autosize={{ minRows: 3 }}
                         value={this.state.taskComment}
                         onChange={(e) => {
                           this.setState({ taskComment: e.target.value });
                         }}
-                      />}
+                      />
+                    }
                   </FormItem>
                 </div>
               }
@@ -1018,12 +1028,7 @@ class NewAddProject extends Component {
                     {...formItemLayout}
                     label="企业要求申报批次"
                   >
-                    {readOnly ? (
-                      this.state.declarationBatch === 1 ? '第一批' :
-                        this.state.declarationBatch === 2 ? '第二批' :
-                          this.state.declarationBatch === 3 ? '第三批' :
-                            this.state.declarationBatch === 4 ? '第四批' : '未知'
-                    ) :
+                    {
                       <Select
                         placeholder="请选择企业要求申报批次"
                         style={{ width: "200px" }}
@@ -1044,8 +1049,9 @@ class NewAddProject extends Component {
                         <Select.Option value={4}>
                           第四批
                         </Select.Option>
-                      </Select>}
-                    {!readOnly && <span className="mandatory">*</span>}
+                      </Select>
+                    }
+                    {<span className="mandatory">*</span>}
                   </FormItem>
                   <FormItem
                     className="half-item"
@@ -1053,25 +1059,24 @@ class NewAddProject extends Component {
                     label="申报年份"
                   >
                     {
-                      readOnly ? this.state.serviceYear :
-                        <Select
-                          style={{ width: '200px' }}
-                          placeholder="请选择申报年份"
-                          value={this.state.serviceYear}
-                          onChange={e => {
-                            this.setState({
-                              serviceYear: e,
-                            })
-                          }}
-                        >
-                          {
-                            vipYear.map(its => (
-                              <Option key={its}>{its}</Option>
-                            ))
-                          }
-                        </Select>
+                      <Select
+                        style={{ width: '200px' }}
+                        placeholder="请选择申报年份"
+                        value={this.state.serviceYear}
+                        onChange={e => {
+                          this.setState({
+                            serviceYear: e,
+                          })
+                        }}
+                      >
+                        {
+                          vipYear.map(its => (
+                            <Option key={its}>{its}</Option>
+                          ))
+                        }
+                      </Select>
                     }
-                    {!readOnly && <span className="mandatory">*</span>}
+                    {<span className="mandatory">*</span>}
                   </FormItem>
                 </div>
               }
@@ -1083,25 +1088,24 @@ class NewAddProject extends Component {
                       {...formItemLayout}
                       label="是否包含认证费用"
                     >
-                      {readOnly ? (
-                        this.state.ifCertificationFee == "1" ? '包含' :
-                          this.state.ifCertificationFee == "0" ? '不包含' : '未知'
-                      ) : <Select
-                        placeholder="请选择是否包含认证费用"
-                        style={{ width: "200px" }}
-                        value={this.state.ifCertificationFee}
-                        onChange={(e) => {
-                          this.setState({ ifCertificationFee: e });
-                        }}
-                      >
-                        <Select.Option value={"0"}>否</Select.Option>
-                        <Select.Option value={"1"}>是</Select.Option>
-                      </Select>}
-                      {!readOnly && <span className="mandatory">*</span>}
+                      {
+                        <Select
+                          placeholder="请选择是否包含认证费用"
+                          style={{ width: "200px" }}
+                          value={this.state.ifCertificationFee}
+                          onChange={(e) => {
+                            this.setState({ ifCertificationFee: e });
+                          }}
+                        >
+                          <Select.Option value={"0"}>否</Select.Option>
+                          <Select.Option value={"1"}>是</Select.Option>
+                        </Select>
+                      }
+                      {<span className="mandatory">*</span>}
                     </FormItem>
                   </div> : null
               }
-              {((!readOnly && isVip != 6) || (isVip == 6 && !isEdit)) &&
+              {((isVip != 6) || (isVip == 6 && !isEdit)) &&
                 <div className="clearfix">
                   <FormItem
                     wrapperCol={{ span: 12, offset: 8 }}
@@ -1309,7 +1313,7 @@ class NewAddProject extends Component {
                               fileList={this.getOrgCodeUrl}
                               pictureUrl={this.state.orgCodeUrl}
                             />
-                            {!readOnly && <span className="mandatory">*</span>}
+                            {<span className="mandatory">*</span>}
                           </FormItem>
                           <div style={{ color: "red", marginLeft: 144, marginBottom: 15 }}>
                             特批需上传附件图,请上传客户同意我方继续服务并安排给我司付款的聊天记录截图,

+ 76 - 14
js/component/common/projectOperation/newEditProject.jsx

@@ -25,14 +25,16 @@ class newEditProject extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      commodityName: '',
-      commodityQuantity: '',
+      commodityName: '',//项目名称
+      commodityQuantity: '',//项目数量
       patentType: 0,
       officialCost: '',
       costReduction: '',
-      commodityPrice: '',
-      main: '',
-      taskComment: '',
+      commodityPrice: '',//项目价格
+      main: '',//主要项目 0否 1是
+      lastYearCapital: '',//上年度总资本
+      lastYearIncome: '',//上年度总资本
+      taskComment: '',//项目说明
       declarationBatch: '',
       ifCertificationFee: '',
       displayFees: "none",
@@ -119,13 +121,9 @@ class newEditProject extends Component {
       declarationBatch: dataInfor.declarationBatch || 1,//申报批次(只有高新有)
       ifCertificationFee: isNaN(parseInt(dataInfor.ifCertificationFee)) ? '' : dataInfor.ifCertificationFee,//是否包含认证费
       isIso: dataInfor.commodityName.indexOf("贯标") !== -1,
-      orgCodeUrl: dataInfor.pictureUrl
-        ? splitUrl(
-          dataInfor.pictureUrl,
-          ",",
-          globalConfig.avatarHost + "/upload"
-        )
-        : [],
+      orgCodeUrl: dataInfor.pictureUrl ? splitUrl(dataInfor.pictureUrl, ",", globalConfig.avatarHost + "/upload") : [],//
+      lastYearCapital: dataInfor.lastYearCapital,//上年度总资本
+      lastYearIncome: dataInfor.lastYearIncome,//上年度总收入
       isVip: dataInfor.cSort,
       yearSum: dataInfor.yearSum,//会员总服务年限
       serviceLife: !dataInfor.serviceLife ? [] : JSON.parse(dataInfor.serviceLife), // 会员服务年限
@@ -152,7 +150,7 @@ class newEditProject extends Component {
       message.warning("请输入正确服务数量!");
       return false;
     }
-    // 审计
+    // 3审计
     if (this.state.addProjectType == "3") {
       if (this.state.serviceLife.length === 0) {
         message.warning("请选择服务年限!");
@@ -162,12 +160,21 @@ class newEditProject extends Component {
         message.warning("服务数量与服务年限不符!");
         return
       }
+      if (isNaN(parseFloat(this.state.lastYearCapital))) {
+        message.warning("请输入正确的企业上年度总资本!");
+        return
+      }
+      if (isNaN(parseFloat(this.state.lastYearIncome))) {
+        message.warning("请输入正确的企业上年度总收入!");
+        return
+      }
     }
     if (!this.state.main) {
       message.warning("请选择是否为主要项目!");
       return false;
     }
-    if (this.state.addProjectType === 5) {// 5高新
+    // 5高新
+    if (this.state.addProjectType === 5) {
       if (!this.state.declarationBatch) {
         message.warning("请选择企业要求申报批次!");
         return
@@ -221,6 +228,8 @@ class newEditProject extends Component {
     }
     if (this.state.addProjectType == "3") {//审计
       infor.serviceLife = JSON.stringify(this.state.serviceLife) //服务年限
+      infor.lastYearCapital = this.state.lastYearCapital //上年度总资本
+      infor.lastYearIncome = this.state.lastYearIncome //上年度总收入
     }
     if (this.state.addProjectType == "5") {//高新
       infor.declarationBatch = this.state.declarationBatch || undefined//申报批次
@@ -797,6 +806,7 @@ class newEditProject extends Component {
                 </FormItem>
               }
               {
+                // 会员合同期
                 isVip == 6 &&
                 <div className="clearfix">
                   <FormItem
@@ -847,6 +857,58 @@ class newEditProject extends Component {
                 </div>
               }
               {
+                // 审计
+                this.state.addProjectType == "3" &&
+                <div className="clearfix">
+                  <FormItem
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 16 }}
+                    label=""
+                  >
+                    <span style={{ color: "red" }}>注:派单年度的上年度总资产和收入。如,当前为2022年,那么需要填写2021年的总资产和收入!</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    label="企业上年度总资本(万元)"
+                    {...formItemLayout}
+                  >
+                    {
+                      readOnly ? this.state.lastYearCapital :
+                        <Input
+                          type='number'
+                          placeholder=""
+                          value={this.state.lastYearCapital}
+                          style={{ width: "200px" }}
+                          onChange={(e) => {
+                            this.setState({ lastYearCapital: e.target.value });
+                          }}
+                        />
+                    }
+
+                    {!readOnly && <span className="mandatory">*</span>}
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    label="企业上年度总收入(万元)"
+                    {...formItemLayout}
+                  >
+                    {
+                      readOnly ? this.state.lastYearIncome :
+                        <Input
+                          type='number'
+                          placeholder=""
+                          value={this.state.lastYearIncome}
+                          style={{ width: "200px" }}
+                          onChange={(e) => {
+                            this.setState({ lastYearIncome: e.target.value });
+                          }}
+                        />
+                    }
+                    {!readOnly && <span className="mandatory">*</span>}
+                  </FormItem>
+                </div>
+              }
+              {
                 // 普通项目说明
                 isVip != 6 &&
                 <div className="clearfix">

+ 13 - 2
js/component/manageCenter/customer/operationalData/reexamine/details.jsx

@@ -13,6 +13,7 @@ import {
 import ImgList from "../../../../common/imgList";
 import $ from "jquery/src/ajax";
 import ProjectDetailsReadOnly from "../../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../../common/projectOperation/newEditProject";
 import OrderRiZi from "@/orderRiZi.jsx";
 import OrderCoor from "../../../order/orderNew/changeComponent/orderCoor";
 import ContentUrl from "../../../order/orderNew/contentUrl";
@@ -895,11 +896,21 @@ class Details extends Component {
                     visible={this.state.rizhivisible}
                     loading={this.state.rizhiLoading}
                 />
-                {this.state.addnextVisible && <ProjectDetailsReadOnly
+                {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
                     infor={this.state.dataInfor}
                     visible={this.state.addnextVisible}
                     onCancel={this.nextCancel}
-                />}
+                />} */}
+                {
+                    // 项目业务详情
+                    this.state.addnextVisible &&
+                    <NewEditProject
+                        readOnly={true}
+                        visible={this.state.addnextVisible}
+                        dataInfor={this.state.dataInfor}
+                        onCancel={this.nextCancel}
+                    />
+                }
             </Modal>
         )
     }

+ 14 - 3
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -12,6 +12,7 @@ import ImgList from "../../../common/imgList";
 import $ from "jquery/src/ajax";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import CustomerServiceRecord from './customerServiceRecord';
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -108,7 +109,7 @@ class FollowUpDetails extends Component {
                     key: "serviceLife",
                     render: (text, record) => {
                         return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+                            <div>{!!text && JSON.parse(text).toString()}</div>
                         );
                     }
                 },
@@ -903,11 +904,21 @@ class FollowUpDetails extends Component {
                         visible={this.state.rizhivisible}
                         loading={this.state.selectOrderLogLoading}
                     />
-                    {this.state.addnextVisible && <ProjectDetailsReadOnly
+                    {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
                         infor={this.state.dataInfor}
                         visible={this.state.addnextVisible}
                         onCancel={this.nextCancel}
-                    />}
+                    />} */}
+                    {
+                        // 项目业务详情
+                        this.state.addnextVisible &&
+                        <NewEditProject
+                            readOnly={true}
+                            visible={this.state.addnextVisible}
+                            dataInfor={this.state.dataInfor}
+                            onCancel={this.nextCancel}
+                        />
+                    }
                 </div>
             </Modal>
         )

+ 13 - 2
js/component/manageCenter/customerService/administration/order.jsx

@@ -46,6 +46,7 @@ import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import LogPopup from "../../../common/logPopup";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -4561,13 +4562,23 @@ const Order = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && (
+          {/* {this.state.addnextVisible && (
             <ProjectDetailsReadOnly
               infor={this.state.dataInfor}
               visible={this.state.addnextVisible}
               onCancel={this.nextCancel}
             />
-          )}
+          )} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     },

+ 2 - 5
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -1259,13 +1259,10 @@ const OrderDetail = Form.create()(
             </Spin>
           </Form>
           {
+            // 项目业务详情
             this.state.addnextVisible &&
             <NewEditProject
-              readOnly={
-                this.state.dataInfor &&
-                Object.keys(this.state.dataInfor).length > 0 &&
-                this.state.processStatus !== 0
-              }
+              readOnly={true}
               visible={this.state.addnextVisible}
               dataInfor={this.state.dataInfor}
               onCancel={this.nextCancel}

+ 3 - 0
js/component/manageCenter/order/orderNew/addService.jsx

@@ -3129,6 +3129,9 @@ const NewService = Form.create()(
     },
     // 
     proList(id) {
+      if (!id && !this.state.changeId) {
+        return
+      }
       this.setState({
         loadData: true,
       });

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

@@ -41,7 +41,7 @@ import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
-import NewEditProject from "../../../common/projectOperation/newEditProject"
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import DepartmentList from "../../../common/departmentList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";

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

@@ -54,6 +54,7 @@ class ChangeApply extends Component {
     this.state = {
       data: {},
       voucherUrl: [],
+      newContractUrl: [],
       dataSource: [],
       cuiDataSource: [],
       loading: false,
@@ -337,7 +338,7 @@ class ChangeApply extends Component {
                     placeholder="请选择时间"
                     style={{ width: "160px" }}
                     disabled={
-                      this.state.approval != 0 && !this.state.timeFlag
+                      this.props.approval != 0 && !this.state.timeFlag
                         ? false
                         : true
                     }
@@ -845,7 +846,6 @@ class ChangeApply extends Component {
       commodityName: e
     });
   }
-
   //客户名称自动补全
   customerChange(e) {
     if (this.state.customType) {
@@ -863,7 +863,6 @@ class ChangeApply extends Component {
       message.warning("客户所属类型必须指定");
     }
   }
-
   //上级主管输入框失去焦点是判断客户是否存在
   selectAuto(value) {
     const newData = this.state.proDataSource
@@ -937,7 +936,6 @@ class ChangeApply extends Component {
     }
 
   }
-
   //加载(自动补全)
   supervisor(e, state) {
     //客户名称与服务名称自动补全
@@ -978,7 +976,6 @@ class ChangeApply extends Component {
       }.bind(this)
     );
   }
-
   //变更申请
   changeApply() {
     if (moneyVerify(this.state.data.totalAmount)) {
@@ -1063,7 +1060,6 @@ class ChangeApply extends Component {
       }.bind(this)
     );
   }
-
   // componentDidMount() {
   //   window.setTimeout(() => {
   //     this.loadDataChange();

+ 13 - 2
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -33,6 +33,7 @@ import ImgList from "../../../common/imgList";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from './changeComponent/orderCoor'
@@ -2081,11 +2082,21 @@ const checkOutsourcing = Form.create()(
               </Spin>
             </div>
           </Modal> : <div />}
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       )
     },

+ 13 - 2
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -23,6 +23,7 @@ import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
@@ -1691,11 +1692,21 @@ const contractChange = Form.create()(
               />
             </Modal>
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -21,6 +21,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
 
@@ -1500,11 +1501,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -23,6 +23,7 @@ import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import Cascaders from "../../../common/cascaders";
 
 const contractChange = Form.create()(
@@ -1684,11 +1685,21 @@ const contractChange = Form.create()(
               />
             </Modal>
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
 
@@ -1494,11 +1495,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from '../../../../component/common/orderItemStatus';
 import Cascaders from "../../../common/cascaders";
 
@@ -1429,11 +1430,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
 
@@ -1488,11 +1489,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
 
@@ -1505,11 +1506,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

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

@@ -24,6 +24,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import Cascaders from "../../../common/cascaders";
 
@@ -1339,6 +1340,7 @@ const contractChange = Form.create()(
                                   <ChangeApply
                                     orderUid={this.state.orderUid}
                                     id={Math.random()}
+                                    approval={this.state.orderData.approval} // 是否特批
                                     orderData={this.state.contractData}
                                     voucherUrl={this.state.voucherUrl}
                                     onCancel={this.visitCancel}
@@ -1539,11 +1541,21 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -48,6 +48,7 @@ import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "./changeComponent/orderCoor.jsx";
@@ -4751,11 +4752,21 @@ const IntentionCustomer = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
           <textarea id="copyText" style={{ opacity: 0 }} />
         </div>
       );

+ 13 - 2
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -39,6 +39,7 @@ import ImgList from "../../../common/imgList";
 import { ChooseList } from "./chooseList";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "./changeComponent/orderCoor";
@@ -2658,11 +2659,21 @@ const outsourcingList = Form.create()(
               loading={this.state.loading}
             />
           </div>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     },

+ 13 - 2
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -28,6 +28,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import Cascaders from "../../../common/cascaders";
 // import ResolutionPro from "../task/resolutionPro";
 
@@ -1211,11 +1212,21 @@ const PersonnelAll = React.createClass({
             </Spin>
           </Form>
         </Modal>
-        {this.state.addnextVisible && <ProjectDetailsReadOnly
+        {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
           infor={this.state.dataInfor}
           visible={this.state.addnextVisible}
           onCancel={this.nextCancel}
-        />}
+        />} */}
+        {
+          // 项目业务详情
+          this.state.addnextVisible &&
+          <NewEditProject
+            readOnly={true}
+            visible={this.state.addnextVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
+          />
+        }
       </div>
     );
   },

+ 13 - 2
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -19,6 +19,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "../task/resolutionPro";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "../../order/orderNew/changeComponent/orderCoor";
@@ -1438,11 +1439,21 @@ const OutsourceTaskAssignment = React.createClass({
             </TabPane>
           </Tabs>
         </Modal>
-        {this.state.addnextVisible && <ProjectDetailsReadOnly
+        {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
           infor={this.state.dataInfor}
           visible={this.state.addnextVisible}
           onCancel={this.nextCancel}
-        />}
+        />} */}
+        {
+          // 项目业务详情
+          this.state.addnextVisible &&
+          <NewEditProject
+            readOnly={true}
+            visible={this.state.addnextVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
+          />
+        }
       </div>
     );
   },

+ 14 - 3
js/component/manageCenter/project/project/projectQuery.jsx

@@ -22,6 +22,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from '../../order/orderNew/changeComponent/orderCoor';
@@ -291,7 +292,7 @@ const PaiDan = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -1341,11 +1342,21 @@ const PaiDan = React.createClass({
           visible={this.state.rizhivisible}
           loading={this.state.loading}
         />
-        {this.state.addnextVisible && <ProjectDetailsReadOnly
+        {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
           infor={this.state.dataInfor}
           visible={this.state.addnextVisible}
           onCancel={this.nextCancel}
-        />}
+        />} */}
+        {
+          // 项目业务详情
+          this.state.addnextVisible &&
+          <NewEditProject
+            readOnly={true}
+            visible={this.state.addnextVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
+          />
+        }
       </div>
     );
   }

+ 14 - 9
js/component/manageCenter/project/summary/highTech.jsx

@@ -20,6 +20,7 @@ import {
   doubleSoft,
   softWriting,
   patent,
+  audit,
   currency,
 } from "./highTechConfig";
 import ProjectDetails from "./projectDetails";
@@ -314,7 +315,7 @@ class HighTech extends Component {
   }
 
   componentWillMount() {
-    // this.loadData();
+    // 
     if (!this.props.introduce) {
       this.defaultcolumns();
       this.selectSuperId();
@@ -327,11 +328,13 @@ class HighTech extends Component {
             ? currency : e == "1"
               ? patent : e == "2"
                 ? softWriting : e == "3"
-                  ? currency : e == "4"
+                  ? audit : e == "4"
                     ? doubleSoft : e == "5"
                       ? highTechColumns : e == "6"
                         ? currency : e == "7"
                           ? member : currency,
+      }, () => {
+        this.defaultcolumns();
       });
     }
   }
@@ -351,7 +354,8 @@ class HighTech extends Component {
                     ? "双软" : this.state.status === 3
                       ? "软著" : this.state.status === 4
                         ? "专利" : this.state.status === 5
-                          ? "会员" : "通用"}
+                          ? "会员" : this.state.status === 6
+                            ? "审计" : "通用"}
                 )
               </span>
             </div>
@@ -422,17 +426,18 @@ class HighTech extends Component {
                           dataSource: [],
                           status:
                             two == "4"
-                              ? 2 : two == "2"
-                                ? 3 : two == "1"
-                                  ? 4 : two == "5"
-                                    ? 1 : two == "7"
-                                      ? 5 : 0,
+                              ? 2 : two == "3"
+                                ? 6 : two == "2"
+                                  ? 3 : two == "1"
+                                    ? 4 : two == "5"
+                                      ? 1 : two == "7"
+                                        ? 5 : 0,
                           columns:
                             two == "0"
                               ? currency : two == "1"
                                 ? patent : two == "2"
                                   ? softWriting : two == "3"
-                                    ? currency : two == "4"
+                                    ? audit : two == "4"
                                       ? doubleSoft : two == "5"
                                         ? highTechColumns : two == "6"
                                           ? currency : two == "7"

+ 263 - 6
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -65,6 +65,19 @@ const member = [
         key: "commodityQuantity"
     },
     {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -136,7 +149,7 @@ const member = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
     },
     {
         title: "特别说明",
@@ -212,6 +225,19 @@ const highTechColumns = [
         key: "commodityQuantity"
     },
     {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -281,7 +307,7 @@ const highTechColumns = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -369,6 +395,19 @@ const doubleSoft = [
         key: "commodityQuantity"
     },
     {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -405,7 +444,7 @@ const doubleSoft = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -488,6 +527,24 @@ const softWriting = [
         key: "pname"
     },
     {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -563,7 +620,7 @@ const softWriting = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -646,6 +703,24 @@ const patent = [
         key: "pname"
     },
     {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -733,7 +808,175 @@ const patent = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
+        // 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",
+        isNoD: true,
+    },
+    {
+        title: "订单说明",
+        dataIndex: "orderRemarks",
+        key: "orderRemarks",
+        isNoD: true,
+    }
+];
+
+// 审计
+const audit = [
+    {
+        title: "序号",
+        dataIndex: "key",
+        key: "key",
+        isNoD: true,
+    },
+    {
+        title: "派单时间",
+        dataIndex: "distributionTime",
+        key: "distributionTime",
+        width: 80,
+    },
+    {
+        title: "派单省份",
+        dataIndex: "province",
+        key: "province"
+    },
+    {
+        title: "订单部门",
+        dataIndex: "depName",
+        key: "depName",
+        isNoD: true,
+    },
+    {
+        title: "营销员",
+        dataIndex: "salesmanName",
+        key: "salesmanName"
+    },
+    {
+        title: "合同编号",
+        dataIndex: "contractNo",
+        key: "contractNo"
+    },
+    {
+        title: "订单编号",
+        dataIndex: "orderNo",
+        key: "orderNo"
+    },
+    {
+        title: "签单客户",
+        dataIndex: "userName",
+        key: "userName"
+    },
+    {
+        title: "项目类型",
+        dataIndex: "cname",
+        key: "cname"
+    },
+    {
+        title: "项目名称",
+        dataIndex: "pname",
+        key: "pname"
+    },
+    {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
+        title: "上年度总资产(万元)",
+        dataIndex: "lastYearCapital",
+        key: "lastYearCapital",
+        width: 70,
+        render: (value, record) => {
+            return (
+                <div>
+                    {value}
+                    {record.lastYear && <div>{"(" + record.lastYear + "年)"}</div>}
+                </div>
+            )
+        }
+    },
+    {
+        title: "上年度总收入(万元)",
+        dataIndex: "lastYearIncome",
+        key: "lastYearIncome",
+        width: 70,
+        render: (value, record) => {
+            return (
+                <div>
+                    {value}
+                    {record.lastYear && <div>{"(" + record.lastYear + "年)"}</div>}
+                </div>
+            )
+        }
+    },
+    {
+        title: "负责部门",
+        dataIndex: "techDepName",
+        key: "techDepName",
+        isNoD: true,
+    },
+    {
+        title: "咨询师/咨询经理",
+        dataIndex: "techName",
+        key: "techName"
+    },
+    //0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
+    {
+        title: "项目状态",
+        dataIndex: "projectStatus",
+        key: "projectStatus",
+        render: (value) => (
+            getProjectName(value)
+        )
+    },
+    {
+        title: "项目金额",
+        dataIndex: "commodityPrice",
+        key: "commodityPrice"
+    },
+    // {
+    //     title: "服务年限",
+    //     dataIndex: "serviceLife",
+    //     key: "serviceLife",
+    //     render: (text, record) => {
+    //         return (
+    //             <div>{!!text && JSON.parse(text).toString()}</div>
+    //         );
+    //     }
+    // },
+    {
+        title: "项目说明",
+        dataIndex: "taskComment",
+        key: "taskComment",
+        width: 250,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -822,6 +1065,19 @@ const currency = [
         key: "commodityQuantity"
     },
     {
+        title: "服务类型",
+        dataIndex: "serviceType",
+        key: "aserviceType",
+        width: 150,
+    },
+    {
+        title: "服务项目",
+        dataIndex: "serviceProject",
+        key: "serviceProject",
+        width: 200,
+        isNoD: true,
+    },
+    {
         title: "负责部门",
         dataIndex: "techDepName",
         key: "techDepName",
@@ -860,7 +1116,7 @@ const currency = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 300,
+        width: 250,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -894,5 +1150,6 @@ export {
     doubleSoft,
     softWriting,
     patent,
+    audit,
     currency,
 }

+ 104 - 3
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -197,7 +197,7 @@ class ProjectDetails extends Component {
                             return (
                                 <span>
                                     {text}{" "}
-                                    <Tag
+                                    {/* <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
                                             e.stopPropagation();
@@ -205,7 +205,7 @@ class ProjectDetails extends Component {
                                         }}
                                     >
                                         已拆
-                                    </Tag>
+                                    </Tag> */}
                                 </span>
                             );
                         } else {
@@ -259,7 +259,7 @@ class ProjectDetails extends Component {
                     key: "serviceLife",
                     render: (text, record) => {
                         return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+                            <div>{!!text && JSON.parse(text).toString()}</div>
                         );
                     }
                 },
@@ -871,7 +871,106 @@ class ProjectDetails extends Component {
         this.loaduserss(this.props.id);
     }
 
+    // 可展开颜色不同
+    addRowColor(record) {
+        if (!!record.splitList && record.splitList.length > 0) {
+            return 'light'
+        } else {
+            return 'dark'
+        }
+    }
+
     render() {
+        const expandedRowRenderVip = (e) => {
+            const data = e.splitList;
+            let columns = [];
+            if (data instanceof Array && data.length) {
+                if (e.cSort == 6) {
+                    columns = [
+                        {
+                            title: "负责人",
+                            dataIndex: "contacts",
+                            key: "contacts",
+                        },
+                        {
+                            title: "负责人电话",
+                            dataIndex: "contactsMobile",
+                            key: "contactsMobile",
+                        },
+                        {
+                            title: "项目状态",
+                            dataIndex: "projectStatus",
+                            key: "projectStatus",
+                            render: (text) => {
+                                return getProjectName(text);
+                            },
+                        },
+                        {
+                            title: "本次派单",
+                            dataIndex: "serviceYear",
+                            key: "serviceYear",
+                        },
+                        {
+                            title: "项目说明",
+                            dataIndex: "taskComment",
+                            key: "taskComment",
+                            render: (text) => {
+                                return (
+                                    <Tooltip title={text}>
+                                        <div
+                                        >{text}</div>
+                                    </Tooltip>
+                                )
+                            },
+                        },
+                    ];
+                } else {
+                    columns = [
+                        {
+                            title: "子项目名称",
+                            dataIndex: "taskName",
+                            key: "taskName"
+                        },
+                        {
+                            title: "子项目数量",
+                            dataIndex: "commodityQuantity",
+                            key: "commodityQuantity"
+                        },
+                        {
+                            title: "拆分操作人",
+                            dataIndex: "splitAname",
+                            key: "splitAname"
+                        },
+                        {
+                            title: "项目负责人",
+                            dataIndex: "receiverName",
+                            key: "receiverName"
+                        },
+                        {
+                            title: "拆分时间",
+                            dataIndex: "splitTimes",
+                            key: "splitTimes"
+                        }
+                    ]
+                }
+                return (
+                    <Table
+                        columns={columns}
+                        dataSource={data}
+                        pagination={false}
+                    />
+                );
+            } else {
+                columns = [];
+                return (
+                    <p
+                        style={{ fontWeight: "bold", color: "red", textAlign: "center" }}
+                    >
+                        {e.cSort == 6 ? "暂无派单" : "此项目暂未拆分"}
+                    </p>
+                );
+            }
+        };
         return (
             this.props.visible ? <Modal
                 maskClosable={false}
@@ -1489,6 +1588,8 @@ class ProjectDetails extends Component {
                                                 dataSource={this.state.dataSourceX}
                                                 pagination={this.state.paginations}
                                                 onRowClick={this.tableRowClickX}
+                                                expandedRowRender={expandedRowRenderVip}
+                                                rowClassName={this.addRowColor}
                                                 style={{
                                                     cursor: 'pointer',
                                                 }}

+ 13 - 2
js/component/manageCenter/project/task/myTask.jsx

@@ -54,6 +54,7 @@ import ImgList from "../../../common/imgList";
 import OperationPayNode from "./operationPayNode";
 import PatentSchedule from './patentSchedule';
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import ProjectLog from './projectLog';
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -6810,11 +6811,21 @@ const Task = React.createClass({
                         }}
                     /> : null
                 }
-                {this.state.addnextVisible && <ProjectDetailsReadOnly
+                {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
                     infor={this.state.dataInfor}
                     visible={this.state.addnextVisible}
                     onCancel={this.nextCancel}
-                />}
+                />} */}
+                {
+                    // 项目业务详情
+                    this.state.addnextVisible &&
+                    <NewEditProject
+                        readOnly={true}
+                        visible={this.state.addnextVisible}
+                        dataInfor={this.state.dataInfor}
+                        onCancel={this.nextCancel}
+                    />
+                }
                 {this.state.projectLogVisible && <ProjectLog
                     projectLogId={this.state.projectLogId}
                     visible={this.state.projectLogVisible}

+ 13 - 2
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -30,6 +30,7 @@ import { ChooseList } from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 
@@ -2174,12 +2175,22 @@ const MyTaskCount = Form.create()(
               </Spin>
             </div>
           </Modal>
-          {this.state.addnextVisible &&
+          {/* {this.state.addnextVisible &&
             <ProjectDetailsReadOnly
               infor={this.state.dataInfor}
               visible={this.state.addnextVisible}
               onCancel={this.nextCancel}
-            />}
+            />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 13 - 2
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -19,6 +19,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "./resolutionPro"
 import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import Cascaders from "../../../common/cascaders";
@@ -1538,11 +1539,21 @@ const Task = React.createClass({
             </TabPane>
           </Tabs>
         </Modal>
-        {this.state.addnextVisible && <ProjectDetailsReadOnly
+        {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
           infor={this.state.dataInfor}
           visible={this.state.addnextVisible}
           onCancel={this.nextCancel}
-        />}
+        />} */}
+        {
+          // 项目业务详情
+          this.state.addnextVisible &&
+          <NewEditProject
+            readOnly={true}
+            visible={this.state.addnextVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
+          />
+        }
       </div>
     );
   },

+ 13 - 2
js/component/manageCenter/project/task/taskCount.jsx

@@ -21,6 +21,7 @@ import { ChooseList } from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 
@@ -2304,11 +2305,21 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </div>
           </Modal>
-          {this.state.addnextVisible && <ProjectDetailsReadOnly
+          {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
             infor={this.state.dataInfor}
             visible={this.state.addnextVisible}
             onCancel={this.nextCancel}
-          />}
+          />} */}
+          {
+            // 项目业务详情
+            this.state.addnextVisible &&
+            <NewEditProject
+              readOnly={true}
+              visible={this.state.addnextVisible}
+              dataInfor={this.state.dataInfor}
+              onCancel={this.nextCancel}
+            />
+          }
         </div>
       );
     }

+ 19 - 8
js/component/manageCenter/project/task/taskQuery.jsx

@@ -39,6 +39,7 @@ import { ChooseList } from "../../order/orderNew/chooseList";
 import moment from "moment";
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 
@@ -1126,12 +1127,12 @@ const Task = React.createClass({
                 return (
                   <Tooltip title={text}>
                     <div
-                      // style={{
-                      //   width: 100,
-                      //   overflow: "hidden",
-                      //   whiteSpace: "nowrap",
-                      //   textOverflow: "ellipsis",
-                      // }}
+                    // style={{
+                    //   width: 100,
+                    //   overflow: "hidden",
+                    //   whiteSpace: "nowrap",
+                    //   textOverflow: "ellipsis",
+                    // }}
                     >{text}</div>
                   </Tooltip>
                 )
@@ -2419,11 +2420,21 @@ const Task = React.createClass({
         ) : (
           ""
         )}
-        {this.state.addnextVisible && <ProjectDetailsReadOnly
+        {/* {this.state.addnextVisible && <ProjectDetailsReadOnly
           infor={this.state.dataInfor}
           visible={this.state.addnextVisible}
           onCancel={this.nextCancel}
-        />}
+        />} */}
+        {
+          // 项目业务详情
+          this.state.addnextVisible &&
+          <NewEditProject
+            readOnly={true}
+            visible={this.state.addnextVisible}
+            dataInfor={this.state.dataInfor}
+            onCancel={this.nextCancel}
+          />
+        }
       </div>
     );
   },

+ 1 - 1
package.json

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

+ 1 - 1
webpack-dll.config.js

@@ -10,7 +10,7 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-  let staticHost = 'http://172.16.1.214';
+  let staticHost = 'http://172.16.1.187';
   switch (argv.env.deploy) {
     case 'test':
       staticHost = '//static.jishutao.com';

+ 2 - 2
webpack.config.js

@@ -345,7 +345,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://172.16.1.214:80'
+    let staticHost = 'http://172.16.1.187:80'
     // let staticHost = "http://192.168.0.106";
     // let staticHost = "http://192.168.0.103";
     switch (argv.env.deploy) {
@@ -389,7 +389,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '172.16.1.214',
+            host: '172.16.1.187',
             port: 80,
             allowedHosts: ['127.0.0.1', '192.168.0.20', '192.168.0.99'],
             headers: {