@zgfe/modules-settings 2.0.0-zhongyuan.29 → 2.0.0-zhongyuan.31

package/es/modules/createDemand/constants.js

@@ -132,7 +132,7 @@ var demandTabList = [{
   value: 6,
   key: 'nodename6',
   color: '#165dff',
-  buttonName: '测试完成'
+  buttonName: '需求完成'
 }, {
   label: '已完成',
   value: 101,

package/es/modules/createDemand/index.js

@@ -42,7 +42,7 @@ var getImgUrl = function getImgUrl(src, pageId) {
   //   : `${'https://test01.zhugeapi.com'}/web/img/report/${pageId}/${src}`;
 };
 var CreateDemand = function CreateDemand(props) {
-  var _props$data, _props$data3, _props$data4, _props$data5, _props$data6;
+  var _props$data;
   var classPrefix = 'system-setting-create-demand';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
@@ -72,125 +72,110 @@ var CreateDemand = function CreateDemand(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     eventKey = _useState10[0],
     setEventKey = _useState10[1];
-  var _useState11 = useState(''),
+  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    attrKey = _useState12[0],
-    setAttrKey = _useState12[1];
+    demandFile = _useState12[0],
+    setDemandFile = _useState12[1];
   var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    demandFile = _useState14[0],
-    setDemandFile = _useState14[1];
-  var _useState15 = useState(),
+    pointEventInfo = _useState14[0],
+    setPointEventInfo = _useState14[1];
+  var _useState15 = useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    pointEventInfo = _useState16[0],
-    setPointEventInfo = _useState16[1];
+    isHandle = _useState16[0],
+    setIsHandle = _useState16[1];
   var _useState17 = useState(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    isHandle = _useState18[0],
-    setIsHandle = _useState18[1];
-  var _useState19 = useState(false),
+    isWithdraw = _useState18[0],
+    setIsWithdraw = _useState18[1];
+  var _useState19 = useState(void 0),
     _useState20 = _slicedToArray(_useState19, 2),
-    isWithdraw = _useState20[0],
-    setIsWithdraw = _useState20[1];
-  var _useState21 = useState(false),
-    _useState22 = _slicedToArray(_useState21, 2),
-    eventAttrListShow = _useState22[0],
-    setEventAttrListShow = _useState22[1];
-  var _useState23 = useState(void 0),
+    currentNodenumber = _useState20[0],
+    setCurrentNodenumber = _useState20[1];
+  var _useState21 = useState(props.isRead),
+    _useState22 = _slicedToArray(_useState21, 1),
+    isRead = _useState22[0];
+  var _useState23 = useState(false),
     _useState24 = _slicedToArray(_useState23, 2),
-    currentNodenumber = _useState24[0],
-    setCurrentNodenumber = _useState24[1];
-  var _useState25 = useState(),
+    isShowBackConfirm = _useState24[0],
+    setIsShowBackConfirm = _useState24[1];
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
-    eventProp = _useState26[0],
-    setEventProp = _useState26[1];
-  var _useState27 = useState(0),
+    isEdit = _useState26[0],
+    setIsEdit = _useState26[1];
+  var _useState27 = useState(),
     _useState28 = _slicedToArray(_useState27, 2),
-    propType = _useState28[0],
-    setPropType = _useState28[1];
-  var _useState29 = useState(-1),
+    processingNode = _useState28[0],
+    setProcessingNode = _useState28[1];
+  var _useState29 = useState(),
     _useState30 = _slicedToArray(_useState29, 2),
-    encryptionType = _useState30[0],
-    setEncryptionType = _useState30[1];
-  var _useState31 = useState(props.isRead),
-    _useState32 = _slicedToArray(_useState31, 1),
-    isRead = _useState32[0];
-  var _useState33 = useState(false),
-    _useState34 = _slicedToArray(_useState33, 2),
-    isShowBackConfirm = _useState34[0],
-    setIsShowBackConfirm = _useState34[1];
-  var _useState35 = useState(false),
+    demandData = _useState30[0],
+    setDemandData = _useState30[1];
+  var _useState31 = useState(0),
+    _useState32 = _slicedToArray(_useState31, 2),
+    demandStatus = _useState32[0],
+    setDemandStatus = _useState32[1];
+  //需求操作类型
+  var _useState33 = useState((props === null || props === void 0 ? void 0 : (_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.type) || 'get'),
+    _useState34 = _slicedToArray(_useState33, 1),
+    demandType = _useState34[0];
+  //埋点列表选择key
+  var _useState35 = useState([]),
     _useState36 = _slicedToArray(_useState35, 2),
-    isEdit = _useState36[0],
-    setIsEdit = _useState36[1];
-  var _useState37 = useState(),
+    selectedRowKeys = _useState36[0],
+    setSelectedRowKeys = _useState36[1];
+  //公司用户列表
+  var _useState37 = useState([]),
     _useState38 = _slicedToArray(_useState37, 2),
-    processingNode = _useState38[0],
-    setProcessingNode = _useState38[1];
-  var _useState39 = useState(),
+    userList = _useState38[0],
+    setUserList = _useState38[1];
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    demandData = _useState40[0],
-    setDemandData = _useState40[1];
-  var _useState41 = useState(((_props$data = props.data) === null || _props$data === void 0 ? void 0 : _props$data.demand.demandStatus) || 0),
-    _useState42 = _slicedToArray(_useState41, 1),
-    demandStatus = _useState42[0];
-  //埋点列表选择key
-  var _useState43 = useState([]),
+    showUser = _useState40[0],
+    setShowUser = _useState40[1];
+  var _useState41 = useState({}),
+    _useState42 = _slicedToArray(_useState41, 2),
+    userSelect = _useState42[0],
+    setUserSelect = _useState42[1];
+  var _useState43 = useState(''),
     _useState44 = _slicedToArray(_useState43, 2),
-    selectedRowKeys = _useState44[0],
-    setSelectedRowKeys = _useState44[1];
-  //公司用户列表
-  var _useState45 = useState([]),
+    userSelectType = _useState44[0],
+    setUserSelectType = _useState44[1];
+  //评论参数列表
+  var _useState45 = useState('comment'),
     _useState46 = _slicedToArray(_useState45, 2),
-    userList = _useState46[0],
-    setUserList = _useState46[1];
-  var _useState47 = useState(false),
+    tabKey = _useState46[0],
+    setTabKey = _useState46[1];
+  var _useState47 = useState([]),
     _useState48 = _slicedToArray(_useState47, 2),
-    showUser = _useState48[0],
-    setShowUser = _useState48[1];
-  var _useState49 = useState({}),
+    comments = _useState48[0],
+    setComments = _useState48[1];
+  var _useState49 = useState(''),
     _useState50 = _slicedToArray(_useState49, 2),
-    userSelect = _useState50[0],
-    setUserSelect = _useState50[1];
-  var _useState51 = useState(''),
+    commentText = _useState50[0],
+    setCommentText = _useState50[1];
+  var _useState51 = useState([]),
     _useState52 = _slicedToArray(_useState51, 2),
-    userSelectType = _useState52[0],
-    setUserSelectType = _useState52[1];
-  //评论参数列表
-  var _useState53 = useState('comment'),
+    operateList = _useState52[0],
+    setOperateList = _useState52[1];
+  var _useState53 = useState(false),
     _useState54 = _slicedToArray(_useState53, 2),
-    tabKey = _useState54[0],
-    setTabKey = _useState54[1];
-  var _useState55 = useState([]),
+    showComment = _useState54[0],
+    setShowComment = _useState54[1];
+  //上线时间
+  var _useState55 = useState(false),
     _useState56 = _slicedToArray(_useState55, 2),
-    comments = _useState56[0],
-    setComments = _useState56[1];
-  var _useState57 = useState(''),
+    showOnlineTime = _useState56[0],
+    setShowOnlineTime = _useState56[1];
+  var _useState57 = useState(),
     _useState58 = _slicedToArray(_useState57, 2),
-    commentText = _useState58[0],
-    setCommentText = _useState58[1];
-  var _useState59 = useState([]),
-    _useState60 = _slicedToArray(_useState59, 2),
-    operateList = _useState60[0],
-    setOperateList = _useState60[1];
-  var _useState61 = useState(false),
-    _useState62 = _slicedToArray(_useState61, 2),
-    showComment = _useState62[0],
-    setShowComment = _useState62[1];
-  //上线时间
-  var _useState63 = useState(false),
-    _useState64 = _slicedToArray(_useState63, 2),
-    showOnlineTime = _useState64[0],
-    setShowOnlineTime = _useState64[1];
-  var _useState65 = useState(),
-    _useState66 = _slicedToArray(_useState65, 2),
-    onlineTime = _useState66[0],
-    setOnlineTime = _useState66[1];
+    onlineTime = _useState58[0],
+    setOnlineTime = _useState58[1];
   //设置时间
-  var _useState67 = useState(1),
-    _useState68 = _slicedToArray(_useState67, 2),
-    tabIndex = _useState68[0],
-    setTabIndex = _useState68[1];
+  var _useState59 = useState(1),
+    _useState60 = _slicedToArray(_useState59, 2),
+    tabIndex = _useState60[0],
+    setTabIndex = _useState60[1];
   useEffect(function () {
     if (props.demandId) {
       getDemand();
@@ -198,10 +183,10 @@ var CreateDemand = function CreateDemand(props) {
       getNode();
     }
   }, [props.demandId]);
-  var _useState69 = useState(false),
-    _useState70 = _slicedToArray(_useState69, 2),
-    isControl = _useState70[0],
-    setIsControl = _useState70[1];
+  var _useState61 = useState(false),
+    _useState62 = _slicedToArray(_useState61, 2),
+    isControl = _useState62[0],
+    setIsControl = _useState62[1];
   var getAppAutoEvent = function getAppAutoEvent() {
     request(apis.getAppAutoEvent, {
       method: 'post',
@@ -217,36 +202,8 @@ var CreateDemand = function CreateDemand(props) {
     });
   };
   useEffect(function () {
-    if (props.data) {
-      setDemandName(props.data.demand.demandName);
-      setDemandDescribe(props.data.demand.demandDescribe);
-      setCompletionTime(moment(new Date(props.data.demand.completionTime)));
-      setDemandFile({
-        fileName: props.data.demand.fileName,
-        filePath: props.data.demand.filePath
-      });
-      setPointEventInfo(props.data.pointEventInfo ? props.data.pointEventInfo.map(function (item) {
-        return _objectSpread(_objectSpread({}, item), {}, {
-          describe: item.pointDescribe,
-          pageImgUrl: item.pageImgUrl ? getImgUrl(item.pageImgUrl, item.pageId) : '',
-          imgPath: item.imgUrl ? getImgUrl(item.imgUrl, item.pageId) : ''
-        });
-      }) : []);
-    }
     getAppAutoEvent();
-    //0为无状态及创建
-    if (demandStatus > 0) {
-      //获取当前评论
-      getComments();
-      //获取历史记录
-      getOperateList();
-      //获取公司列表
-      getUserList();
-    }
   }, []);
-  // useEffect(() => {
-  //   setIsEdit(true);
-  // }, [props.saveObj]);
   var getDemand = function getDemand() {
     request(apis.getDemand, {
       method: 'POST',
@@ -255,7 +212,6 @@ var CreateDemand = function CreateDemand(props) {
         id: props.demandId
       }
     }).then(function (res) {
-      // console.log('res', res);
       if (!res) {
         setTimeout(function () {
           router && (router === null || router === void 0 ? void 0 : router.replace({
@@ -276,8 +232,8 @@ var CreateDemand = function CreateDemand(props) {
         setPointEventInfo((res === null || res === void 0 ? void 0 : res.data.pointEventInfo) ? res === null || res === void 0 ? void 0 : res.data.pointEventInfo.map(function (item) {
           return _objectSpread(_objectSpread({}, item), {}, {
             describe: item.pointDescribe,
-            pageImgUrl: item.pageImgUrl ? getImgUrl(item.pageImgUrl, item.pageId) : '',
-            imgPath: item.imgUrl ? getImgUrl(item.imgUrl, item.pageId) : ''
+            pageImgUrl: item.pageImgUrl || '',
+            imgPath: item.imgPath || ''
           });
         }) : []);
         setIsHandle(res === null || res === void 0 ? void 0 : res.data.isHandle);
@@ -290,6 +246,16 @@ var CreateDemand = function CreateDemand(props) {
           });
         }) : []);
         setCurrentNodenumber(res === null || res === void 0 ? void 0 : res.data.currentNodenumber);
+        setDemandStatus(res === null || res === void 0 ? void 0 : res.data.demand.demandStatus);
+      }
+      //0为无状态及创建
+      if ((res === null || res === void 0 ? void 0 : res.data.demand.demandStatus) > 0) {
+        //获取当前评论
+        getComments();
+        //获取历史记录
+        getOperateList();
+        //获取公司列表
+        getUserList();
       }
     });
   };
@@ -371,7 +337,9 @@ var CreateDemand = function CreateDemand(props) {
         pointEventIds: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
           return item.id;
         }),
-        onlineTime: onlineTime
+        pointEventStatus: pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.map(function (item) {
+          return item.status;
+        })
       })
     }).then(function (res) {
       if ((res === null || res === void 0 ? void 0 : res.code) === '100000') {
@@ -696,13 +664,11 @@ var CreateDemand = function CreateDemand(props) {
         }, "\u5DF2\u4E0A\u7EBF");
       }
     } else if (demandStatus == 102) {
-      if (status == 0) {
-        return /*#__PURE__*/React.createElement("div", {
-          style: {
-            color: '#fb5547'
-          }
-        }, "\u9700\u6C42\u5173\u95ED");
-      }
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          color: '#fb5547'
+        }
+      }, "\u9700\u6C42\u5173\u95ED");
     }
   };
   // 新的埋点表格列表
@@ -723,29 +689,31 @@ var CreateDemand = function CreateDemand(props) {
   };
   //获取评论
   var getComments = function getComments() {
+    var _props$data2;
     request(apis.setting.getComments, {
       method: 'POST',
       data: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        id: props.demandId
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        id: props.demandId || ((_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.demand.id)
       }
     }).then(function (res) {
-      if (res && res.code == '101000') {
+      if (res && res.code == '100000') {
         setComments(res.data);
       }
     });
   };
   //新增评论
   var onCreateComment = function onCreateComment() {
+    var _props$data3;
     request(apis.setting.addComments, {
       method: 'POST',
       data: {
-        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        id: props.demandId,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        id: props.demandId || ((_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : _props$data3.demand.id),
         comments: commentText
       }
     }).then(function (res) {
-      if (res && res.code == '101000') {
+      if (res && res.code == '100000') {
         setShowComment(false);
         getComments();
       }
@@ -753,13 +721,15 @@ var CreateDemand = function CreateDemand(props) {
   };
   //获取历史记录
   var getOperateList = function getOperateList() {
+    var _props$data4;
     request(apis.setting.operateList, {
       method: 'POST',
       data: {
-        id: props.demandId
+        id: props.demandId || ((_props$data4 = props.data) === null || _props$data4 === void 0 ? void 0 : _props$data4.demand.id),
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
-      if (res && res.code == '101000') {
+      if (res && res.code == '100000') {
         setOperateList(res.data);
       }
     });
@@ -780,43 +750,46 @@ var CreateDemand = function CreateDemand(props) {
   //修改转办人
   var designateProcessor = function designateProcessor() {
     var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'click';
-    request(apis.setting.designateProcessor, {
-      method: 'POST',
-      data: {
-        id: props.demandId,
-        processorId: userSelect.id,
-        processorName: userSelect.userName
-      }
-    }).then(function (res) {
-      if (res === null || res === void 0 ? void 0 : res.data) {
+    if (type == 'click') {
+      var _props$data5;
+      request(apis.setting.designateProcessor, {
+        method: 'POST',
+        data: {
+          id: props.demandId || ((_props$data5 = props.data) === null || _props$data5 === void 0 ? void 0 : _props$data5.demand.id),
+          processorId: userSelect.id,
+          processorName: userSelect.userName
+        }
+      }).then(function (res) {
         setShowUser(false);
-        if (type == 'click') {
-          notification.success({
-            message: '修改成功'
+        if (props.data && props.data.demand) {
+          setDemandData(function (val) {
+            return val.demand.currentProcessorName = userSelect.userName;
           });
-          onBack();
-        } else {
-          submitApproval(demandStatus + 1);
         }
-      }
-    });
+        notification.success({
+          message: '修改成功'
+        });
+      });
+    } else {
+      submitApproval(1);
+    }
   };
   //关闭功能
   var disableDemand = function disableDemand() {
-    var _props$data2;
+    var _props$data6, _props$data7;
     request(apis.setting.disableDemand, {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        id: props.demandId,
-        creatorId: (_props$data2 = props.data) === null || _props$data2 === void 0 ? void 0 : _props$data2.demand.creatorName
+        id: props.demandId || ((_props$data6 = props.data) === null || _props$data6 === void 0 ? void 0 : _props$data6.demand.id),
+        creatorId: (_props$data7 = props.data) === null || _props$data7 === void 0 ? void 0 : _props$data7.demand.creatorId
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
         notification.success({
           message: '关闭成功'
         });
-        onBack();
+        props.onBack && props.onBack();
       }
     }).catch(function (err) {
       console.log(err);
@@ -837,6 +810,8 @@ var CreateDemand = function CreateDemand(props) {
   };
   //提交进入下一个流程
   var submitApproval = function submitApproval(status) {
+    var _props$data8;
+    setIsEdit(false);
     //先保存当前设置
     onCreate(false);
     //提交进入下一个流程
@@ -844,15 +819,19 @@ var CreateDemand = function CreateDemand(props) {
       method: 'post',
       data: {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        id: props.demandId,
-        approveStatus: status
+        id: props.demandId || ((_props$data8 = props.data) === null || _props$data8 === void 0 ? void 0 : _props$data8.demand.id),
+        approveStatus: status,
+        processorId: userSelect.id,
+        processorName: userSelect.userName,
+        onlineTime: onlineTime
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
         notification.success({
           message: '提交成功'
         });
-        onBack();
+        setShowUser(false);
+        props.onBack && props.onBack();
       }
     }).catch(function (err) {
       console.log(err);
@@ -880,14 +859,6 @@ var CreateDemand = function CreateDemand(props) {
     })[0];
     return data[key];
   };
-  //埋点列表按钮
-  // const tabListButton = (record:any)=>{
-  //   if(demandStatus == 2){
-  //     return <a  onClick={() => { removeInfo('event', record)}} >移除</a>
-  //   }else if(demandStatus == 3 || demandStatus == 4){
-  //     return <a  onClick={() => { removeInfo('event', record)}} >驳回</a>
-  //   }
-  // }
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -906,7 +877,7 @@ var CreateDemand = function CreateDemand(props) {
   }, /*#__PURE__*/React.createElement("div", {
     id: "system-setting-demand-info",
     className: "".concat(classPrefix, "-info-img")
-  }, props.data && (/*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
+  }, demandData && demandData.demand && demandStatus > 0 && (/*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
@@ -914,15 +885,15 @@ var CreateDemand = function CreateDemand(props) {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-info-item-content-tip")
-  }, props.data && ((_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : _props$data3.demand.id)))), /*#__PURE__*/React.createElement("div", {
+  }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.id)))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
   }, "\u521B\u5EFA\u4EBA"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content")
-  }, props.data && ((_props$data4 = props.data) === null || _props$data4 === void 0 ? void 0 : _props$data4.demand.creatorName), /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-info-item-content-tip")
-  }))), /*#__PURE__*/React.createElement("div", {
+  }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.creatorName)))), demandStatus > 1 && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
@@ -930,7 +901,7 @@ var CreateDemand = function CreateDemand(props) {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement("span", {
     className: "".concat(classPrefix, "-info-item-content-tip")
-  }, props.data && ((_props$data5 = props.data) === null || _props$data5 === void 0 ? void 0 : _props$data5.demand.currentProcessorName)))))), /*#__PURE__*/React.createElement("div", {
+  }, demandData && (demandData === null || demandData === void 0 ? void 0 : demandData.demand.currentProcessorName))))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
@@ -947,14 +918,14 @@ var CreateDemand = function CreateDemand(props) {
       setIsEdit(true);
       setDemandName(e.currentTarget.value);
     },
-    disabled: isRead
+    disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content-input-num")
   }, /*#__PURE__*/React.createElement("span", {
     style: {
       color: '#021429'
     }
-  }, demandName.length), /*#__PURE__*/React.createElement("span", null, "/20")))), /*#__PURE__*/React.createElement("div", {
+  }, demandName ? demandName.length : 0), /*#__PURE__*/React.createElement("span", null, "/20")))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-txt")
@@ -969,7 +940,7 @@ var CreateDemand = function CreateDemand(props) {
       setCompletionTime(e);
     },
     showTime: true,
