fmui-base 2.2.25 → 2.2.27

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.27: 批示意见落款被加签的用户增加标识
+- 2.2.26: 表单组件支持查看发票
 - 2.2.25: 表单组件支持弹出加签意见
 - 2.2.24：表单相关对象组件修改
 - 2.2.23：表单相关对象组件

package/lib/comment_list/List.js

@@ -262,12 +262,17 @@ var PageHome = function (_React$Component) {
       var t = this;
       var returnHtml;
       if (item.inscriptionShow) {
-
+        var userName = item.userName;
+        //是否加签
+        if (item.isAddlots && item.isAddlots == '1' && userName) {
+          userName = userName + "（加签）";
+        }
         var userNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5 userName' },
-          item.replacename && item.replacename != "" ? item.replacename : item.userName
+          item.replacename && item.replacename != "" ? item.replacename : userName
         );
+
         var dateHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5' },
@@ -307,7 +312,7 @@ var PageHome = function (_React$Component) {
             }
           }
         });
-        var replaceHtml = item.replacename && item.replacename != "" ? "(代" + item.userName + "办理)" : "";
+        var replaceHtml = item.replacename && item.replacename != "" ? "(代" + userName + "办理)" : "";
         return _react2.default.createElement(
           Box,
           { className: 'comment-html', style: { marginLeft: "auto", "text-align": "right", width: '100%' } },

package/lib/db/db.js

@@ -1118,6 +1118,20 @@ context.create('form', {
         duration: 800
       });
     }
+  },
+  getNoInvoiceList: {
+    url: _variables2.default.URLS.getNoInvoiceList,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'GET',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        hasMask: true,
+        duration: 800
+      });
+    }
   }
 });
 

package/lib/db/variables.js

@@ -66,7 +66,7 @@ exports.default = {
         getRemindBadgeCount: urlPrefix + 'getRemindBadgeCount' + '?', //分类统计小红点
         queryProcessForm: urlPrefix + 'getMobileForm' + '?', //获取流程表单
         getRelaFieldsMap: formUrlPrefix + 'relafield/getRelaFieldsMap' + '?', //获取关联表单字段
-
+        getNoInvoiceList: formUrlPrefix + 'form/invoice/getNoInvoiceList' + '?', //获取未开票列表
         getComponentInfoList: urlBasicPrefix + 'mobilehall/mobileoffice/getComponentInfoList' + '?', //获取关联表单字段
 
         insertBatchRelation: approveUrlPrefix + 'insertBatchRelation' + '?', // 关联流程

package/lib/form/form.js

@@ -93,6 +93,10 @@ var _relaObj = require('../rela_obj/relaObj');
 
 var _relaObj2 = _interopRequireDefault(_relaObj);
 
+var _invoice = require('../invoice/invoice');
+
+var _invoice2 = _interopRequireDefault(_invoice);
+
 require('./form.less');
 
 var _db = require('../db/db');
@@ -1140,7 +1144,7 @@ var PageHome = function (_React$Component) {
         if (form.dataAttr) {
           dataSrc = form.dataAttr.dataSrc;
         }
-        if (popCode == '' && (!dataSrc || dataSrc != "7")) {
+        if (popCode == '' && (!dataSrc || dataSrc != "7" && dataSrc != "9")) {
           //如果弹出选择的编码为空
           _Toast2.default.show({
             type: 'error',
@@ -1149,6 +1153,8 @@ var PageHome = function (_React$Component) {
           return false;
         } else if (dataSrc == "7") {
           itemParam.itemType = "";
+        } else if (dataSrc == "9") {
+          itemParam.itemType = "invoice";
         }
         itemParam.chooseWay = chooseWay;
         itemParam.popCode = popCode;
@@ -3869,6 +3875,15 @@ var PageHome = function (_React$Component) {
             relaobjType: t.state.itemParam.relaobjType
           }),
           t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
+        ) : this.state.itemParam.itemType == 'invoice' ? _react2.default.createElement(
+          'div',
+          { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
+          _react2.default.createElement(_invoice2.default, {
+            id: t.state.itemParam.value ? t.state.itemParam.value : "",
+            label: t.state.itemParam.title,
+            required: t.state.itemParam.required
+          }),
+          t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
         ) : _react2.default.createElement('div', null)
       );
     }

package/lib/invoice/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _invoice = require('./invoice');
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_invoice).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/invoice/invoice.js

@@ -0,0 +1,177 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = undefined;
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Group = require('saltui/lib/Group');
+
+var _Group2 = _interopRequireDefault(_Group);
+
+var _Field = require('saltui/lib/Field');
+
+var _Field2 = _interopRequireDefault(_Field);
+
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
+var _Boxs = require('saltui/lib/Boxs');
+
+var _Boxs2 = _interopRequireDefault(_Boxs);
+
+var _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+require('./invoice.less');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var HBox = _Boxs2.default.HBox,
+    Box = _Boxs2.default.Box,
+    VBox = _Boxs2.default.VBox;
+
+var Invoice = function (_React$Component) {
+    _inherits(Invoice, _React$Component);
+
+    function Invoice(props) {
+        _classCallCheck(this, Invoice);
+
+        // 传入的props参数
+        var _this = _possibleConstructorReturn(this, (Invoice.__proto__ || Object.getPrototypeOf(Invoice)).call(this, props));
+
+        _this.initFn = function (id) {
+
+            // 初始发票详情数据  
+            _db2.default.form.getNoInvoiceList({
+                invoicedataid: id
+            }).then(function (content) {
+                _this.setState({
+                    invoicedata: content
+                });
+            }).catch(function (error) {
+                console.error('获取详情数据失败', error);
+            });
+        };
+
+        var invoicedataid = _this.props.id;
+        var title = _this.props.label || '发票详情';
+        var required = _this.props.required || false;
+
+        _this.state = {
+            invoicedataid: invoicedataid,
+            invoicedata: [],
+            title: title,
+            required: required
+        };
+
+        return _this;
+    }
+
+    _createClass(Invoice, [{
+        key: 'componentDidMount',
+        value: function componentDidMount() {
+            this.initFn(this.state.invoicedataid);
+        }
+    }, {
+        key: 'downloadFile',
+
+
+        // 下载函数
+        value: function (_downloadFile) {
+            function downloadFile(_x) {
+                return _downloadFile.apply(this, arguments);
+            }
+
+            downloadFile.toString = function () {
+                return _downloadFile.toString();
+            };
+
+            return downloadFile;
+        }(function (file) {
+            downloadFile(file.relaObjId);
+        })
+    }, {
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                _Group2.default.List,
+                { borderTopNone: true },
+                _react2.default.createElement(
+                    _Field2.default,
+                    { required: this.state.required, label: this.state.title, layout: 'h', multiLine: true },
+                    _react2.default.createElement(
+                        'div',
+                        { className: this.state.invoicedataid && this.state.invoicedataid != '' ? '' : 't-DN' },
+                        this.state.invoicedata.map(function (item, index) {
+                            var fileList = [];
+                            try {
+                                if (item.invoicefileInfo) {
+                                    fileList = JSON.parse(item.invoicefileInfo);
+                                }
+                            } catch (e) {
+                                console.error('发票附件解析失败', e);
+                            }
+
+                            return _react2.default.createElement(
+                                'div',
+                                { key: item.id, className: 't-MT2' },
+                                _react2.default.createElement(
+                                    VBox,
+                                    { className: 'nvoice-filetitle', hAlign: 'start' },
+                                    _react2.default.createElement(
+                                        Box,
+                                        null,
+                                        item.invoicename
+                                    ),
+                                    _react2.default.createElement(
+                                        HBox,
+                                        { vAlign: 'center' },
+                                        _react2.default.createElement(
+                                            Box,
+                                            { className: 'label label-primary' },
+                                            item.invoicetype
+                                        ),
+                                        _react2.default.createElement(
+                                            Box,
+                                            null,
+                                            '\uFFE5',
+                                            item.invoiceamount
+                                        )
+                                    )
+                                ),
+                                _react2.default.createElement(_upload2.default, {
+                                    required: false,
+                                    canDel: false,
+                                    canPreview: true,
+                                    canDownload: true,
+                                    initList: fileList,
+                                    dir: 'form_invoice',
+                                    ref: 'upload_invoice'
+                                })
+                            );
+                        })
+                    )
+                )
+            );
+        }
+    }]);
+
+    return Invoice;
+}(_react2.default.Component);
+
+exports.default = Invoice;

package/lib/nvoice/index.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _nvoice = require('./nvoice');
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_nvoice).default;
+  }
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/nvoice/nvoice.js

@@ -0,0 +1,177 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = undefined;
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Group = require('saltui/lib/Group');
+
+var _Group2 = _interopRequireDefault(_Group);
+
+var _Field = require('saltui/lib/Field');
+
+var _Field2 = _interopRequireDefault(_Field);
+
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
+var _Boxs = require('saltui/lib/Boxs');
+
+var _Boxs2 = _interopRequireDefault(_Boxs);
+
+var _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+require('./nvoice.less');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var HBox = _Boxs2.default.HBox,
+    Box = _Boxs2.default.Box,
+    VBox = _Boxs2.default.VBox;
+
+var Nvoice = function (_React$Component) {
+    _inherits(Nvoice, _React$Component);
+
+    function Nvoice(props) {
+        _classCallCheck(this, Nvoice);
+
+        // 传入的props参数
+        var _this = _possibleConstructorReturn(this, (Nvoice.__proto__ || Object.getPrototypeOf(Nvoice)).call(this, props));
+
+        _this.initFn = function (id) {
+
+            // 初始发票详情数据  
+            _db2.default.form.getNoInvoiceList({
+                invoicedataid: id
+            }).then(function (content) {
+                _this.setState({
+                    invoicedata: content
+                });
+            }).catch(function (error) {
+                console.error('获取详情数据失败', error);
+            });
+        };
+
+        var invoicedataid = _this.props.id;
+        var title = _this.props.label || '发票详情';
+        var required = _this.props.required || false;
+
+        _this.state = {
+            invoicedataid: invoicedataid,
+            invoicedata: [],
+            title: title,
+            required: required
+        };
+
+        return _this;
+    }
+
+    _createClass(Nvoice, [{
+        key: 'componentDidMount',
+        value: function componentDidMount() {
+            this.initFn(this.state.invoicedataid);
+        }
+    }, {
+        key: 'downloadFile',
+
+
+        // 下载函数
+        value: function (_downloadFile) {
+            function downloadFile(_x) {
+                return _downloadFile.apply(this, arguments);
+            }
+
+            downloadFile.toString = function () {
+                return _downloadFile.toString();
+            };
+
+            return downloadFile;
+        }(function (file) {
+            downloadFile(file.relaObjId);
+        })
+    }, {
+        key: 'render',
+        value: function render() {
+            return _react2.default.createElement(
+                _Group2.default.List,
+                { borderTopNone: true },
+                _react2.default.createElement(
+                    _Field2.default,
+                    { required: this.state.required, label: this.state.title, layout: 'h', multiLine: true },
+                    _react2.default.createElement(
+                        'div',
+                        null,
+                        this.state.invoicedata.map(function (item, index) {
+                            var fileList = [];
+                            try {
+                                if (item.invoicefileInfo) {
+                                    fileList = JSON.parse(item.invoicefileInfo);
+                                }
+                            } catch (e) {
+                                console.error('发票附件解析失败', e);
+                            }
+
+                            return _react2.default.createElement(
+                                'div',
+                                { key: item.id, className: 't-MT2' },
+                                _react2.default.createElement(
+                                    VBox,
+                                    { className: 'nvoice-filetitle', hAlign: 'start' },
+                                    _react2.default.createElement(
+                                        Box,
+                                        null,
+                                        item.invoicename
+                                    ),
+                                    _react2.default.createElement(
+                                        HBox,
+                                        { vAlign: 'center' },
+                                        _react2.default.createElement(
+                                            Box,
+                                            { className: 'label label-primary' },
+                                            item.invoicetype
+                                        ),
+                                        _react2.default.createElement(
+                                            Box,
+                                            null,
+                                            '\uFFE5',
+                                            item.invoiceamount
+                                        )
+                                    )
+                                ),
+                                _react2.default.createElement(_upload2.default, {
+                                    required: false,
+                                    canDel: false,
+                                    canPreview: true,
+                                    canDownload: true,
+                                    initList: fileList,
+                                    dir: 'form_invoice',
+                                    ref: 'upload_invoice'
+                                })
+                            );
+                        })
+                    )
+                )
+            );
+        }
+    }]);
+
+    return Nvoice;
+}(_react2.default.Component);
+
+exports.default = Nvoice;

package/package.json

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