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

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

@@ -1,112 +1,118 @@
 <template>
-  <div class="es-flow__opinions">
-    <div class="es-flow__opinion">
-      <span class="es-flow__sub-title is-inline">填写意见</span>
-      <es-button
-        v-show="showFile"
-        type="text"
-        class="es-flow__opinions--file"
-        icon="es-icon-fujian"
-        @click="showFileList = true"
-      >
-        意见附件<span class="es-file-num" v-show="fileNum > 0"
-          >({{ fileNum }})</span
-        >
-      </es-button>
-      <es-dialog
-        v-show="showFile"
-        append-to-body
-        title="意见附件"
-        :lazy="false"
-        :close-on-click-modal="false"
-        :visible.sync="showFileList"
-      >
-        <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-flow__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-flow__opinions--group-assist">
-        <div
-          class="es-flow__opinions--tooltip"
-          v-if="pendingItemHandleDescription"
+  <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"
         >
-          <label class="es-flow__opinions--tooltip-label">上一步意见：</label>
-          <es-tooltip
-            placement="bottom-start"
-            auto
-            effect="light"
-            :content="pendingItemHandleDescription"
-          >
-            <div class="es-flow__opinions--tooltip-content">
-              {{ pendingItemHandleDescription }}
+          <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>
-          </es-tooltip>
-        </div>
-        <es-form-item
-          class="es-flow__opinions--tag-box"
-          label="猜您想写："
-          icon="es-icon-zhishidian"
-          labelWidth="auto"
-          last
-        >
-          <es-tag
-            size="medium"
-            class="es-flow__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-flow__opinions--dropdown"
-            trigger="click"
-            label-key="content"
-            :contents="optionList"
-            @command="handleCommand"
-          ></es-dropdown>
+          </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-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">
           <es-button
-            type="text"
-            class="es-flow__opinions--edit"
-            icon="es-icon-xiugai"
-            @click="openList = true"
+            type="primary"
+            size="small"
+            @click="
+              () => {
+                addVisible = true;
+                (FormData.sep = optionList.length + 1),
+                  (FormData.content = ''),
+                  (FormData.id = null);
+              }
+            "
           >
+            新增
           </es-button>
-        </es-form-item>
+        </div>
+        <Table
+          style="flex: 1; display: flex; flex-direction: column"
+          v-if="dialogVisible"
+          :data-list="optionList"
+          @upDateClick="upDate"
+          @delClick="del"
+        />
       </div>
-    </div>
+    </es-dialog>
 
-    <!-- 弹窗内容 -->
     <es-dialog
-      title="常用意见设置"
+      append-to-body
       :close-on-click-modal="false"
-      :visible.sync="openList"
+      title="添加常用意见"
+      :visible.sync="addVisible"
+      v-if="addVisible"
+      class="flow-commonOpinion-dialog"
+      width="600px"
+      height="auto"
+      :showScale="false"
     >
-      <opinions-list
-        :data.sync="optionList"
-        @success="getCommonOpion"
-      ></opinions-list>
+      <ideas :data="FormData" @subMit="submit" />
     </es-dialog>
   </div>
 </template>
@@ -119,42 +125,38 @@ import {
   findSysParam,
   deleteCommonOpion
 } from 'eoss/src/config/api';