-    disabled: isRead
+    disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item")
   }, /*#__PURE__*/React.createElement("div", {
@@ -988,7 +959,7 @@ var CreateDemand = function CreateDemand(props) {
       setIsEdit(true);
       setDemandDescribe(e.currentTarget.value);
     },
-    disabled: isRead
+    disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content-input-num")
   }, /*#__PURE__*/React.createElement("span", {
@@ -1021,7 +992,7 @@ var CreateDemand = function CreateDemand(props) {
   })))) : (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content-row")
   }, /*#__PURE__*/React.createElement(Upload, _objectSpread(_objectSpread({}, uploadProps), {}, {
-    disabled: isRead
+    disabled: isRead || demandStatus == 102 || demandStatus == 101 || demandType == 'manage'
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item-content-btn")
   }, /*#__PURE__*/React.createElement(IconFont, {
@@ -1036,11 +1007,11 @@ var CreateDemand = function CreateDemand(props) {
     className: "".concat(classPrefix, "-info-item-content")
   }, /*#__PURE__*/React.createElement(DatePicker, {
     className: "".concat(classPrefix, "-info-item-content-picker"),
-    value: (_props$data6 = props.data) === null || _props$data6 === void 0 ? void 0 : _props$data6.demand.onlineTime,
+    value: demandData === null || demandData === void 0 ? void 0 : demandData.demand.onlineTime,
     disabledDate: disabledDate,
     showTime: true,
     disabled: true
-  }))))), demandStatus > 1 && (/*#__PURE__*/React.createElement("div", {
+  }))))), (demandType != 'edit' && demandStatus > 0 || isRead) && (/*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-info-item"),
     style: {
       paddingLeft: 24,
@@ -1138,11 +1109,13 @@ var CreateDemand = function CreateDemand(props) {
     className: "".concat(classPrefix, "-comment-tab-btn ").concat(tabKey == 'comment' ? "".concat(classPrefix, "-comment-tab-btnActive") : ''),
     onClick: function onClick() {
       setTabKey('comment');
+      getComments();
     }
   }, "\u8BC4\u8BBA"), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-comment-tab-btn ").concat(tabKey == 'history' ? "".concat(classPrefix, "-comment-tab-btnActive") : ''),
     onClick: function onClick() {
       setTabKey('history');
+      getOperateList();
     }
   }, "\u64CD\u4F5C\u5386\u53F2")), tabKey == 'comment' && comments.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
@@ -1150,17 +1123,24 @@ var CreateDemand = function CreateDemand(props) {
       key: item.id
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-comment-list-name")
-    }, item.creator_name, ' ', /*#__PURE__*/React.createElement("span", {
+    }, item.creatorName, /*#__PURE__*/React.createElement("span", {
       className: "".concat(classPrefix, "-comment-list-time")
-    }, item.create_time)), /*#__PURE__*/React.createElement("div", {
+    }, item.createTime)), /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-comment-list-text")
     }, item.comments));
