修改功能打包

src/components/VueFormMaking/components/WidgetConfig.vue

@@ -468,17 +468,17 @@
           <el-select v-if="Object.keys(data.options).indexOf('dataType')>=0" v-model="data.options.dataType" size="mini">
             <el-option value="string" :label="$t('fm.config.widget.string')" />
             <el-option value="number" :label="$t('fm.config.widget.number')" />
-            <el-option value="boolean" :label="$t('fm.config.widget.boolean')" />
+            <!-- <el-option value="boolean" :label="$t('fm.config.widget.boolean')" /> -->
             <el-option value="integer" :label="$t('fm.config.widget.integer')" />
             <el-option value="float" :label="$t('fm.config.widget.float')" />
-            <el-option value="url" :label="$t('fm.config.widget.url')" />
+            <!-- <el-option value="url" :label="$t('fm.config.widget.url')" />
             <el-option value="email" :label="$t('fm.config.widget.email')" />
-            <el-option value="hex" :label="$t('fm.config.widget.hex')" />
+            <el-option value="hex" :label="$t('fm.config.widget.hex')" /> -->
           </el-select>
 
-          <div v-if="Object.keys(data.options).indexOf('pattern')>=0">
+          <!-- <div v-if="Object.keys(data.options).indexOf('pattern')>=0">
             <el-input v-model.lazy="data.options.pattern" size="mini" style=" width: 240px;" :placeholder="$t('fm.config.widget.patternPlaceholder')" />
-          </div>
+          </div> -->
         </el-form-item>
       </template>
       <el-form-item v-if="Object.keys(data.options).indexOf('displayVerifiy')>=0" :label="$t('fm.config.widget.displayVerifiy')">

src/components/wfd/components/DetailPanel/HandleNodeDetail.vue

@@ -80,7 +80,7 @@
       </div> -->
       <div v-else-if="model.assignType === 'department'" class="panelRow">
         <div><span style="color: red">*</span> {{ i18n['userTask.assignType.department.title'] }}：</div>
-        <el-select
+        <!-- <el-select
           size="small"
           style="width:90%; font-size:12px"
           :placeholder="i18n['userTask.assignType.department.placeholder']"
@@ -91,7 +91,18 @@
           @change="(e) => { onChange('assignValue', e); getPersons(e) }"
         >
           <el-option v-for="department in departments" :key="department.deptId" :label="department.deptName" :value="department.deptId" />
-        </el-select>
+        </el-select> -->
+        <treeselect
+          :value="model.assignValue"
+          size="small"
+          style="width:90%; font-size:12px"
+          :options="departments"
+          :normalizer="normalizer"
+          :multiple="true"
+          :is-disabled="readOnly"
+          :placeholder="i18n['userTask.assignType.department.placeholder']"
+          @input="(e) => { onChange('assignValue', e); getPersons(e) }"
+        />
       </div>
       <div v-else-if="model.assignType === 'variable'" class="panelRow">
         <div><span style="color: red">*</span> {{ i18n['handleNode.assignType.variable.title'] }}：</div>
