ecinc-cloud-mappaio 9.7.21 → 9.7.23

package/lib/ecmappaio.common.js

@@ -8756,7 +8756,7 @@ src.install = function (Vue) {
 
 /***/ }),
 
-/***/ 6504:
+/***/ 5643:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13462,8 +13462,8 @@ var SubmitHandlevue_type_template_id_6451f4d6_scoped_true_render = function rend
 };
 var SubmitHandlevue_type_template_id_6451f4d6_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=79357eb5&scoped=true
-var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Wflowform/src/WfTaskNode.vue?vue&type=template&id=d1ae2f20&scoped=true
+var WfTaskNodevue_type_template_id_d1ae2f20_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('van-cell-group', [_c('div', {
@@ -13776,13 +13776,7 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
       },
       expression: "taskNode.jobPositionNames"
     }
-  }) : _vm._e()], 1) : _vm._e(), _c('div', {
-    directives: [{
-      name: "show",
-      rawName: "v-show",
-      value: _vm.taskNode.selectType == 0 || _vm.taskNode.selectType == 6,
-      expression: "taskNode.selectType == 0 || taskNode.selectType == 6"
-    }],
+  }) : _vm._e()], 1) : _vm._e(), _vm.taskNode.selectType == 0 || _vm.taskNode.selectType == 6 ? _c('div', {
     staticClass: "van-input-field"
   }, [_c('validation-provider', {
     ref: "ValidationProvider",
@@ -13816,14 +13810,8 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
           }
         })];
       }
-    }])
-  })], 1), _c('div', {
-    directives: [{
-      name: "show",
-      rawName: "v-show",
-      value: _vm.taskNode.selectType == 9,
-      expression: "taskNode.selectType == 9"
-    }],
+    }], null, false, 1150585294)
+  })], 1) : _vm._e(), _vm.taskNode.selectType == 9 ? _c('div', {
     staticClass: "van-input-field"
   }, [_c('validation-provider', {
     ref: "ValidationProvider",
@@ -13857,14 +13845,8 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
           }
         })];
       }
-    }])
-  })], 1), _c('div', {
-    directives: [{
-      name: "show",
-      rawName: "v-show",
-      value: _vm.taskNode.selectType == 2,
-      expression: "taskNode.selectType == 2"
-    }],
+    }], null, false, 2990088750)
+  })], 1) : _vm._e(), _vm.taskNode.selectType == 2 ? _c('div', {
     staticClass: "van-input-field"
   }, [_c('validation-provider', {
     ref: "ValidationProvider",
@@ -13898,8 +13880,8 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
           }
         })];
       }
-    }])
-  })], 1), _c('div', {
+    }], null, false, 1094184121)
+  })], 1) : _vm._e(), _c('div', {
     staticClass: "van-input-field"
   }, [_c('van-cell', {
     directives: [{
@@ -13954,16 +13936,29 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
           }],
           attrs: {
             "label": "处理意见标签",
-            "placeholder": "请选择",
+            "placeholder": "请输入或选择",
             "input-align": "right",
-            "is-link": _vm.canModify,
-            "readonly": _vm.taskNode.startNode
-          },
-          on: {
-            "click": function click($event) {
-              return _vm.selectItem('处理意见标签', 'ideaLable');
-            }
+            "readonly": !_vm.canModify || _vm.taskNode.startNode
           },
+          scopedSlots: _vm._u([_vm.canModify && !_vm.taskNode.startNode ? {
+            key: "right-icon",
+            fn: function fn() {
+              return [_c('van-icon', {
+                attrs: {
+                  "name": "arrow",
+                  "size": "16",
+                  "color": "#969799"
+                },
+                on: {
+                  "click": function click($event) {
+                    $event.stopPropagation();
+                    return _vm.selectItem('处理意见标签', 'ideaLable');
+                  }
+                }
+              })];
+            },
+            proxy: true
+          } : null], null, true),
           model: {
             value: _vm.ideaLable,
             callback: function callback($$v) {
@@ -14122,7 +14117,7 @@ var WfTaskNodevue_type_template_id_79357eb5_scoped_true_render = function render
     }
   }, [_vm._v("取 消")])]], 2)], 1);
 };
-var WfTaskNodevue_type_template_id_79357eb5_scoped_true_staticRenderFns = [];
+var WfTaskNodevue_type_template_id_d1ae2f20_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/qs/lib/index.js
 var lib = __webpack_require__(5373);
