fmui-base 2.0.92 → 2.0.94

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.94：子表字段支持计算，批示意见支持上传附件
+- 2.0.93：流程组件支持作废，表单组件关联字段支持绑定子表字段bug修复
 - 2.0.92：流程组件支持作废功能
 - 2.0.91：表单组件关联字段支持绑定子表字段，子表change事件回调时增加子表的index
 - 2.0.90：表单组件子表处理

package/lib/db/db.js

@@ -275,6 +275,21 @@ context.create('FlowApproval', {
         duration: 800
       });
     }
+  },
+
+  getCategoryListByModule: {
+    mockUrl: 'query/getCategoryListByModule.json',
+    url: _variables2.default.URLS.getCategoryListByModule,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'GET',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        duration: 800
+      });
+    }
   }
 
 });
@@ -873,6 +888,7 @@ context.create('FlowModuleAPI', {
       });
     }
   }
+
 });
 
 context.create('form', {

package/lib/db/variables.js

@@ -118,7 +118,8 @@ exports.default = {
         getNewHomePageRemindCount: portalAllUrlPrefix + "getNewHomePageRemindCount" + '?token=' + getLoginUserInfo().token,
         getComAppInfo: portalAllUrlPrefix + 'getComAppInfo?token=' + getLoginUserInfo().token, //获取首页常用应用
         saveAppCount: portalAllUrlPrefix + "saveAppCount" + '?token=' + getLoginUserInfo().token, //移动应用保存更新点击次数接口 
-        getAllActivity: approveUrlPrefix + "getAllActivity" + '?token=' + getLoginUserInfo().token //获取所有节点
+        getAllActivity: approveUrlPrefix + "getAllActivity" + '?token=' + getLoginUserInfo().token, //获取所有节点
+        getCategoryListByModule: approveUrlPrefix + "getCategoryListByModule" + '?token=' + getLoginUserInfo().token //获取所有节点
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/form/form.js

@@ -95,6 +95,8 @@ var _db2 = _interopRequireDefault(_db);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -155,6 +157,7 @@ var PageHome = function (_React$Component) {
       fieldControll: props.fieldControll,
       commentField: props.commentField,
       hasCommentField: props.hasCommentField,
+      commentUpload: props.commentUpload,
       urlPrev: context + '/dingisv/api/common/viewImage?fid=',
       calc: [],
       itemParam: {
@@ -180,7 +183,8 @@ var PageHome = function (_React$Component) {
       savePhrase: [],
       phraseList: [], //常用语列表
       spyj: props.defaultValue,
-      isRemoveCommentFormHtml: isRemoveCommentFormHtml
+      isRemoveCommentFormHtml: isRemoveCommentFormHtml,
+      commentInitList: []
     };
 
     return _this;
@@ -1685,6 +1689,8 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'reloadItemParam',
     value: function reloadItemParam(itemNew) {
+      var dataType = this.state.dataType;
+
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
         var itemParam = this.state.itemParam;
         var selectText = ''; //多选值修改的显示文本
@@ -1741,7 +1747,9 @@ var PageHome = function (_React$Component) {
               selectedText: selectText
             });
           }
-
+          // if(dataType=='sub'){
+          //   this.props.reloadItemParam(itemNew,this.state.itemParam);
+          // } 
           if (itemParam.itemType == 'popuser') {
             this.refs['selectMember_' + itemParam.key].initSelectData();
           }
@@ -2512,8 +2520,26 @@ var PageHome = function (_React$Component) {
         spyj: newValue
       });
       this.props.newspyj.content = newValue;
-      //alert(this.props.newspyj.content);
-      //this.props.onChange(newValue,this.state.itemParam);
+    }
+
+    //修改审批意见
+
+  }, {
+    key: 'changeSpyj4',
+    value: function changeSpyj4(t, newValue) {
+      var attachId = "";
+      if (newValue && newValue.length > 0) {
+        for (var i = 0; i < newValue.length; i++) {
+          attachId += "," + newValue[i].id;
+        }
+      }
+      if (attachId != "") {
+        attachId = attachId.substring(1);
+      }
+      this.props.newspyj.attachId = attachId;
+      this.setState({
+        commentInitList: newValue
+      });
     }
 
     //矩阵评分
@@ -2780,6 +2806,9 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'render',
     value: function render() {
+      var _this3 = this,
+          _React$createElement;
+
       var t = this;
       var radioFieldProps = {
         groupListArgument: {
@@ -3312,7 +3341,23 @@ var PageHome = function (_React$Component) {
                       minRows: 1, maxRows: 5,
                       placeholder: '请输入批示意见',
                       value: t.state.spyj,
-                      onChange: this.changeSpyj3.bind(this) })
+                      onChange: this.changeSpyj3.bind(this) }),
+                    _react2.default.createElement(
+                      'div',
+                      { className: this.state.commentUpload == '1' ? "" : "t-DN" },
+                      _react2.default.createElement(_upload2.default, (_React$createElement = {
+                        ref: "upload_" + this.state.itemParam.uniqueName,
+                        canAdd: true,
+                        dir: this.state.module,
+                        fileSizeLimit: 0,
+                        canDel: true,
+                        limitNo: 5
+                      }, _defineProperty(_React$createElement, 'fileSizeLimit', 0), _defineProperty(_React$createElement, 'initList', this.state.commentInitList), _defineProperty(_React$createElement, 'onChange', function onChange(value, isInit) {
+                        _this3.changeSpyj4(_this3, value);
+                      }), _defineProperty(_React$createElement, 'onDel', function onDel(value) {
+                        t.changeSpyj4(_this3, value);
+                      }), _React$createElement))
+                    )
                   )
                 ),
                 _react2.default.createElement(

package/lib/form/subForm.js

@@ -396,13 +396,13 @@ var PageHome = function (_React$Component) {
     value: function reloadSubItemParam(itemNew) {
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
         var itemParam = this.state.itemParam;
-        var value = itemParam.value;
+        var valueSub = itemParam.value;
         for (var i = 0; i < itemNew.length; i++) {
           var fieldCode = itemNew[i].key;
           var value = itemNew[i].value;
           var index = itemNew[i].index;
-          if (value[index]) {
-            value[index][fieldCode] = value;
+          if (valueSub[index]) {
+            valueSub[index][fieldCode] = value;
           }
           if (this.refs[fieldCode + '_' + index]) {
             var valueItem = {};

package/lib/form/table.js

@@ -47,12 +47,18 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
 var _db = require('../db/db');
 
 var _db2 = _interopRequireDefault(_db);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
@@ -226,7 +232,8 @@ var PageHome = function (_React$Component) {
 			phraseList: [], //常用语列表
 			spyj: defaultValue,
 			formRelaFieldMaps: formRelaFieldMapsNew,
-			linkFields: linkFieldsNew
+			linkFields: linkFieldsNew,
+			commentInitList: []
 		};
 
 		var module = props.module && props.module != "undefined" ? props.module : "approve";
@@ -850,6 +857,7 @@ var PageHome = function (_React$Component) {
 						relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
 							var nowValue = "";
 							var mainTblData = data.mainTblData;
+							var subTbl = data.subTbl;
 
 							mainTblData.map(function (item) {
 								if (item.key == itemKey) {
@@ -887,12 +895,23 @@ var PageHome = function (_React$Component) {
 								} else {
 									relaFieldMap["value"] = true;
 								}
-								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
+								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								mainTblData.map(function (item) {
-									if (item.key == relaFieldNameArray[index]) {
+									if (item.uniqueName == relaFieldNameArray[index]) {
 										item.required = triggerFieldValBoolean;
 									}
 								});
+								for (var i = 0; i < subTbl.length; i++) {
+									var subTblData = subTbl[i].subTblData;
+									for (var a = 0; a < subTblData.length; a++) {
+										var subTblDataItem = subTblData[a];
+										for (var b = 0; b < subTblDataItem.length; b++) {
+											if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
+												subTbl[i].subTblData[a][b].required = triggerFieldValBoolean;
+											}
+										}
+									}
+								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
 								if (triggerFieldVal == nowValue) {
@@ -918,7 +937,7 @@ var PageHome = function (_React$Component) {
 														if (relaFieldTblNameArrayItem == subTblDataItem[a].uniqueName) {
 															isSubField = true;
 															var subTblNameItem = "sub_" + subTblName;
-															var subItem = relaFieldTblNameArrayItem + '_' + a;
+															var subItem = relaFieldTblNameArrayItem + '_' + b;
 															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
 														}
 													}
@@ -1494,6 +1513,26 @@ var PageHome = function (_React$Component) {
 			//alert(this.props.newspyj.content);
 		}
 
+		//修改审批意见
+
+	}, {
+		key: 'changeSpyj4',
+		value: function changeSpyj4(t, newValue) {
+			var attachId = "";
+			if (newValue && newValue.length > 0) {
+				for (var i = 0; i < newValue.length; i++) {
+					attachId += "," + newValue[i].id;
+				}
+			}
+			if (attachId != "") {
+				attachId = attachId.substring(1);
+			}
+			this.props.newspyj.attachId = attachId;
+			this.setState({
+				commentInitList: newValue
+			});
+		}
+
 		//选择是否保存常用语
 
 	}, {
@@ -1598,7 +1637,8 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'render',
 		value: function render() {
-			var _this2 = this;
+			var _this2 = this,
+			    _React$createElement;
 
 			var t = this;
 			var allForm = this.props.allForm;
@@ -1619,16 +1659,16 @@ var PageHome = function (_React$Component) {
 							return _react2.default.createElement(
 								'div',
 								{ className: "form_" + item2.uniqueName },
-								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
 							);
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
 							{ className: "subform_" + item.itemCode },
-							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
 						) : _react2.default.createElement(
 							'div',
 							{ className: "form_" + item.uniqueName },
-							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
 						);
 					}.bind(this)) : "" : _react2.default.createElement(
 						'div',
@@ -1655,16 +1695,16 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								);
 							}.bind(this))
 						)
@@ -1732,6 +1772,22 @@ var PageHome = function (_React$Component) {
 									placeholder: '请输入批示意见',
 									value: this.state.spyj,
 									onChange: this.changeSpyj1.bind(this) }),
+								_react2.default.createElement(
+									'div',
+									{ className: t.props.commentUpload == '1' ? "" : "t-DN" },
+									_react2.default.createElement(_upload2.default, (_React$createElement = {
+										ref: "upload_default",
+										canAdd: true,
+										dir: this.state.module,
+										fileSizeLimit: 0,
+										canDel: true,
+										limitNo: 5
+									}, _defineProperty(_React$createElement, 'fileSizeLimit', 0), _defineProperty(_React$createElement, 'initList', this.state.commentInitList), _defineProperty(_React$createElement, 'onChange', function onChange(value, isInit) {
+										_this2.changeSpyj4(_this2, value);
+									}), _defineProperty(_React$createElement, 'onDel', function onDel(value) {
+										t.changeSpyj4(_this2, value);
+									}), _React$createElement))
+								),
 								_react2.default.createElement(_CheckboxField2.default, {
 									className: this.state.hasCommentField == '1' ? "" : "t-DN",
 									data: this.state.savePhraseList,

package/lib/process_info/processInfo.js

@@ -137,6 +137,7 @@ var sysImType = '0';
 var shortMessageList = [];
 var readShortMessageList = [];
 var newComment = '';
+var commentAttachId = '';
 var remindStyle = '';
 var FlowCommon = void 0;
 var _thirdMenuType = void 0;
@@ -436,7 +437,8 @@ var PageHome = function (_React$Component) {
             allActivity: [], //所有环节名称
             designActivity: '', //选择的提醒环节id
             processData: '1', //1 保留流程数据，2清除已办数据
-            processDataList: []
+            processDataList: [],
+            commentUpload: '' //1 批示意见允许上传
         };
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
@@ -454,6 +456,7 @@ var PageHome = function (_React$Component) {
         param.designActivity = '';
         param.processData = '1';
         param.processDataList = [];
+        param.commentAttachId = ''; //批示意见附件 
         _this.state = param;
         var t = _this;
         var key = "";
@@ -771,6 +774,10 @@ var PageHome = function (_React$Component) {
                     if (content.readScopeList && typeof content.readScopeList != "undefined") {
                         readScopeList = content.readScopeList;
                     }
+                    var commentUpload = '';
+                    if (content.commentUpload && typeof content.commentUpload != "undefined") {
+                        commentUpload = content.commentUpload;
+                    }
                     var formKey = form.formcode;
                     var formStyleObj = form.formStyle;
 
@@ -1333,7 +1340,8 @@ var PageHome = function (_React$Component) {
                         mobileFlowChar: mobileFlowChar,
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
-                        isRemoveCommentFormHtml: isRemoveCommentFormHtml
+                        isRemoveCommentFormHtml: isRemoveCommentFormHtml,
+                        commentUpload: commentUpload
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -1832,6 +1840,9 @@ var PageHome = function (_React$Component) {
             var hasCommentField = t.state.hasCommentField;
             var defaultComValue = t.state.defaultValue;
             newComment = t.state.newspyj.content;
+            if (t.state.newspyj.attachId && t.state.newspyj.attachId != '') {
+                commentAttachId = t.state.newspyj.attachId;
+            }
             if (typeof newComment == "undefined" || newComment == '') {
                 newComment = t.state.defaultValue;
             }
@@ -1841,6 +1852,11 @@ var PageHome = function (_React$Component) {
                     spyj: newComment
                 });
             }
+            if (commentAttachId && commentAttachId != '') {
+                t.setState({
+                    commentAttachId: commentAttachId
+                });
+            }
             if (operate == 1 || operate == 10) {
                 if (newComment && newComment != '') {
                     if (newComment.length > 2000) {
@@ -2769,7 +2785,7 @@ var PageHome = function (_React$Component) {
                             selectOptions.push(option);
                         });
 
-                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除' }];
+                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除(已办人的已办记录)' }];
                         t.setState({
                             allActivity: selectOptions, //所有环节名称
                             designActivity: selectOptions[0].value, //选择的提醒环节id
@@ -3498,6 +3514,7 @@ var PageHome = function (_React$Component) {
                     formData: JSON.stringify(editFormData),
                     module: t.state.module,
                     comment: newComment,
+                    attachId: this.state.commentAttachId,
                     commentId: t.state.commentId,
                     hasCommentField: t.state.hasCommentField,
                     dataId: dataId,
@@ -3596,6 +3613,7 @@ var PageHome = function (_React$Component) {
                     comment: newComment,
                     commentId: this.state.commentId,
                     hasCommentField: t.state.hasCommentField,
+                    attachId: this.state.commentAttachId,
                     dataId: this.state.dataId,
                     lock: this.state.lock,
                     sendShortMessage: sendShortMessage,
@@ -3894,7 +3912,7 @@ var PageHome = function (_React$Component) {
                 formData: JSON.stringify(editFormData),
                 formType: "4",
                 editType: editType
-            }, _defineProperty(_param, 'module', t.state.module), _defineProperty(_param, 'comment', newComment), _defineProperty(_param, 'commentType', 'text'), _defineProperty(_param, 'commentId', t.state.commentId), _defineProperty(_param, 'permissionCode', t.state.permissionCode), _defineProperty(_param, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param, 'dataId', dataId), _param);
+            }, _defineProperty(_param, 'module', t.state.module), _defineProperty(_param, 'comment', newComment), _defineProperty(_param, 'commentType', 'text'), _defineProperty(_param, 'commentId', t.state.commentId), _defineProperty(_param, 'attachId', t.state.commentAttachId), _defineProperty(_param, 'permissionCode', t.state.permissionCode), _defineProperty(_param, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param, 'dataId', dataId), _param);
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -4762,6 +4780,7 @@ var PageHome = function (_React$Component) {
                 hasCommentField: t.state.hasCommentField,
                 comment: newComment,
                 commentId: t.state.commentId,
+                attachId: t.state.commentAttachId,
                 module: t.state.module,
                 permissionCode: t.state.permissionCode,
                 participantMode: t.state.participantMode,
@@ -5400,7 +5419,8 @@ var PageHome = function (_React$Component) {
                 permissionCode: t.state.permissionCode,
                 shortMessage: shortMessage,
                 comment: t.state.spyj,
-                commentId: t.state.commentId
+                commentId: t.state.commentId,
+                attachId: t.state.commentAttachId
             };
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
@@ -6783,7 +6803,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/process_list/processList.js

@@ -496,9 +496,11 @@ var PageHome = function (_React$Component2) {
       doneListUrl: doneListUrl,
       readListUrl: readListUrl,
       myselfListUrl: myselfListUrl,
-      hasBatch: hasBatch
+      hasBatch: hasBatch,
+      categoryList: []
     };
     _this2.getTransactionTitleCount(module, "undo,unread");
+    _this2.getCategoryListByModule(module);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
@@ -598,6 +600,27 @@ var PageHome = function (_React$Component2) {
       });
     }
 
+    /**
+     * 获取分类
+     */
+
+  }, {
+    key: 'getCategoryListByModule',
+    value: function getCategoryListByModule(module) {
+      var _this4 = this;
+
+      var t = this;
+      _db2.default.FlowApproval.getCategoryListByModule({
+        module: module
+      }).then(function (content) {
+        if (content) {
+          _this4.state.categoryList = content;
+        }
+      }).catch(function (error) {
+        console.log(error);
+      });
+    }
+
     /**
      * ScrollList 请求数据之前的函数
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.0.92",
+  "version": "2.0.94",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",