完善

src/views/activiti/task/MyTaskFinish.vue

@@ -61,6 +61,10 @@ export default {
       statusMap: {},
       // 查询参数
       queryParam: {
+        dataScope: {
+          sortBy: 'desc',
+          sortName: 'create_time'
+        }
       },
       // 表头
       columns: [

src/views/fill/task/modules/BaseForm.vue

@@ -1,10 +1,10 @@
 <template>
   <a-card :bordered="false" v-show="visible" class="card">
-    <a-row :gutter="48" style="position:fixed;bottom:150px;z-index:999;display:flex; justify-content: center;width: 90%;">
+    <a-row :gutter="48" style="position:fixed;bottom:150px; left:50%;z-index:999;display:flex; justify-content: center">
       <a-col :md="48" :sm="48">
         <span>
           <a-button v-show="editor" :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
-          <a-button style="margin-left: 8px" v-show="editor" :loading="confirmLoading" type="primary" @click="handleAdd()">新增</a-button>
+          <a-button style="margin-left: 8px" :loading="confirmLoading" type="primary" @click="handleAdd()">新增</a-button>
           <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
           <a-button
             style="margin-left: 8px"
@@ -118,7 +118,6 @@
                 </a-button>
                 <a-button type="link" @click="uploadImg(item,i)">{{ item.images&&item.images.length?'查看图片':'上传图片' }}</a-button>
                 <operation-button
-                  v-if="editor"
                   :type="2"
                   title="是否要删除该条数据？"
                   @confirm="handleDelete(item.id)">删除</operation-button>
@@ -151,7 +150,7 @@
         <div v-if="ListForm.length===0">
           <a-empty />
         </div>
-        <a-pagination style="float:right;margin:10px;" v-model="listPage.pageNum" :total="listPage.total" @change="onChange" />
+        <a-pagination style="position:absolute;right:0; bottom:0px;" v-model="listPage.pageNum" :total="listPage.total" @change="onChange" />
       </div>
     </div>
     <div v-show="type===2">

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -45,49 +45,47 @@
           </a-button>
         </a-dropdown>-->
       </div>
-      <a-spin :spinning="loading">
-        <s-table
-          ref="table"
-          size="default"
-          rowKey="id"
-          :columns="columns"
-          :data="loadData"
-          :alert="options.alert"
-          :rowSelection="options.rowSelection"
-          showPagination="auto"
-        >
-          <span slot="action" slot-scope="record">
-            <template>
-              <a @click="handleView(record)">查看</a>
-              <a-divider v-if="(record.status==0 || record.status == 3)" type="vertical" />
-              <a v-if="$auth('store-out-store-forms-edit')&&(record.status==0 || record.status == 3)" @click="handleEdit(record)">修改</a>
-              <a-divider v-if="record.status == 0 || record.status == 5 || record.status == 4" type="vertical" />
-              <a v-if="record.status == 0 || record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
-              <a-divider v-if="record.status==0" type="vertical" />
-              <a-popconfirm v-if="record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
-                <a>提交审核</a>
-              </a-popconfirm>
-              <a-divider v-if="record.status==3" type="vertical" />
-              <a-popconfirm v-if="record.status==3" title="重新推送？" @confirm="rePush(record.id)">
-                <a>重新推送</a>
-              </a-popconfirm>
-              <a-divider v-if="record.status==0" type="vertical" />
-              <a-popconfirm v-if="$auth('store-out-store-forms-del')&&record.status==0" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
-                <a>删除</a>
-              </a-popconfirm>
+      <s-table
+        ref="table"
+        size="default"
+        rowKey="id"
+        :columns="columns"
+        :data="loadData"
+        :alert="options.alert"
+        :rowSelection="options.rowSelection"
+        showPagination="auto"
+      >
+        <span slot="action" slot-scope="record">
+          <template>
+            <a @click="handleView(record)">查看</a>
+            <a-divider v-if="(record.status==0 || record.status == 3)" type="vertical" />
+            <a v-if="$auth('store-out-store-forms-edit')&&(record.status==0 || record.status == 3)" @click="handleEdit(record)">修改</a>
+            <a-divider v-if="record.status == 0 || record.status == 5 || record.status == 4" type="vertical" />
+            <a v-if="record.status == 0 || record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
+            <a-divider v-if="record.status==0" type="vertical" />
+            <a-popconfirm v-if="record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
+              <a>提交审核</a>
+            </a-popconfirm>
+            <a-divider v-if="record.status==3" type="vertical" />
+            <a-popconfirm v-if="record.status==3" title="重新推送？" @confirm="rePush(record.id)">
+              <a>重新推送</a>
+            </a-popconfirm>
+            <a-divider v-if="record.status==0" type="vertical" />
+            <a-popconfirm v-if="$auth('store-out-store-forms-del')&&record.status==0" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
+              <a>删除</a>
+            </a-popconfirm>
             <!--            <a-divider v-if="record.status==2" type="vertical" />
             <a-popconfirm v-if="record.status==2" title="是否要撤销？" @confirm="updateStoreBack(record.id)">
               <a>撤销</a>
             </a-popconfirm>-->
-            </template>
-          </span>
-          <span slot="status" slot-scope="text">
-            <badge
-              :status="DictCache.COLOR.OUT_STORE_FORM_STATUS[text]"
-              :text="statusMap[text]" />
-          </span>
-        </s-table>
-      </a-spin>
+          </template>
+        </span>
+        <span slot="status" slot-scope="text">
+          <badge
+            :status="DictCache.COLOR.OUT_STORE_FORM_STATUS[text]"
+            :text="statusMap[text]" />
+        </span>
+      </s-table>
     </div>
     <detail ref="detailModal" @ok="handleOk"/>
     <base-form ref="baseModal" @ok="handleOk"/>
@@ -134,7 +132,6 @@ export default {
         ...this.$route.query
       },
       // 表头
-      loading: false,
       columns: [
         {
           title: '序号',
@@ -203,11 +200,8 @@ export default {
             sortName: 'update_time'
           }
         }
-        this.loading = true
         return getOutStoreFormPage(Object.assign(parameter, this.queryParam))
           .then(res => {
-            this.loading = false
-
             return res.data
           })
       },
@@ -308,8 +302,6 @@ export default {
     updateStore (id) {
       const params = {}
       params.id = id
-      this.loading = true
-
       params.processInstanceId = ''
       params.auditModelName = '仓库审批'
       params.auditModelKey = 'out_store_back'