@@ -157,11 +168,14 @@
 <script>
 import DefaultDetail from './DefaultDetail'
 import NodeDetail from './NodeDetail'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   inject: ['i18n'],
   components: {
     DefaultDetail,
-    NodeDetail
+    NodeDetail,
+    Treeselect
   },
   props: {
     model: {
@@ -218,6 +232,17 @@ export default {
     }
   },
   methods: {
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children
+      }
+    },
     getPersons(e) {
       if (e === undefined || e === null || e.length <= 1) {
         this.onChange('activeOrder', false)

src/components/wfd/components/DetailPanel/UserTaskDetail.vue

@@ -33,6 +33,7 @@
           <!-- <el-option key="persongroup" value="persongroup" :label="i18n['userTask.assignType.persongroup']" /> -->
           <el-option key="department" value="department" :label="i18n['userTask.assignType.department']" />
           <el-option key="variable" value="variable" :label="i18n['userTask.assignType.variable']" />
+          <el-option key="post" value="post" :label="i18n['userTask.assignType.post']" />
         </el-select>
       </div>
       <div v-if="model.assignType === 'person'" class="panelRow">
@@ -80,7 +81,7 @@
       </div> -->
       <div v-else-if="model.assignType === 'department'" class="panelRow">
         <div><span style="color: red">*</span> {{ i18n['userTask.assignType.department.title'] }}：</div>
-        <el-select
+        <!-- <el-select
           size="small"
           style="width:90%; font-size:12px"
           :placeholder="i18n['userTask.assignType.department.placeholder']"
@@ -91,7 +92,18 @@
           @change="(e) => { onChange('assignValue', e); getPersons(e) }"
         >
           <el-option v-for="department in departments" :key="department.deptId" :label="department.deptName" :value="department.deptId" />
-        </el-select>
+        </el-select> -->
+        <treeselect
+          :value="model.assignValue"
+          size="small"
+          style="width:90%; font-size:12px"
+          :options="departments"
+          :normalizer="normalizer"
+          :multiple="true"
+          :is-disabled="readOnly"
+          :placeholder="i18n['userTask.assignType.department.placeholder']"
+          @input="(e) => { onChange('assignValue', e); getPersons(e) }"
+        />
       </div>
       <div v-else-if="model.assignType === 'variable'" class="panelRow">
         <div><span style="color: red">*</span> {{ i18n['userTask.assignType.variable.title'] }}：</div>
@@ -108,6 +120,21 @@
           <el-option v-for="(item, index) in variableOptions" :key="index" :label="item.label" :value="item.value" />
         </el-select>
       </div>
+      <div v-else-if="model.assignType === 'post'" class="panelRow">
+        <div><span style="color: red">*</span> {{ i18n['userTask.assignType.post.title'] }}：</div>
+        <el-select
+          v-model.number="model.assignValue"
+          size="small"
+          style="width:90%; font-size:12px"
+          :placeholder="i18n['userTask.assignType.post.placeholder']"
+          :disabled="readOnly"
+          :multiple="true"
+          :filterable="true"
+          @change="(e) => { onChange('assignValue', e); getPersons(e) }"
+        >
+          <el-option v-for="(item, index) in postOptions" :key="index" :label="item.postName" :value="item.postId" />
+        </el-select>
+      </div>
       <div class="panelRow">
         <el-checkbox
           size="small"
@@ -120,7 +147,7 @@
           :value="model.isCounterSign"
           @change="(e) => { onChange('isCounterSign', e); initCounterSign(e) }"
         >{{ i18n['userTask.counterSign'] }}</el-checkbox>
-        <el-checkbox
+        <!-- <el-checkbox
           size="small"
           :disabled="
             model.assignValue===undefined||
@@ -130,7 +157,7 @@
               readOnly"
           :value="model.activeOrder"
           @change="(value) => onChange('activeOrder', value)"
-        >{{ i18n['userTask.activeOrder'] }}</el-checkbox>
+        >{{ i18n['userTask.activeOrder'] }}</el-checkbox> -->
         <el-checkbox
           v-if="(model.assignType === 'role' || model.assignType === 'department') &&
             model.assignValue!==undefined &&
@@ -157,11 +184,14 @@
 <script>
 import DefaultDetail from './DefaultDetail'
 import NodeDetail from './NodeDetail'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   inject: ['i18n'],
   components: {
     DefaultDetail,
-    NodeDetail
+    NodeDetail,
+    Treeselect
   },
   props: {
     model: {
@@ -184,6 +214,10 @@ export default {
       type: Array,
       default: () => ([])
     },
+    postOptions: {
+      type: Array,
+      default: () => ([])
+    },
     tasks: {
       type: Array,
       default: () => ([])
@@ -222,6 +256,17 @@ export default {
     }
   },
   methods: {
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.deptId,
+        label: node.deptName,
+        children: node.children
+      }
+    },
     getPersons(e) {
       if (e === undefined || e === null || e.length <= 1) {
         this.onChange('activeOrder', false)

src/components/wfd/components/DetailPanel/index.vue

@@ -9,6 +9,7 @@
       :roles="roles"
       :groups="groups"
       :departments="departments"
+      :post-options="postOptions"
       :tasks="tasks"
       :templates="templates"
       :templates-base="templatesBase"
@@ -29,6 +30,7 @@
       :roles="roles"
       :groups="groups"
       :departments="departments"
+      :post-options="postOptions"
       :tasks="tasks"
       :templates="templates"
       :templates-base="templatesBase"
@@ -130,6 +132,10 @@ export default {
       type: Array,
       default: () => ([])
     },
+    postOptions: {
+      type: Array,
+      default: () => ([])
+    },
     tasks: {
       type: Array,
       default: () => ([])

src/components/wfd/components/Wfd.vue

@@ -14,6 +14,7 @@
         :roles="roles"
         :groups="groups"
         :departments="departments"
+        :post-options="postOptions"
         :tasks="tasks"
         :process="process"
         :templates="templates"
@@ -94,6 +95,11 @@ export default {
       type: Array,
       default: () => ([])
     },
+    // 岗位
+    postOptions: {
+      type: Array,
+      default: () => ([])
+    },
     // 任务
     tasks: {
       type: Array,

src/components/wfd/locales/zh-CN.js

@@ -21,6 +21,9 @@ export default {
   'userTask.assignType.variable': '变量',
   'userTask.assignType.variable.title': '审批变量',
   'userTask.assignType.variable.placeholder': '选择审批变量',
+  'userTask.assignType.post': '岗位',
+  'userTask.assignType.post.title': '审批岗位',
+  'userTask.assignType.post.placeholder': '选择审批岗位',
   'userTask.dueDate': '到期时间',
   'userTask.dueDate.placeholder': '请选择日期',
   'userTask.counterSign': '会签',

src/layout/components/Navbar.vue

@@ -62,7 +62,7 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/store/modules/user.js

@@ -54,7 +54,8 @@ const actions = {
       login({ username: username.trim(), password: password, clientId: 'system', clientSecret: 'system' }).then(response => {
         const { data } = response
         if (response.code == 200) {
-          const token = data.authentication.token_type + ' ' + data.authentication.access_token
+          console.log(data)
+          const token = data.authentication.access_token
           commit('SET_REFRESH_TOKEN', data.authentication.refresh_token)
           commit('SET_EXPIRES_IN', data.authentication.expires_in)
           commit('SET_TOKEN', token)

src/views/process/admin/process-manager.vue

@@ -172,6 +172,7 @@
                     :users="users"
                     :roles="roles"
                     :departments="departments"
+                    :post-options="postOptions"
                     :tasks="taskListData"
                     :process="processData"
                     :templates="ruleForm.tpls"
@@ -209,7 +210,9 @@ import { templateList } from '@/api/process/admin/template'
 import { taskList } from '@/api/process/admin/task'
 import { listUser } from '@/api/system/sysuser'
 import { listRole } from '@/api/system/role'
-import { getOrdinaryDeptList } from '@/api/system/dept'
+import { listPost } from '@/api/system/post'
+// import { getOrdinaryDeptList } from '@/api/system/dept'
+import { treeselect } from '@/api/system/dept'
 
 export default {
   name: 'Process',
@@ -237,6 +240,7 @@ export default {
       roles: [],
       groups: [],
       departments: [],
+      postOptions: [],
       templates: [],
       taskListData: [],
       processData: [],
@@ -328,10 +332,23 @@ export default {
     },
     // 获取部门
     getDepartments() {
-      getOrdinaryDeptList().then(response => {
+      // getOrdinaryDeptList().then(response => {
+      //   this.departments = response.data
+      // })
+      treeselect().then(response => {
         this.departments = response.data
       })
     },
+    // 获取岗位
+    getPostOptions() {
+      listPost({
+        page: 1,
+        per_page: 99999
+      }).then(response => {
+        this.postOptions = response.data.list
+        console.log(this.postOptions)
+      })
+    },
     /** 查询流程列表 */
     getList() {
       this.loading = true
@@ -353,6 +370,7 @@ export default {
       this.getDepartments()
       this.getTaskList()
       this.getProcessList()
+      this.getPostOptions()
     },
     handleCreate() {
       this.getProcessInitData()