dev01 11 months ago
parent
commit
1621ae9299

+ 77 - 73
js/component/common/projectOperation/index.jsx

@@ -324,7 +324,7 @@ class ProjectOperation 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.costReduction : 0//是否有费减
       infor.patentType = this.state.patentType //专利类型
     }
     if (this.state.isIso) {
@@ -618,81 +618,85 @@ class ProjectOperation 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>
-              {
-                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",
-                    }}
-                  >
-                    {/*不含官费或者专利类型不为复审或者申请时置灰*/}
-                    <Radio.Group
-                      disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
-                      value={this.state.costReduction}
+              <div className="clearfix">
+                <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({ costReduction: e.target.value });
+                        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>
-              }
+                      <Radio value={1}>含官费</Radio>
+                      <Radio value={0}>不含官费</Radio>
+                    </Radio.Group>}
+                  <span style={{ color: "red", marginLeft: "8px" }}>
+                    *
+                  </span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                {
+                  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) &&
+                    <FormItem
+                      className="half-item"
+                      labelCol={{ span: 3 }}
+                      wrapperCol={{ span: 14 }}
+                      label="费减:"
+                      style={{
+                        display: this.state.displayFees,
+                        marginLeft: "63px",
+                      }}
+                    >
+                      {/*不含官费或者专利类型不为复审或者申请时置灰*/}
+                      <Radio.Group
+                        disabled={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>
               <FormItem
                 className="half-item"
                 {...formItemLayout}

+ 2 - 3
js/component/common/projectOperation/newAddProject.jsx

@@ -172,7 +172,7 @@ class NewAddProject extends Component {
         message.warning("请选择官费!");
         return false;
       }
-      if (this.state.costReduction === "" && (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1) {
+      if (this.state.costReduction === "" && (this.state.patentType === 0 || this.state.patentType === 2)) {
         message.warning("请选择费减!");
         return false;
       }
@@ -264,8 +264,7 @@ 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.costReduction : 0//是否有费减
       infor.patentType = this.state.patentType //专利类型
     }
     if (this.state.isIso) {

+ 34 - 32
js/component/common/projectOperation/newEditProject.jsx

@@ -227,7 +227,7 @@ class newEditProject 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.costReduction : 0//是否有费减
       infor.patentType = this.state.patentType //专利类型
     }
     if (this.state.isIso) {
@@ -676,24 +676,9 @@ class newEditProject extends Component {
                   </span>
                 </FormItem>
               </div>
-              {
-                readOnly ?
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="费减:"
-                    style={{
-                      display: this.state.displayFees,
-                    }}
-                  >
-                    {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 &&
-                  <div className="clearfix">
+              <div className="clearfix">
+                {
+                  readOnly ?
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
@@ -702,23 +687,40 @@ class newEditProject extends Component {
                         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>
+                      {this.state.costReduction === 1 ? '有费减' : this.state.costReduction === 0 ? '无费减' : ''}
                       <span style={{ color: "red", marginLeft: "8px" }}>
                         *
                       </span>
                     </FormItem>
-                  </div>
-              }
+                    :
+                    (this.state.patentType === 0 || this.state.patentType === 2) &&
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="费减:"
+                        style={{
+                          display: this.state.displayFees,
+                        }}
+                      >
+                        {/*不含官费或者专利类型不为复审或者申请时置灰*/}
+                        <Radio.Group
+                          disabled={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>
+                }
+              </div>
               {
                 //审计
                 this.state.addProjectType == "3" &&

+ 12 - 25
js/component/manageCenter/components/checkProject/index.jsx

@@ -160,7 +160,7 @@ class CheckProject extends Component {
                 {/*this.props.startType   0外包  1供应商(不需要审核)*/}
                 {/*record.status  0-未支付 1-待全款 ,2已全款  status=2的时候已经全款,按钮可以去掉了*/}
                 <Button disabled={
-                  !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && record.status !== 2)
+                  !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && record.status !== 2)
                 } type="primary" onClick={() => {
                   this.setState({
                     previewPayVisible: true,
@@ -279,7 +279,7 @@ class CheckProject extends Component {
                   {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
                   {/*this.props.startType   0外包  1供应商(不需要审核)*/}
                   <Button disabled={
-                    !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                    !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && this.props.dataSource.length === 0)
                   } type="primary" onClick={() => {
                     this.setState({
                       previewPayVisible: true,
@@ -396,7 +396,7 @@ class CheckProject extends Component {
                   {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
                   {
                     <Button disabled={
-                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && this.props.dataSource.length === 0)
                     } type="primary" onClick={() => {
                       this.setState({
                         previewPayVisible: true,
@@ -531,7 +531,7 @@ class CheckProject extends Component {
                     {/*存在支付节点时不显示第三方的申请付款*/}
                     {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
                     <Button disabled={
-                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && this.props.dataSource.length === 0)
                     } type="primary" onClick={() => {
                       this.setState({
                         previewPayVisible: true,
@@ -540,21 +540,6 @@ class CheckProject extends Component {
                     }}>
                       申请付款
                     </Button>
-                    {/*{record.officialCost === 1? <Button*/}
-                    {/*    type="primary"*/}
-                    {/*    style={{*/}
-                    {/*      marginLeft: '10px',*/}
-                    {/*    }}*/}
-                    {/*    disabled={!(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1))}*/}
-                    {/*    onClick={() => {*/}
-                    {/*      this.setState({*/}
-                    {/*        previewPayVisible: true,*/}
-                    {/*        previewPayInfor: record,*/}
-                    {/*        type: 2,*/}
-                    {/*      })*/}
-                    {/*    }}>*/}
-                    {/*  付官费*/}
-                    {/*</Button> : <div/>}*/}
                     {this.props.status === 2 && !this.props.isAuditPaymentGLY ? <Popconfirm
                       title="是否删除?"
                       onConfirm={() => {
@@ -664,7 +649,7 @@ class CheckProject extends Component {
                     {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
                     {
                       <Button disabled={
-                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && this.props.dataSource.length === 0)
                       } type="primary" onClick={() => {
                         this.setState({
                           previewPayVisible: true,
@@ -797,7 +782,7 @@ class CheckProject extends Component {
                   {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
                   {
                     <Button disabled={
-                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1 || parseInt(this.props.startType) === 2) && this.props.dataSource.length === 0)
                     } type="primary" onClick={() => {
                       this.setState({
                         previewPayVisible: true,
@@ -951,12 +936,14 @@ class CheckProject extends Component {
                 <div>类型:</div>
               </div>
               {
-                parseInt(this.props.startType) === 0 ?
+                parseInt(this.props.startType) === 0
+                  ?
                   <div>
                     <div>外包(外包派单,不走总部)</div>
                     <div className="tipsText">提示高于总部价格,费用个人承担</div>
-                  </div> :
-                  <div>供应商信息(普通单)</div>
+                  </div> : parseInt(this.props.startType) === 1
+                    ?
+                    <div>供应商信息(普通单)</div> : <div>高质量申请</div>
               }
               <div style={{ marginLeft: 'auto' }}>
                 <span style={{ color: '#58a3ff' }}>项目状态:</span>{getProjectName(parseInt(this.props.projectStatus))}
@@ -1065,7 +1052,7 @@ class CheckProject extends Component {
               </div>
             </div>
             {/*如果是软著类或者专利类的专利申请,隐藏付款节点但当为外包类型时,无需隐藏*/}
-            {(!((this.props.projectType === 1 && this.props.patentType === 0) || this.props.projectType === 2)) || this.props.startType === 0 ? <div className="thirdParty">
+            {(!((this.props.projectType === 1 && this.props.patentType === 0) || this.props.projectType === 2)) || this.props.startType === 0 || this.props.startType === 2 ? <div className="thirdParty">
               <div>
                 <span className="title">
                   付款节点

+ 37 - 5
js/component/manageCenter/financialManage/account/accountDetails.jsx

@@ -172,7 +172,18 @@ class AccountDetails extends Component {
           width: "8%",
           render: (text, record) => {
             return (
-              <div>{!!text ? text : (!!record.vehicle && record.type == 1 ? (
+              <div
+                style={{ cursor: !text && !record.vehicle && record.type != 1 && "pointer" }}
+                onClick={() => {
+                  !text && !record.vehicle && record.type != 1 &&
+                    this.setState({
+                      editA: "detTypeOther",
+                      editTit: "修改其他详细说明",
+                      upId: record.id,
+                      detTypeOther: record.typeOther,
+                    })
+                }}
+              >{!!text ? text : (!!record.vehicle && record.type == 1 ? (
                 getVehicleName(record.vehicle, record.vehicleOther) +
                 "(" + record.startDistrict + " - " + record.endDistrict + ")"
               ) : getTypeName(record.type, record.typeOther))}</div>
@@ -520,6 +531,10 @@ class AccountDetails extends Component {
       message.warn("请选择合同编号!");
       return
     }
+    if (editA == "detTypeOther" && !this.state.detTypeOther) {
+      message.warn("其他类型说明不能为空!");
+      return
+    }
     let obj1 = {
       id: this.state.upId,
       amount: this.state.upAmount,
@@ -536,16 +551,22 @@ class AccountDetails extends Component {
       id: this.state.upId,
       orderNo: this.state.upOrderNo,
     }
+    let obj5 = {
+      id: this.state.upId,
+      typeOther: this.state.detTypeOther,
+    }
     $.ajax({
       method: "POST",
       dataType: "json",
       crossDomain: false,
       url: globalConfig.context + editA == "amount"
-        ? "/api/admin/expenseAccount/updateRealAmount" : "/api/admin/expenseAccount/updateTypeOther",
+        ? "/api/admin/expenseAccount/updateRealAmount" : editA == "detTypeOther"
+          ? "/api/admin/expenseAccount/updateDetailsTypeOther" : "/api/admin/expenseAccount/updateTypeOther",
       data: editA == "amount"
         ? obj1 : editA == "remarks"
           ? obj2 : editA == "typesOther"
-            ? obj3 : editA == "contractNo" && obj4,
+            ? obj3 : editA == "contractNo"
+              ? obj4 : editA == "detTypeOther" && obj5,
     }).done(
       function (data) {
         this.setState({
@@ -1084,7 +1105,7 @@ class AccountDetails extends Component {
                   <div style={{ fontSize: 13, fontWeight: "bold" }}>审核意见</div>
                   <ul
                     style={{
-                      width: "560px",
+                      // width: "560px",
                       overflow: "hidden",
                       paddingLeft: "90px",
                       position: "relative",
@@ -1101,7 +1122,6 @@ class AccountDetails extends Component {
                             marginBottom: "10px",
                           }}
                         >
-                          {/* {item.auditorName + ":" + item.status + item.remarks + "(" + item.createTimeStr + ")"} */}
                           <span>{item.auditorName}:</span>
                           <span style={{ color: ["#1D4FEA", "#34DE38", "#108EE9", "red", "#808080", "#1D4FEA"][item.status] }}>
                             {["【发起】,", "【通过】,", "【完成】,", "【驳回】,", "【撤销】,", "【修改】,"][item.status]}
@@ -1362,6 +1382,18 @@ class AccountDetails extends Component {
                 </div>
               </div>
             }
+            {
+              this.state.editA == "detTypeOther" &&
+              <Input
+                placeholder='请填写详细说明'
+                value={this.state.detTypeOther}
+                onChange={e => {
+                  this.setState({
+                    detTypeOther: e.target.value
+                  })
+                }}
+              />
+            }
           </Modal>
         }
 

+ 1 - 1
js/component/manageCenter/financialManage/account/accountReview.less

@@ -76,7 +76,7 @@
     font-weight: bold;
     padding: 2px 5px;
     // border-bottom: 1px solid #000;
-    margin-bottom: 20px;
+    margin-bottom: 5px;
   }
 
   .ant-table-wrapper {

+ 42 - 38
js/component/manageCenter/project/task/businessManagement/checkInfor.jsx

@@ -39,7 +39,7 @@ class checkInfor extends Component {
       message.warning('请选择专利类型')
       return
     }
-    if ((this.state.patentType === 0 || this.state.patentType === 2) && isNaN(parseInt(this.state.costReduction)) && this.state.officialCost === 1) {
+    if ((this.state.patentType === 0 || this.state.patentType === 2) && isNaN(parseInt(this.state.costReduction))) {
       message.warning('请选择是否有费减')
       return;
     }
@@ -51,7 +51,7 @@ class checkInfor extends Component {
       data: {
         id: this.props.infor.id, //项目ID
         officialCost: this.state.officialCost, //是否有官费
-        costReduction: (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1 ? this.state.costReduction : 0, //是否有费减
+        costReduction: (this.state.patentType === 0 || this.state.patentType === 2) ? this.state.costReduction : 0, //是否有费减
         patentType: this.state.patentType, //专利类型
       },
     }).done(
@@ -193,44 +193,48 @@ class checkInfor extends Component {
                 </Select>
               </FormItem>
             </div>
-            <FormItem
-              className="half-item"
-              {...formItemLayout}
-              label="官费"
-              style={{ display: this.state.displayFees }}
-            >
-              <Radio.Group
-                value={this.state.officialCost}
-                onChange={(e) => {
-                  this.setState({ officialCost: e.target.value });
-                  if (e.target.value === 0) {
-                    this.setState({
-                      costReduction: ''
-                    })
-                  }
-                }}
+            <div className="clearfix">
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="官费"
+                style={{ display: this.state.displayFees }}
               >
-                <Radio value={1}>含官费</Radio>
-                <Radio value={0}>不含官费</Radio>
-              </Radio.Group>
-            </FormItem>
-            <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.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>
+              </FormItem>
+            </div>
+            <div className="clearfix">
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
+                label="费减"
+                style={{ display: this.state.displayFees }}
               >
-                <Radio value={1}>有费减</Radio>
-                <Radio value={0}>无费减</Radio>
-              </Radio.Group>
-            </FormItem>
+                <Radio.Group
+                  disabled={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>
+              </FormItem>
+            </div>
           </div>
           <div style={{ color: '#f00', paddingLeft: '67px', paddingBottom: '10px' }}>
             注意:技术员已发起二次确认,请核对本次费用情况,填写有误,将影响到成本支付情况

+ 20 - 79
js/component/manageCenter/project/task/myTask.jsx

@@ -364,7 +364,7 @@ const Task = React.createClass({
           render: (text, record) => {
             if (record.outsourceType === 1) {
               return '供应商'
-            } else {
+            } else if ((record.outsourceType === 0)) {
               if (text === 0) {
                 return <Tag color="#f50">外包待审核</Tag>
               } else if (text === 1) {
@@ -374,6 +374,10 @@ const Task = React.createClass({
               } else {
                 return <div style={{ textAlign: 'center' }}>/</div>
               }
+            } else if ((record.outsourceType === 2)) {
+              return '高质量申请'
+            } else {
+              return <div style={{ textAlign: 'center' }}>/</div>
             }
           },
         },
@@ -2198,6 +2202,7 @@ const Task = React.createClass({
         approvalSearch: undefined,
         category: undefined,
         outsourceStatusSearch: [],
+        projectName: undefined,
       })
     }
     this.setState({
@@ -2358,8 +2363,6 @@ const Task = React.createClass({
     })
   },
   timeDetail(record) {
-    console.log(record)
-
     this.setState({
       loading: true,
       recordHour: record.hours,
@@ -2380,7 +2383,6 @@ const Task = React.createClass({
           this.setState({
             dataSourceTime: data.data,
           })
-          console.log(this.state.dataSourceTime)
         }
       }.bind(this),
     }).always(
@@ -2412,7 +2414,7 @@ const Task = React.createClass({
   },
   // 项目发起外包
   sureOut(startType) {
-    if (this.state.startType !== 0 && this.state.startType !== 1) {
+    if (this.state.startType !== 0 && this.state.startType !== 1 && this.state.startType !== 2) {
       message.warning('请选择类型')
       return
     }
@@ -2442,7 +2444,7 @@ const Task = React.createClass({
     //refundStatus   0-待审核 ,1-审核通过,2-审核拒绝
     //类型为供应商时不需要发起原因
     //this.state.startType 0外包  1供应商
-    if (!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined') && this.state.startType !== 1) {
+    if (!this.state.reason && (this.state.refundStatus === 2 || typeof this.state.refundStatus === 'undefined') && this.state.startType == 0) {
       message.warning('发起原因不能为空')
       return
     }
@@ -2510,7 +2512,6 @@ const Task = React.createClass({
               ? _this.getUrl(_this.state.pictureUrl)
               : ''
           }
-
           ajaxObj = $.ajax({
             method: 'POST',
             dataType: 'json',
@@ -5019,7 +5020,7 @@ const Task = React.createClass({
                           >
                             <Radio value={0}>外包(不走总部)</Radio>
                             <Radio value={1}>供应商信息</Radio>
-                            <Radio value={2}>转让专利</Radio>
+                            {adminData.isTechTransfer && <Radio value={2}>高质量申请</Radio>}
                           </Radio.Group>
                         </FormItem>
                       </div>
@@ -5090,7 +5091,7 @@ const Task = React.createClass({
                         </FormItem>
                       </div>
                       {/*外包类型无此选项*/}
-                      {this.state.startType !== 0 && this.state.projectType === 1 ?
+                      {this.state.startType === 1 && this.state.projectType === 1 ?
                         <div className="clearfix">
                           <FormItem
                             className="half-item"
@@ -5201,7 +5202,7 @@ const Task = React.createClass({
                       {/*this.state.startType 0外包 1供应商*/}
                       <div
                         style={{
-                          display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
+                          display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
                         }}
                       >
                         <span
@@ -5236,7 +5237,7 @@ const Task = React.createClass({
                       <div
                         className="clearfix"
                         style={{
-                          display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
+                          display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
                         }}
                       >
                         <Spin spinning={this.state.payNodeLoading}>
@@ -5280,36 +5281,12 @@ const Task = React.createClass({
                           />
                         </FormItem>
                       </div>
-                      {/*<div className="clearfix">
-                                          <FormItem className="half-item"
-                                              {...formItemLayout}
-                                              label="上传协议文件" style={{height:"auto"}}>
-                                               <Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
-                                                      data={(e)=>{
-                                                          return {
-                                                              'sign': e.name.substring(0,e.name.lastIndexOf("."))
-                                                          }
-                                                      }}
-                                                      fileList={this.state.fileUrl}
-                                                      onChange={(e)=>{
-                                                          this.setState({
-                                                              attachmentUrl:e.fileList,
-                                                              fileUrl:e.fileList
-                                                          })
-                                                      }}>
-                                                  {fileUrl.length>1?null:<Button>
-                                                  <Icon type="upload" /> 点击上传
-                                                  </Button>}
-                                              </Upload>
-                                              <span className="tip" style={{display:"inline-block"}}>支持文件格式: doc,excel,ppt</span>
-                                          </FormItem>
-                                      </div>*/}
                       <p
                         className="tip"
                         style={{
                           paddingBottom: '12px',
                           width: '240px',
-                          marginLeft: '145px',
+                          marginLeft: '195px',
                           color: 'red',
                         }}
                       >
@@ -5333,7 +5310,7 @@ const Task = React.createClass({
                       </div>
                       {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因   如果是类型为供应商则不需要发起原因*/}
                       {/*this.state.startType  0外包  1供应商*/}
-                      {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ?
+                      {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType == 0 ?
                         <div className="clearfix">
                           <FormItem
                             className="half-item"
@@ -5485,43 +5462,6 @@ const Task = React.createClass({
                             ))
                           }
                         </div>
-                        {/*  <div*/}
-                        {/*    className="clearfix"*/}
-                        {/*    style={{*/}
-                        {/*      display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
-                        {/*    }}*/}
-                        {/*  >*/}
-                        {/*    <FormItem*/}
-                        {/*      className="half-item"*/}
-                        {/*      {...formItemLayout}*/}
-                        {/*      label="审核意见"*/}
-                        {/*    >*/}
-                        {/*      <span>{this.state.remarks}</span>*/}
-                        {/*    </FormItem>*/}
-                        {/*  </div>*/}
-                        {/*  {parseInt(this.state.startType) !== 1 ?<div className="clearfix">*/}
-                        {/*    <FormItem*/}
-                        {/*      className="half-item"*/}
-                        {/*      {...formItemLayout}*/}
-                        {/*      label="审核结果"*/}
-                        {/*    >*/}
-                        {/*      <span>{getRefundStatus(this.state.refundStatus)}</span>*/}
-                        {/*    </FormItem>*/}
-                        {/*  </div> : <div/>}*/}
-                        {/*  <div*/}
-                        {/*    className="clearfix"*/}
-                        {/*    style={{*/}
-                        {/*      display: this.state.refundStatus == 0 ? 'none' : 'block',*/}
-                        {/*    }}*/}
-                        {/*  >*/}
-                        {/*    <FormItem*/}
-                        {/*      className="half-item"*/}
-                        {/*      {...formItemLayout}*/}
-                        {/*      label="审核时间"*/}
-                        {/*    >*/}
-                        {/*      <span>{this.state.auditTimes}</span>*/}
-                        {/*    </FormItem>*/}
-                        {/*  </div>*/}
                       </div>
                     ) : (
                       ''
@@ -6339,6 +6279,7 @@ const Task = React.createClass({
                           >
                             <Radio value={0}>外包(不走总部)</Radio>
                             <Radio value={1}>供应商信息</Radio>
+                            {adminData.isTechTransfer && <Radio value={2}>高质量申请</Radio>}
                           </Radio.Group>
                         </FormItem>
                       </div>
@@ -6408,7 +6349,7 @@ const Task = React.createClass({
                           </Radio.Group>
                         </FormItem>
                       </div>
-                      {this.state.startType !== 0 && this.state.projectType === 1 ?
+                      {this.state.startType === 1 && this.state.projectType === 1 ?
                         <div className="clearfix">
                           <FormItem
                             className="half-item"
@@ -6522,7 +6463,7 @@ const Task = React.createClass({
                       {/*如果是软著类或者专利类的专利申请,隐藏付款节点*/}
                       <div
                         style={{
-                          display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
+                          display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
                         }}
                       >
                         <span
@@ -6557,7 +6498,7 @@ const Task = React.createClass({
                       <div
                         className="clearfix"
                         style={{
-                          display: this.state.startType === 0 ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
+                          display: (this.state.startType === 0 || this.state.startType === 2) ? 'block' : ((this.state.projectType === 1 && this.state.patentType === 0) || this.state.projectType === 2 ? 'none' : 'block'),  //0正常 1专利 2软著 3审计
                         }}
                       >
                         <Spin spinning={this.state.payNodeLoading}>
@@ -6632,7 +6573,7 @@ const Task = React.createClass({
                       </div>
                       {/*只有审核拒绝和第一次发起外包的时候才要填写发起原因 如果是类型为供应商则不需要发起原因*/}
                       {/*this.state.startType  0外包  1供应商*/}
-                      {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType !== 1 ?
+                      {(typeof this.state.refundStatus === 'undefined' || this.state.refundStatus === 2) && this.state.startType == 0 ?
                         <div className="clearfix">
                           <FormItem
                             className="half-item"
@@ -6861,7 +6802,7 @@ const Task = React.createClass({
             ThirdId={this.state.ThirdId}
             tid={this.state.tid}
             patentType={this.state.patentType}
-            projectType={this.state.startType === 0 ? 0 : this.state.projectType}
+            projectType={(this.state.startType === 0 || this.state.startType === 2) ? 0 : this.state.projectType}
             realProjectType={this.state.projectType}       //真实的项目类型
             startType={this.state.startType}               //项目类型 0外包  1供应商
             thirdCompanyName={this.state.thirdCompanyName}

+ 1 - 1
package.json

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