eoss-ui 0.7.16 → 0.7.18

package/packages/flow/src/component/FreeCirculation.vue

@@ -24,7 +24,8 @@
           multiple
           mix
           :disableds="otherOrgDisabledObjId"
-          :where="{ filid: 'other' }"
+          :where="{ filid: 'other',roleid :selectorParams.roleid }"
+
           @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
           :types="foreignOrgSelectorTabs"
           :params="foreignOrgSelectorParams"
@@ -52,6 +53,7 @@ export default {
       type: String,
       default: 'left'
     },
+    selectorParams: { type: Object, default: () => {return {}} },
     params: {
       type: Object,
       default: () => {}
@@ -60,7 +62,7 @@ export default {
       type: String,
       default: ''
     },
-    showOther:{type:Boolean,default:true}
+    showOther: { type: Boolean, default: true }
   },
   data() {
     return {
@@ -82,6 +84,8 @@ export default {
     };
   },
   mounted() {
+    this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid =
+      this.selectorParams.roleid;
     this.getFreeTaskCircularRead();
   },
   methods: {
@@ -105,7 +109,6 @@ export default {
       util.ajax(param).then((res) => {
         this.loading.close();
         if (res.rCode == 0 || res.status == 'success') {
-          
           if (!this.simpleTips) {
             this.$alert('提交成功', '', {
               confirmButtonText: '确定',
@@ -117,8 +120,10 @@ export default {
           } else {
             this.$parent.$emit('success');
           }
-        }else{
-          this.$message.error(res.message || res.msg || '系统错误，请联系管理员！');
+        } else {
+          this.$message.error(
+            res.message || res.msg || '系统错误，请联系管理员！'
+          );
         }
       });
     },

package/packages/flow/src/component/taskUnionExamine.vue

@@ -52,7 +52,9 @@
               ? ['enterprise', 'employee']
               : ['enterprise']
           "
-          :params="type == 'startDraf' || type == 'unionExamine'?otherParams:params"
+          :params="
+            type == 'startDraf' || type == 'unionExamine' ? otherParams : params
+          "
           :tabs="currentOrgTabsParam"
           :disabled="disabled"
           :onlyName="onlyName"
@@ -65,7 +67,7 @@
       >
         <SelectUser
           :nextUser="infoList.nextOtherOrgObj"
-            :where="{ filid: 'other' }"
+          :where="{ filid: 'other',roleid :selectorParams.roleid }"
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
           :mix="otherMix"
@@ -81,13 +83,13 @@
           :tabs="foreignOrgTabsParam"
         />
       </el-form-item>
-       <!-- :rules="[
+      <!-- :rules="[
           { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]" -->
       <el-form-item
         prop="noticeType"
         label="通知方式"
-       v-show="infoList.noticeList.length != 0"
+        v-show="infoList.noticeList.length != 0"
       >
         <el-checkbox-group
           v-model="infoList.noticeType"
@@ -166,8 +168,9 @@ export default {
     defaultOpinion: { type: String, default: '' },
     oldOption: { type: String, default: '' },
     disabled: { type: Boolean, default: false },
-    simpleTips:  { type: Boolean, default: true },
-    multiple: { type: Boolean, default: true }
+    simpleTips: { type: Boolean, default: true },
+    multiple: { type: Boolean, default: true },
+    selectorParams: { type: Object, default: () => {return {}} }
   },
   inheritAttrs: false,
   data() {
@@ -185,13 +188,13 @@ export default {
         opinion: ''
       },
       onlyName: '',
-      unionSealData:[],
+      unionSealData: [],
       currentOrgTabs: [],
       foreignOrgTabs: [],
       foreignOrgTabsParam: {},
       currentOrgTabsParam: {},
       currentOrgProcessKey: '',
-      otherOrgDisabledObjId:[],
+      otherOrgDisabledObjId: [],
       isSubFlow: true,
       choiceDeptId: '',
       choiceOrgId: '',
@@ -211,7 +214,8 @@ export default {
   mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
-  this.opinion = this.oldOption
+    this.otherParams.roleid = this.params.roleid = this.selectorParams.roleid;
+    this.opinion = this.oldOption;
     this.getNodeType();
     if (this.type === 'taskReview') return this.getTaskReview();
     this.getInfo();
@@ -252,7 +256,7 @@ export default {
           const { message, status } = res;
           this.loading = false;
           if (status === 'success') {
-           this.simpleTips && this.$message.success('提交成功');
+            this.simpleTips && this.$message.success('提交成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -279,7 +283,7 @@ export default {
             const {
               data: { initiatorUser, taskExamine }
             } = res;
-            if(taskExamine.opinion){
+            if (taskExamine.opinion) {
               this.opinion = taskExamine.opinion;
             }
             this.infoList.nextOtherOrgObj.push(initiatorUser.userId);
@@ -341,8 +345,8 @@ export default {
                 }
               }
             } = res;
-            if(otherOrgDisabledObjId){
-              this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',')
+            if (otherOrgDisabledObjId) {
+              this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',');
             }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
@@ -362,7 +366,7 @@ export default {
                     filid:
                       param[i] == 'my'
                         ? (this.params.filid = JSON.parse(
-                           util.getStorage('mainConfig')
+                            util.getStorage('mainConfig')
                           ).userModel.orgId)
                         : param[i]
                   };
@@ -370,11 +374,11 @@ export default {
               } else {
                 if (this.type == 'takeAdvice') {
                   this.params.filid = JSON.parse(
-                   util.getStorage('mainConfig')
+                    util.getStorage('mainConfig')
                   ).userModel.orgId;
                 }
               }
-              
+
               if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
                 this.otherMix =
                   res.data.customizedConfig.foreignOrgSelectorSelectMix ==
@@ -397,7 +401,7 @@ export default {
               notificationMessageReadOnly == 'true';
             this.isSinglePage = taskExamine.isSinglePage;
             this.isSubFlow = taskExamine.isSubFlow;
-            if(taskExamine.opinion){
+            if (taskExamine.opinion) {
               this.opinion = taskExamine.opinion;
             }
             this.choiceDeptId = choiceDeptId;
@@ -411,17 +415,16 @@ export default {
             }
             this.isOpinionRequired = isOpinionRequired;
             if (this.type == 'unionSeal') {
-              let names = unionDispatchOrgName.split(',')
-              let ids = unionDispatchOrgId.split(',')
-              names.map((x,i) => {
-                if(x){
+              let names = unionDispatchOrgName.split(',');
+              let ids = unionDispatchOrgId.split(',');
+              names.map((x, i) => {
+                if (x) {
                   this.unionSealData.push({
                     showname: x,
                     showid: ids[i]
-                  })
-
+                  });
                 }
-              })
+              });
               // this.onlyName = unionDispatchOrgName;
               // this.infoList.nextOtherOrgObj.push(unionDispatchOrgId);
             }
@@ -502,9 +505,12 @@ export default {
         data: {
           opinion,
           pendingId,
-          nextOtherOrgObj:this.type == 'unionSeal'?this.unionSealData.map(x => x.showid).join(',') : Array.isArray(nextOtherOrgObj)
-            ? nextOtherOrgObj.join(',')
-            : nextOtherOrgObj,
+          nextOtherOrgObj:
+            this.type == 'unionSeal'
+              ? this.unionSealData.map((x) => x.showid).join(',')
+              : Array.isArray(nextOtherOrgObj)
+              ? nextOtherOrgObj.join(',')
+              : nextOtherOrgObj,
           nextCurrentOrgObj: Array.isArray(nextCurrentOrgObj)
             ? nextCurrentOrgObj.join(',')
             : nextCurrentOrgObj,
@@ -524,7 +530,7 @@ export default {
           const { message, status } = res;
           this.loading = false;
           if (status == 'success') {
-           this.simpleTips && this.$message.success('提交成功');
+            this.simpleTips && this.$message.success('提交成功');
             this.quit(true);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -570,7 +576,7 @@ export default {
           params: {
             ccCode: 'notification_type',
             userId: util.getStorage('userId'),
-            pendingId:this.pendingId
+            pendingId: this.pendingId
           }
         })
         .then((res) => {

package/packages/flow/src/freeStartFlow.vue

@@ -292,7 +292,7 @@
                     :disableds="currentOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
                     :types="['department', 'employee']"
-                    :params="{ filid: userModel.orgId }"
+                    :params="{ filid: userModel.orgId,roleid:selectorParams.roleid }"
                   />
                 </el-form-item>
                 <el-form-item
@@ -304,11 +304,12 @@
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
                     mix
-            :where="{ filid: 'other' }"
+            :where="{ filid: 'other',roleid:selectorParams.roleid  }"
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
                     :types="['enterprise']"
-                    :params="{ filid: 'all' }"
+                    :params="{ filid: 'all',roleid:selectorParams.roleid  }"
+
                   />
                 </el-form-item>
                 <el-form-item
@@ -835,6 +836,7 @@ export default {
     userSelectRange: {
       type: String
     },
+    selectorParams: { type: Object, default: () => {return {}} },
     defaultProcessShowStrategy: { type: String, default: '' },
     taskParams: {
       type: Object,

package/packages/flow/src/main.vue

@@ -38,7 +38,7 @@
         </div>
       </div>
       <CommonOpinions
-      v-if="showOpinion"
+        v-if="showOpinion"
         class="es-common-opinions"
         v-show="!shrink"
         ref="commonOpinions"
@@ -85,7 +85,7 @@
           :businessId="businessIds"
           :label-position="formLabelPosition"
           ref="circulate"
-          :selectorParams="params"
+          :selectorParams="selectorParams"
           :pending-id="pendingId"
           :showBtn="false"
           :formTitle="formTitle"
@@ -129,6 +129,7 @@
       :appId="resetAppId"
       :params="param"
       :showOther="showOther"
+          :selectorParams="selectorParams"
       :formLabelPosition="formLabelPosition"
       :simpleTips="simpleTips"
     />
@@ -718,7 +719,7 @@
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
           :showBtn="false"
-          :selectorParams="params"
+          :selectorParams="selectorParams"
           :oldOption="value"
           @cancel="closeProcess($event, 'circulateVisible')"
         />
@@ -813,7 +814,7 @@
             class="es-button-agree-save"
             v-if="!isHideTemporarySave"
             @click="saveInfo()"
-            >暂存</el-button
+            >{{ saveButtonName }}</el-button
           >
         </div>
         <div
@@ -835,7 +836,7 @@
             :style="btnStyle"
             @click="item.event === 'sub' ? subProcess() : saveInfo(false, item)"
           >
-            {{ item.text }}
+            {{ item.event == 'save' ? saveButtonName : item.text }}
           </el-button>
 
           <div
@@ -886,7 +887,7 @@
                   item.event === 'sub' ? subProcess() : saveInfo(false, item)
                 "
               >
-                {{ item.text }}
+                {{ item.event == 'save' ? saveButtonName : item.text }}
               </el-button>
               <el-dropdown
                 v-if="
@@ -961,7 +962,7 @@
           :businessId="businessId"
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
-          :selectorParams="params"
+          :selectorParams="selectorParams"
           :oldOption="value"
           @cancel="closeProcess($event, 'circulateVisible')"
         />
@@ -1096,6 +1097,7 @@
           :pendingId="pendingId"
           :defaultOpinion="nodeDefaultSubmitOpinion"
           :oldOption="value"
+          :selectorParams="selectorParams"
           :type="flowType"
           :multiple="flowMultiple"
           :disabled="flowDisabled"
@@ -1237,6 +1239,7 @@ export default {
       type: Object,
       default: () => {}
     },
+    selectorParams: { type: Object, default: () => {return {}} },
     width: {
       type: String
     },
@@ -1248,7 +1251,7 @@ export default {
       type: [String, Number],
       default: 10
     },
-    showOther:{
+    showOther: {
       type: Boolean,
       default: true
     },
@@ -1261,7 +1264,7 @@ export default {
       endMessage: '',
       isHideTemporarySave: false,
       oldNextOperate: '',
-      showOpinion:true,
+      showOpinion: true,
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
@@ -1445,6 +1448,7 @@ export default {
       otherOrgName: '', //外单位名称
       needRetrialAuth: false, //是否二次鉴权
       msgTypeCount: 0,
+      saveButtonName: '暂存',
       nodeInfo: {
         nextNode: '',
         nextUser: '',
@@ -1463,6 +1467,8 @@ export default {
     this.currentOrgSelectorParams.filid = JSON.parse(
       util.getStorage('mainConfig')
     ).userModel.orgId;
+    this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid =
+      this.selectorParams.roleid;
     this.nextNode.nextNodeId = this.nextNodeId;
     if (!this.isFlow) {
       this.getInfo();
@@ -1530,8 +1536,7 @@ export default {
             }
           }
           if (this.nodeInfo.nextNode) {
-
-            this.handleChange(this.nodeInfo.nextNode,true);
+            this.handleChange(this.nodeInfo.nextNode, true);
           }
         }
       },
@@ -1651,6 +1656,9 @@ export default {
       };
       util.ajax(params).then((res) => {
         if (res.status == 'success') {
+          if (res.data.temporarySaveButtonName) {
+            this.saveButtonName = res.data.temporarySaveButtonName;
+          }
           this.isHideTemporarySave =
             res.data.nodeExtAttr.isHideTemporarySave == 1;
           this.isBanInputOpinion = res.data.nodeExtAttr.isBanInputOpinion;
@@ -1668,9 +1676,9 @@ export default {
           // }
           this.optionsKey++;
           this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
-          this.showOpinion = false
+          this.showOpinion = false;
           setTimeout(() => {
-            this.showOpinion = true
+            this.showOpinion = true;
           }, 0);
         }
       });
@@ -1715,8 +1723,8 @@ export default {
       this.flowSuccess(true);
       // this.$emit('success');
     },
-    handleChange(val,isForStartFlow) {
-      this.getNodeInfoForStartFlow(val,isForStartFlow);
+    handleChange(val, isForStartFlow) {
+      this.getNodeInfoForStartFlow(val, isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
     getsubProcessColumns() {
@@ -2895,6 +2903,7 @@ export default {
           //pc返回数据
 
           this.loading.close();
+
           if (res.status === 'success') {
             const {
               data: {
@@ -2903,6 +2912,7 @@ export default {
                 isCustomPreset,
                 presetTaskNodeKeyStr,
                 presetTaskNodeMap,
+                temporarySaveButtonName,
                 circularReadParamsMap,
                 isPreset,
                 choiceOrgId,
@@ -2934,6 +2944,9 @@ export default {
                 isCanPreAddSign
               }
             } = res;
+            if (temporarySaveButtonName) {
+              this.saveButtonName = temporarySaveButtonName;
+            }
             if (simpleTips != undefined) {
               this.simpleTips = simpleTips;
             }
@@ -3201,6 +3214,10 @@ export default {
               this.$message.error(res.message || '系统错误，请联系管理员！');
             }
           }
+          this.showOpinion = false;
+          setTimeout(() => {
+            this.showOpinion = true;
+          }, 0);
         })
         .catch((err) => {
           this.loading.close();
@@ -3314,7 +3331,7 @@ export default {
                 }
               }
               if (this.nodeInfo.nextNode) {
-                this.handleChange(this.nodeInfo.nextNode,true);
+                this.handleChange(this.nodeInfo.nextNode, true);
               }
               if (
                 this.showCirculate != undefined &&
@@ -3552,7 +3569,8 @@ export default {
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
           if (this.isFlow) {
-            if(this.isOpinionRequired && !this.$refs.commonOpinions.validate()) return 
+            if (this.isOpinionRequired && !this.$refs.commonOpinions.validate())
+              return;
             if (this.directCreateCircularReadWhenFlowStarted) {
               this.circulateVisible = true;
             } else {

package/packages/form/src/main.vue

@@ -154,6 +154,12 @@
                               attrs: ['value']
                             })
                           "
+                          v-on="
+                            handleExclAttribute({
+                              data: item.events,
+                              attrs: 'change'
+                            })
+                          "
                           v-model="models[item.name]"
                           size="medium"
                           :plain="item.plain || item.name === undefined"
@@ -167,6 +173,7 @@
                               handleChange(item, val, items);
                             }
                           "
+                          @optionSuccess="$emit('optionSuccess', $event)"
                         ></es-select>
                         <es-switch
                           v-else-if="item.type == 'switch'"
@@ -373,6 +380,12 @@
                               attrs: ['value']
                             })
                           "
+                          v-on="
+                            handleExclAttribute({
+                              data: item.events,
+                              attrs: ['change', 'blur', 'focus']
+                            })
+                          "
                           v-model="models[item.name]"
                           :plain="item.plain || item.name === undefined"
                           :readonly="
@@ -395,6 +408,7 @@
                               handleChange(item, val);
                             }
                           "
+                          @optionSuccess="$emit('optionSuccess', $event)"
                         ></es-select>
                         <es-cascader
                           v-else-if="item.type == 'cascader'"
@@ -848,6 +862,12 @@
                                           attrs: ['value']
                                         })
                                       "
+                                      v-on="
+                                        handleExclAttribute({
+                                          data: inline.events,
+                                          attrs: ['change', 'blur', 'focus']
+                                        })
+                                      "
                                       v-model="models[inline.name]"
                                       :plain="
                                         inline.plain ||
@@ -875,6 +895,9 @@
                                           handleChange(inline, val);
                                         }
                                       "
+                                      @optionSuccess="
+                                        $emit('optionSuccess', $event)
+                                      "
                                     ></es-select>
                                     <es-cascader
                                       v-else-if="inline.type == 'cascader'"
@@ -1131,6 +1154,12 @@
                                     attrs: ['value']
                                   })
                                 "
+                                v-on="
+                                  handleExclAttribute({
+                                    data: inline.events,
+                                    attrs: ['change', 'blur', 'focus']
+                                  })
+                                "
                                 v-model="models[item.inline.name]"
                                 :plain="
                                   item.inline.plain ||
@@ -1158,6 +1187,7 @@
                                     handleChange(item.inline, val);
                                   }
                                 "
+                                @optionSuccess="$emit('optionSuccess', $event)"
                               ></es-select>
                               <es-cascader
                                 v-else-if="item.inline.type == 'cascader'"
@@ -1517,6 +1547,12 @@
                     v-bind="
                       handleExclAttribute({ data: item, attrs: ['value'] })
                     "
+                    v-on="
+                      handleExclAttribute({
+                        data: item.events,
+                        attrs: ['change', 'blur', 'focus']
+                      })
+                    "
                     v-model="models[item.name]"
                     :plain="item.plain || item.name === undefined"
                     :readonly="
@@ -1537,6 +1573,7 @@
                         handleChange(item, val);
                       }
                     "
+                    @optionSuccess="$emit('optionSuccess', $event)"
                   ></es-select>
                   <es-cascader
                     v-else-if="item.type == 'cascader'"
@@ -1905,10 +1942,16 @@
                                 v-else-if="inline.type == 'select'"
                                 v-bind="
                                   handleExclAttribute({
-                                    data: inline,
+                                    data: inline.events,
                                     attrs: ['value']
                                   })
                                 "
+                                v-on="
+                                  handleExclAttribute({
+                                    data: inline,
+                                    attrs: ['change', 'blur', 'focus']
+                                  })
+                                "
                                 v-model="models[inline.name]"
                                 :plain="
                                   inline.plain || inline.name === undefined
@@ -1935,6 +1978,7 @@
                                     handleChange(inline, val);
                                   }
                                 "
+                                @optionSuccess="$emit('optionSuccess', $event)"
                               ></es-select>
                               <es-cascader
                                 v-else-if="inline.type == 'cascader'"
@@ -2177,6 +2221,12 @@
                               attrs: ['value']
                             })
                           "
+                          v-on="
+                            handleExclAttribute({
+                              data: item.inline.events,
+                              attrs: ['change', 'blur', 'focus']
+                            })
+                          "
                           v-model="models[item.inline.name]"
                           :plain="
                             item.inline.plain || item.inline.name === undefined
@@ -2203,6 +2253,7 @@
                               handleChange(item.inline, val);
                             }
                           "
+                          @optionSuccess="$emit('optionSuccess', $event)"
                         ></es-select>
                         <es-cascader
                           v-else-if="item.inline.type == 'cascader'"

package/packages/form/src/table.vue

@@ -1417,13 +1417,17 @@ export default {
       let widths = [];
       let surplus = 0;
       let divisor = this.col;
+      const parentWidth =
+        this.$el.clientWidth -
+        (parseFloat(this.$el.style.paddingLeft) || 0) -
+        (parseFloat(this.$el.style.paddingRight) || 0);
       let getWidth = this.$refs.dataTable
         ? this.$refs.dataTable.$el
           ? this.$refs.dataTable.$el.offsetWidth
           : this.$refs.dataTable[0].$el.offsetWidth
-        : this.$parent.$el.offsetWidth;
-      if (getWidth < this.$parent.$el.offsetWidth) {
-        getWidth = this.$parent.$el.offsetWidth;
+        : parentWidth;
+      if (getWidth < parentWidth) {
+        getWidth = parentWidth;
       }
       let allWidth = getWidth - parseInt(this.labelWidth, 10) * this.col;
       if (this.widths && this.widths.length === this.col) {