-  }), tabKey == 'history' && operateList.map(function (item) {
+  }), comments.length == 0 && tabKey == 'comment' && (/*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-comment-empty")
+  }, "\u6682\u65E0\u8BC4\u8BBA")), tabKey == 'history' && operateList.map(function (item) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-history-list"),
-      key: item.id
-    }, /*#__PURE__*/React.createElement("span", null, item.operator_name), item.operator_desc);
-  })))), /*#__PURE__*/React.createElement("div", {
+      key: item.id,
+      dangerouslySetInnerHTML: {
+        __html: item.operateDesc
+      }
+    });
+  }), operateList.length == 0 && tabKey == 'history' && (/*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-comment-empty")
+  }, "\u6682\u65E0\u64CD\u4F5C\u5386\u53F2"))))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-right"),
     id: "xsd4"
   }, nodeData.length ? (/*#__PURE__*/React.createElement(ProcessCanvas, {
@@ -1179,7 +1159,7 @@ var CreateDemand = function CreateDemand(props) {
     className: "".concat(classPrefix, "-right-title")
   }, "\u8282\u70B9\u9884\u89C8"))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-footer")
-  }, !isDemo && authority[1724922574] && [1, 2, 3, 4, 5, 6, 101].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
+  }, !isDemo && !isRead && authority[1724922574] && [1, 2, 3, 4, 5, 6, 101].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "forbiddenColor",
     onClick: function onClick() {
@@ -1208,7 +1188,7 @@ var CreateDemand = function CreateDemand(props) {
     onClick: downloadData
   }, "\u5BFC\u51FA\u57CB\u70B9\u8BBE\u8BA1")), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-footer-btnRight")
