eoss 0.1.0-alpha.21 → 0.1.0-alpha.22

package/packages/{flow-copy/src/component → flows/src/components}/opinions.vue

@@ -1,118 +1,112 @@
 <template>
-  <div class="commonOpinion">
-    <es-form :model="form" :rules="rules" ref="ruleForm" label-width="0">
-      <es-form-item label="" prop="value">
-        <es-tooltip
-          :disabled="tooltipDisabled || !pendingItemHandleDescription"
-          placement="top"
+  <div class="es-flows__opinions">
+    <div class="es-flows__opinion">
+      <span class="es-flows__sub-title">填写意见</span>
+      <es-button
+        v-show="showFile"
+        type="text"
+        class="es-flows__opinions--file"
+        icon="es-icon-fujian"
+        @click="showFileList = true"
+      >
+        意见附件<span class="es-file-num" v-show="fileNum > 0"
+          >({{ fileNum }})</span
         >
-          <div slot="content">{{ pendingItemHandleDescription }}</div>
-          <div class="commonOpinion-content-message">
-            <es-input
-              v-model="form.value"
-              :disabled="isBanInputOpinion == '1' || disabled"
-              type="textarea"
-              clear="inp"
-              :placeholder="pendingItemHandleDescription || '请输入意见'"
-              @change="changeOpinion"
-              @blur="handleBlur"
-              @focus="handleFocus"
-              :rows="rows"
-            ></es-input>
-            <div class="commonOpinion-content-tag">
-              <span>猜您想写：</span>
-              <es-tag
-                v-for="item in optionList.slice(0, 3)"
-                :key="item.content"
-                :class="form.value == item.content ? 'active-tag' : ''"
-                :style="`${
-                  form.value == item.content
-                    ? `backgroundColor: rgba(${getColor()} , 0.1)`
-                    : ''
-                }`"
-                type="info"
-                color="#F5F7FA"
-                @click="selectChange(item.content)"
-                >{{ item.content }}</es-tag
-              >
-            </div>
-          </div>
-        </es-tooltip>
-      </es-form-item>
-    </es-form>
-    <es-input
-      v-model="input3"
-      placeholder="请输入内容"
-      class="input-with-select"
-    >
-      <es-select
-        v-model="selectValue"
-        slot="prepend"
-        :disabled="isBanInputOpinion == '1'"
-        placeholder="--请选择常用语--"
-        @change="selectChange"
+      </es-button>
+      <es-dialog
+        v-show="showFile"
+        append-to-body
+        title="意见附件"
+        :lazy="false"
+        :close-on-click-modal="false"
+        :visible.sync="showFileList"
       >
-        <es-option
-          v-for="item in optionList"
-          :key="item.id"
-          :label="item.content"
-          :value="item.content"
-        ></es-option>
-      </es-select>
-      <es-button
-        :disabled="disabled"
-        slot="append"
-        icon="es-icon-xiugai"
-        @click="dialogVisible = true"
-      ></es-button>
-    </es-input>
-
-    <!-- 弹窗内容 -->
-    <es-dialog
-      append-to-body
-      title="常用意见设置"
-      :close-on-click-modal="false"
-      :visible.sync="dialogVisible"
-    >
-      <div class="commonOpinion-set">
-        <div style="text-align: right">
+        <template slot-scope="scope">
+          <opinions-file
+            v-if="ownId && code"
+            :scale="scope.scale"
+            :ownId="ownId"
+            :code="code"
+            @change="(val) => (fileNum = val)"
+          />
+        </template>
+      </es-dialog>
+    </div>
+    <div class="es-flows__opinions--group">
+      <es-form-item label="" prop="opinion" last>
+        <es-input
+          v-model="modelValue"
+          type="textarea"
+          :class="{ 'is-tips': pendingItemHandleDescription }"
+          :rows="rows"
+          :disabled="isBanInputOpinion == '1' || disabled"
+          :placeholder="pendingItemHandleDescription || '请输入意见'"
+          @change="changeOpinion"
+          @blur="handleBlur"
+          @focus="handleFocus"
+        ></es-input>
+      </es-form-item>
+      <div class="es-flows__opinions--group-assist">
+        <div
+          class="es-flows__opinions--tooltip"
+          v-if="pendingItemHandleDescription"
+        >
+          <label class="es-flows__opinions--tooltip-label">上一步意见：</label>
+          <es-tooltip
+            placement="bottom-start"
+            auto
+            effect="light"
+            :content="pendingItemHandleDescription"
+          >
+            <div class="es-flows__opinions--tooltip-content">
+              {{ pendingItemHandleDescription }}
+            </div>
+          </es-tooltip>
+        </div>
+        <es-form-item
+          class="es-flows__opinions--tag-box"
+          label="猜您想写："
+          icon="es-icon-zhishidian"
+          labelWidth="auto"
+          last
+        >
+          <es-tag
+            size="medium"
+            class="es-flows__opinions--tag"
+            v-for="item in tags"
+            :key="item.id"
+            :type="modelValue !== item ? 'info' : ''"
+            @click="handleClickTag(item)"
+            >{{ item.content }}</es-tag
+          >
+          <es-dropdown
+            class="es-flows__opinions--dropdown"
+            trigger="click"
+            label-key="content"
+            :contents="optionList"
+            @command="handleCommand"
+          ></es-dropdown>
           <es-button
-            type="primary"
-            size="small"
-            @click="
-              () => {
-                addVisible = true;
-                (FormData.sep = optionList.length + 1),
-                  (FormData.content = ''),
-                  (FormData.id = null);
-              }
-            "
+            type="text"
+            class="es-flows__opinions--edit"
+            icon="es-icon-xiugai"
+            @click="openList = true"
           >
-            新增
           </es-button>
-        </div>
-        <Table
-          style="flex: 1; display: flex; flex-direction: column"
-          v-if="dialogVisible"
-          :data-list="optionList"
-          @upDateClick="upDate"
-          @delClick="del"
-        />
+        </es-form-item>
       </div>
-    </es-dialog>
+    </div>
 
+    <!-- 弹窗内容 -->
     <es-dialog
-      append-to-body
+      title="常用意见设置"
       :close-on-click-modal="false"
-      title="添加常用意见"
-      :visible.sync="addVisible"
-      v-if="addVisible"
-      class="flow-commonOpinion-dialog"
-      width="600px"
-      height="auto"
-      :showScale="false"
+      :visible.sync="openList"
     >
-      <ideas :data="FormData" @subMit="submit" />
+      <opinions-list
+        :data.sync="optionList"
+        @success="getCommonOpion"
+      ></opinions-list>
     </es-dialog>
   </div>
 </template>
@@ -125,38 +119,42 @@ import {
   findSysParam,
   deleteCommonOpion
 } from 'eoss/src/config/api';
-import Table from '../table.vue';
-import ideas from '../form.vue';
+import ideas from './form.vue';
+import OpinionsList from './opinions-list.vue';
 import { error, success, loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import { getStorage } from 'eoss/src/utils/storage';
 import { getRgb } from 'eoss/src/utils/color.js';
+import OpinionsFile from './opinions-file.vue';
 export default {
   name: 'Opinions',
   components: {
-    [ideas.name]: ideas,
-    [Table.name]: Table
-  },
-  data() {
-    return {
-      value: '',
-      tooltipDisabled: false,
-      form: {
-        value: ''
-      },
-      input3: '',
-      selectValue: '',
-      optionList: [],
-      dialogVisible: false,
-      addVisible: false,
-      disabled: false,
-      FormData: {
-        id: null
-      },
-      loading: null
-    };
+    ideas,
+    OpinionsList,
+    OpinionsFile
   },
   props: {
+    /**
+     * 是否显示意见附件
+     */
+    showFile: {
+      type: Boolean,
+      default: false
+    },
+    /**
+     * 意见附件所属ID
+     */
+    ownId: {
+      type: String,
+      default: ''
+    },
+    /**
+     * 意见附件编码
+     */
+    code: {
+      type: String,
+      default: ''
+    },
     /**
      * 是否 禁止输入意见
      */
@@ -167,10 +165,7 @@ export default {
     /**
      * 审批意见
      */
-    opinion: {
-      type: String,
-      default: ''
-    },
+    value: String,
     pendingItemHandleDescription: {
       type: String,
       default: ''
@@ -195,18 +190,61 @@ export default {
     required: { type: Boolean, default: false }
   },
   computed: {
+    modelValue: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit('input', val);
+      }
+    },
+    tags() {
+      return this.optionList.slice(0, 3);
+    },
     rules() {
       return {
-        value: [
-          {
-            required: this.required,
-            message: '请输入意见',
-            trigger: 'blur'
-          }
-        ]
+        required: this.required,
+        message: '请输入意见',
+        trigger: 'blur'
       };
     }
   },
+  data() {
+    return {
+      fileNum: 0,
+      showFileList: false,
+      labelContents: [
+        {
+          contents: 'es-icon-xiugai',
+          type: 'icon',
+          pointer: true,
+          events: {
+            click: () => {
+              this.openList = true;
+            }
+          }
+        },
+        {
+          type: 'text',
+          contents: '猜您想写：'
+        }
+      ],
+      tooltipDisabled: false,
+      form: {
+        value: ''
+      },
+      input3: '',
+      selectValue: '',
+      optionList: [],
+      openList: false,
+      addVisible: false,
+      disabled: false,
+      FormData: {
+        id: null
+      },
+      loading: null
+    };
+  },
   mounted() {
     this.form.value = this.opinion;
     if (this.nodeFixedOpinionSelectList.length > 0) {
@@ -223,6 +261,57 @@ export default {
     }
   },
   methods: {
+    /**
+     * getFile
+     * @desc:获取附件
+     * @date 2022年10月28日
+     **/
+    getFile() {
+      let params = {
+        url: getAdjunctFileInfos,
+        params: { ownId, code }
+      };
+      ajax(params)
+        .then((res) => {
+          const { rCode, results, msg } = res;
+          if (rCode == 0) {
+            results && (this.fileNum = results.length);
+          } else {
+            error(msg || '系统错误，请联系管理员！');
+          }
+        })
+        .catch((err) => {});
+    },
+    /**
+     * handleClickTag
+     * @desc:点击标签
+     * @author liufan
+     * @param {String} item 标签值
+     * @date 2022年10月28日
+     **/
+    handleClickTag(item) {
+      this.modelValue = item.content;
+    },
+    /**
+     * handleCommand
+     * @desc:下拉菜单命令
+     * @author liufan
+     * @param {String} command 命令值
+     * @date 2022年5月25日
+     **/
+    handleCommand(command) {
+      const val = command.content;
+      ajax({
+        url: findSysParam,
+        params: { cpName: 'commonOpinionsSelectType' }
+      }).then((res) => {
+        if (res.status == 'success') {
+          res.data == 2 ? (this.modelValue += val) : (this.modelValue = val);
+        } else {
+          this.modelValue = val;
+        }
+      });
+    },
     getColor() {
       return getRgb(getStorage('theme')).join(',');
     },
@@ -290,72 +379,6 @@ export default {
       this.FormData.id = val.id;
       this.addVisible = true;
     },
-    /**
-     * selectChange
-     * @desc:常用语选择
-     * @author liufan
-     * @param {String} val 选中值
-     * @date 2022年5月25日
-     **/
-    selectChange(val) {
-      const that = this;
-      ajax({
-        url: findSysParam,
-        params: { cpName: 'commonOpinionsSelectType' }
-      }).then((res) => {
-        if (res.status == 'success') {
-          res.data == 2
-            ? (that.form.value = that.form.value + val)
-            : (that.form.value = val);
-        } else {
-          that.form.value = val;
-        }
-        this.$emit('change', that.form.value);
-      });
-    },
-    /**
-     * del
-     * @desc:删除常用语
-     * @author liufan
-     * @param {Object} val 删除的数据
-     * @date 2022年5月25日
-     **/
-    del(val) {
-      this.$confirm('您确定要删除此信息吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.loading = loading('删除中');
-          ajax({
-            url: deleteCommonOpion,
-            params: {
-              id: val.id
-            }
-          })
-            .then((res) => {
-              const { status, message } = res;
-              if (status == 'success') {
-                this.$message({
-                  message: '删除成功!',
-                  type: 'success'
-                });
-                this.getCommonOpion();
-              } else {
-                this.$message({
-                  message: message || '系统错误，请联系管理员！',
-                  type: 'error'
-                });
-              }
-              this.loading.close();
-            })
-            .catch((err) => {
-              this.loading.close();
-            });
-        })
-        .catch((e) => {});
-    },
     /**
      * submit
      * @desc:新增/编辑意见保存

package/packages/flows/src/components/quick-actions.vue

@@ -0,0 +1,64 @@
+<!-- 快捷操作 -->
+<template>
+  <div class="es-flow__quick-actions">
+    <div class="es-flow__sub-title">快捷操作</div>
+    <es-radio-group
+      v-model="type"
+      mode="button"
+      size="medium"
+      separate
+      :data="types"
+    ></es-radio-group>
+    <!-- <component
+      v-if="tag"
+      class="es-info"
+      :is="tag"
+      v-bind="config"
+      v-on="events"
+    /> -->
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'QuickActions',
+
+  components: {
+  },
+
+  props: {
+    type: String,
+    types:{
+      type: Array,
+      default() {
+        return [];
+      }
+    }
+  },
+  computed: {
+    typeValue:{
+      get() {
+        return this.type;
+      },
+      set(val) {
+        this.$emit('update:type', val);
+      }
+    }
+  },
+
+  data() {
+    return {
+    };
+  },
+
+  watch: {},
+
+  created() {},
+
+  mounted() {},
+
+  methods: {
+  }
+};
+</script>

package/packages/flows/src/components/reject.vue

@@ -0,0 +1,83 @@
+<!-- 驳回流程 -->
+<template>
+  <div>
+    <es-form-item prop="node" label="当前节点">
+      <es-input v-model="models.node" placeholder="请输入内容" disabled />
+    </es-form-item>
+    <es-form-item prop="userId" label="驳回对象">
+      <es-radio-group
+        v-model="models.userId"
+        :data="personnels"
+        label-key="name"
+        value-key="id"
+        placeholder="请选择下步办理人"
+        :append="append"
+        types=""
+      ></es-radio-group>
+    </es-form-item>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Reject',
+
+  components: {},
+
+  props: {
+    // 表单数据支持同步更新
+    model: {
+      type: [Object, Array],
+      default() {
+        return {};
+      }
+    }
+  },
+
+  data() {
+    return {
+
+      personnels: [
+        {
+          id: '1',
+          name: '张三'
+        },
+        {
+          id: '2',
+          name: '李四'
+        },
+        {
+          id: '3',
+          name: '王五'
+        },
+        {
+          id: '4',
+          name: '赵六'
+        }
+      ]
+    };
+  },
+
+  computed: {
+
+    //表单数据
+    models: {
+      get() {
+        return this.model || this.value;
+      },
+      set(val) {
+        this.$emit('input', val);
+        this.$emit('update:model', val);
+      }
+    }
+  },
+
+  watch: {},
+
+  created() {},
+
+  mounted() {},
+
+  methods: {}
+};
+</script>