mentoswzq пре 4 година
родитељ
комит
dddcc849ca
19 измењених фајлова са 2775 додато и 2394 уклоњено
  1. BIN
      image/quxiao.png
  2. 780 683
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  3. 22 15
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx
  4. 3 3
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businessDetail.jsx
  5. 89 70
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  6. 7 4
      js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx
  7. 219 205
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  8. 217 203
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  9. 148 134
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  10. 151 137
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  11. 305 287
      js/component/manageCenter/order/orderNew/addService.jsx
  12. 625 562
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  13. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  14. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  15. 32 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  16. 42 72
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  17. 19 14
      js/component/manageCenter/order/orderNew/contractYxy.js
  18. 112 0
      js/component/zhuanjiaoDetail.jsx
  19. 1 1
      package.json

Разлика између датотеке није приказан због своје велике величине
+ 780 - 683
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx


+ 22 - 15
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx

@@ -77,6 +77,7 @@ const Business = React.createClass({
             <div className="control">
               <Button
                 onClick={e => {
+					e.stopPropagation()
                   this.businessIntentionDetails(record);
                 }}
               >
@@ -192,6 +193,11 @@ const Business = React.createClass({
 			businessModul:true
 		})
 	},
+	businessIntentionCancel() {
+		this.setState({
+			businessModul:false
+		})
+	},
 	//业务意向
 	BusinessList(pageNo) {
 		this.setState({
@@ -316,21 +322,22 @@ const Business = React.createClass({
 		console.log("数组",this.state.dataBusiness);
 		
 		return (
-			<div className="clearfix">
-				<Spin spinning={this.state.loading}>
-				<Table
-					pagination={this.state.paginationt}
-					columns={this.state.businessIntentionList}
-					dataSource={this.state.dataBusiness}
-				/>
-				</Spin>
-				<BusinessDetail
-					ids={this.props.data.id}
-					data={this.state.followData}
-					businessModul={this.state.businessModul}
-				/>
-			</div>
-    	);
+      <div className="clearfix">
+        <Spin spinning={this.state.loading}>
+          <Table
+            pagination={this.state.paginationt}
+            columns={this.state.businessIntentionList}
+            dataSource={this.state.dataBusiness}
+          />
+        </Spin>
+        <BusinessDetail
+          ids={this.props.data.id}
+          data={this.state.followData}
+          businessModul={this.state.businessModul}
+          businessIntentionCancel={this.businessIntentionCancel}
+        />
+      </div>
+    );
 	}
 })
 

+ 3 - 3
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businessDetail.jsx

@@ -262,9 +262,9 @@ const BusinessDetail =React.createClass({
 				      footer=''
 			          title="业务意向详情"
 			          width='1000px'
-			          visible={this.state.businessModul}
-			          onOk={this.businessIntentionCancel}
-					  onCancel={this.businessIntentionCancel}							          							          
+			          visible={this.props.businessModul}
+			          onOk={this.props.businessIntentionCancel}
+					  onCancel={this.props.businessIntentionCancel}							          							          
 			        >				    
 					    <div className="clearfix">
 			    			<Form layout="horizontal" id="demand-form" onSubmit={this.passworldSubmit}>

+ 89 - 70
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -8,6 +8,7 @@ import { socialAttribute, industry, auditStatusL, lvl, currentMember } from '@/d
 import { getSocialAttribute, beforeUploadFile, ShowModal } from "@/tools.js";
 import FollowDetail from './followDetail.jsx'
 import ShowModalDiv from "@/showModal.jsx";
+import ZhuanjiaoDetail from "@/ZhuanjiaoDetail.jsx";
 import IntentionDetail from './intentionDetail/intentionDetail.jsx'
 import './customer.less';
 
@@ -157,6 +158,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					render: (text, record, index) => {
 						return <div>
                             <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">客户跟进</Button>                            							    
+                            <Button style={{ marginLeft: 10 }} onClick={(e) =>{ e.stopPropagation(), this.zhuanjiaoDetail(record)}} type="primary">转交记录</Button>                            							    
                         </div>
 					}
 				}
@@ -165,8 +167,17 @@ const IntentionCustomer = Form.create()(React.createClass({
 			dataSource: [],
 		};
 	},
-	
-	
+	zhuanjiaoDetail(record) {
+		this.setState({
+			zhuanjiaoVisible: true,
+			zhuanjiaoId: record.id
+		})
+	},
+	zhuanjiaoDetailCancel() {
+		this.setState({
+			zhuanjiaoVisible: false
+		})
+	},
 	
 	//进入新增拜访记录
 	visit(e) {
@@ -337,86 +348,94 @@ const IntentionCustomer = Form.create()(React.createClass({
 		return (
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
+        {this.state.zhuanjiaoVisible ? (
+          <ZhuanjiaoDetail
+            cancel={this.zhuanjiaoDetailCancel}
+            visible={this.state.zhuanjiaoVisible}
+            type={1}
+            id={this.state.zhuanjiaoId}
+          />
+        ) : (
+          ""
+        )}
         <div className="content-title">
           <span>
             {!intentionState ? "我的单位签单客户" : "我的个人签单客户"}
           </span>
         </div>
-		<Tabs
-          defaultActiveKey="1"
-          onChange={this.callback}
-          className="test">
-             <TabPane tab="搜索" key="1">
-        <div className="user-search">
-          <Input
-            placeholder="客户名称"
-            value={this.state.nameSearch}
-            onChange={e => {
-              this.setState({ nameSearch: e.target.value });
-            }}
-          />
-          <Select
-            placeholder="省"
-            style={{ width: 80 }}
-            value={this.state.provinceSearch}
-            onChange={e => {
-              this.setState({ provinceSearch: e });
-            }}
-          >
-            {this.state.Provinces}
-          </Select>
-          <span style={{ marginRight: "10px" }}>
-            <Cascader
-              options={citySelect()}
-              value={this.state.addressSearch}
-              placeholder="选择城市"
-              onChange={(e, pre) => {
-                this.setState({ addressSearch: e });
-              }}
-            />
-          </span>
-          <Button type="primary" onClick={this.search}>
-            搜索
-          </Button>
-          <Button onClick={this.reset}>重置</Button>
-          {/* {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
+        <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+          <TabPane tab="搜索" key="1">
+            <div className="user-search">
+              <Input
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
+              />
+              <Select
+                placeholder="省"
+                style={{ width: 80 }}
+                value={this.state.provinceSearch}
+                onChange={(e) => {
+                  this.setState({ provinceSearch: e });
+                }}
+              >
+                {this.state.Provinces}
+              </Select>
+              <span style={{ marginRight: "10px" }}>
+                <Cascader
+                  options={citySelect()}
+                  value={this.state.addressSearch}
+                  placeholder="选择城市"
+                  onChange={(e, pre) => {
+                    this.setState({ addressSearch: e });
+                  }}
+                />
+              </span>
+              {/* <div className="clearfix" style={{ marginTop: "5px" }}>
+                <div
+                  className="search-more"
+                  style={this.state.searchMore ? { display: "none" } : {}}
+                > */}
+				<span>签单时间:</span>
+                  <RangePicker
+                    value={[
+                      this.state.releaseDate[0]
+                        ? moment(this.state.releaseDate[0])
+                        : null,
+                      this.state.releaseDate[1]
+                        ? moment(this.state.releaseDate[1])
+                        : null,
+                    ]}
+                    onChange={(data, dataString) => {
+                      this.setState({ releaseDate: dataString });
+                    }}
+                  />
+                {/* </div>
+              </div> */}
+              <Button type="primary" onClick={this.search} style={{ marginLeft: 10 }} >
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+              {/* {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
 	                       			 disabled={!hasSelected} 
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
 	                </Popconfirm>:''
 	                }*/}
-          <span style={{ marginLeft: "10px", marginRight: "20px" }}>
-            更多搜索
-            <Switch
-              checked={!this.state.searchMore}
-              onChange={this.searchSwitch}
-            />
-          </span>
-          <div className="clearfix" style={{ marginTop: "5px" }}>
-            <div
-              className="search-more"
-              style={this.state.searchMore ? { display: "none" } : {}}
-            >
-              <RangePicker
-                value={[
-                  this.state.releaseDate[0]
-                    ? moment(this.state.releaseDate[0])
-                    : null,
-                  this.state.releaseDate[1]
-                    ? moment(this.state.releaseDate[1])
-                    : null
-                ]}
-                onChange={(data, dataString) => {
-                  this.setState({ releaseDate: dataString });
-                }}
-              />
+              {/* <span style={{ marginLeft: "10px", marginRight: "20px" }}>
+                更多搜索
+                <Switch
+                  checked={!this.state.searchMore}
+                  onChange={this.searchSwitch}
+                />
+              </span> */}
             </div>
-          </div>
-        </div>
-        </TabPane>
-		</Tabs>
-		<div className="patent-table">
+          </TabPane>
+        </Tabs>
+        <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
               columns={this.state.columns}

+ 7 - 4
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx

@@ -235,7 +235,7 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 				showQuickJumper: true,
 				pageSize: 10,
 				onChange: function(page) {
-					this.xiangmu(page,this.state.dataSource[this.state.rowKey-1]);
+					this.xiangmu(page,this.state.rowKey,this.state.type);
 				}.bind(this),
 				showTotal: function(total) {
 					return '共' + total + '条数据';
@@ -333,7 +333,8 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 		this.xiangmu(1,record,type);
 		this.setState({
 		    visible: true,
-			rowKey: record.key
+			rowKey: record,
+			type: type
 		});
 	},
 	xiangmu(pageNo,record,type) {
@@ -348,7 +349,8 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 			url: globalConfig.context +"/api/admin/customer/selectAdminCustomerList",
 			data: {
 				pageNo:pageNo || 1,
-				pageSize:this.state.pagination.pageSizeX,
+				pageSize:this.state.paginationX.pageSize,
+				// pageSize: 10,
 				startTime: this.state.releaseDate[0],
 				endTime: this.state.releaseDate[1],
 				aid:record.aid,
@@ -504,7 +506,8 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 								<Spin spinning={this.state.loading}>
 									<Table columns={this.state.columnsX}
 									dataSource={this.state.dataSourceX} 
-									pagination={this.state.paginationX} />
+									pagination={this.state.paginationX}
+									 />
 								</Spin>
 							</div>
 						</Modal>

Разлика између датотеке није приказан због своје велике величине
+ 219 - 205
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx


Разлика између датотеке није приказан због своје велике величине
+ 217 - 203
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx


+ 148 - 134
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -140,7 +140,9 @@ const ShouKuang = React.createClass({
               finalReceivablesTime: thisdata.finalReceivablesTime,
               signTotalAmount: thisdata.signTotalAmount,
               financeName: thisdata.financeName,
-              backStatus: thisdata.backStatus
+              backStatus: thisdata.backStatus,
+              orderReceivables: thisdata.orderReceivables,
+              orderArrears: thisdata.orderArrears,
             });
           }
         }
@@ -192,12 +194,12 @@ const ShouKuang = React.createClass({
         defaultPageSize: 10,
         showQuickJumper: true,
         pageSize: 10,
-        onChange: function(page) {
+        onChange: function (page) {
           this.loadData(page);
         }.bind(this),
-        showTotal: function(total) {
+        showTotal: function (total) {
           return "共" + total + "条数据";
-        }
+        },
       },
       // 子组件改变的表格title数组
       changeList: undefined,
@@ -205,45 +207,45 @@ const ShouKuang = React.createClass({
         {
           title: "序号",
           dataIndex: "key",
-          key: "key"
+          key: "key",
         },
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "是否主项目",
           dataIndex: "main",
           key: "main",
-          render: text => {
+          render: (text) => {
             return text == 0 ? "否" : "是";
-          }
+          },
         },
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
         {
           title: "项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
         },
         {
           title: "项目数量",
@@ -256,7 +258,7 @@ const ShouKuang = React.createClass({
                   {text}{" "}
                   <Tag
                     color="#108ee9"
-                    onClick={e => {
+                    onClick={(e) => {
                       e.stopPropagation();
                       this.showRes(record);
                     }}
@@ -268,129 +270,129 @@ const ShouKuang = React.createClass({
             } else {
               return text;
             }
-          }
+          },
         },
         {
           title: "服务市价",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
         },
         {
           title: "证书编号",
           dataIndex: "certificateNumber",
-          key: "certificateNumber"
+          key: "certificateNumber",
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "项目说明",
           dataIndex: "taskComment",
-          key: "taskComment"
+          key: "taskComment",
         },
         {
           title: "是否外包",
           dataIndex: "outsource",
           key: "outsource",
-          render: text => {
+          render: (text) => {
             if (text == 0) {
               return "否";
             } else if (text == 1) {
               return "是";
             }
-          }
+          },
         },
         {
           title: "外包(内部)公司",
           dataIndex: "outsourceName",
-          key: "outsourceName"
+          key: "outsourceName",
         },
         {
           title: "外包(内部)价格",
           dataIndex: "outsourcePrice",
-          key: "outsourcePrice"
-        }
+          key: "outsourcePrice",
+        },
       ],
 
       cuiColumns: [
         {
           title: "序号",
           dataIndex: "key",
-          key: "key"
+          key: "key",
         },
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "订单部门",
           dataIndex: "depName",
-          key: "depName"
+          key: "depName",
         },
         {
           title: "订单状态",
           dataIndex: "orderStatus",
           key: "orderStatus",
-          render: text => {
+          render: (text) => {
             return getNewOrderStatus(text);
-          }
+          },
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "签单金额",
           dataIndex: "totalAmount",
-          key: "totalAmount"
+          key: "totalAmount",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "已收款",
           dataIndex: "settlementAmount",
-          key: "settlementAmount"
+          key: "settlementAmount",
         },
         {
           title: "应收款",
           dataIndex: "accountsReceivable",
-          key: "accountsReceivable"
+          key: "accountsReceivable",
         },
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject"
+          key: "dunSubject",
           // render: text => {
           //   return getjiedian(text);
           // }
@@ -398,24 +400,24 @@ const ShouKuang = React.createClass({
         {
           title: "催款状态",
           dataIndex: "dunStatus",
-          key: "dunStatus"
+          key: "dunStatus",
         },
         {
           title: "催收启动时间",
           dataIndex: "startDate",
-          key: "startDate"
-        }
+          key: "startDate",
+        },
       ],
       timeColumns: [
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "项目编号",
@@ -427,192 +429,192 @@ const ShouKuang = React.createClass({
             } else {
               return text;
             }
-          }
+          },
         },
         {
           title: "客户名称",
           dataIndex: "userName",
           key: "userName",
-          render: text => {
+          render: (text) => {
             return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
-          }
+          },
         },
 
         {
           title: "订单部门",
           dataIndex: "depName",
-          key: "depName"
+          key: "depName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
         {
           title: "项目名称",
           dataIndex: "taskName",
-          key: "taskName"
+          key: "taskName",
         },
         {
           title: "项目负责人",
           dataIndex: "receiverName",
-          key: "receiverName"
+          key: "receiverName",
         },
         {
           title: "项目价格(万元)",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
         },
         {
           title: "数量(个)",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
         },
         {
           title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
-          render: text => {
+          render: (text) => {
             return getTaskStatus(text);
-          }
+          },
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "工时",
           dataIndex: "hours",
-          key: "hours"
+          key: "hours",
         },
         {
           title: "是否外包",
           dataIndex: "outsource",
           key: "outsource",
-          render: text => {
+          render: (text) => {
             if (text == 0) {
               return "否";
             } else if (text == 1) {
               return "是";
             }
-          }
+          },
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
-          key: "signTime"
+          key: "signTime",
         },
         {
           title: "派单日期",
           dataIndex: "creteTime",
-          key: "creteTime"
+          key: "creteTime",
         },
         {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
-          key: "taskDistributionTime"
+          key: "taskDistributionTime",
         },
         {
           title: "完成时间",
           dataIndex: "taskEndTime",
-          key: "taskEndTime"
-        }
+          key: "taskEndTime",
+        },
       ],
       printColumns: [
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
           // fixed: "left"
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
-          key: "buyerName"
+          key: "buyerName",
         },
         {
           title: "订单部门",
           dataIndex: "departmentName",
-          key: "departmentName"
+          key: "departmentName",
         },
         {
           title: "订单负责人",
           dataIndex: "sellerName",
-          key: "sellerName"
+          key: "sellerName",
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
-          key: "signTime"
+          key: "signTime",
         },
         {
           title: "下单日期",
           dataIndex: "createTime",
-          key: "createTime"
+          key: "createTime",
         },
         {
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
-          key: "signTotalAmount"
+          key: "signTotalAmount",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
-          key: "invoiceAmount"
+          key: "invoiceAmount",
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
-          key: "actuallyTotalAmount"
+          key: "actuallyTotalAmount",
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
-          key: "finalReceivables"
+          key: "finalReceivables",
         },
         {
           title: "最近收款时间",
           dataIndex: "finalReceivablesTime",
-          key: "finalReceivablesTime"
+          key: "finalReceivablesTime",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
+          render: (text) => {
             return getProcessStatus(text);
-          }
+          },
         },
         {
           title: "特批状态",
           dataIndex: "approval",
           key: "approval",
-          render: text => {
+          render: (text) => {
             return getApproval(text);
-          }
-        }
+          },
+        },
       ],
       columns: [
         {
@@ -620,20 +622,20 @@ const ShouKuang = React.createClass({
           dataIndex: "contractNo",
           key: "contractNo",
           className: "title-table",
-          fixed: "left"
+          fixed: "left",
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
           className: "title-table",
-          fixed: "left"
+          fixed: "left",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          className: "title-table"
+          className: "title-table",
           // fixed: "left"
         },
         {
@@ -641,105 +643,117 @@ const ShouKuang = React.createClass({
           dataIndex: "approval",
           key: "approval",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             if (text == 1 || text == 2) {
               return <Tag color="#f50">{getApproval(text)}</Tag>;
             }
             return getApproval(text);
-          }
+          },
         },
 
         {
           title: "订单部门",
           dataIndex: "departmentName",
           key: "departmentName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "订单负责人",
           dataIndex: "sellerName",
           key: "sellerName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "财务负责人",
           dataIndex: "financeName",
           key: "financeName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "下单日期",
           dataIndex: "createTime",
           key: "createTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
-          className: "title-table"
+          className: "title-table",
+        },
+        {
+          title: "应收款(万元)",
+          dataIndex: "orderReceivables",
+          key: "orderReceivables",
+          className: "title-table",
+        },
+        {
+          title: "欠款(万元)",
+          dataIndex: "orderArrears",
+          key: "orderArrears",
+          className: "title-table",
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "最近收款时间",
           dataIndex: "finalReceivablesTime",
           key: "finalReceivablesTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             return getProcessStatus(text);
-          }
+          },
         },
         {
           title: "驳回状态",
           dataIndex: "backStatus",
           key: "backStatus",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             if (text == 3) {
               return <Tag>已驳回</Tag>;
             } else {
               return "";
             }
-          }
-        }
+          },
+        },
 
         //                 {
         //                     title: '订单状态',
@@ -826,106 +840,106 @@ const ShouKuang = React.createClass({
         {
           title: "编号",
           dataIndex: "id",
-          key: "id"
+          key: "id",
         },
         {
           title: "订单编号",
           dataIndex: "orderno",
-          key: "orderno"
+          key: "orderno",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "amount",
-          key: "amount"
+          key: "amount",
         },
         {
           title: "申请时间",
           dataIndex: "createTime",
-          key: "createTime"
+          key: "createTime",
         },
         {
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
+          render: (text) => {
             return getInvoiceStatus(text);
-          }
-        }
+          },
+        },
       ],
       waterlistDate: [
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "平台流水号",
           dataIndex: "billNo",
-          key: "billNo"
+          key: "billNo",
           //   fixed: "left"
         },
         {
           title: "收款金额(万元)",
           dataIndex: "transactionAmount",
-          key: "transactionAmount"
+          key: "transactionAmount",
         },
         {
           title: "收款方",
           dataIndex: "payeeName",
-          key: "payeeName"
+          key: "payeeName",
         },
         {
           title: "付款方",
           dataIndex: "payerName",
-          key: "payerName"
+          key: "payerName",
         },
         {
           title: "流水科目",
           dataIndex: "transactionSubject",
           key: "transactionSubject",
-          render: text => {
+          render: (text) => {
             return getTransactionProject(text);
-          }
+          },
         },
         {
           title: "收款类型",
           dataIndex: "type",
-          key: "type"
+          key: "type",
         },
         {
           title: "财务流水时间",
           dataIndex: "financialPayTimes",
-          key: "financialPayTimes"
+          key: "financialPayTimes",
         },
         {
           title: "财务流水号",
           dataIndex: "financialPayNo",
-          key: "financialPayNo"
+          key: "financialPayNo",
         },
         {
           title: "订单负责人",
           dataIndex: "saleName",
-          key: "saleName"
+          key: "saleName",
         },
         {
           title: "创建时间",
           dataIndex: "createTimes",
-          key: "createTimes"
+          key: "createTimes",
         },
         {
           title: "退款时间",
           dataIndex: "refundTimes",
-          key: "refundTimes"
+          key: "refundTimes",
         },
         {
           title: "删除时间",
           dataIndex: "deleteTimes",
-          key: "deleteTimes"
+          key: "deleteTimes",
         },
         {
           title: "备注",
           dataIndex: "remarks",
-          key: "remarks"
+          key: "remarks",
         },
         {
           title: "流水状态",
@@ -937,10 +951,10 @@ const ShouKuang = React.createClass({
             } else {
               return <Tag>已删除</Tag>;
             }
-          }
-        }
+          },
+        },
       ],
-      waterData: []
+      waterData: [],
     };
   },
   // 特批通过

