liting2017 před 7 roky
rodič
revize
b04ab75369

+ 3 - 3
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -760,9 +760,9 @@ const NewService = Form.create()(React.createClass({
 		const orderDetaiel=this.state.orderList || []
 		const dataSources=this.state.customerArr || [];
         const options = this.state.states?dataSources.map((group,index) =>
-				      <Option key={index} value={group.name}>{group.name}</Option>
+				      <Select.Option key={index} value={group.name}>{group.name}</Select.Option>
 				     ):dataSources.map((group,index) =>
-				      <Option key={group.id} value={group.bname}>{group.bname}</Option>
+				      <Select.Option key={group.id} value={group.bname}>{group.bname}</Select.Option>
 				     )
 		    
 		return(
@@ -1229,7 +1229,7 @@ const NewService = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 3 - 3
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -840,9 +840,9 @@ const NewService = Form.create()(React.createClass({
 		const orderDetaiel=this.state.orderList || []
 		const dataSources=this.state.customerArr || [];
         const options = this.state.states?dataSources.map((group,index) =>
-				      <Option key={index} value={group.name}>{group.name}</Option>
+				      <Select.Option key={index} value={group.name}>{group.name}</Select.Option>
 				     ):dataSources.map((group,index) =>
-				      <Option key={group.id} value={group.bname}>{group.bname}</Option>
+				      <Select.Option key={group.id} value={group.bname}>{group.bname}</Select.Option>
 				     )
 		    
 		return(
@@ -1350,7 +1350,7 @@ const NewService = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                    
                         footer=''
                         className="admin-desc-content">

+ 1 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -573,7 +573,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 1
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -572,7 +572,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 1
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -559,7 +559,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			         <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 1
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -573,7 +573,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -520,7 +520,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1000px'
+                        width='1200px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 3 - 4
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -91,7 +91,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     key: 'taskComment',
                     render:(text) => {
                     	return(
-                    		 text?text.substr(0,8)+'...':''
+                    		 text&&text.length>6?text.substr(0,8)+'...':text
                     	)
                     }
                 },{
@@ -426,7 +426,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	//派单
 	//操作分配
     confirmDelet(index){
-    	console.log(index)
     	this.setState({
     		taskIds:index.taskId,
     		userDetaile:false,
@@ -760,9 +759,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		const dataSources=this.state.customerArr || [];
 		const orderArr=this.state.orderArr ||[];
         const options = this.state.states?dataSources.map((group,index) =>
-				      <Option key={index} value={group.name}>{group.name}</Option>
+				      <Select.Option key={index} value={group.name}>{group.name}</Select.Option>
 				     ):dataSources.map((group,index) =>
-				      <Option key={index} value={group.bname}>{group.bname}</Option>
+				      <Select.Option key={index} value={group.bname}>{group.bname}</Select.Option>
 				     )
 		return(
 			<div>