-  }, !isDemo && !isRead && [2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
+  }, !isDemo && !isRead && demandType == 'manage' && [2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
     type: 'default',
     className: "commentBtn",
     onClick: function onClick() {
@@ -1216,27 +1196,27 @@ var CreateDemand = function CreateDemand(props) {
       setUserSelect({});
       setShowUser(true);
     }
-  }, "\u8F6C\u529E")), !isDemo && !isRead && demandStatus > 0 && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u8F6C\u529E")), !isDemo && demandStatus > 0 && (/*#__PURE__*/React.createElement(Button, {
     type: 'default',
     className: "commentBtn",
     onClick: function onClick() {
       setCommentText('');
       setShowComment(true);
     }
-  }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && !isRead && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
+  }, "\u6DFB\u52A0\u8BC4\u8BBA")), !isDemo && !isRead && demandType == 'edit' && [0, 1, 2, 3, 4, 5, 6].indexOf(demandStatus) != -1 && (/*#__PURE__*/React.createElement(Button, {
     type: 'primary',
     className: "commentBtn",
     onClick: function onClick() {
       return onCreate();
     }
-  }, props.data ? '保存' : '提交')), !isDemo && !isRead && demandStatus > 0 && demandStatus <= 6 && (/*#__PURE__*/React.createElement(Button, {
+  }, demandData ? '保存' : '提交')), !isDemo && !isRead && demandStatus > 0 && demandStatus <= 6 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
     type: 'primary',
     className: "commentBtn",
     disabled: demandStatus > 1 ? !Boolean(pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.length) || Boolean(pointEventInfo === null || pointEventInfo === void 0 ? void 0 : pointEventInfo.filter(function (res) {
       return [0, 2].indexOf(res.status) != -1;
     }).length) : false,
     onClick: submitMethod
