ecinc-cloud-mappaio 9.7.21 → 9.7.22

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
   
 )
@@ -72215,39 +72223,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 +72308,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/富文本，仅特定页面使用） ----------

package/lib/ecmappaio.umd.js

@@ -8766,7 +8766,7 @@ src.install = function (Vue) {
 
 /***/ }),
 
-/***/ 7444:
+/***/ 6104:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13472,8 +13472,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-83.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-83.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', {
@@ -13786,13 +13786,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",
@@ -13826,14 +13820,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",
@@ -13867,14 +13855,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",
@@ -13908,8 +13890,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: [{
@@ -13964,16 +13946,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) {
@@ -14132,7 +14127,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);
@@ -14273,9 +14268,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({
@@ -14389,6 +14390,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;
@@ -14443,8 +14449,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,
@@ -14781,11 +14789,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
   
 )
@@ -72225,39 +72233,39 @@ var asyncComponents = [
 }],
 // ========== ecmapp/Wflowform 工作流表单子组件 → chunk: m-wflow-form ==========
 ['Attachment', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.Attachment;
   });
 }], ['BodyFile', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.BodyFile;
   });
 }], ['HandleIdea', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.HandleIdea;
   });
 }], ['SelectOuterDeputy', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.SelectOuterDeputy;
   });
 }], ['SubmitHandle', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.SubmitHandle;
   });
 }], ['SubmitDialog', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.SubmitDialog;
   });
 }], ['ShortcutProcessing', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.ShortcutProcessing;
   });
 }], ['WfNodelogList', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.WfNodelogList;
   });
 }], ['WriteToReadIdea', function () {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444)).then(function (m) {
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104)).then(function (m) {
     return m.WriteToReadIdea;
   });
 }]];
@@ -72310,7 +72318,7 @@ var WfengineModule = function WfengineModule() {
   return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6322));
 };
 var WflowformModule = function WflowformModule() {
-  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 7444));
+  return Promise.resolve(/* import() eager */).then(__webpack_require__.bind(__webpack_require__, 6104));
 };
 
 // ---------- 重型功能（PDF/富文本，仅特定页面使用） ----------