+ 151 - 137
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -143,7 +143,9 @@ const ShouKuang = React.createClass({
               finalReceivablesTime: thisdata.finalReceivablesTime,
               signTotalAmount: thisdata.signTotalAmount,
               financeName: thisdata.financeName,
-              backStatus: thisdata.backStatus
+              backStatus: thisdata.backStatus,
+              orderReceivables: thisdata.orderReceivables,
+              orderArrears: thisdata.orderArrears,
             });
           }
         }
@@ -200,17 +202,17 @@ const ShouKuang = React.createClass({
         defaultPageSize: 10,
         showQuickJumper: true,
         pageSize: 10,
-        onChange: function(page) {
+        onChange: function (page) {
           // console.log(page);
 
           this.setState({
-            pageNo: page
+            pageNo: page,
           });
           this.loadData(page);
         }.bind(this),
-        showTotal: function(total) {
+        showTotal: function (total) {
           return "共" + total + "条数据";
-        }
+        },
       },
       // 子组件改变的表格title数组
       changeList: undefined,
@@ -218,17 +220,17 @@ const ShouKuang = React.createClass({
         {
           title: "序号",
           dataIndex: "key",
-          key: "key"
+          key: "key",
         },
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         // {
         //   title: "项目编号",
@@ -238,30 +240,30 @@ const ShouKuang = React.createClass({
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "是否主项目",
           dataIndex: "main",
           key: "main",
-          render: text => {
+          render: (text) => {
             return text == 0 ? "否" : "是";
-          }
+          },
         },
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
         {
           title: "项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
         },
         {
           title: "项目数量",
@@ -274,7 +276,7 @@ const ShouKuang = React.createClass({
                   {text}{" "}
                   <Tag
                     color="#108ee9"
-                    onClick={e => {
+                    onClick={(e) => {
                       e.stopPropagation();
                       this.showRes(record);
                     }}
@@ -286,129 +288,129 @@ const ShouKuang = React.createClass({
             } else {
               return text;
             }
-          }
+          },
         },
         {
           title: "服务市价",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
         },
         {
           title: "证书编号",
           dataIndex: "certificateNumber",
-          key: "certificateNumber"
+          key: "certificateNumber",
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "项目说明",
           dataIndex: "taskComment",
-          key: "taskComment"
+          key: "taskComment",
         },
         {
           title: "是否外包",
           dataIndex: "outsource",
           key: "outsource",
-          render: text => {
+          render: (text) => {
             if (text == 0) {
               return "否";
             } else if (text == 1) {
               return "是";
             }
-          }
+          },
         },
         {
           title: "外包(内部)公司",
           dataIndex: "outsourceName",
-          key: "outsourceName"
+          key: "outsourceName",
         },
         {
           title: "外包(内部)价格",
           dataIndex: "outsourcePrice",
-          key: "outsourcePrice"
-        }
+          key: "outsourcePrice",
+        },
       ],
 
       cuiColumns: [
         {
           title: "序号",
           dataIndex: "key",
-          key: "key"
+          key: "key",
         },
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "客户名称",
           dataIndex: "userName",
-          key: "userName"
+          key: "userName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "订单部门",
           dataIndex: "depName",
-          key: "depName"
+          key: "depName",
         },
         {
           title: "订单状态",
           dataIndex: "orderStatus",
           key: "orderStatus",
-          render: text => {
+          render: (text) => {
             return getNewOrderStatus(text);
-          }
+          },
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "签单金额",
           dataIndex: "totalAmount",
-          key: "totalAmount"
+          key: "totalAmount",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "已收款",
           dataIndex: "settlementAmount",
-          key: "settlementAmount"
+          key: "settlementAmount",
         },
         {
           title: "应收款",
           dataIndex: "accountsReceivable",
-          key: "accountsReceivable"
+          key: "accountsReceivable",
         },
         {
           title: "催收科目",
           dataIndex: "dunSubject",
-          key: "dunSubject"
+          key: "dunSubject",
           // render: text => {
           //   return getjiedian(text);
           // }
@@ -416,24 +418,24 @@ const ShouKuang = React.createClass({
         {
           title: "催款状态",
           dataIndex: "dunStatus",
-          key: "dunStatus"
+          key: "dunStatus",
         },
         {
           title: "催收启动时间",
           dataIndex: "startDate",
-          key: "startDate"
-        }
+          key: "startDate",
+        },
       ],
       timeColumns: [
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "项目编号",
@@ -445,194 +447,194 @@ const ShouKuang = React.createClass({
             } else {
               return text;
             }
-          }
+          },
         },
 
         {
           title: "客户名称",
           dataIndex: "userName",
           key: "userName",
-          render: text => {
+          render: (text) => {
             return text && text.length > 9 ? text.substr(0, 9) + "..." : text;
-          }
+          },
         },
 
         {
           title: "订单部门",
           dataIndex: "depName",
-          key: "depName"
+          key: "depName",
         },
         {
           title: "订单负责人",
           dataIndex: "salesmanName",
-          key: "salesmanName"
+          key: "salesmanName",
         },
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
 
         {
           title: "项目名称",
           dataIndex: "taskName",
-          key: "taskName"
+          key: "taskName",
         },
         {
           title: "项目负责人",
           dataIndex: "receiverName",
-          key: "receiverName"
+          key: "receiverName",
         },
         {
           title: "项目价格(万元)",
           dataIndex: "commodityPrice",
-          key: "commodityPrice"
+          key: "commodityPrice",
         },
         {
           title: "数量(个)",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
         },
         {
           title: "任务状态",
           dataIndex: "taskStatus",
           key: "taskStatus",
-          render: text => {
+          render: (text) => {
             return getTaskStatus(text);
-          }
+          },
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
+          render: (text) => {
             return getProjectStatus(text);
-          }
+          },
         },
         {
           title: "工时",
           dataIndex: "hours",
-          key: "hours"
+          key: "hours",
         },
         {
           title: "是否外包",
           dataIndex: "outsource",
           key: "outsource",
-          render: text => {
+          render: (text) => {
             if (text == 0) {
               return "否";
             } else if (text == 1) {
               return "是";
             }
-          }
+          },
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
-          key: "signTime"
+          key: "signTime",
         },
         {
           title: "派单日期",
           dataIndex: "creteTime",
-          key: "creteTime"
+          key: "creteTime",
         },
         {
           title: "分配时间",
           dataIndex: "taskDistributionTime",
-          key: "taskDistributionTime"
+          key: "taskDistributionTime",
         },
         {
           title: "完成时间",
           dataIndex: "taskEndTime",
-          key: "taskEndTime"
-        }
+          key: "taskEndTime",
+        },
       ],
       printColumns: [
         {
           title: "合同编号",
           dataIndex: "contractNo",
-          key: "contractNo"
+          key: "contractNo",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
           // fixed: "left"
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
-          key: "buyerName"
+          key: "buyerName",
         },
         {
           title: "订单部门",
           dataIndex: "departmentName",
-          key: "departmentName"
+          key: "departmentName",
         },
         {
           title: "订单负责人",
           dataIndex: "sellerName",
-          key: "sellerName"
+          key: "sellerName",
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
-          key: "signTime"
+          key: "signTime",
         },
         {
           title: "下单日期",
           dataIndex: "createTime",
-          key: "createTime"
+          key: "createTime",
         },
         {
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
-          key: "signTotalAmount"
+          key: "signTotalAmount",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
-          key: "invoiceAmount"
+          key: "invoiceAmount",
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
-          key: "actuallyTotalAmount"
+          key: "actuallyTotalAmount",
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
-          key: "finalReceivables"
+          key: "finalReceivables",
         },
         {
           title: "最近收款时间",
           dataIndex: "finalReceivablesTime",
-          key: "finalReceivablesTime"
+          key: "finalReceivablesTime",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
+          render: (text) => {
             return getProcessStatus(text);
-          }
+          },
         },
         {
           title: "特批状态",
           dataIndex: "approval",
           key: "approval",
-          render: text => {
+          render: (text) => {
             return getApproval(text);
-          }
-        }
+          },
+        },
       ],
       columns: [
         {
@@ -640,20 +642,20 @@ const ShouKuang = React.createClass({
           dataIndex: "contractNo",
           key: "contractNo",
           className: "title-table",
-          fixed: "left"
+          fixed: "left",
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
           className: "title-table",
-          fixed: "left"
+          fixed: "left",
         },
         {
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          className: "title-table"
+          className: "title-table",
           // fixed: "left"
         },
         {
@@ -661,91 +663,103 @@ const ShouKuang = React.createClass({
           dataIndex: "approval",
           key: "approval",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             if (text == 1 || text == 2) {
               return <Tag color="#f50">{getApproval(text)}</Tag>;
             }
             return getApproval(text);
-          }
+          },
         },
 
         {
           title: "订单部门",
           dataIndex: "departmentName",
           key: "departmentName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "订单负责人",
           dataIndex: "sellerName",
           key: "sellerName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "财务负责人",
           dataIndex: "financeName",
           key: "financeName",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "下单日期",
           dataIndex: "createTime",
           key: "createTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "签单金额(万元)",
           dataIndex: "signTotalAmount",
           key: "signTotalAmount",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "invoiceAmount",
           key: "invoiceAmount",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "已收款(万元)",
           dataIndex: "actuallyTotalAmount",
           key: "actuallyTotalAmount",
-          className: "title-table"
+          className: "title-table",
+        },
+        {
+          title: "应收款(万元)",
+          dataIndex: "orderReceivables",
+          key: "orderReceivables",
+          className: "title-table",
+        },
+        {
+          title: "欠款(万元)",
+          dataIndex: "orderArrears",
+          key: "orderArrears",
+          className: "title-table",
         },
         {
           title: "最近收款(万元)",
           dataIndex: "finalReceivables",
           key: "finalReceivables",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "最近收款时间",
           dataIndex: "finalReceivablesTime",
           key: "finalReceivablesTime",
-          className: "title-table"
+          className: "title-table",
         },
         {
           title: "结算状态",
           dataIndex: "liquidationStatus",
           key: "liquidationStatus",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             return getLiquidationStatus(text);
-          }
+          },
         },
         {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
           className: "title-table",
-          render: text => {
+          render: (text) => {
             return getProcessStatus(text);
-          }
+          },
         },
 
         //                 {
@@ -787,7 +801,7 @@ const ShouKuang = React.createClass({
                 {recard.processStatus == 3 ? (
                   <Button
                     type="primary"
-                    onClick={e => {
+                    onClick={(e) => {
                       // e.stopPropagation(), this.evaluateZ(recard);
                       e.stopPropagation(), this.checkRemark(recard);
                     }}
@@ -807,9 +821,9 @@ const ShouKuang = React.createClass({
                     style={{
                       marginLeft: "5px",
                       display:
-                        recard.processStatus == 3 ? "inline-block" : "none"
+                        recard.processStatus == 3 ? "inline-block" : "none",
                     }}
-                    onClick={e => {
+                    onClick={(e) => {
                       e.stopPropagation(), this.reject(recard);
                     }}
                   >
@@ -830,8 +844,8 @@ const ShouKuang = React.createClass({
                 }
               </div>
             );
-          }
-        }
+          },
+        },
       ],
       dataSource: [],
       searchTime: [],
@@ -839,106 +853,106 @@ const ShouKuang = React.createClass({
         {
           title: "编号",
           dataIndex: "id",
-          key: "id"
+          key: "id",
         },
         {
           title: "订单编号",
           dataIndex: "orderno",
-          key: "orderno"
+          key: "orderno",
         },
         {
           title: "开票金额(万元)",
           dataIndex: "amount",
-          key: "amount"
+          key: "amount",
         },
         {
           title: "申请时间",
           dataIndex: "createTime",
-          key: "createTime"
+          key: "createTime",
         },
         {
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
+          render: (text) => {
             return getInvoiceStatus(text);
-          }
-        }
+          },
+        },
       ],
       waterlistDate: [
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo"
+          key: "orderNo",
         },
         {
           title: "平台流水号",
           dataIndex: "billNo",
-          key: "billNo"
+          key: "billNo",
           //   fixed: "left"
         },
         {
           title: "收款金额(万元)",
           dataIndex: "transactionAmount",
-          key: "transactionAmount"
+          key: "transactionAmount",
         },
         {
           title: "收款方",
           dataIndex: "payeeName",
-          key: "payeeName"
+          key: "payeeName",
         },
         {
           title: "付款方",
           dataIndex: "payerName",
-          key: "payerName"
+          key: "payerName",
         },
         {
           title: "流水科目",
           dataIndex: "transactionSubject",
           key: "transactionSubject",
-          render: text => {
+          render: (text) => {
             return getTransactionProject(text);
-          }
+          },
         },
         {
           title: "收款类型",
           dataIndex: "type",
-          key: "type"
+          key: "type",
         },
         {
           title: "财务流水时间",
           dataIndex: "financialPayTimes",
-          key: "financialPayTimes"
+          key: "financialPayTimes",
         },
         {
           title: "财务流水号",
           dataIndex: "financialPayNo",
-          key: "financialPayNo"
+          key: "financialPayNo",
         },
         {
           title: "订单负责人",
           dataIndex: "saleName",
-          key: "saleName"
+          key: "saleName",
         },
         {
           title: "创建时间",
           dataIndex: "createTimes",
-          key: "createTimes"
+          key: "createTimes",
         },
         {
           title: "退款时间",
           dataIndex: "refundTimes",
-          key: "refundTimes"
+          key: "refundTimes",
         },
         {
           title: "删除时间",
           dataIndex: "deleteTimes",
-          key: "deleteTimes"
+          key: "deleteTimes",
         },
         {
           title: "备注",
           dataIndex: "remarks",
-          key: "remarks"
+          key: "remarks",
         },
         {
           title: "流水状态",
@@ -961,10 +975,10 @@ const ShouKuang = React.createClass({
             } else {
               return <Tag>已删除</Tag>;
             }
-          }
-        }
+          },
+        },
       ],
-      waterData: []
+      waterData: [],
     };
   },
 

Разлика између датотеке није приказан због своје велике величине
+ 305 - 287
js/component/manageCenter/order/orderNew/addService.jsx


Разлика између датотеке није приказан због своје велике величине
+ 625 - 562
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js


+ 2 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -1452,7 +1452,7 @@ class ChangeDetail extends Component {
                     />
                   </Form.Item>
                 </div>
-                <div
+                {/* <div
                   style={{
                     marginTop: "10px",
                     display:
@@ -1478,7 +1478,7 @@ class ChangeDetail extends Component {
                       }}
                     />
                   </Form.Item>
-                </div>
+                </div> */}
               </div>
             )}
           <ul

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -791,7 +791,7 @@ class ChangeDetail extends Component {
                 style={{
                   marginTop: "10px",
                   display:
-                    this.props.data.status == 2 ||
+                    this.props.data.status == 1 || this.props.data.status == 3 &&
                     this.props.processState != this.props.data.processState
                       ? "none"
                       : "block"

+ 32 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -6,6 +6,7 @@ import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
+import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 // import ReactToPrint from "react-to-print";
@@ -406,6 +407,36 @@ class ChangeDetail extends Component {
             </span> */}
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
+          <div
+            style={{
+              borderRadius: "50%",
+              width: 300,
+              height: 300,
+              position: "absolute",
+              top: 284,
+              left: 586,
+              transform: "rotate(-5deg)",
+              zIndex: 1,
+              display:
+                this.props.data.status == 5
+                  ? "block"
+                  : "none"
+            }}
+          >
+            {/* <span
+              style={{
+                fontSize: 29,
+                position: "absolute",
+                left: "50%",
+                top: "50%",
+                transform: "translate(-50%,-50%)",
+                color: "red"
+              }}
+            >
+              通过
+            </span> */}
+            <img src={quxiao} style={{ width: "63%" }} />
+          </div>
 
           <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
             合同变更记录
@@ -642,7 +673,7 @@ class ChangeDetail extends Component {
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
-        {this.props.processState === this.props.data.processState ? (
+        {this.props.processState === this.props.data.processState && this.props.data.status != 5 ? (
           <div
             className="clearfix"
             style={{ display: "flex", justifyContent: "space-around" }}

+ 42 - 72
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -57,46 +57,25 @@ const ProAndCuiList = React.createClass({
                 )}
               </span>
             );
-          }
+          },
         },
         {
           title: "业务项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
-          // render: (text, record) => {
-          //   let str = "";
-          //   let color = "";
-          //   if (record.type == 1) {
-          //     str = "增";
-          //     color = "#87d068";
-          //   } else if (record.type == 2) {
-          //     str = "改";
-          //     color = "#108ee9";
-          //   } else if (record.type == 3) {
-          //     str = "删";
-          //     color = "#f50";
-          //   }
-          //   if (record.type == 0) {
-          //     return <span>{text}</span>;
-          //   } else {
-          //     return (
-          //       <span>
-          //         <Tag color={color}>{str}</Tag>
-          //         {text}
-          //       </span>
-          //     );
-          //   }
-          // }
+          key: "commodityName",
+          render: (text, record) => {
+            return text + "-" + record.id;
+          },
         },
         {
           title: "项目类别",
           dataIndex: "cname",
-          key: "cname"
+          key: "cname",
         },
         {
           title: "项目数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
         },
         {
           title: "金额(万元)",
@@ -110,29 +89,29 @@ const ProAndCuiList = React.createClass({
             } else {
               return <span>{text}</span>;
             }
-          }
+          },
         },
         {
           title: "主要项目",
           dataIndex: "main",
           key: "main",
-          render: text => {
+          render: (text) => {
             return text ? "是" : "否";
-          }
+          },
         },
         {
           title: "项目负责人",
           dataIndex: "receiverName",
-          key: "receiverName"
+          key: "receiverName",
         },
         {
           title: "项目说明",
           dataIndex: "taskComment",
           key: "taskComment",
-          render: text => {
+          render: (text) => {
             return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-          }
-        }
+          },
+        },
       ],
       contactsLists: [
         {
@@ -162,42 +141,33 @@ const ProAndCuiList = React.createClass({
                 </Tag>
               </span>
             );
-          }
+          },
         },
         {
           title: "项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
-          // render: (text, record) => {
-          //   let str = "";
-          //   let color = "";
-          //   if (record.type == 1) {
-          //     str = "增";
-          //     color = "#87d068";
-          //   } else if (record.type == 2) {
-          //     str = "改";
-          //     color = "#108ee9";
-          //   } else if (record.type == 3) {
-          //     str = "删";
-          //     color = "#f50";
-          //   }
-          //   if (record.type == 0) {
-          //     return <span>{text}</span>;
-          //   } else {
-          //     return (
-          //       <span>
-          //         <Tag color={color}>{str}</Tag>
-          //         {text}
-          //       </span>
-          //     );
-          //   }
-          // }
+          key: "commodityName",
+          render: (text, record) => {
+            let dataArr = this.state.dataSource || [];
+            if (record.ctid) {
+              return <span>{text + "-" + record.ctid}</span>;
+            } else {
+              let tid = record.tid;
+              let ctid = "";
+              dataArr.forEach((item, index) => {
+                if (item.tid == tid) {
+                  ctid = item.id;
+                }
+              });
+              return <span>{text + "-" + ctid}</span>;
+            }
+          },
         },
         {
           title: "项目分类",
           dataIndex: "projectType",
           key: "projectType",
-          render: text => {
+          render: (text) => {
             let arr = this.state.dataSource || [];
             let str = "";
             for (let i = 0; i < arr.length; i++) {
@@ -206,15 +176,15 @@ const ProAndCuiList = React.createClass({
                 return <span>{str}</span>;
               }
             }
-          }
+          },
         },
         {
           title: "催款科目",
           dataIndex: "dunTypeName",
           key: "dunTypeName",
-          render: text => {
+          render: (text) => {
             return <span>{text}</span>;
-          }
+          },
         },
         {
           title: "时间",
@@ -224,7 +194,7 @@ const ProAndCuiList = React.createClass({
             if (record.dunTypeName) {
               return <span>{text}</span>;
             }
-          }
+          },
         },
         {
           title: "金额(万元)",
@@ -247,7 +217,7 @@ const ProAndCuiList = React.createClass({
                 return <span>{text}</span>;
               }
             }
-          }
+          },
         },
         {
           title: "服务年限",
@@ -257,17 +227,17 @@ const ProAndCuiList = React.createClass({
             if (record.dunTypeName) {
               return <span>{text}</span>;
             }
-          }
+          },
         },
         {
           title: "催款状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
+          render: (text) => {
             return <span>{text == 1 ? "已启动" : "未启动"}</span>;
-          }
-        }
-      ]
+          },
+        },
+      ],
     };
   },
   componentWillReceiveProps(nextProps) {

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

@@ -1238,7 +1238,8 @@ const contractChange = Form.create()(
                 {tabList.map((item, index, arr) => {
                   return (
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
-                      {this.state.contractData.processState === 0 ? (
+                      {this.state.contractData.processState === 0 &&
+                      this.state.contractData.status != 5 ? (
                         <ChangeApply
                           id={Math.random()}
                           orderData={this.state.contractData}
@@ -1246,19 +1247,23 @@ const contractChange = Form.create()(
                           onCancel={this.visitCancel}
                         />
                       ) : (
-                          <ChangeDetail
-                            id={item.id}
-                            money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
-                            data={this.state.contractData}
-                            pictureUrl={this.state.voucherUrl}
-                            processState={this.props.processState}
-                            dataSource={this.state.dataProps}
-                            proceedsData={this.state.proceedsData}
-                            proceedsTotal={this.state.proTotal}
-                            invoiceTotal={this.state.invTotal}
-                            contactList={this.state.refundInvoice}
-                          />
-                        )}
+                        <ChangeDetail
+                          id={item.id}
+                          money={
+                            index == arr.length - 1
+                              ? this.state.orderData.totalAmount + ""
+                              : undefined
+                          }
+                          data={this.state.contractData}
+                          pictureUrl={this.state.voucherUrl}
+                          processState={this.props.processState}
+                          dataSource={this.state.dataProps}
+                          proceedsData={this.state.proceedsData}
+                          proceedsTotal={this.state.proTotal}
+                          invoiceTotal={this.state.invTotal}
+                          contactList={this.state.refundInvoice}
+                        />
+                      )}
                     </TabPane>
                   );
                 })}

+ 112 - 0
js/component/zhuanjiaoDetail.jsx

@@ -0,0 +1,112 @@
+import React from "react";
+import { Spin, Button, Tabs, Table, message, Modal } from "antd";
+import $ from "jquery/src/ajax";
+const ZhuanjiaoDetail = React.createClass({
+  getInitialState() {
+    return {
+      newVisible: false,
+      colunmn: [
+        {
+          title: "序号",
+          dataIndex: "id",
+          key: "id",
+        },
+        {
+          title: "客户姓名",
+          dataIndex: "userName",
+          key: "userName",
+        },
+        {
+          title: "原管理员",
+          dataIndex: "usedAName",
+          key: "usedAName",
+        },
+        {
+          title: "现管理员",
+          dataIndex: "newAName",
+          key: "newAName",
+        },
+        {
+          title: "转交类型",
+          dataIndex: "type",
+          key: "type",
+          render: text => {
+            if(text == 1) {
+              return "项目转交"
+            }else {
+              return "客户转交"
+            }
+          }
+        },
+        {
+          title: "项目名称",
+          dataIndex: "pName",
+          key: "pName",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "createDate",
+          key: "createDate",
+        },
+      ]
+    };
+  },
+  loadData() {
+      this.setState({
+        loading: true
+      });
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/customer/transferList",
+        data: {
+          uid: this.props.id,
+        },
+        success: function (data) {
+          if (data.error.length || data.data.list == "") {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            }
+          } else {
+            this.setState({
+              dataSource: data.data,
+            });
+          }
+        }.bind(this),
+      }).always(
+        function () {
+          this.setState({
+            loading: false,
+          });
+        }.bind(this)
+      );
+
+  },
+  componentWillMount() {
+    this.loadData()
+  },
+  render() {
+    return (
+      <Modal
+        style={{ position: "relative" }}
+        title="转交记录"
+        visible={this.props.visible}
+        onCancel={this.props.cancel}
+        footer={null}
+        destroyOnClose={true}
+      >
+        <Table
+          columns={this.state.colunmn}
+          dataSource={this.state.dataSource}
+          pagination={false}
+          scroll={{ x: "max-content", y: 0 }}
+          bordered
+          size="small"
+        />
+      </Modal>
+    );
+  },
+});
+
+export default ZhuanjiaoDetail;

+ 1 - 1
package.json

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