111

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>
@@ -193,12 +193,12 @@
                 <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/process-center/applyListByTableName.vue

@@ -135,13 +135,12 @@
     <!-- 表 -->
     <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"
           :dataSource="dataSource"
           :pagination="ipagination"
-          :scroll="{ x: 1500,y:200 }"
           :loading="loading"
           @change="handleTableChange"
           :columns="selectedColumns"
@@ -648,7 +647,7 @@ export default {
       this.visible = false
       if (this.checkedColumn.length > 0) {
         let selectedColumns = this.tableColumns.map(item => {
-          item.width=200
+          // item.width=200
           // item.customRender=this.getSubstring;
           //判断是否页面临时处理字段
           let isscopedSlots = '1'
@@ -868,7 +867,7 @@ export default {
           }
         })
         this.selectedColumns.map(item=>{
-          item.width=200
+          // item.width=200
           // item.customRender=this.getSubstring;
         })
       })