Browse Source

报销删除调整

huangguoce 10 hours atrás
parent
commit
028e3c0042

+ 9 - 4
src/views/ccpm/reimbursement/info/InfoList.vue

@@ -130,10 +130,10 @@
 						exportMethod: exportMethod,
 						types: ['xlsx'],
 						modes: ['current', 'selected', 'all']
-					}" :data="dataList" :checkbox-config="{}">
+					}" :data="dataList" :checkbox-config="checkboxConfig">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column type="checkbox" width="40"></vxe-column>
-					<vxe-column width="130" title="报销编号" field="no" align="center">
+					<vxe-column width="150" title="报销编号" field="no" align="center">
 						<template #default="scope">
 							<el-link type="primary" :underline="false" v-if="hasPermission('ccpm:info:view')"
 								@click="view(scope.row)">{{ scope.row.no }}</el-link>
@@ -223,7 +223,7 @@
 								v-if="hasPermission('ccpm:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')"
 								text type="primary" @click="reback(scope.row)">撤回</el-button>
 							<el-button
-								v-if="hasPermission('ccpm:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+								v-if="hasPermission('ccpm:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
 								text type="primary" @click="del(scope.row.id)">删除</el-button>
 							<el-button v-if="checkIsAudit(scope.row)" text type="primary"
 								@click="todo(scope.row)">审核</el-button>
@@ -292,7 +292,13 @@ import dayjs from 'dayjs';
 
 export default {
 	data() {
+		const checkboxConfig = {
+			checkMethod: ({ row }) => {
+				return row.type == '1' || row.type == '3';
+			}
+		};
 		return {
+			checkboxConfig,
 			showHideItem: false,
 			showHideIcon: 'el-icon-arrow-down',
 			showHideName: '展示',
@@ -942,7 +948,6 @@ export default {
 				this.reimbursementService.remove(ids).then((data) => {
 					this.$message.success(data)
 					this.refreshList()
-					this.loading = false
 				})
 				// this.reimbursementService.remove(ids).then(({data}) => {
 				//   this.$message.success(data)

+ 9 - 4
src/views/consultancy/reimbursement/info/InfoList.vue

@@ -128,10 +128,10 @@
 						exportMethod: exportMethod,
 						types: ['xlsx'],
 						modes: ['current', 'selected', 'all']
-					}" :data="dataList" :checkbox-config="{}">
+					}" :data="dataList" :checkbox-config="checkboxConfig">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column type="checkbox" width="40"></vxe-column>
-					<vxe-column width="130" title="报销编号" field="no" align="center">
+					<vxe-column width="150" title="报销编号" field="no" align="center">
 						<template #default="scope">
 							<el-link type="primary" :underline="false" v-if="hasPermission('consultancy:info:view')"
 								@click="view(scope.row)">{{ scope.row.no }}</el-link>
@@ -222,7 +222,7 @@
 								v-if="hasPermission('consultancy:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')"
 								text type="primary" @click="reback(scope.row)">撤回</el-button>
 							<el-button
-								v-if="hasPermission('consultancy:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+								v-if="hasPermission('consultancy:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
 								text type="primary" @click="del(scope.row.id)">删除</el-button>
 							<el-button v-if="checkIsAudit(scope.row)" text type="primary"
 								@click="todo(scope.row)">审核</el-button>
@@ -294,7 +294,13 @@ import UserSelect2 from '@/views/utils/UserTreeSelect'
 import dayjs from 'dayjs';
 export default {
 	data() {
+		const checkboxConfig = {
+			checkMethod: ({ row }) => {
+				return row.type == '1' || row.type == '3';
+			}
+		};
 		return {
+			checkboxConfig,
 			formUrlFile: '/consultancy/reimbursement/info/NewReimbursementFileSupplementForm',
 			formUrl: '/consultancy/reimbursement/info/NewReimbursementForm',
 			showHideItem: false,
@@ -785,7 +791,6 @@ export default {
 				this.reimbursementService.remove(ids).then((data) => {
 					this.$message.success(data)
 					this.refreshList()
-					this.loading = false
 				})
 				// this.reimbursementService.remove(ids).then(({data}) => {
 				//   this.$message.success(data)

+ 9 - 4
src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -130,10 +130,10 @@
 						exportMethod: exportMethod,
 						types: ['xlsx'],
 						modes: ['current', 'selected', 'all']
-					}" :data="dataList" :checkbox-config="{}">
+					}" :data="dataList" :checkbox-config="checkboxConfig">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column type="checkbox" width="60"></vxe-column>
-					<vxe-column min-width="130" title="报销编号" field="no" align="center">
+					<vxe-column min-width="150" title="报销编号" field="no" align="center">
 						<template #default="scope">
 							<el-link type="primary" :underline="false"
 								v-if="hasPermission('cw:reimbursement:info:view')" @click="view(scope.row)">{{
@@ -228,7 +228,7 @@
 									v-if="hasPermission('cw:reimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')"
 									text type="primary" @click="reback(scope.row)">撤回</el-button>
 								<el-button
-									v-if="hasPermission('cw:reimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+									v-if="hasPermission('cw:reimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
 									text type="primary" @click="del(scope.row.id)">删除</el-button>
 								<!--              审核-->
 								<el-button v-if="scope.row.type === '2' && checkIsAudit(scope.row)" text type="primary"
@@ -305,7 +305,13 @@ import UserSelect2 from '@/views/utils/UserTreeSelect'
 import dayjs from 'dayjs';
 export default {
 	data() {
+		const checkboxConfig = {
+			checkMethod: ({ row }) => {
+				return row.type == '1' || row.type == '3';
+			}
+		};
 		return {
+			checkboxConfig,
 			formUrlFile: '/cw/reimbursementApproval/info/NewReimbursementFileSupplementForm',
 			formUrl: '/cw/reimbursementApproval/info/NewReimbursementForm',
 			searchVisible: true,
@@ -833,7 +839,6 @@ export default {
 				this.reimbursementApprovalService.remove(ids).then((data) => {
 					this.$message.success(data)
 					this.refreshList()
-					this.loading = false
 				})
 			})
 		},

+ 9 - 3
src/views/cw/szfbReimbursementApproval/info/InfoList.vue

@@ -119,10 +119,10 @@
 						exportMethod: exportMethod,
 						types: ['xlsx'],
 						modes: ['current', 'selected', 'all']
-					}" :data="dataList" :checkbox-config="{}">
+					}" :data="dataList" :checkbox-config="checkboxConfig">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column type="checkbox" width="60"></vxe-column>
-					<vxe-column min-width="130" title="报销编号" field="no" align="center">
+					<vxe-column min-width="150" title="报销编号" field="no" align="center">
 						<template #default="scope">
 							<el-link type="primary" :underline="false"
 								v-if="hasPermission('businessOperation:info:view')" @click="view(scope.row)">{{
@@ -200,7 +200,7 @@
 									v-if="hasPermission('businessOperation:info:update') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')"
 									text type="primary" @click="reback(scope.row)">撤回</el-button>
 								<el-button
-									v-if="hasPermission('businessOperation:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+									v-if="hasPermission('businessOperation:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
 									text type="primary" @click="del(scope.row.id)">删除</el-button>
 								<!--              审核-->
 								<el-button v-if="scope.row.type === '2' && checkIsAudit(scope.row)" text type="primary"
@@ -255,7 +255,13 @@ import UserSelect2 from '@/views/utils/UserTreeSelect'
 import dayjs from 'dayjs';
 export default {
 	data() {
+		const checkboxConfig = {
+			checkMethod: ({ row }) => {
+				return row.type == '1' || row.type == '3';
+			}
+		};
 		return {
+			checkboxConfig,
 			formUrl: '/cw/szfbReimbursementApproval/info/NewReimbursementForm',
 			searchVisible: true,
 			showHideItem: false,

+ 9 - 3
src/views/reimbursement/info/InfoList.vue

@@ -116,7 +116,7 @@
             exportMethod: exportMethod,
             types: ['xlsx'],
             modes: ['current', 'selected', 'all']
-          }" :data="dataList" :checkbox-config="{}">
+          }" :data="dataList" :checkbox-config="checkboxConfig">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="50"></vxe-column>
           <vxe-column min-width="200" title="报销编号" field="no" align="center">
@@ -211,7 +211,7 @@
                 v-if="hasPermission('reimbursement:info:edit') && scope.row.createId === $store.state.user.id && scope.row.type === '4'"
                 text type="primary" @click="adjust(scope.row)">驳回调整</el-button>
               <el-button
-                v-if="hasPermission('reimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+                v-if="hasPermission('reimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
                 text type="primary" @click="del(scope.row.id)">删除</el-button>
               <!--								付款-->
               <el-button v-if="hasPermission('pg:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"
@@ -278,7 +278,13 @@ import UserSelect2 from '@/views/utils/UserTreeSelect'
 import dayjs from 'dayjs';
 export default {
   data() {
+    const checkboxConfig = {
+      checkMethod: ({ row }) => {
+        return row.type == '1' || row.type == '3';
+      }
+    };
     return {
+      checkboxConfig,
       formUrlFile: '/reimbursement/info/NewReimbursementFileSupplementForm',
       formUrl: '/reimbursement/info/NewReimbursementForm',
       showHideItem: false,
@@ -753,6 +759,7 @@ export default {
     },
     // 删除
     del(id) {
+
       let ids = id || this.$refs.infoTable.getCheckboxRecords().map(item => {
         return item.id
       }).join(',')
@@ -765,7 +772,6 @@ export default {
         this.reimbursementService.remove(ids).then((data) => {
           this.$message.success(data)
           this.refreshList()
-          this.loading = false
         })
       })
     },

+ 9 - 4
src/views/zs/reimbursement/info/InfoList.vue

@@ -128,10 +128,10 @@
 						exportMethod: exportMethod,
 						types: ['xlsx'],
 						modes: ['current', 'selected', 'all']
-					}" :data="dataList" :checkbox-config="{}">
+					}" :data="dataList" :checkbox-config="checkboxConfig">
 					<vxe-column type="seq" width="60" title="序号"></vxe-column>
 					<vxe-column type="checkbox" width="40"></vxe-column>
-					<vxe-column width="130" title="报销编号" field="no" align="center">
+					<vxe-column width="150" title="报销编号" field="no" align="center">
 						<template #default="scope">
 							<el-link type="primary" :underline="false" v-if="hasPermission('zsReimbursement:info:view')"
 								@click="view(scope.row)">{{ scope.row.no }}</el-link>
@@ -232,7 +232,7 @@
 								v-if="hasPermission('zsReimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')"
 								text type="primary" @click="reback(scope.row)">撤回</el-button>
 							<el-button
-								v-if="hasPermission('zsReimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')"
+								v-if="hasPermission('zsReimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3')"
 								text type="primary" @click="del(scope.row.id)">删除</el-button>
 							<el-button v-if="checkIsAudit(scope.row)" text type="primary"
 								@click="todo(scope.row)">审核</el-button>
@@ -308,7 +308,13 @@ import UserSelect2 from '@/views/utils/UserTreeSelect'
 import dayjs from 'dayjs';
 export default {
 	data() {
+		const checkboxConfig = {
+			checkMethod: ({ row }) => {
+				return row.type == '1' || row.type == '3';
+			}
+		};
 		return {
+			checkboxConfig,
 			formUrlFile: "/zs/reimbursement/info/NewReimbursementFileSupplementForm",
 			formUrl: '/zs/reimbursement/info/NewReimbursementForm',
 			showHideItem: false,
@@ -802,7 +808,6 @@ export default {
 				this.reimbursementService.remove(ids).then((data) => {
 					this.$message.success(data)
 					this.refreshList()
-					this.loading = false
 				})
 				// this.reimbursementService.remove(ids).then(({data}) => {
 				//   this.$message.success(data)