dev01 il y a 1 an
Parent
commit
8c64f23b5a

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

@@ -41,15 +41,15 @@ const Business = React.createClass({
           title: "客户名称",
           dataIndex: "identifyName",
           key: "identifyName",
-          width: 150,
+          // width: 150,
           render: (text) => {
             return (
                 <Tooltip title={text}>
                   <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
+                    // maxWidth:'150px',
+                    // overflow:'hidden',
+                    // textOverflow: "ellipsis",
+                    // whiteSpace:'nowrap',
                   }}>{text}</div>
                 </Tooltip>
             )

+ 8 - 8
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -427,7 +427,7 @@ class PublicSummary extends Component {
         releaseEnd: this.state.releaseDate[1] || undefined,
         aid: this.state.theTypes || undefined,
         sid: this.state.theTypes1 || undefined,
-        uid: this.state.theCustomerTypes,
+        uid: this.state.theCustomerTypes || undefined,
         status: this.state.status,
         clockIn: this.state.clockIn,
         deps: this.state.deps || undefined,
@@ -663,17 +663,17 @@ class PublicSummary extends Component {
     let loading = message.loading("下载中...");
 
     let data = {
-      releaseStart: this.state.releaseDate[0],
-      releaseEnd: this.state.releaseDate[1],
-      aid: this.state.theTypes,
-      sid: this.state.theTypes1,
-      uid: this.state.theCustomerTypes,
+      releaseStart: this.state.releaseDate[0] || undefined,
+      releaseEnd: this.state.releaseDate[1] || undefined,
+      aid: this.state.theTypes || undefined,
+      sid: this.state.theTypes1 || undefined,
+      uid: this.state.theCustomerTypes || undefined,
       status: this.state.status,
       clockIn: this.state.clockIn,
       // depId: this.state.depId,
-      deps: this.state.deps,
+      deps: this.state.deps || undefined,
       publicType: this.state.type,
-      contractNo: this.state.contractNo,
+      contractNo: this.state.contractNo || undefined
 
     };
     for (let i of Object.keys(data)) {

+ 5 - 5
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -208,16 +208,16 @@ const inSpecial = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
+          // width: 100,
           render: (text) => {
             return (
               <Tooltip title={text}>
                 <div
                   style={{
-                    maxWidth: "100px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
+                    // maxWidth: "100px",
+                    // overflow: "hidden",
+                    // textOverflow: "ellipsis",
+                    // whiteSpace: "nowrap",
                   }}
                 >
                   {text}

+ 5 - 5
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -209,16 +209,16 @@ const invoiceApplyList = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
+          // width: 100,
           render: (text) => {
             return (
               <Tooltip title={text}>
                 <div
                   style={{
-                    maxWidth: "100px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
+                    // maxWidth: "100px",
+                    // overflow: "hidden",
+                    // textOverflow: "ellipsis",
+                    // whiteSpace: "nowrap",
                   }}
                 >
                   {text}

+ 5 - 5
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -204,15 +204,15 @@ const invoiceApplyListQuery = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
+          // width: 100,
           render: text => {
             return (
               <Tooltip title={text}>
                 <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
+                  // maxWidth: '100px',
+                  // overflow: 'hidden',
+                  // textOverflow: "ellipsis",
+                  // whiteSpace: 'nowrap',
                 }}>{text}</div>
               </Tooltip>
             )

+ 15 - 9
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -105,10 +105,16 @@ const invoiceApplyListWai = React.createClass({
     );
   },
   tableRowClick(record) {
-    this.state.RowData = record;
-    this.setState({
-      showDesc: true,
-    });
+    // 要求 营销管理员不允许查看 详情(省外开票审核详情)
+    let newShiroList = window.adminData.shiroList == "" ? [] : window.adminData.shiroList.split(",");
+    if (!newShiroList.includes("3")) {
+      this.state.RowData = record;
+      this.setState({
+        showDesc: true,
+      });
+    } else {
+      // message.warn("暂无权限查看")
+    }
   },
   closeDesc(e, s) {
     this.state.showDesc = e;
@@ -208,16 +214,16 @@ const invoiceApplyListWai = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
+          // width: 100,
           render: (text) => {
             return (
               <Tooltip title={text}>
                 <div
                   style={{
-                    maxWidth: "100px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
+                    // maxWidth: "100px",
+                    // overflow: "hidden",
+                    // textOverflow: "ellipsis",
+                    // whiteSpace: "nowrap",
                   }}
                 >
                   {text}

+ 4 - 5
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -202,15 +202,14 @@ const outInvoiceQuery = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
           render: text => {
             return (
               <Tooltip title={text}>
                 <div style={{
-                  maxWidth: '100px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
+                  // maxWidth: '100px',
+                  // overflow: 'hidden',
+                  // textOverflow: "ellipsis",
+                  // whiteSpace: 'nowrap',
                 }}>{text}</div>
               </Tooltip>
             )

+ 5 - 5
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -194,16 +194,16 @@ const outSpecial = React.createClass({
           title: "客户",
           dataIndex: "unitName",
           key: "unitName",
-          width: 100,
+          // width: 100,
           render: (text) => {
             return (
               <Tooltip title={text}>
                 <div
                   style={{
-                    maxWidth: "100px",
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
+                    // maxWidth: "100px",
+                    // overflow: "hidden",
+                    // textOverflow: "ellipsis",
+                    // whiteSpace: "nowrap",
                   }}
                 >
                   {text}

+ 3 - 0
js/component/manageCenter/order/orderNew/changeComponent/searchInput.js

@@ -77,10 +77,12 @@ class PrimarySelect extends Component {
 
   render() {
     const Datas = this.props.searchSelectData;
+    const newShiroList = window.adminData.shiroList == "" ? [] : window.adminData.shiroList.split(",");
     return (
       <Select
         style={{ width: Datas.width, marginRight: 10 }}
         placeholder={Datas.placeholder}
+        disabled={(newShiroList.includes("3")) && Datas.placeholder == "审核状态"}
         value={this.state.value}
         onChange={e => {
           Datas.getValue(e);
@@ -417,6 +419,7 @@ class SearchInput extends Component {
           }
           return (
             <PrimarySelect
+              processState={this.props.processState}
               searchSelectData={item}
               key={index}
               reset={this.state.reset}

+ 4 - 4
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -152,10 +152,10 @@ const checkOutsourcing = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div style={{
-                    maxWidth: '150px',
-                    overflow: 'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace: 'nowrap',
+                    // maxWidth: '150px',
+                    // overflow: 'hidden',
+                    // textOverflow: "ellipsis",
+                    // whiteSpace: 'nowrap',
                   }}>{text}</div>
                 </Tooltip>
               )

+ 1 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1210,7 +1210,7 @@ const contractChange = Form.create()(
               className="test">
               <TabPane tab="搜索" key="1">
                 <div style={{ marginLeft: 10 }}>
-                  <SearchInput search={this.search} />
+                  <SearchInput search={this.search} processState={this.props.processState}/>
                 </div>
               </TabPane>
               <TabPane tab="更改表格显示数据" key="2">

+ 5 - 5
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -80,15 +80,15 @@ class CostAuditList extends Component {
           title: "客户名称",
           dataIndex: "userName",
           key: "userName",
-          width: 150,
+          // width: 150,
           render: (text) => {
             return (
               <Tooltip placement="bottom" title={text}>
                 <div style={{
-                  maxWidth: '150px',
-                  overflow: 'hidden',
-                  textOverflow: "ellipsis",
-                  whiteSpace: 'nowrap',
+                  // maxWidth: '150px',
+                  // overflow: 'hidden',
+                  // textOverflow: "ellipsis",
+                  // whiteSpace: 'nowrap',
                 }}>{text}</div>
               </Tooltip>
             )

+ 39 - 17
js/component/manageCenter/project/summary/projecCount.jsx

@@ -300,7 +300,17 @@ class ProjecCount extends Component {
     );
   }
 
+  // 导出excel
   exportExcel() {
+    message.config({
+      duration: 20,
+    });
+    let loading = message.loading("下载中...");
+    this.setState({
+      exportPendingLoading: true,
+    });
+
+
     let option = this.state.contactsOptionData.filter(
       (v) => v.value === this.state.taberProjectStatus
     )[0].label; //项目类别名称
@@ -342,7 +352,7 @@ class ProjecCount extends Component {
       projectId: this.state.kid || undefined,
       province: this.state.taberProvince || undefined,
       projectStatus: this.state.taberProjectStatus || undefined, //项目类别
-      thchDepId: this.state.taberdepId || undefined,
+      thchDeps: this.state.taberdepId || undefined,
       status:
         this.state.projectType == "4"
           ? 2
@@ -370,10 +380,27 @@ class ProjecCount extends Component {
       }
     }
 
-    window.location.href =
-      globalConfig.context +
-      "/api/admin/statistis/exporTaskList?" +
-      $.param(data);
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: "/api/admin/statistis/exporTaskList",
+      data,
+      success: function (data) {
+        if (data.error.length === 0) {
+          this.download(data.data);
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        loading();
+        this.setState({
+          exportPendingLoading: false,
+        });
+      }.bind(this)
+    );
   }
 
   download(fileName) {
@@ -512,7 +539,7 @@ class ProjecCount extends Component {
       projectSummary: true,
       taberProvince: record.province,
       taberProjectStatus: record.bpId, //项目类别
-      taberdepId: record.thchDepId,
+      taberdepId: !!record.thchDepId && JSON.stringify(record.thchDepId.split(',')),
       thchDepName: record.thchDepName,
       screen: screen,
     });
@@ -832,25 +859,20 @@ class ProjecCount extends Component {
 
                   province: this.state.taberProvince || undefined,
                   projectStatus: this.state.taberProjectStatus || undefined, //项目类别
-                  thchDepId: this.state.taberdepId || undefined,
+                  thchDeps: this.state.taberdepId || undefined,
 
                   status:
                     this.state.projectType == "4"
-                      ? 2
-                      : this.state.projectType == "2"
-                        ? 3
-                        : this.state.projectType == "1"
-                          ? 4
-                          : this.state.projectType == "5"
-                            ? 1
-                            : this.state.contactsOptionData.filter(
+                      ? 2 : this.state.projectType == "2"
+                        ? 3 : this.state.projectType == "1"
+                          ? 4 : this.state.projectType == "5"
+                            ? 1 : this.state.contactsOptionData.filter(
                               (v) => v.value === this.state.taberProjectStatus
                             ).length > 0
                               ? this.state.contactsOptionData.filter(
                                 (v) => v.value === this.state.taberProjectStatus
                               )[0].label === "高新"
-                                ? 1
-                                : 0
+                                ? 1 : 0
                               : 0,
                   screen: this.state.screen, //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
                 }}

+ 1 - 1
package.json

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