@zgfe/modules-settings 2.0.0-zhongyuan.25 → 2.0.0-zhongyuan.26

package/es/modules/demandManage/index.js

@@ -21,6 +21,7 @@ import './styles/index.less';
 import apis from '../../constants/api';
 import request from '../../utils/ajax';
 import moment from 'moment';
+import { demandTabList } from '../createDemand/constants';
 var sorterKey = {
   ascend: 'asc',
   descend: 'desc'
@@ -46,47 +47,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     pageData = _useState4[0],
     setPageData = _useState4[1];
-  var _useState5 = useState([{
-      label: '设计',
-      value: 1,
-      key: 'nodename1',
-      color: '#fda145'
-    }, {
-      label: '审核1',
-      value: 2,
-      key: 'nodename2',
-      color: '#fb5547'
-    }, {
-      label: '审核2',
-      value: 3,
-      key: 'nodename3',
-      color: '#fb5547'
-    }, {
-      label: '开发',
-      value: 4,
-      key: 'nodename4',
-      color: '#165dff'
-    }, {
-      label: '测试',
-      value: 5,
-      key: 'nodename5',
-      color: '#165dff'
-    }, {
-      label: '已完成',
-      value: 6,
-      key: 'finishedSum',
-      color: '#2cbe54'
-    }, {
-      label: '已关闭',
-      value: 7,
-      key: 'closedSum',
-      color: '#cccfd5'
-    }, {
-      label: '已超时',
-      value: 8,
-      key: 'overTimeSum',
-      color: '#fda145'
-    }]),
+  var _useState5 = useState(demandTabList),
     _useState6 = _slicedToArray(_useState5, 1),
     labelList = _useState6[0];
   var _useState7 = useState(route && route.query && route.query.demandKey || ''),
@@ -271,21 +232,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       }).then(function (res) {
         if (res === null || res === void 0 ? void 0 : res.data) {
-          if (type === 'revocation') {
-            request(apis.revocationDemand, {
-              method: 'POST',
-              data: {
-                app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-                id: props.record.id
-              }
-            }).then(function (re) {
-              props.onDeal && props.onDeal(type, res.data);
-              getDemandStatistics();
-              getDemandList();
-            });
-          } else {
-            props.onDeal && props.onDeal(type, res.data);
-          }
+          props.onDeal && props.onDeal(type, res.data);
         }
         // getDemandStatistics();
         // getDemandList();
@@ -325,32 +272,24 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       color: "primary",
       type: "link",
       onClick: function onClick() {
-        props.onDeal && props.onDeal('view', {
-          data: props.record
+        props.onDeal && props.onDeal('revocation', {
+          appId: props.record.id,
+          approvalModule: props.record.approvalModule,
+          businessType: props.record.businessType,
+          completionTime: props.record.completionTime,
+          demandDescribe: props.record.demandDescrib,
+          demandName: props.record.demandName + '复制',
+          fileName: props.record.fileName,
+          filePath: props.record.filePath
         });
       }
     }, "\u590D\u5236"), /*#__PURE__*/React.createElement(Button, {
       color: "primary",
       type: "link",
-      onClick: function onClick() {
-        props.onDeal && props.onDeal('view', {
-          data: props.record
-        });
-      }
-    }, "\u7F16\u8F91"), !isDemo && props.record.isHandle && authority[17228364473] && (/*#__PURE__*/React.createElement("a", {
-      style: {
-        marginRight: 16
-      },
-      onClick: function onClick() {
-        getDemand('deal');
-      }
-    }, "\u5904\u7406")
-    // </Popover>
-    ), !isDemo && props.record.revocation && (/*#__PURE__*/React.createElement("a", {
       onClick: function onClick() {
         getDemand('revocation');
       }
-    }, "\u64A4\u56DE")));
+    }, "\u7F16\u8F91"));
   };
   //关闭功能
   var disableDemand = function disableDemand(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.25",
+  "version": "2.0.0-zhongyuan.26",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f3037c51831c77a9d50fc193ed7f31374b55f82f",
+  "gitHead": "848555469759c362b0f069f0d8a09216c8281f7e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }