eoss-ui 0.8.34 → 0.8.36

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

@@ -60,7 +60,7 @@
           >
          
         </div>
-        <el-dropdown trigger="click" @command="handleClickTag">
+        <el-dropdown trigger="click"  @command="handleClickTag">
   <span class="el-dropdown-link">
     <i class="el-icon-arrow-down el-icon--right"></i>
   </span>
@@ -72,7 +72,7 @@
             type="text"
             class="es-flow__opinions--edit"
             icon="es-icon-xiugai"
-            @click="dialogVisible = true"
+            @click="handleOpenDialog"
           >
           </el-button>
       </div>
@@ -210,7 +210,7 @@ export default {
     },
     rows: {
       type: [Number, String],
-      default: 10
+      default: 5
     },
     required: { type: Boolean, default: false }
   },
@@ -246,8 +246,14 @@ export default {
     }
   },
   methods: {
+      handleOpenDialog(){
+        if(this.isBanInputOpinion == '1' || this.disabled) return
+        this.dialogVisible = true
+      },
         handleClickTag(item) {
+          if(this.isBanInputOpinion == '1') return
       this.form.value = typeof item === 'object' ? item.content : item;
+      this.$emit('change', this.form.value);
     },
     handleBlur() {
       this.$emit('blur', this.form.value);

package/packages/flow/src/flow.vue

@@ -221,7 +221,7 @@
         />
       </div>
       <div
-        v-show="!isStartFlow && !shrink && isSpecial"
+        v-show="!isStartFlow && !shrink && typeList.length > 1"
         class="es-flow-middle-more-btn"
         :style="{
           flex: getFlexStyle()
@@ -631,9 +631,7 @@
                 <el-form-item
                   prop="nextReadUserId"
                   v-if="isTaskread == 1"
-                  label="
-           分阅用户
-          "
+                  label="分阅用户"
                 >
                   <SelectUser
                     :nextUser="nextNode.nextReadUserId"
@@ -642,6 +640,7 @@
                     :options="userOptions"
                     :showTooltip="showTooltip"
                     title="分阅用户"
+                    :params="fyParams"
                     :mix="true"
                     :types="types"
                     @change="changeSelectReadUser($event, 'nextReadUserId')"
@@ -664,6 +663,7 @@
                     :radioList="presetReadUserId"
                     :presetEdit="1"
                     title="分阅用户"
+                    :params="fyParams"
                     :mix="true"
                     :types="types"
                     @change="changeSelectReadUser($event, 'presetReadUserId')"
@@ -916,6 +916,7 @@
         ref="reject"
         :pending-id="pendingId"
         :option="value"
+        class="es-info"
         hideBtn
         :showTooltip="showTooltip"
         :simpleTips="simpleTips"
@@ -930,8 +931,10 @@
         ref="toStartTaskRead"
         :pending-id="pendingId"
         hideBtn
+        class="es-info"
         :opinion="value"
         :type="taskReadType"
+        :resetAppId="resetAppId"
         :showTooltip="showTooltip"
         :flowLabelConfig="flowLabelConfig"
         :hideMessage="hideMessage"
@@ -943,24 +946,24 @@
         @cancel="closeProcess($event, 'showTaskRead')"
       />
       <TaskUnionExamine
-          v-else-if="
-            btnType === 'toTakeAdvice' ||
-            btnType === 'toUnionExamine' ||
-            btnType === 'toStartDraf'
-          "
-          :ref="btnType"
-          class="es-info"
-          hideBtn
-          @cancel="closeProcess($event, 'showTaskUnionExamine')"
-          :simpleTips="simpleTips"
-          :pendingId="pendingId"
-          :defaultOpinion="nodeDefaultSubmitOpinion"
-          :oldOption="value"
-          :selectorParams="selectorParams"
-          :type="flowType"
-          :multiple="flowMultiple"
-          :disabled="flowDisabled"
-        />
+        v-else-if="
+          btnType === 'toTakeAdvice' ||
+          btnType === 'toUnionExamine' ||
+          btnType === 'toStartDraf'
+        "
+        :ref="btnType"
+        class="es-info"
+        hideBtn
+        @cancel="closeProcess($event, 'showTaskUnionExamine')"
+        :simpleTips="simpleTips"
+        :pendingId="pendingId"
+        :defaultOpinion="nodeDefaultSubmitOpinion"
+        :oldOption="value"
+        :selectorParams="selectorParams"
+        :type="flowType"
+        :multiple="flowMultiple"
+        :disabled="flowDisabled"
+      />
       <div
         class="es-flow-buttons"
         v-if="newTypeCode != 'fenyue' && !shrink"
@@ -1044,7 +1047,7 @@
               style="margin: 0px 10px"
               v-if="hideBtn"
             > -->
-              <!-- <el-button
+            <!-- <el-button
                 v-show="isSubmitButtonShowAgreeAndDisagree != 1"
                 v-for="item of btnList.slice(0, 2)"
                 :key="item.name"
@@ -1056,7 +1059,7 @@
               >
                 {{ item.event == 'save' ? saveButtonName : item.text }}
               </el-button> -->
-              <!-- <el-dropdown
+            <!-- <el-dropdown
                 v-if="
                   !isFlow &&
                   (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0)
@@ -1111,7 +1114,7 @@
           size="medium"
           style="margin: 10px 0px; margin-left: 10px"
           @click="taskReadBtn"
-          >分阅222</el-button
+          >分阅</el-button
         >
       </div>
       <!-- 弹窗内容 -->
@@ -1226,6 +1229,7 @@
           :flowLabelConfig="flowLabelConfig"
           :hideMessage="hideMessage"
           :selectorConfig="selectorConfig"
+          :resetAppId="resetAppId"
           :simpleTips="simpleTips"
           :subParams="subParams"
           :taskExamine="taskExamineInfo"
@@ -1426,7 +1430,7 @@ export default {
       type: Array,
       default: () => [
         { text: '暂存', event: 'save' },
-        { text: '提交', event: 'sub', type: 'primary' },
+        { text: '提交', event: 'sub', type: 'primary' }
       ]
     },
     subFun: {
@@ -1474,7 +1478,7 @@ export default {
     },
     rows: {
       type: [String, Number],
-      default: 10
+      default: 5
     },
     showOther: {
       type: Boolean,
@@ -1849,6 +1853,28 @@ export default {
       } else {
         return { width: '100%' };
       }
+    },
+    fyParams() {
+      let orgId = JSON.parse(util.getStorage('mainConfig')).userModel.orgId;
+      let params = {};
+      if (this.configInfo.selectPersonValue == 1) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 2) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 3) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 4) {
+        params.filid = 'all';
+      } else if (this.configInfo.selectPersonValue == 5) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 6) {
+        params.filid = '';
+      } else if (this.configInfo.selectPersonValue == 7) {
+        params.filid = orgId;
+      } else if (this.configInfo.selectPersonValue == 8) {
+        params.filid = orgId;
+      }
+      return params;
     }
   },
   methods: {
@@ -2464,7 +2490,7 @@ export default {
      **/
     taskReadBtn(res) {
       // return this.$message.warning('暂未开放！敬请期待');
-      
+
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit()
           .then((next) => {
@@ -2764,9 +2790,9 @@ export default {
           this.loading.close();
           if (message == 'success') {
             // this.showTaskUnionExamine = true;
-            this.btnType = ''
+            this.btnType = '';
             setTimeout(() => {
-              this.btnType = this.btnFunValue(resInfo.fun)
+              this.btnType = this.btnFunValue(resInfo.fun);
             }, 0);
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
@@ -2786,24 +2812,24 @@ export default {
      * @date 2022年9月29日
      **/
     toStartDraf(res) {
-      console.log(res)
+      console.log(res);
       if (this.beforeSubmit != undefined) {
         this.beforeSubmit()
           .then((next) => {
             // this.showTaskUnionExamine = true;
-            this.btnType = ''
+            this.btnType = '';
             setTimeout(() => {
-              this.btnType = this.btnFunValue(res.fun)
+              this.btnType = this.btnFunValue(res.fun);
             }, 0);
             // this.btnType = this.btnFunValue(res.fun) //this.btnFunValue(res.fun);
           })
           .catch((e) => {});
       } else {
         // this.showTaskUnionExamine = true;
-            this.btnType = ''
-            setTimeout(() => {
-              this.btnType = this.btnFunValue(res.fun)
-            }, 0);
+        this.btnType = '';
+        setTimeout(() => {
+          this.btnType = this.btnFunValue(res.fun);
+        }, 0);
       }
     },
     /**
@@ -3134,6 +3160,10 @@ export default {
                 data.globalNodeType === 'endEvent' ? (this.endFlow = true) : '';
               }
             }
+            console.log(
+              this.$refs.customPreset.getPresetFlowInfo,
+              'his.$refs.customPreset'
+            );
             this.isCustomPreset &&
               this.$refs.customPreset.getPresetFlowInfo(
                 this.nextNode.nextNodeId,
@@ -3933,7 +3963,7 @@ export default {
           warning('暂无可驳回节点及对象');
           return;
         }
-         console.log('taskReadBtn', this.btnType);
+        console.log('taskReadBtn', this.btnType);
         this.$refs[this.btnType].subProcess('nextNode');
         return;
       }