Browse Source

专利成本列表权限问题更改

dev01 2 years ago
parent
commit
0ddc5bd734

File diff suppressed because it is too large
+ 704 - 671
js/component/manageCenter/order/orderNew/costAuditList/index.js


+ 33 - 2
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -69,7 +69,7 @@ class CostAuditList extends Component {
           render: (text) => {
             return (
               <Tooltip placement="bottom" title={text}>
-                <div 
+                <div
                 // style={{
                 //   maxWidth: '150px',
                 //   overflow: 'hidden',
@@ -240,6 +240,7 @@ class CostAuditList extends Component {
     });
     data.pageNo = pageNo || 1;
     data.pageSize = this.state.pagination.pageSize;
+    data.permissionsGrade = 1;
     $.ajax({
       method: "get",
       dataType: "json",
@@ -294,6 +295,14 @@ class CostAuditList extends Component {
 
   //导出
   exportExec() {
+    
+    message.config({
+      duration: 20,
+    });
+    let loading = message.loading("下载中...");
+    this.setState({
+      exportPendingLoading: true,
+    });
     let data = Object.assign({}, this.state.searchInfor);
     for (let key in data) {
       if (!data[key]) {
@@ -302,7 +311,29 @@ class CostAuditList extends Component {
     }
     data.pageSize = 9999999;
     data.pageNo = 1;
-    window.location.href = (globalConfig.context + '/api/admin/company/exportPaymentList?' + $.param(data));
+    data.permissionsGrade = 1;
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: "/api/admin/company/exportPaymentList",
+      data,
+      success: function (data) {
+        if (data.error.length === 0) {
+          window.location.href =
+            globalConfig.context + "/open/download?fileName=" + data.data;
+        } else {
+          message.warning(data.error[0].message);
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        loading();
+        this.setState({
+          exportPendingLoading: false,
+        });
+      }.bind(this)
+    );
   }
 
   changeList(arr) {

+ 7 - 6
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -71,12 +71,12 @@ class PayApplyReject extends Component {
             return (
               <Tooltip title={text}>
                 <div
-                  // style={{
-                  //   maxWidth: '150px',
-                  //   overflow: 'hidden',
-                  //   textOverflow: "ellipsis",
-                  //   whiteSpace: 'nowrap',
-                  // }}
+                // style={{
+                //   maxWidth: '150px',
+                //   overflow: 'hidden',
+                //   textOverflow: "ellipsis",
+                //   whiteSpace: 'nowrap',
+                // }}
                 >{text}</div>
               </Tooltip>
             )
@@ -241,6 +241,7 @@ class PayApplyReject extends Component {
     data.pageNo = pageNo || 1;
     data.pageSize = this.state.pagination.pageSize;
     data.status = 2;   //驳回状态
+    data.permissionsGrade = 3;
     $.ajax({
       method: "get",
       dataType: "json",

+ 1 - 1
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -266,7 +266,7 @@ const Newuser = Form.create()(React.createClass({
             managerId: thisdata.managerId, // 经理审核
             theTypes: '',
             duty: thisdata.duty ? thisdata.duty : undefined,//职务
-            publicPurview: thisdata.publicPurview ? thisdata.publicPurview : undefined,
+            publicPurview: thisdata.publicPurview,
             seniorStaff: thisdata.seniorStaff,
             status: Number(thisdata.status),
             contactMobile: thisdata.contactMobile ? thisdata.contactMobile : undefined,//手机号

+ 1 - 1
package.json

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