-  }, getLableValue(demandStatus, 'buttonName'))), !isDemo && !isRead && demandStatus > 2 && demandStatus <= 4 && (/*#__PURE__*/React.createElement(Button, {
+  }, getLableValue(demandStatus, 'buttonName'))), !isDemo && !isRead && demandStatus > 2 && demandStatus <= 4 && demandType == 'manage' && (/*#__PURE__*/React.createElement(Button, {
     type: 'primary',
     className: "commentBtn",
     onClick: function onClick() {
@@ -1307,7 +1287,7 @@ var CreateDemand = function CreateDemand(props) {
     onOk: function onOk() {
       if (onlineTime) {
         onCreate(false);
-        submitApproval(demandStatus + 1);
+        submitApproval(1);
         setShowOnlineTime(false);
       }
     },

package/es/modules/createDemand/styles/index.less

@@ -338,10 +338,27 @@
         content: '|';
       }
     }
+    &-empty {
+      min-height: 200px;
+      color: #9aa1a9;
+      font-size: 16px;
+      line-height: 200px;
+      text-align: center;
+    }
     &-list {
       margin: 0 10px 0 20px;
       padding: 10px 0;
       border-bottom: 1px solid #e6e7ea;
+      &-time {
+        margin-left: 10px;
+        color: #9aa1a9;
+        font-size: 12px;
+      }
+      &-text {
+        margin-top: 10px;
+        color: #9aa1a9;
+        font-size: 12px;
+      }
     }
   }
   &-history {

package/es/modules/demandManage/index.js

@@ -88,7 +88,11 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       }
     }).then(function (res) {
       if (res && res.code === '100000') {
-        setDemandInfo(res.data);
+        var data = {};
+        res.data.map(function (res) {
+          data[res.node] = res.count;
+        });
+        setDemandInfo(data);
       }
     }).catch(function (err) {
       console.log(err);
@@ -153,7 +157,10 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
             message.error('无查看权限');
             return;
           }
-          props.onDeal && props.onDeal('view', data.id);
+          props.onDeal && props.onDeal('revocation', {
+            type: 'manage',
+            demand: data
+          });
           // router &&
           //   router?.push({
           //     name: routes.createDemand,
@@ -273,21 +280,28 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       type: "link",
       onClick: function onClick() {
         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
+          type: 'edit',
+          demand: {
+            appId: props.record.id,
+            approvalModule: props.record.approvalModule,
+            businessType: props.record.businessType,
+            completionTime: props.record.completionTime,
+            demandDescribe: props.record.demandDescribe,
+            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() {
-        getDemand('revocation');
+        // getDemand('revocation');
+        props.onDeal && props.onDeal('revocation', {
+          type: 'edit',
+          demand: props.record
+        });
       }
     }, "\u7F16\u8F91"));
   };
