dengzhiguo 7 years ago
parent
commit
3304de599a

+ 3 - 7
js/component/manageCenter/set/business/businessCategory.jsx

@@ -134,7 +134,7 @@ const BusinessCategory=Form.create()(React.createClass({
 				        	for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
 		                    theArr.push(
-		                        <Select.Option value={i.toString()} key={theData.name}>{theData.name}</Select.Option>
+		                        <Select.Option value={i.toString()} key={theData.cname}>{theData.cname}</Select.Option>
 		                    );
 		                };
 						this.setState({	
@@ -222,7 +222,7 @@ const BusinessCategory=Form.create()(React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/achievement/delete",
+            url: globalConfig.context + "/open/api/admin/Varieties/deleteState",
             data: {
                 ids: deletedIds
             }
@@ -312,17 +312,13 @@ const BusinessCategory=Form.create()(React.createClass({
 		                </Select>
 	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-	                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                       		    disabled={!hasSelected}
-                        		onClick={this.delectRow}>删除<Icon type="minus" />
-                        </Button>
                         <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
 	                   			 disabled={!hasSelected} 
 	                    		 >删除<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
-						<Popconfirm title="是否停用?" onConfirm={this.delectRow} okText="是" cancelText="否">
+						<Popconfirm title="是否停用?" onConfirm={this.blockRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
 	                   			 disabled={!hasSelected} 
 	                    		 >停用<Icon type="minus" />

+ 8 - 8
js/component/manageCenter/set/organization/organization.jsx

@@ -20,7 +20,7 @@ const Organization=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/open/api/admin/organization/listOrganizationManagement',
+            url: globalConfig.context + '/api/admin/organization/listOrganizationManagement',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -125,7 +125,7 @@ const Organization=Form.create()(React.createClass({
                 method: "post",
                 dataType: "json",
                 crossDomain: false,
-                url: globalConfig.context + "/open/api/admin/organization/selectSuperId",
+                url: globalConfig.context + "/api/admin/organization/selectSuperId",
                 data:{
                   
                 },
@@ -176,7 +176,7 @@ const Organization=Form.create()(React.createClass({
 	            method: "post",
 	            dataType: "json",
 	            crossDomain: false,
-	            url:globalConfig.context + '/open/api/admin/organization/updateOrganization',
+	            url:globalConfig.context + '/api/admin/organization/updateOrganization',
 	            data:{
 	            	name:this.state.editName,//组织名称
 	            	type:this.state.editType, //组织类型
@@ -205,7 +205,7 @@ const Organization=Form.create()(React.createClass({
 	            method: "post",
 	            dataType: "json",
 	            crossDomain: false,
-	            url:globalConfig.context + '/open/api/admin/organization/updateOrganization',
+	            url:globalConfig.context + '/api/admin/organization/updateOrganization',
 	            data:{
 	            	name:this.state.editName,//组织名称
 	            	type:this.state.editType, //组织类型
@@ -242,7 +242,7 @@ const Organization=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +"/open/api/admin/organization/selectAllById" ,
+            url: globalConfig.context +"/api/admin/organization/selectAllById" ,
             data: {
                id: record.id
             },
@@ -305,7 +305,7 @@ const Organization=Form.create()(React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/open/api/admin/organization/deleteById",
+            url: globalConfig.context + "/api/admin/organization/deleteById",
             data: {
                 id: deletedIds
             }
@@ -348,7 +348,7 @@ const Organization=Form.create()(React.createClass({
                     method: "post",
                     dataType: "json",
                     crossDomain: false,
-                    url:globalConfig.context + '/open/api/admin/organization/addOrganization',
+                    url:globalConfig.context + '/api/admin/organization/addOrganization',
                     data:{
                     	name:this.state.nameOrganization,//组织名称
                     	managerId:this.state.theTypes,//负责人ID
@@ -378,7 +378,7 @@ const Organization=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/open/api/admin/organization/selectName",
+            url: globalConfig.context + "/api/admin/organization/selectName",
             data:{
             	name:e
             },