Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/api/api.js

@@ -52,6 +52,8 @@ const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermission
 
 // 部门管理
 const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params);
+//不分公司查询部门树形
+const queryDepartTreeListNotOrg = (params)=>getAction("/sys/sysDepart/queryTreeListNotOrg",params);
 const tableList = (params)=>getAction("/actBusiness/getTableInfoList",params);
 const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params);
 const queryParentName   = (params)=>getAction("/sys/sysDepart/queryParentName",params);
@@ -138,6 +140,7 @@ export {
   getPermissionRuleList,
   queryPermissionRule,
   queryDepartTreeList,
+  queryDepartTreeListNotOrg,
   queryIdTree,
   queryParentName,
   searchByKeywords,

src/components/tools/ShowAnnouncement.vue

@@ -13,8 +13,9 @@
     <template slot="footer">
       <a-button key="back" @click="handleCancel">关闭</a-button>
       <!-- v-if="record.openType==='url'&&record.readFlag!=='1'" -->
+        <!-- v-if="record.openType==='url'&&record.readFlag!=='1'&&isShowtoHandle" -->
       <a-button
-        v-if="record.openType==='url'&&record.readFlag!=='1'&&isShowtoHandle"
+        v-if="record.openType==='url'&&isShowtoHandle"
         type="primary"
         @click="toHandle"
       >去处理</a-button>
@@ -100,7 +101,8 @@ export default {
       //流程消息通过任务节点查询是否需要显示处理按钮
       console.log(111)
       console.log(this.record.openPage)
-      if (this.record.openType === 'url' &&this.record.readFlag!=='1'&& this.record.openPage) {
+      // if (this.record.openType === 'url' &&this.record.readFlag!=='1'&& this.record.openPage) {
+      if (this.record.openType === 'url' && this.record.openPage) {
         postFormAction('/actTask/todoGetByTaskId', { taskId: this.record.openPage }).then(res => {
           this.loading = false
           if (res.success) {

src/views/activiti/todoManage.vue

@@ -170,8 +170,8 @@
           </a-form-item>
           <a-form-item label="消息通知">
             <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
-            <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
-            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>
+            <!-- <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
+            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox> -->
           </a-form-item>
         </a-form>
       </div>

src/views/system/DepartList.vue

@@ -162,7 +162,7 @@
 <script>
   import DepartModal from './modules/DepartModal'
   import pick from 'lodash.pick'
-  import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
+  import {queryDepartTreeListNotOrg,queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
   import {httpAction, deleteAction} from '@/api/manage'
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
   import DepartAuthModal from './modules/DepartAuthModal'
@@ -280,7 +280,7 @@
         var that = this
         that.treeData = []
         that.departTree = []
-        queryDepartTreeList().then((res) => {
+        queryDepartTreeListNotOrg().then((res) => {
           if (res.success) {
             for (let i = 0; i < res.result.length; i++) {
               let temp = res.result[i]