@@ -305,6 +319,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         notification.success({
           message: '关闭成功'
         });
+        getDemandList();
       }
     }).catch(function (err) {
       console.log(err);
@@ -331,7 +346,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
     onClick: function onClick() {
       return setDemandStatus(0);
     }
-  }, demandInfo ? (demandInfo === null || demandInfo === void 0 ? void 0 : demandInfo.demandAllSum) || 0 : '-'))), /*#__PURE__*/React.createElement("div", {
+  }, demandInfo ? demandInfo[100] || 0 : '-'))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-panel-status")
   }, labelList.map(function (res) {
     return /*#__PURE__*/React.createElement("div", {
@@ -352,7 +367,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       onClick: function onClick() {
         return setDemandStatus(res.value);
       }
-    }, demandInfo ? demandInfo[res.key] || 0 : '-'));
+    }, demandInfo ? demandInfo[res.value] || 0 : '-'));
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-filter")
   }, /*#__PURE__*/React.createElement("div", {
@@ -404,7 +419,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
       //     name: routes.createDemand,
       //   });
     }
-  }, "\u65B0\u589E\u9700\u6C42"), /*#__PURE__*/React.createElement(Button, {
+  }, "\u65B0\u589E\u9700\u6C42"), false && (/*#__PURE__*/React.createElement(Button, {
     shape: "round",
     className: "button ".concat(!authority[1722839123] ? 'disabled' : ''),
     disabled: isDemo || !authority[1722839123],
@@ -416,7 +431,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         }
       }));
     }
