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

src/components/jeecgbiz/JSelectMultiUserAu.vue

@@ -0,0 +1,46 @@
+<template>
+  <!-- 定义在这里的参数都是不可在外部覆盖的，防止出现问题 -->
+  <j-select-biz-component
+    :value="value"
+    :listUrl="url.list"
+    :columns="columns"
+    v-on="$listeners"
+    v-bind="attrs"
+  />
+</template>
+
+<script>
+  import JSelectBizComponent from './JSelectBizComponent'
+
+  export default {
+    name: 'JSelectMultiUser',
+    components: { JSelectBizComponent },
+    props: ['value'],
+    data() {
+      return {
+        url: { list: '/sys/user/list' },
+        columns: [
+          { title: '姓名', align: 'center', width: '20%', widthRight: '70%', dataIndex: 'realname' },
+          { title: '账号', align: 'center', width: '20%', dataIndex: 'username' },
+          { title: '电话', align: 'center', width: '23%', dataIndex: 'phone' },
+          { title: '出生日期', align: 'center', width: '23%', dataIndex: 'birthday' }
+        ],
+        // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件
+        default: {
+          name: '用户',
+          width: 1000,
+          displayKey: 'realname',
+          returnKeys: ['id', 'username'],
+          queryParamText: '账号',
+        }
+      }
+    },
+    computed: {
+      attrs() {
+        return Object.assign(this.default, this.$attrs)
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped></style>

src/views/activiti/applyList.vue

@@ -177,9 +177,9 @@
           <a-table-column title="操作" dataIndex="" align="center" :width="200">
             <template slot-scope="t, r">
               <template v-if="r.status == 0">
-                <!-- <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
+                <a href="javascript:void(0);" style="color: #00A0E9" @click="apply(r)">提交申请</a>
                 <a-divider type="vertical" />
-                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a> -->
+                <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑</a>
                 <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
                   <a href="javascript:void(0);" style="color: red">删除</a>
@@ -188,17 +188,17 @@
               <template v-else-if="r.status == 1">
                 <a href="javascript:void(0);" @click="detail(r)">详情</a>
                 <a-divider type="vertical" />
-               <!-- <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
-                <a-divider type="vertical" /> -->
+                <a href="javascript:void(0);" @click="cancel(r)" style="color:orange;">撤回</a>
+                <a-divider type="vertical" /> 
                 <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
               </template>
               <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
-               <!-- <a-popconfirm title="确定再次提交申请吗?" @confirm="() => apply(r)">
+                <a-popconfirm title="确定再次提交申请吗?" @confirm="() => apply(r)">
                   <a href="javascript:void(0);" style="color:green;">再次申请</a>
                 </a-popconfirm>
                 <a-divider type="vertical" />
                 <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
-                <a-divider type="vertical" /> -->
+                <a-divider type="vertical" /> 
                 <a href="javascript:void(0);" @click="history(r)" style="color:gray;">审批历史</a>
                 <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">

src/views/oa/modules/JSelectUserByDepModal.vue

@@ -104,6 +104,7 @@
         ],
         scrollTrigger: {},
         dataSource: [],
+        dataSourceAll: [],
         selectedRowKeys: [],
         selectUserRows: [],
         selectUserIds: [],
@@ -194,6 +195,7 @@
           if(params.realname) params.realname = `*${params.realname}*`;
           await getUserList(params).then((res) => {
             if (res.success) {
+                this.dataSourceAll = res.result.records
               this.dataSource = res.result.records
               this.ipagination.total = res.result.total
             }
@@ -268,7 +270,7 @@
       },
       //获取选择用户信息
       getSelectUserRows(rowId) {
-        let dataSource = this.dataSource;
+        let dataSource = this.dataSourceAll;
         let userIds = "";
         this.selectUserRows = [];
         for (let i = 0, len = dataSource.length; i < len; i++) {

src/views/process-center/applyListByTableName.vue

@@ -135,13 +135,13 @@
     <!-- 表 -->
     <a-row :gutter="24">
       <a-col :md="24" :sm="24">
-        <a-table
+        <a-table style="word-break:break-all; word-wrap:break-all;"
           bordered
           ref="table"
           rowKey="id"
+          :scroll="{ x: 1000,y:600}" 
           :dataSource="dataSource"
           :pagination="ipagination"
-          :scroll="{ x: 1500,y:200 }"
           :loading="loading"
           @change="handleTableChange"
           :columns="selectedColumns"
@@ -648,7 +648,18 @@ export default {
       this.visible = false
       if (this.checkedColumn.length > 0) {
         let selectedColumns = this.tableColumns.map(item => {
-          item.width=200
+          if(item.width == null || item.width == ""){
+            if(item.key == 'action'){
+               item.width=280
+            }else if(item.key == 'result'){
+              item.width=100
+            }else if(item.key == 'status'){
+              item.width=100
+            }else{
+              item.width=160
+            }
+           
+          }
           // item.customRender=this.getSubstring;
           //判断是否页面临时处理字段
           let isscopedSlots = '1'
@@ -868,7 +879,18 @@ export default {
           }
         })
         this.selectedColumns.map(item=>{
-          item.width=200
+          if(item.width == null || item.width == ""){
+            if(item.key == 'action'){
+               item.width=280
+            }else if(item.key == 'result'){
+              item.width=100
+            }else if(item.key == 'status'){
+              item.width=100
+            }else{
+              item.width=160
+            }
+           
+          }
           // item.customRender=this.getSubstring;
         })
       })