yuansh 2 years ago
parent
commit
858df1ca7d

+ 2 - 2
src/views/activiti/applyList.vue

@@ -188,8 +188,8 @@
               <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">

+ 25 - 2
src/views/process-center/applyListByTableName.vue

@@ -139,6 +139,7 @@
           bordered
           ref="table"
           rowKey="id"
+          :scroll="{ x: 1000,y:600}" 
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -647,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'
@@ -867,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;
         })
       })