chenc пре 3 година
родитељ
комит
b587f5b888

+ 2 - 2
src/components/tools/UserMenu.vue

@@ -38,7 +38,7 @@
         <span v-if="isDesktop()">欢迎您,{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
+        <!-- <a-menu-item key="0">
           <router-link :to="{ name: 'account-center' }">
             <a-icon type="user"/>
             <span>个人中心</span>
@@ -53,7 +53,7 @@
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>

+ 7 - 2
src/views/activiti/ProcessModelList.vue

@@ -338,6 +338,7 @@
                     <a-icon type="exclamation-circle" />
                   </a-tooltip>
                 </a-checkbox>
+                <a-checkbox value="5">上级部门负责人</a-checkbox>
               </a-checkbox-group>
             </a-form-item>
             <!--            0角色 1用户 2部门 3发起人 4发起人的部门负责人-->
@@ -531,6 +532,7 @@ export default {
         departmentIds: '',
         chooseSponsor: false,
         chooseDepHeader: false,
+        headSuperiorDepartment:false,
         tbTableInfoId:null
       },
       lcModa: {
@@ -594,7 +596,9 @@ export default {
       console.log('onChange:', node)
       this.current = index
       this.editNode = node
-      /* 0角色 1用户 2部门 3发起人 4发起人的部门负责人*/
+      /* 0角色 1用户 2部门 3发起人 4发起人的部门负责人 5上级部门负责人*/
+      this.spry.headSuperiorDepartment=node.headSuperiorDepartment||false
+      if(this.spry.headSuperiorDepartment) this.spryTypes.push('5')
       this.spry.chooseDepHeader = node.chooseDepHeader || false
       if (this.spry.chooseDepHeader) this.spryTypes.push('4')
       this.spry.chooseSponsor = node.chooseSponsor || false
@@ -636,7 +640,8 @@ export default {
       this.spry.chooseSponsor = this.spryTypes.indexOf('3') > -1
       //是否选中发起人的部门领导
       this.spry.chooseDepHeader = this.spryTypes.indexOf('4') > -1
-
+      //是否选中上级部门负责人
+      this.spry.headSuperiorDepartment = this.spryTypes.indexOf('5') > -1
       console.log('this.spry', this.spry)
     },
     sprySubmit() {

+ 4 - 0
src/views/activiti/applyList.vue

@@ -138,6 +138,10 @@
             <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
             <a-divider type="vertical" />
             <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
+            <a-divider type="vertical" />
+            <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
+              <a href="javascript:void(0);"  style="color: red">删除</a>
+            </a-popconfirm>
           </template>
           <template v-else>
             <a href="javascript:void(0);" @click="detail(r)" style="color:#999;">表单数据</a>

+ 6 - 2
src/views/activiti/form/demoForm2.vue

@@ -161,7 +161,7 @@ export default {
             this.dynamicData = dictData.result.dicList
 
             //获取用户下拉数据
-            this.getAction('/sys/user/list',{pageSize:20000}).then(userData => {
+            this.getAction('/sys/user/list2',{pageSize:20000}).then(userData => {
               if (res.success) {
                 userData.result.records.forEach(user => {
                   user.label = user.realname
@@ -357,13 +357,17 @@ export default {
           if (ischild) {
             formData.filedNames = formData.filedNames + ',table_name_children'
           }
-
+          
           console.log(formData)
           //子表数据
           //调用保存接口
           this.btndisabled = true
           this.todoManageOperationObject.formData = formData
           this.todoManageOperationObject.url = url
+          //获取是否部门负责人
+          formData.filedNames=formData.filedNames+',is_leaders'
+          formData.is_leaders=this.$store.getters.userInfo.identity
+          
           //非我的待办节点打卡表单界面
           this.postFormAction(url, formData)
             .then(res => {