-  }, "\u6D41\u7A0B\u7BA1\u7406"))), /*#__PURE__*/React.createElement(BizTable, {
+  }, "\u6D41\u7A0B\u7BA1\u7406")))), /*#__PURE__*/React.createElement(BizTable, {
     className: "".concat(classPrefix, "-table"),
     columns: columns,
     rowKey: "id",

package/es/modules/personalSetting/index.js

@@ -16,13 +16,12 @@ import util from '../../utils/util';
 import SecurityLog from './securityLog';
 import CreateProcess from '../messageList';
 var PersonalSetting = function PersonalSetting(_ref) {
-  var _route$query;
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentUser = _useContext.currentUser,
     isDemo = _useContext.isDemo,
     route = _useContext.route;
-  var _useState = useState((route === null || route === void 0 ? void 0 : (_route$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) || '1'),
+  var _useState = useState('1'),
     _useState2 = _slicedToArray(_useState, 2),
     currentKey = _useState2[0],
     setCurrentKey = _useState2[1];
@@ -32,8 +31,10 @@ var PersonalSetting = function PersonalSetting(_ref) {
     className: "tab-header-title"
   }, "\u4E2A\u4EBA\u8BBE\u7F6E"));
   useEffect(function () {
+    var _route$query, _route$query2;
     var query = util.getHrefData(window.location.href);
     if (query.password) setCurrentKey('2');
+    if (route === null || route === void 0 ? void 0 : (_route$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) setCurrentKey(route === null || route === void 0 ? void 0 : (_route$query2 = route.query) === null || _route$query2 === void 0 ? void 0 : _route$query2.currentKey);
   }, []);
   var items = [{
     key: '1',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.29",
+  "version": "2.0.0-zhongyuan.31",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a98a038f5c0579122ed2ba5f4d7d1ed7d9b8f48b",
+  "gitHead": "9fc086171b4c34dd21134eec19331049552ae59e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }