eoss-ui 0.6.64 → 0.6.66

package/lib/eoss-ui.common.js

@@ -5881,8 +5881,8 @@ calendar_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var calendar = (calendar_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=template&id=372f66b1&scoped=true&
-var mainvue_type_template_id_372f66b1_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calogin/src/main.vue?vue&type=template&id=e879a944&scoped=true&
+var mainvue_type_template_id_e879a944_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5893,11 +5893,11 @@ var mainvue_type_template_id_372f66b1_scoped_true_render = function () {
     2
   )
 }
-var mainvue_type_template_id_372f66b1_scoped_true_staticRenderFns = []
-mainvue_type_template_id_372f66b1_scoped_true_render._withStripped = true
+var mainvue_type_template_id_e879a944_scoped_true_staticRenderFns = []
+mainvue_type_template_id_e879a944_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/calogin/src/main.vue?vue&type=template&id=372f66b1&scoped=true&
+// CONCATENATED MODULE: ./packages/calogin/src/main.vue?vue&type=template&id=e879a944&scoped=true&
 
 // CONCATENATED MODULE: ./packages/calogin/src/plugin.js
 var plugin_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
@@ -6813,7 +6813,7 @@ var caPlugin = new CA_ExtInterface();
     init: function init() {
       if (!window.PNXClient) {
         var parser = new DOMParser();
-        var doc = parser.parseFromString("<object classid='clsid:9DD991F7-6FB0-4004-95A4-0A55006A8C42' width='0' height='0' id='PNXClient'></object>", 'text/html');
+        var doc = parser.parseFromString("<object classid='clsid:9DD991F7-6FB0-4004-95A4-0A55006A8C42' width='0' height='0' id='PNXClient' style='position: absolute;'></object>", 'text/html');
         var pnxClientElement = doc.querySelector('object');
         if (pnxClientElement) {
           document.body.appendChild(pnxClientElement);
@@ -6879,11 +6879,11 @@ var caPlugin = new CA_ExtInterface();
 
 var calogin_src_main_component = normalizeComponent(
   packages_calogin_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_372f66b1_scoped_true_render,
-  mainvue_type_template_id_372f66b1_scoped_true_staticRenderFns,
+  mainvue_type_template_id_e879a944_scoped_true_render,
+  mainvue_type_template_id_e879a944_scoped_true_staticRenderFns,
   false,
   null,
-  "372f66b1",
+  "e879a944",
   null
   
 )
@@ -16713,8 +16713,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=2158e4f3&
-var mainvue_type_template_id_2158e4f3_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=45a4048d&
+var mainvue_type_template_id_45a4048d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -16846,14 +16846,17 @@ var mainvue_type_template_id_2158e4f3_render = function () {
                                             ],
                                             key: indexs,
                                             staticClass: "es-collapse-item",
-                                            class: {
-                                              "es-collapse-readonly":
-                                                _vm.accordion
-                                                  ? false
-                                                  : !_vm.collapse,
-                                              "es-collapse-caption":
-                                                items.caption,
-                                            },
+                                            class: [
+                                              {
+                                                "es-collapse-readonly":
+                                                  _vm.accordion
+                                                    ? false
+                                                    : !_vm.collapse,
+                                                "es-collapse-caption":
+                                                  items.caption,
+                                              },
+                                              items.class,
+                                            ],
                                             attrs: {
                                               "show-title": items.showTitle,
                                               name:
@@ -22724,11 +22727,11 @@ var mainvue_type_template_id_2158e4f3_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_2158e4f3_staticRenderFns = []
-mainvue_type_template_id_2158e4f3_render._withStripped = true
+var mainvue_type_template_id_45a4048d_staticRenderFns = []
+mainvue_type_template_id_45a4048d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=2158e4f3&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=45a4048d&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -26270,8 +26273,8 @@ var mainvue_type_script_lang_js_pageView = utils_util["a" /* default */].getPara
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_2158e4f3_render,
-  mainvue_type_template_id_2158e4f3_staticRenderFns,
+  mainvue_type_template_id_45a4048d_render,
+  mainvue_type_template_id_45a4048d_staticRenderFns,
   false,
   null,
   null,
@@ -26288,8 +26291,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=fc4f395a&
-var mainvue_type_template_id_fc4f395a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=fe0ac130&
+var mainvue_type_template_id_fe0ac130_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -26302,7 +26305,133 @@ var mainvue_type_template_id_fc4f395a_render = function () {
           style: _vm.styles,
         },
         [
-          _vm.typeCode == "read"
+          _vm.showCirculate
+            ? _c(
+                "div",
+                [
+                  _c("CommonOpinions", {
+                    directives: [
+                      {
+                        name: "show",
+                        rawName: "v-show",
+                        value: !_vm.shrink,
+                        expression: "!shrink",
+                      },
+                    ],
+                    ref: "commonOpinions",
+                    staticClass: "es-common-opinions",
+                    attrs: {
+                      opinion: _vm.value,
+                      rows: _vm.rows,
+                      required: _vm.isOpinionRequired == 1,
+                      isBanInputOpinion: _vm.isBanInputOpinion,
+                      nodeFixedOpinionSelectList:
+                        _vm.nodeFixedOpinionSelectList,
+                    },
+                    on: {
+                      change: function (val) {
+                        return (_vm.value = val)
+                      },
+                    },
+                  }),
+                  _c(
+                    "el-form",
+                    {
+                      ref: "form",
+                      attrs: {
+                        model: _vm.circulateForm,
+                        "label-width": "120px",
+                      },
+                    },
+                    [
+                      _c(
+                        "el-form-item",
+                        { attrs: { prop: "nextNodeId", label: "下步节点" } },
+                        [
+                          _vm.nextNodeCheckType == "select"
+                            ? _c(
+                                "el-select",
+                                {
+                                  attrs: { placeholder: "请选择下步节点" },
+                                  model: {
+                                    value: _vm.circulateForm.nextNodeId,
+                                    callback: function ($$v) {
+                                      _vm.$set(
+                                        _vm.circulateForm,
+                                        "nextNodeId",
+                                        $$v
+                                      )
+                                    },
+                                    expression: "circulateForm.nextNodeId",
+                                  },
+                                },
+                                [
+                                  _c("el-option", {
+                                    attrs: { label: "传阅", value: "111" },
+                                  }),
+                                ],
+                                1
+                              )
+                            : _vm.nextNodeCheckType == "radio"
+                            ? _c("es-radio-group", {
+                                attrs: {
+                                  data: [{ nodeId: "111", nodeName: "传阅" }],
+                                  "value-key": "nodeId",
+                                  "label-key": "nodeName",
+                                },
+                                model: {
+                                  value: _vm.circulateForm.nextNodeId,
+                                  callback: function ($$v) {
+                                    _vm.$set(
+                                      _vm.circulateForm,
+                                      "nextNodeId",
+                                      $$v
+                                    )
+                                  },
+                                  expression: "circulateForm.nextNodeId",
+                                },
+                              })
+                            : _vm._e(),
+                        ],
+                        1
+                      ),
+                    ],
+                    1
+                  ),
+                  _c("circulate", {
+                    ref: "circulate",
+                    staticStyle: { "margin-top": "10px" },
+                    attrs: {
+                      businessId: _vm.businessId,
+                      selectorParams: _vm.params,
+                      showBtn: false,
+                      processDefinitionId: _vm.nodeInfo.nextNode,
+                      simpleTips: _vm.simpleTips,
+                      oldOption: _vm.value,
+                    },
+                    on: {
+                      cancel: function ($event) {
+                        _vm.closeProcess($event, "circulateVisible")
+                      },
+                    },
+                  }),
+                  _c(
+                    "el-button",
+                    {
+                      staticStyle: { width: "100%" },
+                      attrs: { type: "primary" },
+                      on: {
+                        click: function ($event) {
+                          _vm.handleClickCirculate()
+                        },
+                      },
+                    },
+                    [_vm._v("\n      提交\n    ")]
+                  ),
+                ],
+                1
+              )
+            : _vm.typeCode == "read"
             ? _c("StartTaskRead", {
                 key: _vm.StartTaskReadKey,
                 attrs: {
@@ -26644,6 +26773,7 @@ var mainvue_type_template_id_fc4f395a_render = function () {
                                       _c(
                                         "el-select",
                                         {
+                                          key: _vm.optionsKey,
                                           staticStyle: {
                                             width: "calc(100% + 40px)",
                                           },
@@ -26672,6 +26802,7 @@ var mainvue_type_template_id_fc4f395a_render = function () {
                                               key: items.id,
                                               attrs: {
                                                 label: items.name,
+                                                disabled: items.disabled,
                                                 value: items.processDefId,
                                               },
                                             })
@@ -27435,11 +27566,7 @@ var mainvue_type_template_id_fc4f395a_render = function () {
                                                             "department",
                                                             "employee",
                                                           ],
-                                                          params: {
-                                                            filid:
-                                                              _vm.userModel
-                                                                .orgId,
-                                                          },
+                                                          params: _vm.params,
                                                         },
                                                         on: {
                                                           change: function (
@@ -28375,6 +28502,7 @@ var mainvue_type_template_id_fc4f395a_render = function () {
                               businessId: _vm.businessId,
                               processDefinitionId: _vm.nodeInfo.nextNode,
                               simpleTips: _vm.simpleTips,
+                              selectorParams: _vm.params,
                               oldOption: _vm.value,
                             },
                             on: {
@@ -28718,11 +28846,11 @@ var mainvue_type_template_id_fc4f395a_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_fc4f395a_staticRenderFns = []
-mainvue_type_template_id_fc4f395a_render._withStripped = true
+var mainvue_type_template_id_fe0ac130_staticRenderFns = []
+mainvue_type_template_id_fe0ac130_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fc4f395a&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fe0ac130&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=fdf49dec&
 var CommonOpinionsvue_type_template_id_fdf49dec_render = function () {
@@ -42820,8 +42948,8 @@ var supervise_component = normalizeComponent(
 )
 
 /* harmony default export */ var supervise = (supervise_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=template&id=4f5020b6&
-var Circulatevue_type_template_id_4f5020b6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=template&id=1012ba25&
+var Circulatevue_type_template_id_1012ba25_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -42983,35 +43111,37 @@ var Circulatevue_type_template_id_4f5020b6_render = function () {
         ],
         1
       ),
-      _c(
-        "div",
-        { staticStyle: { "text-align": "right" } },
-        [
-          _c(
-            "el-button",
-            {
-              attrs: { type: "primary", size: "small" },
-              on: { click: _vm.subMit },
-            },
-            [_vm._v(" 确定 ")]
-          ),
-          _c(
-            "el-button",
-            { attrs: { size: "small" }, on: { click: _vm.quit } },
-            [_vm._v(" 取消 ")]
-          ),
-        ],
-        1
-      ),
+      _vm.showBtn
+        ? _c(
+            "div",
+            { staticStyle: { "text-align": "right" } },
+            [
+              _c(
+                "el-button",
+                {
+                  attrs: { type: "primary", size: "small" },
+                  on: { click: _vm.subMit },
+                },
+                [_vm._v(" 确定 ")]
+              ),
+              _c(
+                "el-button",
+                { attrs: { size: "small" }, on: { click: _vm.quit } },
+                [_vm._v(" 取消 ")]
+              ),
+            ],
+            1
+          )
+        : _vm._e(),
     ],
     1
   )
 }
-var Circulatevue_type_template_id_4f5020b6_staticRenderFns = []
-Circulatevue_type_template_id_4f5020b6_render._withStripped = true
+var Circulatevue_type_template_id_1012ba25_staticRenderFns = []
+Circulatevue_type_template_id_1012ba25_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=4f5020b6&
+// CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=1012ba25&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=script&lang=js&
 var Circulatevue_type_script_lang_js_components;
@@ -43116,7 +43246,9 @@ var Circulatevue_type_script_lang_js_components;
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
-    multiple: { type: Boolean, default: true }
+    showBtn: { type: Boolean, default: true },
+    multiple: { type: Boolean, default: true },
+    selectorParams: { type: Object, default: function _default() {} }
   },
   inheritAttrs: false,
   data: function data() {
@@ -43150,10 +43282,35 @@ var Circulatevue_type_script_lang_js_components;
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
       otherParams: { filid: 'other' },
-      loading: false
+      loading: false,
+      userModel: {}
     };
   },
+
+  watch: {
+    selectorParams: {
+      handler: function handler(val) {
+        this.params = val;
+      },
+
+      deep: true,
+      immediate: true
+    },
+    oldOption: {
+      handler: function handler(val) {
+        this.opinion = val;
+      },
+
+      deep: true,
+      immediate: true
+    }
+  },
   mounted: function mounted() {
+    var mainConfig = utils_util["a" /* default */].getStorage('mainConfig');
+    if (mainConfig) {
+      this.userModel = JSON.parse(mainConfig).userModel;
+      this.params.filid = this.userModel.orgId;
+    }
     this.loading = true;
     this.newMultiple = this.multiple;
     this.opinion = this.oldOption;
@@ -43336,8 +43493,8 @@ var Circulatevue_type_script_lang_js_components;
 
 var Circulate_component = normalizeComponent(
   component_Circulatevue_type_script_lang_js_,
-  Circulatevue_type_template_id_4f5020b6_render,
-  Circulatevue_type_template_id_4f5020b6_staticRenderFns,
+  Circulatevue_type_template_id_1012ba25_render,
+  Circulatevue_type_template_id_1012ba25_staticRenderFns,
   false,
   null,
   null,
@@ -44248,7 +44405,58 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -44281,7 +44489,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
     hideBtn: { type: Boolean, default: false },
-
+    isCirculate: { type: Boolean, default: false },
     btnList: {
       type: Array,
       default: function _default() {
@@ -44318,6 +44526,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
     return _ref = {
       styles: {},
+      optionsKey: 0,
+      showCirculate: false,
+      circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
       showFreeStartFlow: false, //自由发起流程弹窗
@@ -44465,19 +44676,21 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
   mounted: function mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
-    this.getNodeType();
-    !this.isFlow && (this.newTypeCode = this.typeCode || this.$route.query.typecode);
-    if (this.isFlow) {
-      this.businessId && this.getProcess();
-    } else if (this.newTypeCode == 'fenyue') {
-      this.getTaskReadFlow();
-    } else if (this.newTypeCode != 'reset' && this.newTypeCode != 'continuation') {
-      this.getHedInfo();
-    }
+    this.getInfo();
   },
 
   watch: {
+    isCirculate: {
+      handler: function handler(val) {
+        this.showCirculate = val;
+        if (!val) {
+          this.getInfo();
+        }
+      },
+
+      deep: true,
+      immediate: true
+    },
     width: {
       immediate: true,
       handler: function handler(val) {
@@ -44571,6 +44784,21 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     }
   },
   methods: {
+    getInfo: function getInfo() {
+      if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
+      this.getNodeType();
+      !this.isFlow && (this.newTypeCode = this.typeCode || this.$route.query.typecode);
+      if (this.isFlow) {
+        this.businessId && this.getProcess();
+      } else if (this.newTypeCode == 'fenyue') {
+        this.getTaskReadFlow();
+      } else if (this.newTypeCode != 'reset' && this.newTypeCode != 'continuation') {
+        this.getHedInfo();
+      }
+    },
+    handleClickCirculate: function handleClickCirculate() {
+      this.$refs.circulate.subMit();
+    },
     getNodeInfoForStartFlow: function getNodeInfoForStartFlow(processDefinitionId) {
       var _this = this;
 
@@ -44582,6 +44810,17 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         if (res.status == 'success') {
           _this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
           _this.directCreateCircularReadWhenFlowStarted = res.data.nodeExtAttr.directCreateCircularReadWhenFlowStarted == 1;
+
+          if (_this.directCreateCircularReadWhenFlowStarted) {
+            _this.nodeInfo.option.map(function (item) {
+              item.disabled = item.processDefId != processDefinitionId;
+            });
+          } else {
+            _this.nodeInfo.option.map(function (item) {
+              item.disabled = false;
+            });
+          }
+          _this.optionsKey++;
           _this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
         }
       });
@@ -45539,7 +45778,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             _this25.presetEdit = data.nodeExtAttr.presetEdit;
             _this25.countersignaturetypeCode = data.countersignaturetypeCode; //是否展示处理方式
             _this25.handleMode = data.countersignaturetypeText;
-            data.globalNodeType === 'endEvent' ? _this25.endFlow = true : '';
+            if (data.globalNodeType === 'endEvent') {
+              _this25.isNextUser = data.globalNodeType != 'endEvent';
+              data.globalNodeType === 'endEvent' ? _this25.endFlow = true : '';
+            }
           }
           _this25.isCustomPreset && _this25.$refs.customPreset.getPresetFlowInfo(_this25.nextNode.nextNodeId, _this25.nodeInfo.nextNode, true);
         } else {
@@ -45578,6 +45820,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         this.isShowNode = false;
         this.isMainSubProcess = false;
         this.isNodeShowProcess = false;
+        this.endFlow = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -46457,8 +46700,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fc4f395a_render,
-  mainvue_type_template_id_fc4f395a_staticRenderFns,
+  mainvue_type_template_id_fe0ac130_render,
+  mainvue_type_template_id_fe0ac130_staticRenderFns,
   false,
   null,
   null,
@@ -48448,8 +48691,8 @@ flow_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_group = (flow_group_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=1b0fe550&
-var mainvue_type_template_id_1b0fe550_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=0f6641c6&
+var mainvue_type_template_id_0f6641c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48652,11 +48895,11 @@ var mainvue_type_template_id_1b0fe550_render = function () {
     2
   )
 }
-var mainvue_type_template_id_1b0fe550_staticRenderFns = []
-mainvue_type_template_id_1b0fe550_render._withStripped = true
+var mainvue_type_template_id_0f6641c6_staticRenderFns = []
+mainvue_type_template_id_0f6641c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=1b0fe550&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=0f6641c6&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=script&lang=js&
 
@@ -48817,7 +49060,10 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
       type: String,
       default: ''
     },
-
+    showDoresult: {
+      type: Boolean,
+      default: false
+    },
     theadWidth: {
       type: Object,
       default: function _default() {
@@ -49777,6 +50023,8 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
       }).catch(function () {});
     },
     getCircularReadList: function getCircularReadList() {
+      var _this9 = this;
+
       var _that = this;
       var params = {
         url: api["qb" /* pendedhistoryListWithCircularReadJson */],
@@ -49784,6 +50032,11 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
       };
       utils_util["a" /* default */].ajax(params).then(function (res) {
         if (res.status == 'success' || res.rCode == 0) {
+          if (_this9.showDoresult && res.data.fyHistoryList) {
+            res.data.fyHistoryList = res.data.fyHistoryList.filter(function (x) {
+              return x.doresult || x.handleInfo;
+            });
+          }
           _that.circularData = res.data.fyHistoryList;
           _that.hasCircularReadWithdrawAuthority = res.data.hasCircularReadWithdrawAuthority;
           _that.$nextTick(function () {
@@ -49846,7 +50099,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月29日
      **/
     handleFormSubmit: function handleFormSubmit(formData) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.delLoading = true;
       var params = {
@@ -49858,18 +50111,18 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
         var status = res.status,
             message = res.message;
 
-        _this9.delLoading = false;
+        _this10.delLoading = false;
         if (status === 'success') {
-          _this9.$message.success('删除成功');
-          _this9.showDel = false;
-          _this9.handleChange();
+          _this10.$message.success('删除成功');
+          _this10.showDel = false;
+          _this10.handleChange();
         } else {
-          _this9.$message.error(message || '系统错误，请联系管理员！');
+          _this10.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this9.delLoading = false;
+        _this10.delLoading = false;
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
@@ -49933,7 +50186,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月29日
      **/
     getPressList: function getPressList() {
-      var _this10 = this;
+      var _this11 = this;
 
       var historyId = this.historyId,
           pageSize = this.pageSize,
@@ -49949,13 +50202,13 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
         data: { page: currentPage, rows: pageSize, sidx: sidx, sord: sord, historyId: historyId }
       };
       utils_util["a" /* default */].ajax(params).then(function (res) {
-        _this10.pressTableList = res.data;
-        _this10.total = res.totalrecords;
-        _this10.pressLoading = false;
+        _this11.pressTableList = res.data;
+        _this11.total = res.totalrecords;
+        _this11.pressLoading = false;
       }).catch(function (err) {
-        _this10.pressLoading = false;
+        _this11.pressLoading = false;
         if (err.message && err.message !== 'canceled') {
-          _this10.$message.error(err.message);
+          _this11.$message.error(err.message);
         }
       });
     },
@@ -50000,7 +50253,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
       this.getFlowList();
     },
     getFyListJson: function getFyListJson(type) {
-      var _this11 = this;
+      var _this12 = this;
 
       return flow_list_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee3() {
         var params;
@@ -50011,16 +50264,21 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
                 params = {
                   url: api["E" /* fyListJson */],
                   params: {
-                    appRecordId: _this11.businessId,
+                    appRecordId: _this12.businessId,
                     status: type
                   }
                 };
                 _context3.next = 3;
                 return utils_util["a" /* default */].ajax(params).then(function (res) {
+                  if (_this12.showDoresult && res.data) {
+                    res.data = res.data.filter(function (x) {
+                      return x.doresult || x.handleInfo;
+                    });
+                  }
                   if (type == 1) {
-                    _this11.untreatedReadData = res.data;
+                    _this12.untreatedReadData = res.data;
                   } else {
-                    _this11.processedReadData = res.data;
+                    _this12.processedReadData = res.data;
                   }
                 });
 
@@ -50029,7 +50287,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
                 return _context3.stop();
             }
           }
-        }, _callee3, _this11);
+        }, _callee3, _this12);
       }))();
     },
 
@@ -50040,7 +50298,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月22日
      **/
     getFlowList: function getFlowList() {
-      var _this12 = this;
+      var _this13 = this;
 
       var params = {
         url: api["pb" /* pendedhistoryListJson */],
@@ -50063,45 +50321,53 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
             modify = _res$data.modify,
             taskReadName = _res$data.taskReadName;
 
-        _this12.loading.close();
+        _this13.loading.close();
         if (status == 'success') {
-          _this12.flowTableInfo.adjunctCode = adjunctCode;
-          _this12.flowTableInfo.hasAgent = hasAgent;
-          _this12.attachmentPaperClipCssStyle = res.data.attachmentPaperClipCssStyle;
-          _this12.isShort = isShort;
-          _this12.taskReadName = taskReadName;
-          _this12.flowData = wfHistoryList;
-          _this12.flowData.map(function (x) {
+          if (_this13.showDoresult) {
+            wfHistoryList && (wfHistoryList = wfHistoryList.filter(function (x) {
+              return x.doresult || x.handleInfo;
+            }));
+            fyHistoryList && (fyHistoryList = fyHistoryList.filter(function (x) {
+              return x.doresult || x.handleInfo;
+            }));
+          }
+          _this13.flowTableInfo.adjunctCode = adjunctCode;
+          _this13.flowTableInfo.hasAgent = hasAgent;
+          _this13.attachmentPaperClipCssStyle = res.data.attachmentPaperClipCssStyle;
+          _this13.isShort = isShort;
+          _this13.taskReadName = taskReadName;
+          _this13.flowData = wfHistoryList;
+          _this13.flowData.map(function (x) {
             if (!x.deptid) {
               x.deptid = x.deptName;
             }
           });
-          _this12.splitReadingData = fyHistoryList;
-          _this12.modify = modify;
-          _this12.show = true;
-          if (_this12.height == 'auto') {
-            _this12.$nextTick(function () {
-              _this12.content.map(function (x) {
-                _this12[x.type + 'Height'] = _this12.$refs[x.type][0].offsetHeight;
+          _this13.splitReadingData = fyHistoryList;
+          _this13.modify = modify;
+          _this13.show = true;
+          if (_this13.height == 'auto') {
+            _this13.$nextTick(function () {
+              _this13.content.map(function (x) {
+                _this13[x.type + 'Height'] = _this13.$refs[x.type][0].offsetHeight;
               });
             });
           }
-          if (_this12.contents.indexOf('circular') != -1) {
-            _this12.getCircularReadList();
+          if (_this13.contents.indexOf('circular') != -1) {
+            _this13.getCircularReadList();
           } else {
-            _this12.$nextTick(function () {
-              _this12.getListCount(_this12.flowListCount);
+            _this13.$nextTick(function () {
+              _this13.getListCount(_this13.flowListCount);
             });
           }
         } else {
-          _this12.$message.error(message || '系统错误，请联系管理员！');
+          _this13.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this12.loading.close();
+        _this13.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this12.$message.error(err.message);
+          _this13.$message.error(err.message);
         }
-        _this12.show = true;
+        _this13.show = true;
       });
     },
 
@@ -50113,7 +50379,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月10日
      **/
     handleClick: function handleClick(val) {
-      var _this13 = this;
+      var _this14 = this;
 
       var text = val.handle.text,
           _val$row = val.row,
@@ -50123,7 +50389,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
       if (text === '置为失效') {
         if (status == 0) {
           this.$confirm('您确定要置为失效吗?').then(function () {
-            _this13.loading = utils_util["a" /* default */].loading(_this13.$loading, '提交中...');
+            _this14.loading = utils_util["a" /* default */].loading(_this14.$loading, '提交中...');
             var param = {
               url: api["m" /* deletePresetInfo */],
               headers: { Accept: 'application/json,text/plain' },
@@ -50134,17 +50400,17 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
               var status = res.status,
                   message = res.message;
 
-              _this13.loading.close();
+              _this14.loading.close();
               if (status === 'success') {
-                _this13.$message.success('操作成功');
-                _this13.getListInfo();
+                _this14.$message.success('操作成功');
+                _this14.getListInfo();
               } else {
-                _this13.$message.error(message || '系统错误，请联系管理员！');
+                _this14.$message.error(message || '系统错误，请联系管理员！');
               }
             }).catch(function (err) {
-              _this13.loading.close();
+              _this14.loading.close();
               if (err.message && err.message !== 'canceled') {
-                _this13.$message.error(err.message);
+                _this14.$message.error(err.message);
               }
             });
           }).catch(function (e) {
@@ -50179,7 +50445,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月10日
      **/
     getSysInfo: function getSysInfo(code) {
-      var _this14 = this;
+      var _this15 = this;
 
       var params = {
         url: api["y" /* findCodeValues */],
@@ -50191,9 +50457,9 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
             data = res.data;
 
         if (status == 'success') {
-          _this14[code] = data;
+          _this15[code] = data;
         } else {
-          _this14.$message.error(message || '系统错误，请联系管理员！');
+          _this15.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (e) {});
     },
@@ -50205,7 +50471,7 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
      * @date 2022年11月10日
      **/
     getListInfo: function getListInfo() {
-      var _this15 = this;
+      var _this16 = this;
 
       var param = {
         url: api["Vb" /* toPresetInfoListIndex */],
@@ -50220,19 +50486,24 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
             canDelete = _res$data2.canDelete,
             currentUserHasPresetInfoAuth = _res$data2.currentUserHasPresetInfoAuth;
 
-        _this15.loading.close();
+        _this16.loading.close();
         if (status == 'success') {
-          presetInfoList && (_this15.presetData = presetInfoList);
-          _this15.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
-          _this15.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
-          _this15.canDelete = canDelete;
+          if (_this16.showDoresult && presetInfoList) {
+            presetInfoList = presetInfoList.filter(function (x) {
+              return x.doresult || x.handleInfo;
+            });
+          }
+          presetInfoList && (_this16.presetData = presetInfoList);
+          _this16.presetInfoListHiddenColumns = presetInfoListHiddenColumns;
+          _this16.currentUserHasPresetInfoAuth = currentUserHasPresetInfoAuth;
+          _this16.canDelete = canDelete;
         } else {
-          _this15.$message.error(message || '系统错误，请联系管理员！');
+          _this16.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this15.loading.close();
+        _this16.loading.close();
         if (err.message && err.message !== 'canceled') {
-          _this15.$message.error(err.message);
+          _this16.$message.error(err.message);
         }
       });
     }
@@ -50250,8 +50521,8 @@ function flow_list_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return
 
 var flow_list_src_main_component = normalizeComponent(
   packages_flow_list_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1b0fe550_render,
-  mainvue_type_template_id_1b0fe550_staticRenderFns,
+  mainvue_type_template_id_0f6641c6_render,
+  mainvue_type_template_id_0f6641c6_staticRenderFns,
   false,
   null,
   null,
@@ -52792,8 +53063,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=74708296&
-var mainvue_type_template_id_74708296_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=68c9ba89&
+var mainvue_type_template_id_68c9ba89_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -53819,105 +54090,112 @@ var mainvue_type_template_id_74708296_render = function () {
               ),
             ]
           ),
-          _vm._t("footer", [
-            _vm.copyright && _vm.copyright.length
-              ? _c(
-                  "div",
-                  { staticClass: "es-login-icp" },
-                  [
-                    _vm._l(_vm.copyright, function (item) {
-                      return [
-                        item.url || item.open
-                          ? _c(
-                              "a",
-                              {
-                                key: item.title,
-                                staticClass: "es-login-icp-item",
-                                style: item.style || _vm.copyrightStyle,
-                                attrs: {
-                                  target: item.open ? "_blank" : "_self",
-                                  href: item.url || item.open,
-                                },
-                              },
-                              [
-                                _vm._v(
-                                  "\n          " +
-                                    _vm._s(item.title) +
-                                    "\n        "
-                                ),
-                              ]
-                            )
-                          : _c(
-                              "span",
-                              {
-                                key: item.title,
-                                staticClass: "es-login-icp-item",
-                                style: item.style || _vm.copyrightStyle,
+          _vm._t(
+            "footer",
+            [
+              _c(
+                "div",
+                { staticClass: "es-login-icp" },
+                [
+                  _vm._l(_vm.copyright, function (item) {
+                    return [
+                      item.url || item.open
+                        ? _c(
+                            "a",
+                            {
+                              key: item.title,
+                              staticClass: "es-login-icp-item",
+                              style: Object.assign(
+                                {},
+                                { color: "#63c2ff" },
+                                item.style
+                              ),
+                              attrs: {
+                                target: item.open ? "_blank" : "_self",
+                                href: item.url || item.open,
                               },
-                              [
-                                _vm._v(
-                                  "\n          " +
-                                    _vm._s(item.title) +
-                                    "\n        "
-                                ),
-                              ]
-                            ),
-                        item.children && item.children.length
-                          ? [
-                              _vm._l(item.children, function (child) {
-                                return [
-                                  child.url || child.open
-                                    ? _c(
-                                        "a",
-                                        {
-                                          key: child.title,
-                                          staticClass:
-                                            "es-login-icp-child-item",
-                                          style:
-                                            child.style || _vm.copyrightStyle,
-                                          attrs: {
-                                            target: child.open
-                                              ? "_blank"
-                                              : "_self",
-                                            href: child.url || child.open,
-                                          },
-                                        },
-                                        [
-                                          _vm._v(
-                                            "\n              " +
-                                              _vm._s(child.title) +
-                                              "\n            "
-                                          ),
-                                        ]
-                                      )
-                                    : _c(
-                                        "span",
-                                        {
-                                          key: child.title,
-                                          staticClass:
-                                            "es-login-icp-child-item",
-                                          style:
-                                            child.style || _vm.copyrightStyle,
-                                        },
-                                        [
-                                          _vm._v(
-                                            "\n              " +
-                                              _vm._s(child.title) +
-                                              "\n            "
-                                          ),
-                                        ]
-                                      ),
-                                ]
-                              }),
+                            },
+                            [
+                              _vm._v(
+                                "\n          " +
+                                  _vm._s(item.title) +
+                                  "\n        "
+                              ),
                             ]
-                          : _vm._e(),
-                      ]
-                    }),
-                  ],
-                  2
-                )
-              : _vm._e(),
-          ]),
+                          )
+                        : _c(
+                            "span",
+                            {
+                              key: item.title,
+                              staticClass: "es-login-icp-item",
+                              style: item.style || _vm.copyrightStyle,
+                            },
+                            [
+                              _vm._v(
+                                "\n          " +
+                                  _vm._s(item.title) +
+                                  "\n        "
+                              ),
+                            ]
+                          ),
+                      item.children && item.children.length
+                        ? [
+                            _vm._l(item.children, function (child) {
+                              return [
+                                child.url || child.open
+                                  ? _c(
+                                      "a",
+                                      {
+                                        key: child.title,
+                                        staticClass: "es-login-icp-child-item",
+                                        style: Object.assign(
+                                          {},
+                                          { color: "#63c2ff" },
+                                          child.style
+                                        ),
+                                        attrs: {
+                                          target: child.open
+                                            ? "_blank"
+                                            : "_self",
+                                          href: child.url || child.open,
+                                        },
+                                      },
+                                      [
+                                        _vm._v(
+                                          "\n              " +
+                                            _vm._s(child.title) +
+                                            "\n            "
+                                        ),
+                                      ]
+                                    )
+                                  : _c(
+                                      "span",
+                                      {
+                                        key: child.title,
+                                        staticClass: "es-login-icp-child-item",
+                                        style:
+                                          child.style || _vm.copyrightStyle,
+                                      },
+                                      [
+                                        _vm._v(
+                                          "\n              " +
+                                            _vm._s(child.title) +
+                                            "\n            "
+                                        ),
+                                      ]
+                                    ),
+                              ]
+                            }),
+                          ]
+                        : _vm._e(),
+                    ]
+                  }),
+                ],
+                2
+              ),
+            ],
+            { copyright: _vm.copyright }
+          ),
           _c(
             "es-dialog",
             {
@@ -54033,16 +54311,21 @@ var mainvue_type_template_id_74708296_render = function () {
               ]
             ),
           ]),
-          _c("es-ca-login", {
-            ref: "calogin",
-            attrs: { identifyingId: _vm.identifyingId, success: _vm.caLogin },
-          }),
+          _vm.isCaLogin
+            ? _c("es-ca-login", {
+                ref: "calogin",
+                attrs: {
+                  identifyingId: _vm.identifyingId,
+                  success: _vm.caLogin,
+                },
+              })
+            : _vm._e(),
         ],
         2
       )
     : _vm._e()
 }
-var mainvue_type_template_id_74708296_staticRenderFns = [
+var mainvue_type_template_id_68c9ba89_staticRenderFns = [
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -54057,10 +54340,10 @@ var mainvue_type_template_id_74708296_staticRenderFns = [
     ])
   },
 ]
-mainvue_type_template_id_74708296_render._withStripped = true
+mainvue_type_template_id_68c9ba89_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=74708296&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=68c9ba89&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=45dccfdc&
 var resetPasswordvue_type_template_id_45dccfdc_render = function () {
@@ -55139,6 +55422,13 @@ function login_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -55322,7 +55612,9 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
     copyrightStyle: {
       type: Object,
       default: function _default() {
-        return {};
+        return {
+          color: '#fff'
+        };
       }
     },
     appName: String,
@@ -55476,6 +55768,9 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
       });
       return icon;
     },
+    isCaLogin: function isCaLogin() {
+      return this.loginModel.indexOf('1') > -1;
+    },
     showVerifyCode: function showVerifyCode() {
       return this.passModifyModel && (this.passModifyModel.indexOf('6') > -1 || this.passModifyModel.indexOf('11') > -1);
     },
@@ -56512,8 +56807,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_74708296_render,
-  mainvue_type_template_id_74708296_staticRenderFns,
+  mainvue_type_template_id_68c9ba89_render,
+  mainvue_type_template_id_68c9ba89_staticRenderFns,
   false,
   null,
   null,
@@ -89615,7 +89910,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.64',
+  version: '0.6.66',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,