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

src/views/activiti/todoManage.vue

@@ -10,7 +10,7 @@
           <a-row :gutter="24">
             <a-col :md="6" :sm="8">
               <a-form-item label="关键字" prop="name">
-                <a-input type="text" allowClear v-model="searchForm.name" placeholder="请输入" />
+                <a-input type="text" allowClear v-model="searchForm.name" placeholder="请输入业务信息或流程发起人" />
               </a-form-item>
             </a-col>
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">

src/views/oa/modules/JSelectUserByDepModal.vue

@@ -1,6 +1,7 @@
 <template>
   <a-modal
     width="60%"
+    height="100%"
     :visible="visible"
     :title="title"
     @ok="handleSubmit"
@@ -10,10 +11,10 @@
     wrapClassName="ant-modal-cust-warp"
   >
     <a-row :gutter="10" style="background-color: #ececec; padding: 10px; margin: -10px">
-      <a-col :md="6" :sm="24">
-        <a-card :bordered="false">
+     <!-- <a-col :md="6" :sm="24">
+        <a-card :bordered="false"> -->
           <!--组织机构-->
-          <a-directory-tree
+         <!-- <a-directory-tree
             selectable
             :selectedKeys="selectedDepIds"
             :checkStrictly="true"
@@ -22,11 +23,11 @@
             :expandAction="false"
             :expandedKeys.sync="expandedKeys"
             @select="onDepSelect"
-          />
-        </a-card>
-      </a-col>
-      <a-col :md="18" :sm="24">
-        <a-card :bordered="false" style="height: 500px; overflow-y: scroll;">
+          /> -->
+       <!-- </a-card>
+      </a-col> -->
+      <a-col :md="24" :sm="24">
+        <a-card :bordered="false" style="height: 100%; overflow-y: scroll;">
           用户姓名:
           <a-input-search
             :style="{width:'150px',marginBottom:'15px'}"
@@ -57,7 +58,7 @@
 <script>
   import {filterObj} from '@/utils/util'
   import {queryDepartTreeList, getUserList, queryUserByDepId} from '@/api/api'
-
+  import { putAction,getAction } from '@/api/manage'
   export default {
     name: 'JSelectUserByDepModal',
     components: {},
@@ -164,7 +165,8 @@
           }
           param[this.customReturnField] = values;
           console.log("回显用户参数",param)
-          getUserList(param).then((res) => {
+          getAction('/sys/user/listBy', {}).then((res) => {
+          // getUserList(param).then((res) => {
             if (res.success) {
               let selectedRowKeys = []
               let realNames = []
@@ -193,7 +195,8 @@
           let params = this.getQueryParams()//查询条件
           params.syHireType ='在职'
           if(params.realname) params.realname = `*${params.realname}*`;
-          await getUserList(params).then((res) => {
+          await getAction('/sys/user/listBy', {}).then((res) => {
+          // await getUserList(params).then((res) => {
             if (res.success) {
                 this.dataSourceAll = res.result.records
               this.dataSource = res.result.records

src/views/process-center/applyListByTableName.vue

@@ -652,9 +652,11 @@ export default {
             if(item.key == 'action'){
                item.width=280
             }else if(item.key == 'result'){
-              item.width=100
+              item.width=70
             }else if(item.key == 'status'){
-              item.width=100
+              item.width=60
+            }else if(item.key == 'currTaskName'){
+              item.width=105
             }else{
               item.width=160
             }
@@ -883,9 +885,11 @@ export default {
             if(item.key == 'action'){
                item.width=280
             }else if(item.key == 'result'){
-              item.width=100
+              item.width=70
             }else if(item.key == 'status'){
-              item.width=100
+              item.width=60
+            }else if(item.key == 'currTaskName'){
+              item.width=105
             }else{
               item.width=160
             }