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

src/views/activiti/applyList.vue

@@ -606,8 +606,13 @@ export default {
       }
       this.submitLoading = true
       var params = Object.assign({}, this.form)
-      params.assignees = params.assignees.join(',')
+       debugger
+       if(params.assignees != null && params.assignees != ""){
+         params.assignees = params.assignees.join(',')
+       }
+      
       var requestUrl = this.url.applyBusiness;
+     
       if (this.form.routeName != null && this.form.routeName.indexOf("外部表单")>-1){
         postAction(this.url.applyOuterBusiness, params)
             .then(res => {

src/views/oa/modules/JSelectUserByDepModal.vue

@@ -10,7 +10,6 @@
     style="margin-top: -70px"
     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"> -->
           <!--组织机构-->
@@ -26,18 +25,16 @@
           /> -->
        <!-- </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'}"
             placeholder="请输入姓名"
             v-model="queryParam.realname"
             @search="onSearch"
           ></a-input-search>
-          <a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button>
+          <a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button> -->
           <!--用户列表-->
-          <a-table
+          <a-table style="margin-top: -25px;"
             ref="table"
             :scroll="scrollTrigger"
             size="middle"
@@ -49,9 +46,6 @@
             :loading="loading"
             @change="handleTableChange">
           </a-table>
-        </a-card>
-      </a-col>
-    </a-row>
   </a-modal>
 </template>
 

src/views/process-center/applyListByTableName.vue

@@ -649,17 +649,17 @@ export default {
       if (this.checkedColumn.length > 0) {
         let selectedColumns = this.tableColumns.map(item => {
           if(item.width == null || item.width == ""){
-            if(item.key == 'action'){
-               item.width=280
-            }else if(item.key == 'result'){
-              item.width=70
-            }else if(item.key == 'status'){
-              item.width=60
-            }else if(item.key == 'currTaskName'){
-              item.width=105
-            }else{
-              item.width=160
-            }
+             if(item.key == 'action'){
+                item.width=280
+             }else if(item.key == 'result'){
+               item.width=90
+             }else if(item.key == 'status'){
+               item.width=90
+             }else if(item.key == 'currTaskName'){
+               item.width=125
+             }else{
+               item.width=160
+             }
            
           }
           // item.customRender=this.getSubstring;
@@ -885,11 +885,11 @@ export default {
             if(item.key == 'action'){
                item.width=280
             }else if(item.key == 'result'){
-              item.width=70
+              item.width=90
             }else if(item.key == 'status'){
-              item.width=60
+              item.width=90
             }else if(item.key == 'currTaskName'){
-              item.width=105
+              item.width=125
             }else{
               item.width=160
             }