dev01 7 months ago
parent
commit
8f4da20e55

+ 2 - 1
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -51,6 +51,7 @@ const QueryCustomer = React.createClass({
               name: thisdata.name,
               contacts: thisdata.contacts,
               contactMobile: thisdata.contactMobile,
+              signBills: thisdata.signBills,
               createTime:
                 thisdata.createTime && thisdata.createTime.split(" ")[0],
               transferTime:
@@ -170,7 +171,7 @@ const QueryCustomer = React.createClass({
       }
     }).done(function (data) {
       if (!data.error.length) {
-        message.success('领取成功!');
+        message.success(e.signBills == 1 ? '领取成功!客户为签单客户,请在【签单单位客户】列表中查询' : '领取成功!客户为私有客户,请在【私有单位客户】列表中查询');
         this.setState({
           loading: false,
         });

+ 2 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -56,6 +56,7 @@ const QueryCustomer = React.createClass({
               (thisdata.area == null ? "" : "-" + thisdata.area);
             thisdata.key = i;
             thisdata.id = thisdata.uid;
+            thisdata.signBills = thisdata.signBills;
             thisdata.createTime = thisdata.createTime && thisdata.createTime.split(" ")[0];
             thisdata.locationProvince = diqu;
             theArr.push(thisdata);
@@ -288,7 +289,7 @@ const QueryCustomer = React.createClass({
         loading: false,
       });
       if (data.error.length === 0) {
-        message.success('领取成功!');
+        message.success(e.signBills == 1 ? '领取成功!客户为签单客户,请在【签单单位客户】列表中查询' : '领取成功!客户为私有客户,请在【私有单位客户】列表中查询');
         this.loadData(this.state.ispage);
       } else {
         message.warning(data.error[0].message);

+ 1 - 2
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -734,7 +734,6 @@ const PaiDan = React.createClass({
   },
 
   rizhi() {
-    // console.log(this.state.orderNo);
     this.setState({
       loading: true
     });
@@ -1244,7 +1243,7 @@ const PaiDan = React.createClass({
               render: (text, record) => {
                 return (
                   <div>
-                    {(this.state.processStatus == 5 || this.state.processStatus == 6) && record.taskStatus == 0 &&
+                    {(this.state.processStatus == 6 || this.state.processStatus == 7) && record.taskStatus == 0 &&
                       <Button
                         type="primary"
                         onClick={e => {

+ 230 - 48
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -3,7 +3,7 @@ import { Icon, Modal, message, AutoComplete, Spin, Input, Select, Button, Form,
 import $ from 'jquery/src/ajax';
 import './userMangagement.less';
 import { cityArr, station, post } from '../../../dataDic.js';
-import { splitUrl } from '../../../tools.js';
+import { splitUrl, getNewArray } from '../../../tools.js';
 import moment from 'moment';
 import ImgList from "../../../common/imgList";
 
@@ -73,7 +73,9 @@ const Newuser = Form.create()(React.createClass({
       loading: false,
       loaduser: {},
       datauser: [],
-      role: []
+      role: [],
+      Business: [{ reviewerName: "", reviewerId: "" }], // 公出审核
+      Coorder: [{ reviewerName: "", reviewerId: "" }],  // 协单审核
     };
   },
   getDefaultProps() {
@@ -101,7 +103,7 @@ const Newuser = Form.create()(React.createClass({
       message.warning('请输入正确的上级主管');
       return false;
     };
-    if (!this.state.reviewer) {
+    if (!getNewArray(this.state.Business, "value").toString()) {
       message.warning('请输入正确的公出审核人');
       return false;
     }
@@ -152,7 +154,7 @@ const Newuser = Form.create()(React.createClass({
           position: this.state.position,//岗位
           email: this.state.email,
           superiorId: this.state.theTypes ? this.state.theTypes : this.state.superiorId,
-          reviewer: this.state.reviewer,
+          // reviewer: this.state.reviewer, 
           district: this.state.district,
           headPortraitUrl: theorgCodeUrl.length ? theorgCodeUrl : '',
           entryTime: this.state.selTime,
@@ -160,7 +162,9 @@ const Newuser = Form.create()(React.createClass({
           managerId: this.state.managerId,
           expenseSuperExamine: this.state.expenseSuperExamine, // 报销是否需要上级审核
           publicCarbonCopy: this.state.publicCarbonCopy,// 公出抄送
-        })
+        }),
+        publicReviewerIds: getNewArray(this.state.Business, "reviewerId").toString(),// 公出审核
+        assistReviewerIds: getNewArray(this.state.Coorder, "reviewerId").toString(),// 协单审核
       }
     }).done(function (data) {
       this.setState({
@@ -291,6 +295,36 @@ const Newuser = Form.create()(React.createClass({
       }.bind(this));
     }
   },
+  getReviewer(record) {
+    if (record) {
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + '/api/admin/superviser/publicReviewer',
+        data: {
+          id: record.id
+        },
+        success: function (data) {
+          let thisdata = data.data;
+          if (!thisdata) {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            };
+            thisdata = {};
+          };
+          this.setState({
+            Business: thisdata.publicReviewer.length > 0 ? thisdata.publicReviewer : [{ reviewerName: "", reviewerId: "" }],
+            Coorder: thisdata.assistReviewer.length > 0 ? thisdata.assistReviewer : [{ reviewerName: "", reviewerId: "" }],
+          });
+        }.bind(this),
+      }).always(function () {
+        this.setState({
+          loading: false
+        });
+      }.bind(this));
+    }
+  },
   //重置密码
   resetPwd() {
     this.setState({
@@ -343,13 +377,54 @@ const Newuser = Form.create()(React.createClass({
   componentDidMount() {
     if (this.props.datauser.id) {
       this.loaduser(this.props.datauser)
+      this.getReviewer(this.props.datauser)
       this.setState({
         rolek: this.props.role
       })
     }
   },
 
+  add() {
+    const { Coorder } = this.state;
+    let arr = Coorder
+    let obj = { title: "", value: "" }
+    arr.push(obj)
+    this.setState({
+      Coorder: arr
+    })
+  },
+
+  remove(i) {
+    const { Coorder } = this.state;
+    let arr = Coorder
+    arr.splice(i, 1)
+    this.setState({
+      Coorder: arr
+    })
+  },
+
+  add1() {
+    const { Business } = this.state;
+    let arr = Business
+    let obj = { title: "", value: "" }
+    arr.push(obj)
+    this.setState({
+      Business: arr
+    })
+  },
+
+  remove1(i) {
+    const { Business } = this.state;
+    let arr = Business
+    arr.splice(i, 1)
+    this.setState({
+      Business: arr
+    })
+  },
+
+
   render() {
+    const { Coorder, Business } = this.state
     const FormItem = Form.Item
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -362,11 +437,12 @@ const Newuser = Form.create()(React.createClass({
     const departmentArr = this.props.departmentArr || [];
     const roleArrS = this.props.roleArr || [];
     const rolst = this.state.rolek || [];
+
     return (
       <div>
         <Modal maskClosable={false} visible={this.props.showDesc}
           onOk={this.handleOk} onCancel={this.handleCancel}
-          width='800px'
+          width='1000px'
           title={this.props.userDetaile ? '用户详情' : '新建用户'}
           footer=''
           className="admin-desc-content">
@@ -564,49 +640,154 @@ const Newuser = Form.create()(React.createClass({
                     <span>{this.state.userNo}</span>
                   </FormItem>
                   : ''}
-                <FormItem className="half-item"
-                  {...formItemLayout}
-                  label="公出审核"
-                >
-                  <StaffSearch
-                    valueName={this.state.reviewerName}
-                    placeholder="输入名称"
-                    onBlurText={e => {
-                      this.setState({
-                        reviewerName: e.title
-                      })
-                    }}
-                    onBlurChange={(obj) => {
-                      this.setState({
-                        reviewer: obj.value,
-                      })
-                    }}
-                  />
-                  <span className="mandatory">*</span>
-                </FormItem>
-                <FormItem className="half-item"
-                  {...formItemLayout}
-                  label="经理审核"
-                >
-                  <StaffSearch
-                    valueName={this.state.managerName}
-                    placeholder="输入名称"
-                    onBlurText={e => {
-                      this.setState({
-                        managerName: e.title
-                      })
-                    }}
-                    onBlurChange={(obj) => {
-                      this.setState({
-                        managerId: obj.value,
-                      })
-                    }}
-                  />
-                </FormItem>
 
-                <FormItem className="half-item"
+                <div className='clearfix'>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label='公出审核'
+                  >
+                    {
+                      Business.map((k, index) =>
+                        <div key={index}>
+                          <StaffSearch
+                            valueName={k.reviewerName}
+                            placeholder="输入名称"
+                            width={200}
+                            onBlurText={e => {
+                              let newBusiness = Business
+                              for (var i = 0; i < newBusiness.length; i++) {
+                                if (index == i) {
+                                  newBusiness[i].reviewerName = e.title
+                                }
+                              }
+                              this.setState({
+                                Business: newBusiness
+                              })
+                            }}
+                            onBlurChange={(e) => {
+                              let newBusiness = Business
+                              for (var i = 0; i < newBusiness.length; i++) {
+                                if (index == i) {
+                                  newBusiness[i].reviewerId = e.value
+                                }
+                              }
+                              this.setState({
+                                Business: newBusiness
+                              })
+                            }}
+                          />
+                          <div style={{ width: 25, display: "inline-block" }}>
+                            {Business.length > 1 ? (
+                              <Icon
+                                className="dynamic-delete-button"
+                                type="minus-circle-o"
+                                disabled={Business.length === 1}
+                                onClick={() => this.remove1(index)}
+                              />
+                            ) : null}
+                          </div>
+                          {index === 0 && <Button style={{ marginLeft: 10 }} size="small" type="primary" onClick={this.add1}>新增</Button>}
+                        </div>
+                      )
+                    }
+                  </FormItem>
+
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="经理审核"
+                  >
+                    <StaffSearch
+                      valueName={this.state.managerName}
+                      placeholder="输入名称"
+                      onBlurText={e => {
+                        this.setState({
+                          managerName: e.title
+                        })
+                      }}
+                      onBlurChange={(obj) => {
+                        this.setState({
+                          managerId: obj.value,
+                        })
+                      }}
+                    />
+                  </FormItem>
+                </div>
+
+                <div className='clearfix'>
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label='协单审核'
+                  >
+                    {
+                      Coorder.map((k, index) =>
+                        <div key={index}>
+                          <StaffSearch
+                            valueName={k.reviewerName}
+                            placeholder="输入名称"
+                            width={200}
+                            onBlurText={e => {
+                              let newCoorder = Coorder
+                              for (var i = 0; i < newCoorder.length; i++) {
+                                if (index == i) {
+                                  newCoorder[i].reviewerName = e.title
+                                }
+                              }
+                              this.setState({
+                                Coorder: newCoorder
+                              })
+                            }}
+                            onBlurChange={(e) => {
+                              let newCoorder = Coorder
+                              for (var i = 0; i < newCoorder.length; i++) {
+                                if (index == i) {
+                                  newCoorder[i].reviewerId = e.value
+                                }
+                              }
+                              this.setState({
+                                Coorder: newCoorder
+                              })
+                            }}
+                          />
+                          <div style={{ width: 25, display: "inline-block" }} >
+                            {Coorder.length > 1 ? (
+                              <Icon
+                                className="dynamic-delete-button"
+                                type="minus-circle-o"
+                                disabled={Coorder.length === 1}
+                                onClick={() => this.remove(index)}
+                              />
+                            ) : null}
+                          </div>
+                          {index === 0 && <Button style={{ marginLeft: 10 }} size="small" type="primary" onClick={this.add}>新增</Button>}
+                        </div>
+                      )
+                    }
+                  </FormItem>
+
+                  <FormItem className="half-item"
+                    {...formItemLayout}
+                    label="公出抄送"
+                  >
+                    <StaffSearch
+                      valueName={this.state.publicCarbonCopyName}
+                      placeholder="输入名称"
+                      onBlurText={e => {
+                        this.setState({
+                          publicCarbonCopyName: e.title
+                        })
+                      }}
+                      onBlurChange={(obj) => {
+                        this.setState({
+                          publicCarbonCopy: obj.value,
+                        })
+                      }}
+                    />
+                  </FormItem>
+                </div>
+
+                {/* <FormItem className="half-item"
                   {...formItemLayout}
-                  label="公出抄送"
+                  label="协单审核"
                 >
                   <StaffSearch
                     valueName={this.state.publicCarbonCopyName}
@@ -622,7 +803,7 @@ const Newuser = Form.create()(React.createClass({
                       })
                     }}
                   />
-                </FormItem>
+                </FormItem> */}
 
                 <FormItem className="half-item"
                   {...formItemLayout}
@@ -638,6 +819,7 @@ const Newuser = Form.create()(React.createClass({
                     <Select.Option value={1} >是</Select.Option>
                   </Select>
                 </FormItem>
+
                 <div className='clearfix'>
                   <FormItem className="half-item"
                     {...formItemLayout}

+ 88 - 53
js/component/manageCenter/set/userManagementS/userMangagement.less

@@ -1,75 +1,110 @@
 .user-content {
-    background: #fff;
-    padding: 20px;
-    .content-title {
-        color: #333;
-        font-size: 16px;
-        overflow: hidden;
+  background: #fff;
+  padding: 20px;
+
+  .content-title {
+    color: #333;
+    font-size: 16px;
+    overflow: hidden;
+  }
+
+  .user-search {
+
+    // margin-bottom: 10px;
+    >input {
+      width: 140px;
     }
-    .user-search {
-        // margin-bottom: 10px;
-        > input {
-            width: 140px;
-        }
-         > button,
-        .ant-select,
-        > input {
-            margin-right: 10px;
-            // margin-top: 10px;
-        }
-        .ant-switch {
-            margin-left: 10px;
-        }
-        .search-more {
-            margin: 10px 0;
-            > span {
-                margin-right: 10px;
-            }
-        }
+
+    >button,
+    .ant-select,
+    >input {
+      margin-right: 10px;
+      // margin-top: 10px;
     }
-    .addButton {
-        float: right;
-        margin-right: 10px!important;
+
+    .ant-switch {
+      margin-left: 10px;
     }
+
+    .search-more {
+      margin: 10px 0;
+
+      >span {
+        margin-right: 10px;
+      }
+    }
+  }
+
+  .addButton {
+    float: right;
+    margin-right: 10px !important;
+  }
 }
+
 .ant-tabs-bar {
-    margin-bottom: 10px;
+  margin-bottom: 10px;
 }
+
 .half-item {
-    float: left;
-    width: 50%;
-    min-height: 36px;
-    margin-bottom: 10px;
-    button {
-        margin-left: 20px;
-    }
+  float: left;
+  width: 50%;
+  min-height: 36px;
+  margin-bottom: 10px;
+
+  button {
+    margin-left: 20px;
+  }
 }
+
 .half-middle {
-    width: 80%;
-    margin: 10px auto;
-    height: 36px;
-    button {
-        margin-left: 20px;
-    }
+  width: 80%;
+  margin: 10px auto;
+  height: 36px;
+
+  button {
+    margin-left: 20px;
+  }
 }
+
 .patent-table {
-    clear: both;
+  clear: both;
 }
+
 .set-submit {
-    margin-right: 15px;
+  margin-right: 15px;
 }
+
 .deletButton {
-    float: right;
-    margin-bottom: 15px;
+  float: right;
+  margin-bottom: 15px;
 }
+
 .clearfix {
-    clear: both;
+  clear: both;
 }
+
 .mandatory {
-    color: red;
-    margin-left: 8px;
+  color: red;
+  margin-left: 8px;
+}
+
+.search-more .ant-select-auto-complete.ant-select-lg .ant-input {
+  height: 28px
+}
+
+.rolesCol {
+  width: 90%;
+}
+
+.dynamic-delete-button {
+  cursor: pointer;
+  position: relative;
+  top: 4px;
+  font-size: 24px;
+  color: #999;
+  transition: all .3s;
 }
-.search-more .ant-select-auto-complete.ant-select-lg .ant-input{
-    height:28px
+
+.dynamic-delete-button:hover {
+  color: #777;
 }
-.rolesCol{width: 90%;}

+ 10 - 0
js/component/manageCenter/standard/content.jsx

@@ -31,6 +31,7 @@ class Content extends Component {
   }
   getKey(key) {
     switch (key) {
+      // 标准列表
       case 'standard':
         require.ensure([], () => {
           const Standard = require('./stList/index').default;
@@ -39,6 +40,15 @@ class Content extends Component {
           });
         });
         break;
+      // 标准平台链接
+      case 'standardLink':
+        require.ensure([], () => {
+          const StandardLink = require('./slLink/index').default;
+          this.setState({
+            component: <StandardLink />
+          });
+        });
+        break;
       default:
         require.ensure([], () => {
           const Module = require('../module').default;

+ 499 - 0
js/component/manageCenter/standard/slLink/index.jsx

@@ -0,0 +1,499 @@
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import {
+  Form, Button, Input, Select, InputNumber, Spin, Table,
+  message, DatePicker, Modal, Tabs
+} from 'antd';
+import moment from 'moment';
+import { ShowModal, } from '../../../tools.js';
+import { ChooseList } from "../../order/orderNew/chooseList";
+import "./index.less";
+
+const { TabPane } = Tabs
+const FormItem = Form.Item;
+const Standard = Form.create()(React.createClass({
+
+  getInitialState() {
+    return {
+      searchValues: {},
+      loading: false,
+      changeList: undefined, // 更改后的表格显示数据
+      dataSource: [],
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 20,
+        onChange: function (page) {
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function (total) {
+          return '共' + total + '条数据';
+        }
+      },
+      columns: [
+        {
+          title: '链接',
+          dataIndex: 'url',
+          key: 'url',
+          width: 360,
+          render: text =>
+            <a href={text} target="_blank">{text}</a>
+            // <div onClick={e => {
+            //   window.open(text)
+            // }}>
+            //   {text}
+            // </div>
+        },
+        {
+          title: '标准平台',
+          dataIndex: 'name',
+          key: 'name',
+        },
+        {
+          title: '排序',
+          dataIndex: 'sort',
+          key: 'sort',
+        },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          key: 'status',
+          render: text => <span style={{ color: ["red", "green"][text] }}>{["关闭", "开启"][text]}</span>
+        },
+        {
+          title: '更新时间',
+          dataIndex: 'updateTime',
+          key: 'updateTime',
+        },
+      ],
+      visible: "",
+      data: {},
+    };
+  },
+
+  componentWillMount() {
+    this.loadData();
+  },
+  // 列表接口
+  loadData(pageNo) {
+    const { searchValues, pagination } = this.state;
+    this.setState({
+      loading: true,
+    });
+    let datas = Object.assign(searchValues, {
+      pageNo: pageNo || 1,
+      pageSize: pagination.pageSize,
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/standardPlatformLink/list",
+      data: datas,
+      success: function (data) {
+        ShowModal(this);
+        this.setState({
+          loading: false,
+        });
+        if (data.error && data.error.length === 0) {
+          if (data.data.list) {
+            pagination.current = data.data.pageNo;
+            pagination.total = data.data.totalCount;
+            if (data.data && data.data.list && !data.data.list.length) {
+              pagination.current = 0;
+              pagination.total = 0;
+            }
+            this.setState({
+              dataSource: data.data.list,
+              pagination: this.state.pagination,
+              pageNo: data.data.pageNo,
+            });
+          } else {
+            this.setState({
+              dataSource: data.data,
+              pagination: false,
+            });
+          }
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
+  },
+  // 搜索
+  search() {
+    this.loadData();
+  },
+  // 重置
+  reset() {
+    this.setState({
+      searchValues: {}
+    }, () => {
+      this.loadData();
+    })
+  },
+
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
+
+  addClick() {
+    this.setState({
+      visible: "add"
+    })
+  },
+
+  tableRowClick(e) {
+    if (!adminData.isSuperAdmin) {
+      return
+    }
+    this.setState({
+      visible: "edit",
+    })
+    this.getDetails(e.id)
+  },
+  // 数据详情
+  getDetails(id) {
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/standardPlatformLink/get",
+      data: {
+        id,
+      },
+      success: function (data) {
+        let thedata = data.data || {};
+        if (!thedata) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          };
+        }
+        this.setState({
+          data: thedata,
+        })
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  },
+
+  handleCancel() {
+    this.setState({
+      visible: "",
+      data: {},
+    })
+  },
+  // 提交保存
+  handleSubmit() {
+    const { data } = this.state
+    if (!data.name) {
+      message.warning('标准平台名称不能为空!');
+      return;
+    }
+    if (!data.url) {
+      message.warning('链接不能为空!');
+      return;
+    }
+    if (!data.sort && data.sort != 0) {
+      message.warning('排序不能为空!');
+      return;
+    }
+    if (!data.status && data.status != 0) {
+      message.warning('请选择状态!');
+      return;
+    }
+    if (data.id) {
+      delete data.createTime;
+      delete data.updateTime;
+      delete data.aid;
+    }
+    $.ajax({
+      method: "POST",
+      dataType: "json",
+      crossDomain: false,
+      url:
+        data.id
+          ? globalConfig.context + '/api/admin/standardPlatformLink/update'
+          : globalConfig.context + '/api/admin/standardPlatformLink/add',
+      data,
+    }).done(function (data) {
+      this.setState({
+        loading: false
+      });
+      if (!data.error.length) {
+        message.success('保存成功!');
+        this.handleCancel();
+        this.loadData(this.state.pageNo);
+      } else {
+        message.warning(data.error[0].message);
+      }
+    }.bind(this));
+  },
+
+  render() {
+    const { RangePicker } = DatePicker;
+    const { searchValues, data } = this.state
+    const formItemLayout = {
+      labelCol: { span: 8 },
+      wrapperCol: { span: 16 },
+    };
+    return (
+      <div className="user-content">
+        <div className="content-title">
+          <Tabs defaultActiveKey="1" className="test">
+            <TabPane tab="搜索" key="1">
+              <div className="user-search" style={{ marginLeft: 10 }}>
+                <Input
+                  placeholder="请输入标准平台"
+                  value={searchValues["name"]
+                    ? searchValues["name"]
+                    : ""}
+                  onChange={(e) => {
+                    searchValues["name"] = e.target.value;
+                    this.setState({
+                      searchValues: searchValues,
+                    });
+                  }}
+                />
+                <Select
+                  placeholder="状态"
+                  style={{ width: 140 }}
+                  value={searchValues["status"]}
+                  onChange={(e) => {
+                    searchValues["status"] = e;
+                    this.setState({
+                      searchValues: searchValues,
+                    });
+                  }}
+                >
+                  <Select.Option value={null}>全部</Select.Option>
+                  <Select.Option value={0}>关闭</Select.Option>
+                  <Select.Option value={1}>开启</Select.Option>
+                </Select>
+                <span>时间:</span>
+                <RangePicker
+                  style={{ width: 300 }}
+                  value={[
+                    searchValues.startTime ? moment(searchValues.startTime) : null,
+                    searchValues.endTime ? moment(searchValues.endTime) : null,
+                  ]}
+                  onChange={(data, dataString) => {
+                    this.setState({
+                      searchValues: Object.assign(searchValues, {
+                        startTime: dataString[0],
+                        endTime: dataString[1],
+                      }),
+                    });
+                  }}
+                />
+                <Button
+                  type="primary"
+                  onClick={this.search}
+                  style={{ margin: "0 10px" }}
+                >搜索</Button>
+                <Button onClick={this.reset}>重置</Button>
+              </div>
+            </TabPane>
+            <TabPane tab="更改表格显示数据" key="2">
+              <div style={{ marginLeft: 10 }}>
+                <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+                />
+              </div>
+            </TabPane>
+            {adminData.isSuperAdmin ?
+              <TabPane tab="新增" key="3">
+                <Button
+                  type="primary"
+                  className="addButton"
+                  style={{ float: "left", marginBottom: 10, marginTop: 12 }}
+                  onClick={this.addClick}
+                >
+                  新增
+                </Button>
+              </TabPane> : ""}
+          </Tabs>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                bordered
+                columns={
+                  this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+                }
+                style={{
+                  cursor: 'pointer',
+                }}
+                dataSource={this.state.dataSource}
+                pagination={this.state.pagination}
+                onRowDoubleClick={this.tableRowClick}
+              />
+            </Spin>
+          </div>
+        </div>
+        {
+          this.state.visible != "" &&
+          <Modal
+            title={!!data.id ? "编辑标准平台链接" : "新增标准平台链接"}
+            visible={this.state.visible != ""}
+            width="600px"
+            onCancel={this.handleCancel}
+            maskClosable={false}
+            footer=""
+            className="admin-desc-content"
+          >
+            <Form
+              layout="horizontal"
+              // onSubmit={this.handleSubmit}
+              id="demand-form"
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-middle"
+                    {...formItemLayout}
+                    label="标准平台链接"
+                  >
+                    <Input
+                      placeholder="请输入标准平台链接"
+                      value={data["url"]
+                        ? data["url"]
+                        : ""}
+                      style={{ width: "230px" }}
+                      onChange={(e) => {
+                        data["url"] = e.target.value;
+                        this.setState({
+                          data: data
+                        });
+                      }}
+                    />
+                    <span className="mandatory">*</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-middle"
+                    {...formItemLayout}
+                    label="标准平台名称"
+                  >
+                    <Input
+                      placeholder="请输入标准平台名称"
+                      value={data["name"]
+                        ? data["name"]
+                        : ""}
+                      style={{ width: "230px" }}
+                      onChange={(e) => {
+                        data["name"] = e.target.value;
+                        this.setState({
+                          data: data
+                        });
+                      }}
+                    />
+                    <span className="mandatory">*</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-middle"
+                    {...formItemLayout}
+                    label="排序"
+                  >
+                    <InputNumber
+                      min={0}
+                      max={999999}
+                      step={1}
+                      value={data["sort"]
+                        ? data["sort"]
+                        : ""}
+                      style={{ width: "130px" }}
+                      onChange={(e) => {
+                        data["sort"] = e;
+                        this.setState({
+                          data: data
+                        });
+                      }}
+                    />
+                    <span className="mandatory">数字越大排序越前</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-middle"
+                    {...formItemLayout}
+                    label="状态"
+                  >
+                    <Select
+                      placeholder=""
+                      style={{ width: "80px" }}
+                      value={data.status}
+                      onChange={(e) => {
+                        data["status"] = e;
+                        this.setState({
+                          data: data,
+                        });
+                      }}
+                    >
+                      {[
+                        { key: "关闭", value: 0 },
+                        { key: "开启", value: 1 },
+                      ].map(function (item) {
+                        return (
+                          <Select.Option key={item.value} value={item.value}>
+                            {item.key}
+                          </Select.Option>
+                        );
+                      })}
+                    </Select>
+                    <span className="mandatory">*</span>
+                  </FormItem>
+
+                </div>
+                <FormItem className="half-middle">
+                  <Button
+                    className="set-submit"
+                    type="primary"
+                    onClick={this.handleSubmit}
+                    style={{ marginLeft: "150px" }}
+                  >
+                    保存
+                  </Button>
+                  <Button
+                    className="set-submit"
+                    type="ghost"
+                    onClick={this.handleCancel}
+                  >
+                    取消
+                  </Button>
+                </FormItem>
+              </Spin>
+            </Form>
+          </Modal>
+        }
+      </div>
+    );
+  }
+}));
+
+export default Standard;

+ 0 - 0
js/component/manageCenter/standard/slLink/index.less


+ 21 - 1
js/component/manageCenter/standard/stList/index.jsx

@@ -88,6 +88,7 @@ const Standard = Form.create()(React.createClass({
         { key: "地方标准", value: 2, },
         { key: "团体标准", value: 3, },
         { key: "国际标准", value: 4, },
+        { key: "企业标准", value: 5, },
       ],
       pagination: {
         defaultCurrent: 1,
@@ -116,7 +117,7 @@ const Standard = Form.create()(React.createClass({
           title: '参考',
           dataIndex: 'reference',
           key: 'reference',
-          render: (text, record) => <span>{['国家 ', '行业 ', '地方 ', '团体 ', '国际 '][record.type]}{text}</span>
+          render: (text, record) => <span>{['国家 ', '行业 ', '地方 ', '团体 ', '国际 ','企业 '][record.type]}{text}</span>
         },
         {
           title: '部门',
@@ -516,6 +517,25 @@ const Standard = Form.create()(React.createClass({
                   <Select.Option value={0}>关闭</Select.Option>
                   <Select.Option value={1}>开启</Select.Option>
                 </Select>
+                <Select
+                  placeholder="标准类型"
+                  style={{ width: 140 }}
+                  value={searchValues["type"]}
+                  onChange={(e) => {
+                    searchValues["type"] = e;
+                    this.setState({
+                      searchValues: searchValues,
+                    });
+                  }}
+                >
+                  {this.state.typeList.map(function (item) {
+                    return (
+                      <Select.Option key={item.value} value={item.value}>
+                        {item.key}
+                      </Select.Option>
+                    );
+                  })}
+                </Select>
                 <span>时间:</span>
                 <RangePicker
                   style={{ width: 300 }}

+ 11 - 0
js/component/tools.js

@@ -2462,6 +2462,17 @@ const obj = {
     return a - b;
   },
 
+  // 数组重组
+  getNewArray: function (array, key) {
+    let arr = []
+    if (array && array.length > 0) {
+      array.forEach(e => {
+        arr.push(e[key])
+      });
+    }
+    return arr
+  },
+
 };
 
 

+ 1 - 1
package.json

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