@@ -14263,9 +14258,15 @@ var lib_default = /*#__PURE__*/__webpack_require__.n(lib);
       });
       if (ideaLablelist.length == 0 && this.taskNode.name) {
         //表单上没有定义意见栏
+        if (this.taskNode.users && this.taskNode.users.length > 0 && !this.taskNode.users[0].personId) {
+          ideaLablelist.push({
+            value: 'curNodeName',
+            text: this.taskNode.name + '意见'
+          });
+        }
         ideaLablelist.push({
-          value: 'curNodeName',
-          text: this.taskNode.name + '意见'
+          value: '协同办理意见',
+          text: '协同办理意见'
         });
       }
       ideaLablelist.push({
@@ -14379,6 +14380,11 @@ var lib_default = /*#__PURE__*/__webpack_require__.n(lib);
     }
   },
   watch: {
+    ideaLable: function ideaLable(newVal) {
+      if (this.taskNode.ideaLable !== newVal) {
+        this.$set(this.taskNode, 'ideaLable', newVal);
+      }
+    },
     taskNode: {
       handler: function handler(newValue, oldValue) {
         var _this = this;
@@ -14433,8 +14439,10 @@ var lib_default = /*#__PURE__*/__webpack_require__.n(lib);
         if (this.taskNode.returnHistoryTN !== undefined) {
           this.returnHistoryTN = this.returnHistoryTNOptions[this.taskNode.returnHistoryTN].text;
         }
-        if (this.taskNode.autoCheckedAll !== undefined) {
+        if (this.taskNode.autoCheckedAll) {
           this.autoCheckedAll = this.autoCheckedAllOptions[this.taskNode.autoCheckedAll].text;
+        } else {
+          this.autoCheckedAll = this.autoCheckedAllOptions['0'].text;
         }
       },
       deep: true,
@@ -14771,11 +14779,11 @@ var lib_default = /*#__PURE__*/__webpack_require__.n(lib);
 ;
 var WfTaskNode_component = (0,componentNormalizer/* default */.A)(
   src_WfTaskNodevue_type_script_lang_js,
-  WfTaskNodevue_type_template_id_79357eb5_scoped_true_render,
-  WfTaskNodevue_type_template_id_79357eb5_scoped_true_staticRenderFns,
+  WfTaskNodevue_type_template_id_d1ae2f20_scoped_true_render,
+  WfTaskNodevue_type_template_id_d1ae2f20_scoped_true_staticRenderFns,
   false,
   null,
-  "79357eb5",
+  "d1ae2f20",
   null
   
 )
@@ -21470,7 +21478,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".van-file-field[data-v-b394b218]{posit
 
 /***/ }),
 
-/***/ 1613:
+/***/ 6547:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -21484,7 +21492,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-67219e88]{position:relative}.van-textarea-field[data-v-67219e88]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}[data-v-67219e88] .van-cell-field-title{height:44px}[data-v-67219e88] .idea-content{width:100%}[data-v-67219e88] .idea-content .ideaDiv{margin:5px 0}[data-v-67219e88] .idea-content .ideaDiv p{margin-top:0;margin-bottom:0}[data-v-67219e88] .idea-content .ideaDiv span{display:inline-block}[data-v-67219e88] .idea-content .ideaDiv .handwritingIdea{width:200px}[data-v-67219e88] .idea-content .ideaDiv .ideaSignature{max-width:100px;max-height:50px}[data-v-67219e88] .idea-content .van-icon{font-size:20px}[data-v-67219e88] .idea-content .can-delete-idea{float:right;margin-top:-28px}[data-v-67219e88] .idea-content .can-delete-idea i{color:red;cursor:pointer;font-size:16px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-f2110134]{position:relative}.van-textarea-field[data-v-f2110134]:after{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;content:\" \";pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}[data-v-f2110134] .van-cell-field-title{height:44px}[data-v-f2110134] .idea-content{width:100%}[data-v-f2110134] .idea-content .ideaDiv{margin:5px 0}[data-v-f2110134] .idea-content .ideaDiv p{margin-top:0;margin-bottom:0}[data-v-f2110134] .idea-content .ideaDiv span{display:inline-block}[data-v-f2110134] .idea-content .ideaDiv .handwritingIdea{width:200px}[data-v-f2110134] .idea-content .ideaDiv .ideaSignature{max-width:100px;max-height:50px}[data-v-f2110134] .idea-content .van-icon{font-size:20px}[data-v-f2110134] .idea-content .can-delete-idea{float:right;margin-top:-28px}[data-v-f2110134] .idea-content .can-delete-idea i{color:red;cursor:pointer;font-size:16px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -49297,19 +49305,19 @@ var update = add("ad8900a0", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 171:
+/***/ 9225:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(1613);
+var content = __webpack_require__(6547);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("3fe91231", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("6daa3a2f", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -70688,8 +70696,8 @@ var TextareaField_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var TextareaField = (TextareaField_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=template&id=67219e88&scoped=true
-var IdeaFieldvue_type_template_id_67219e88_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=template&id=f2110134&scoped=true
+var IdeaFieldvue_type_template_id_f2110134_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.showWfIdea ? _c('div', {
@@ -70716,7 +70724,7 @@ var IdeaFieldvue_type_template_id_67219e88_scoped_true_render = function render(
       'min-height': 20 * 4 + 'px'
     },
     domProps: {
-      "innerHTML": _vm._s(_vm.showWfIdea.ideaContent)
+      "innerHTML": _vm._s(_vm.displayIdeaContent)
     }
   })]), _c('van-button', {
     directives: [{
@@ -70764,7 +70772,7 @@ var IdeaFieldvue_type_template_id_67219e88_scoped_true_render = function render(
     }
   })], 1)])], 1) : _vm._e();
 };
