Browse Source

外包审核列表 添加拆分区分

mentoswzq 4 years ago
parent
commit
005d7975f7

+ 1 - 1
js/component/manageCenter/components/checkProject/payRecord.js

@@ -418,7 +418,7 @@ class PayRecord extends Component{
                                     {/*    '***':*/}
                                     {/*    paymentDetails.initialUnitPrice*/}
                                     {/*}*/}
-                                    {paymentDetails.initialUnitPrice}
+                                    {isNaN(parseFloat(paymentDetails.initialUnitPrice)) ? paymentDetails.initialUnitPrice : parseFloat(paymentDetails.initialUnitPrice)}
                                 </div>
                             </Form.Item>
                             <Form.Item

+ 3 - 16
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -64,22 +64,9 @@ const checkOutsourcing = Form.create()(
             }
           } else {
             for (let i = 0; i < data.data.list.length; i++) {
-              let thisdata = data.data.list[i]
-              theArr.push({
-                key: i,
-                id: thisdata.id, //用户ID
-                orderNo: thisdata.orderNo, //订单编号
-                contractNo: thisdata.contractNo, //签单金额
-                createTime: thisdata.createTime, //流程状态
-                signTime: thisdata.signTime, //结算状态
-                userName: thisdata.userName, //特批状态
-                depName: thisdata.depName, //签单时间
-                totalAmount: thisdata.totalAmount, //客户名称
-                adminName: thisdata.adminName, //营销员名称
-                financeName: thisdata.financeName, //财务名称
-                liquidationStatus: thisdata.liquidationStatus, //下单时间
-                refundStatus: thisdata.refundStatus,
-              })
+              let thisdata = data.data.list[i];
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
             this.state.pagination.total = data.data.totalCount
             this.state.pagination.current = data.data.pageNo

+ 31 - 19
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -122,6 +122,7 @@ const outsourcingPro = Form.create()(
           pageNo: pageNo || 1,
           pageSize: this.state.pagination.pageSize,
           contractNo: this.state.contractNoSearch,
+          tid: this.state.tidSearch,
           name: this.state.nameSearch, //名称
           orderNo: this.state.orderNoSearch, //订单编号
           starTime: this.state.releaseDate[0], //开始时间
@@ -139,24 +140,8 @@ const outsourcingPro = Form.create()(
           } else {
             for (let i = 0; i < data.data.list.length; i++) {
               let thisdata = data.data.list[i];
-              theArr.push({
-                key: i,
-                tid: thisdata.tid, //用户ID
-                orderNo: thisdata.orderNo, //订单编号
-                contractNo: thisdata.contractNo, //签单金额
-                createTime: thisdata.createTime, //流程状态
-                signTime: thisdata.signTime, //结算状态
-                userName: thisdata.userName, //特批状态
-                depName: thisdata.depName, //签单时间
-                totalAmount: thisdata.totalAmount, //客户名称
-                adminName: thisdata.adminName, //营销员名称
-                financeName: thisdata.financeName, //财务名称
-                liquidationStatus: thisdata.liquidationStatus, //下单时间
-                refundStatus: thisdata.refundStatus,
-                pname: thisdata.pname,
-                cname: thisdata.cname,
-                bname: thisdata.bname,
-              });
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
             this.state.pagination.total = data.data.totalCount;
             this.state.pagination.current = data.data.pageNo;
@@ -212,6 +197,13 @@ const outsourcingPro = Form.create()(
             title: "项目编号",
             dataIndex: "tid",
             key: "tid",
+            render: (text, record) => {
+              if (record.splitStatus == 2) {
+                return <span>{record.splitSuper + "-" + record.splitId}</span>;
+              } else {
+                return text;
+              }
+            },
           },
           {
             title: "项目名称",
@@ -1008,6 +1000,10 @@ const outsourcingPro = Form.create()(
           refundStatus: record.refundStatus,
           tid: record.tid,
           taskName: record.bname,
+          splitId: record.splitId, //拆分序号
+          splitStatus: record.splitStatus, //0未拆分 1已拆分
+          splitSuper: record.splitSuper,  //拆分前项目编号
+
         },
         () => {
           console.log(record);
@@ -1247,6 +1243,9 @@ const outsourcingPro = Form.create()(
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
       this.state.refundStatusSearch = undefined;
+      this.setState({
+        tidSearch: ""
+      })
       this.loadData(1);
     },
     resets() {
@@ -1400,6 +1399,14 @@ const outsourcingPro = Form.create()(
                     this.setState({ contractNoSearch: e.target.value });
                   }}
                 />
+                <Input
+                    placeholder="项目编号"
+                    style={{ width: "150px" }}
+                    value={this.state.tidSearch}
+                    onChange={(e) => {
+                      this.setState({ tidSearch: e.target.value });
+                    }}
+                />
                 <span style={{ marginRight: "10px" }}>下单时间 :</span>
                 <RangePicker
                   value={[
@@ -1472,7 +1479,12 @@ const outsourcingPro = Form.create()(
                       </span>
                       <span style={{marginLeft:'15px'}}>
                         项目编号:
-                      <span style={{color:'#F00',paddingRight:'5px'}}>{this.state.tid}</span>
+                      <span style={{color:'#F00',paddingRight:'5px'}}>
+                        {this.state.tid}
+                        {
+                          this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
+                        }
+                      </span>
                       </span>
                     </div>
                   }

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

@@ -3405,7 +3405,7 @@ const Task = React.createClass({
                   <span style={{color:'#F00',paddingRight:'5px'}}>
                     {this.state.id}
                     {
-                      this.state.splitStatus === 1 || this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
+                      this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
                     }
                   </span>
                   </span>
@@ -4940,7 +4940,7 @@ const Task = React.createClass({
                   <span style={{color:'#F00',paddingRight:'5px'}}>
                     {this.state.id}
                     {
-                      this.state.splitStatus === 1 || this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
+                      this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
                     }
                   </span>
                   </span>

+ 1 - 1
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -2235,7 +2235,7 @@ const MyTaskOutsource = React.createClass({
                     <span style={{color:'#F00',paddingRight:'5px'}}>
                       {this.state.id}
                       {
-                        this.state.splitStatus === 1 || this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
+                        this.state.splitStatus === 2 ? '('+this.state.splitSuper+'-'+this.state.splitId+')' : ''
                       }
                     </span>
                   </span>