+import Table from '../table.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,
-    OpinionsList,
-    OpinionsFile
+    [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
+    };
   },
   props: {
-    /**
-     * 是否显示意见附件
-     */
-    showFile: {
-      type: Boolean,
-      default: false
-    },
-    /**
-     * 意见附件所属ID
-     */
-    ownId: {
-      type: String,
-      default: ''
-    },
-    /**
-     * 意见附件编码
-     */
-    code: {
-      type: String,
-      default: ''
-    },
     /**
      * 是否 禁止输入意见
      */
@@ -165,7 +167,10 @@ export default {
     /**
      * 审批意见
      */
-    value: String,
+    opinion: {
+      type: String,
+      default: ''
+    },
     pendingItemHandleDescription: {
       type: String,
       default: ''
@@ -190,61 +195,18 @@ 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 {
-        required: this.required,
-        message: '请输入意见',
-        trigger: 'blur'
+        value: [
+          {
+            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) {
@@ -261,57 +223,6 @@ 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(',');
     },
@@ -379,6 +290,72 @@ 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/flow/src/component/taskUnionExamine.vue

@@ -710,11 +710,9 @@ export default {
             this.simpleTips &&
               this.$message({
                 message: '提交成功',
-                type: 'success',
-                onClose: () => {
-                  this.quit(true);
-                }
+                type: 'success'
               });
+            this.quit(true);
           } else {
             this.$message({
               message: message || '系统错误，请联系管理员！',

package/packages/flow/src/freeStartFlow.vue

@@ -796,8 +796,8 @@ import {
 } from 'eoss/src/utils/util';
 import { getStorage } from 'eoss/src/utils/storage';
 export default {
-  name: 'FreeStartFlow',
-  componentName: 'FreeStartFlow',
+  name: 'EsFreeStartFlow',
+  componentName: 'EsFreeStartFlow',
   components: {
     ProcessForm,
     ProcessReject,

package/packages/flow/src/selectUser.vue

@@ -23,7 +23,41 @@
         >{{ item.name ? item.name : item.showname }}</es-checkbox
       >
     </es-checkbox-group>
+    <!-- <es-select 
+      v-model="newNextUser"
+      :multiple="newMultiple"
+      :class="isCustomUser ? 'es-select-user' : ''"
+      filterable
+      remote
+      reserve-keyword
+      placeholder="请输入办理人"
+      :remote-method="remoteMethod"
+      :loading="searchLoading"
+      @change="changeSelectUser"
+    >
+      <es-option
+        v-for="(item,index) in newOptions"
+        :key="index"
+        :label="item.name"
+        :value="item.id"
+      >
+      </es-option>
+    </es-select> -->
+    <!-- class="select-user-icon es-button--primary" -->
     <div style="position: relative">
+      <!-- <es-selector
+        v-if="isChange"
+        v-model="newSelectUserList"
+        value-type="string"
+        :types="types"
+        :tabs="tabs"
+        :title="title"
+        :mix="mix"
+        :multiple="newMultiple"
+        @confirm="getSelectUser"
+        @cancel="cancelSelectUser"
+        :param="newParams"
+      ></es-selector> -->
       <es-input v-if="disabled" :readonly="disabled" v-model="onlyName" />
       <es-selector
         v-else-if="!disabled && isChange"
@@ -52,6 +86,7 @@
         @change="getSelectUser"
         :param="{ ...newParams, info: classify ? '' : 'no' }"
         :disableds="disableds"
+        ><i class="es-icon-yonghu"></i
       ></es-selector>
       <!-- :action="url" -->
       <!-- :where="{type:'user',a:'1'}" -->
@@ -127,7 +162,7 @@ export default {
      */
     isCustomUser: { type: Number, default: 1 },
     /**
-     *
+     * 
      */
     isCurrentNodeForbiddenChangeCandidate: { type: Number, default: 0 },
     options: {

package/packages/flow/src/supervise.vue

@@ -133,9 +133,11 @@ export default {
         if (res.rCode == 0 || res.status == 'success') {
           this.$message({
             message: '操作成功',
-            type: 'success'
+            type: 'success',
+            onClose: () => {
+              this.$parent.$emit('success');
+            }
           });
-          this.$parent.$emit('success');
         } else {
           this.$message({
             message: res.message || '系统错误，请联系管理员！',

package/packages/flows/index.js

@@ -0,0 +1,7 @@
+import Flows from './src/flow';
+
+Flows.install = function (Vue) {
+  Vue.component(Flows.name, Flows);
+};
+
+export default Flows;