-var IdeaFieldvue_type_template_id_67219e88_scoped_true_staticRenderFns = [];
+var IdeaFieldvue_type_template_id_f2110134_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=script&lang=js
 var IdeaFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
@@ -70813,7 +70821,24 @@ var IdeaFieldvue_type_script_lang_js_moment = __webpack_require__(5093);
       ideaInputDialogVisible: false
     };
   },
-  computed: {},
+  computed: {
+    displayIdeaContent: function displayIdeaContent() {
+      if (!this.showWfIdea) return '';
+      if (this.showWfIdea.ideaContent) return this.showWfIdea.ideaContent;
+      // ideaContent为空时，从ideaContentGroupMap中拼接所有部门意见
+      var groupMap = this.showWfIdea.ideaContentGroupMap;
+      if (groupMap && Object.keys(groupMap).length > 0) {
+        var content = '';
+        for (var dept in groupMap) {
+          if (groupMap[dept]) {
+            content += groupMap[dept];
+          }
+        }
+        return content;
+      }
+      return '';
+    }
+  },
   watch: {},
   created: function created() {},
   beforeDestroy: function beforeDestroy() {},
@@ -71011,9 +71036,9 @@ window.callDeleteIdeaBtnClick = function (ideaId) {
 };
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=script&lang=js
  /* harmony default export */ var FormField_IdeaFieldvue_type_script_lang_js = (IdeaFieldvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=style&index=0&id=67219e88&prod&scoped=true&lang=scss
-var IdeaFieldvue_type_style_index_0_id_67219e88_prod_scoped_true_lang_scss = __webpack_require__(171);
-;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=style&index=0&id=67219e88&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=style&index=0&id=f2110134&prod&scoped=true&lang=scss
+var IdeaFieldvue_type_style_index_0_id_f2110134_prod_scoped_true_lang_scss = __webpack_require__(9225);
+;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/IdeaField.vue?vue&type=style&index=0&id=f2110134&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/FormField/IdeaField.vue
 
@@ -71026,11 +71051,11 @@ var IdeaFieldvue_type_style_index_0_id_67219e88_prod_scoped_true_lang_scss = __w
 
 var IdeaField_component = (0,componentNormalizer/* default */.A)(
   FormField_IdeaFieldvue_type_script_lang_js,
-  IdeaFieldvue_type_template_id_67219e88_scoped_true_render,
-  IdeaFieldvue_type_template_id_67219e88_scoped_true_staticRenderFns,
+  IdeaFieldvue_type_template_id_f2110134_scoped_true_render,
+  IdeaFieldvue_type_template_id_f2110134_scoped_true_staticRenderFns,
   false,
   null,
-  "67219e88",
+  "f2110134",
   null
   
 )
@@ -72215,39 +72240,39 @@ var asyncComponents = [
 }],
 // ========== ecmapp/Wflowform 工作流表单子组件 → chunk: m-wflow-form ==========
 ['Attachment', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.Attachment;
   });
 }], ['BodyFile', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.BodyFile;
   });
 }], ['HandleIdea', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.HandleIdea;
   });
 }], ['SelectOuterDeputy', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.SelectOuterDeputy;
   });
 }], ['SubmitHandle', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.SubmitHandle;
   });
 }], ['SubmitDialog', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.SubmitDialog;
   });
 }], ['ShortcutProcessing', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.ShortcutProcessing;
   });
 }], ['WfNodelogList', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.WfNodelogList;
   });
 }], ['WriteToReadIdea', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643)).then(function (m) {
     return m.WriteToReadIdea;
   });
 }]];
@@ -72300,7 +72325,7 @@ var WfengineModule = function WfengineModule() {
   return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 8838));
 };
 var WflowformModule = function WflowformModule() {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6504));
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 5643));
 };
 
 // ---------- 重型功能（PDF/富文本，仅特定页面使用） ----------