mentoswzq 4 年之前
父節點
當前提交
caa4a2d8ba

+ 2 - 1
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -42,6 +42,7 @@ class projectOverview extends Component{
                     return '共' + total + '条数据'
                 },
             },
+            attachmentUrl: [],
             paginations: false,
             columnsX: [
                 {
@@ -279,7 +280,7 @@ class projectOverview extends Component{
             crossDomain: false,
             url: globalConfig.context + '/api/admin/orderProject/orderTaskList',
             data: {
-                pageNo: pageNo || 1,
+                // pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 specially: 0, //个人
                 name: this.state.nameSearch, //客户名称

+ 4 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -113,6 +113,7 @@ const MyTaskOutsource = React.createClass({
               splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
               splitSuper: thisdata.splitSuper,
               splitId: thisdata.splitId,
+              projectType: thisdata.projectType//项目类型
             });
           }
         }
@@ -736,8 +737,10 @@ const MyTaskOutsource = React.createClass({
         splitStatus: record.splitStatus,
         splitSuper: record.splitSuper,
         splitId: record.splitId,
+        projectType: record.projectType,
       });
     }
+
     this.xiangqing(record.id, record.taskName);
     this.xiangqings(record.orderNo);
     this.xiangmu(record.orderNo);
@@ -2933,6 +2936,7 @@ const MyTaskOutsource = React.createClass({
                   {...this.props}
                   tid={this.state.tid}
                   status={this.state.refundStatus}
+                  projectType={this.state.projectType}
                   patentType={this.state.patentType}
                   isPreviewPay={true}
                   thirdInfoList={this.state.thirdInfoList}

+ 5 - 5
js/component/manageCenter/project/task/newSupplier.js

@@ -120,7 +120,7 @@ class NewSupplier extends Component{
             }
         });
         //软著  必须要使用查询出来第三方名称和对应id
-        if(!isHave && this.props.projectType === 2){   //projectType   0正常 1专利 2软著
+        if(!isHave && this.props.projectType === 2){   //projectType   0正常 1专利 2软著 3审计
             message.warning('请输入正确的供应商名称')
             return;
         }
@@ -162,8 +162,8 @@ class NewSupplier extends Component{
         //     data.officialCost  = this.state.officialCost; //是否有官费
         //     data.costReduction = this.state.costReduction; //是否有费减
         // }
-        data.type = this.props.patentType === 0 ? 1 : (this.props.patentType ? 2 : 0)   //0其他 1专利申请 2专利买卖
-        if(this.state.projectType === 3){
+        data.type = this.props.projectType === 1 ? (this.props.patentType === 0 ? 1 : 2) : 0   //0其他 1专利申请 2专利买卖
+        if(this.props.projectType === 3){
             if(!this.state.assets){
                 message.warning("请选择审计!");
                 return false;
@@ -177,7 +177,7 @@ class NewSupplier extends Component{
                 return false;
             }
         }
-        if(this.state.projectType === 3){                   //审计
+        if(this.props.projectType === 3){                   //审计
             data.assets = this.state.assets; //资产
             data.audit = this.state.audit;   //0无审计 1年审 2专审
             data.income = this.state.income;   //收入
@@ -391,7 +391,7 @@ class NewSupplier extends Component{
                             {/*    </div> : <div/>*/}
                             {/*}*/}
                             {
-                                this.state.projectType === 3 ? <div>
+                                this.props.projectType === 3 ? <div>
                                     <div className="clearfix">
                                         <Form.Item {...formItemLayout} label="审计">
                                             <Select

+ 13 - 3
js/component/manageCenter/set/business/businessProject.jsx

@@ -364,7 +364,9 @@ const BusinessProject=Form.create()(React.createClass({
 				    return "专利";
 				} else if (record.type == 2) {
 				    return "软著";
-				}
+				} else if (record.type == 3) {
+                    return "审计";
+                }
               },
             },
           ],
@@ -586,7 +588,9 @@ const BusinessProject=Form.create()(React.createClass({
 						str = "专利"
 					}else if(thisdata.type == 2) {
 						str = "软著"
-					}
+					}else if(thisdata.type == 3) {
+                        str = "审计"
+                    }
                     theArr.push({
                          editId: thisdata.id,//每一条记录的ID
                          editName:thisdata.bname,//项目名称
@@ -623,7 +627,9 @@ const BusinessProject=Form.create()(React.createClass({
 						str = "专利"
 					}else if(thisdata.type == 2) {
 						str = "软著"
-					}
+					}else if(thisdata.type == 3) {
+                        str = "审计"
+                    }
                 this.setState({
                   editId: thisdata.id, //每一条记录的ID
                   editName: thisdata.bname, //项目名称
@@ -1263,6 +1269,7 @@ const BusinessProject=Form.create()(React.createClass({
                         <Select.Option value="0">通用</Select.Option>
                         <Select.Option value="1">专利</Select.Option>
                         <Select.Option value="2">软著</Select.Option>
+                        <Select.Option value="3">审计</Select.Option>
                       </Select>
                     </div>
                   </div>
@@ -2124,6 +2131,8 @@ const BusinessProject=Form.create()(React.createClass({
                                     str = "专利";
                                   } else if (e == 2) {
                                     str = "软著";
+                                  } else if (e == 3) {
+                                      str = "审计";
                                   }
                                   this.setState({
                                     typeStatus: e,
@@ -2134,6 +2143,7 @@ const BusinessProject=Form.create()(React.createClass({
                                 <Select.Option key={0}>通用</Select.Option>
                                 <Select.Option key={1}>专利</Select.Option>
                                 <Select.Option key={2}>软著</Select.Option>
+                                <Select.Option key={3}>审计</Select.Option>
                               </Select>
                             </FormItem>
                             <FormItem