Merge branch 'master' into 'mhy'

Master

See merge request !19

xichongSys/src/http/moudules/getlist.js

@@ -131,19 +131,13 @@ export const listAllBaseInfo = (data) => {
       data
     })
   }
-//领取人员查询
-export const getGrantList = (data) => {
+  //
+  export const selectflowState = (data) => {
     return axios({
-    url: '/grantInfo/getGrantList',
+      url: '/folw/selectflowState',
       method: 'post',
       data
     })
-}
-//缴费信息查询
-export const listPayInfo = (data) => {
-  return axios({
+  }
+  
+  
\ No newline at end of file
-    url: '/payInfo/getPayInfo',
-    method: 'post',
-    data
-  })
-}

xichongSys/src/views/Core/KtTable.vue

@@ -13,14 +13,14 @@
       <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
         <template slot-scope="scope">
           <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" />
-          <kt-button icon="fa fa-trash" :label="$t('action.delete')" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />
+          <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />
         </template>
       </el-table-column>
     </el-table>
     <!--分页栏-->
     <div class="toolbar" style="padding:10px;">
-      <kt-button :label="$t('action.batchDelete')" :perms="permsDelete" :size="size" type="danger" @click="handleBatchDelete()" 
-        :disabled="this.selections.length===0" style="float:left;" v-if="showBatchDelete & showOperation"/>
+      <!-- <kt-button :label="$t('action.batchDelete')" :perms="permsDelete" :size="size" type="danger" @click="handleBatchDelete()"  -->
+        <!-- :disabled="this.selections.length===0" style="float:left;" v-if="showBatchDelete & showOperation"/> -->
       <el-pagination layout="total, prev, pager, next, jumper" @current-change="refreshPageRequest" 
         :current-page="pageRequest.pageNum" :page-size="pageRequest.pageSize" :total="data.totalSize" style="float:right;">
       </el-pagination>
@@ -130,7 +130,7 @@ export default {
 		},
 		// 删除操作
 		delete: function (ids) {
-			this.$confirm('确认删除选中记录吗？', '提示', {
+			this.$confirm('确认禁用选中记录吗？', '提示', {
 				type: 'warning'
 			}).then(() => {
 				let params = []
@@ -141,10 +141,10 @@ export default {
         this.loading = true
         let callback = res => {
           if(res.code == 200) {
-            this.$message({message: '删除成功', type: 'success'})
+            this.$message({message: '操作成功', type: 'success'})
             this.findPage()
           } else {
-            this.$message({message: '操作失败, ' + res.msg, type: 'error'})
+            this.$message({message: '操作失败, ' + res.message, type: 'error'})
           }
           this.loading = false
         }

xichongSys/src/views/Myvue/flow.vue

@@ -3,7 +3,7 @@
   <div class="op">
  
 <el-button type="primary" @click="showadd(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
- <el-button type="danger" @click="showadd(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-delete">已作废</el-button>
+ <el-button type="danger" @click="delet(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-delete">已作废</el-button>
 </div>
   <el-table
     :data="tableData"
@@ -153,6 +153,16 @@
       }
     },
     methods:{
+      //作废
+      delet(){
+this.$api.getlist.selectflowState().then((res) => {
+          this.tableData=res.data
+          console.log(this.tableData)
+        
+        }).catch((res) => {
+          
+        });
+      },
       //加载流程列表
       loadFlow(){
           this.$api.getlist.selectflowlist().then((res) => {

xichongSys/src/views/Sys/User.vue

@@ -278,12 +278,13 @@ export default {
 			this.columns = [
 				{prop:"id", label:"ID", minWidth:50},
 				{prop:"name", label:"用户名", minWidth:120},
+				{prop:"truename", label:"真实姓名", minWidth:100},
 				{prop:"deptName", label:"机构", minWidth:120},
 				{prop:"roleNames", label:"角色", minWidth:100},
-				{prop:"email", label:"邮箱", minWidth:120},
+				
 				{prop:"mobile", label:"手机", minWidth:100},
 				{prop:"status", label:"状态", minWidth:70},
-				{prop:"truename", label:"真实姓名", minWidth:100},
+				
 				// {prop:"createBy", label:"创建人", minWidth:120},
 				// {prop:"createTime", label:"创建时间", minWidth:120, formatter:this.dateFormat}
 				// {prop:"lastUpdateBy", label:"更新人", minWidth:100},