报销付款

src/api/ccpm/reimbursement/ReimbursementService.js

@@ -102,5 +102,12 @@ export default class ReimbursementService {
 			params: {id: id}
 		})
 	}
+	updatePaymentStatus (param) {
+		return request({
+			url: prefix + '/ccpmReimbursement/info/updatePaymentStatus',
+			method: 'post',
+			data: param
+		})
+	}
 
 }

src/api/consultancy/reimbursement/ReimbursementService.js

@@ -102,4 +102,11 @@ export default class ReimbursementService {
 			params: {id: id}
 		})
 	}
+	updatePaymentStatus (param) {
+		return request({
+			url: prefix + '/consultancyReimbursement/info/updatePaymentStatus',
+			method: 'post',
+			data: param
+		})
+	}
 }

src/api/cw/reimbursementApproval/ReimbursementApprovalService.js

@@ -134,4 +134,12 @@ export default class ReimbursementApprovalService {
 			params: {id: id}
 		})
 	}
+	updatePaymentStatus (param) {
+		return request({
+			url: prefix + '/reimbursementApproval/info/updatePaymentStatus',
+			method: 'post',
+			data: param
+		})
+	}
+
 }

src/api/sys/ReimbursementService.js

@@ -110,4 +110,12 @@ export default class ReimbursementService {
 		})
 	}
 
+	updatePaymentStatus (param) {
+		return request({
+			url: prefix + '/reimbursement/info/updatePaymentStatus',
+			method: 'post',
+			data: param
+		})
+	}
+
 }

src/api/zs/reimbursement/ReimbursementService.js

@@ -102,5 +102,12 @@ export default class ReimbursementService {
 			params: {id: id}
 		})
 	}
+	updatePaymentStatus (param) {
+		return request({
+			url: prefix + '/zsReimbursement/info/updatePaymentStatus',
+			method: 'post',
+			data: param
+		})
+	}
 
 }

src/views/ccpm/reimbursement/info/InfoList.vue

@@ -111,7 +111,16 @@
       <!--<el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
         <el-input size="small" v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
       </el-form-item>-->
-
+		<el-form-item v-if="showHideItem" label="付款状态" prop="paymentStatus">
+			<el-select v-model="searchForm.paymentStatus" placeholder="请选择付款状态" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('payment_status')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
       <el-form-item>
         <el-button @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
         <el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
@@ -140,6 +149,7 @@
           show-header-overflow
           show-overflow
           highlight-hover-row
+		  :tooltip-config="tooltipConfig"
           :menu-config="{}"
           :sort-config="{remote:true}"
           :export-config="{
@@ -196,7 +206,11 @@
               <el-button  @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
-
+			<vxe-column  min-width="100" title="付款状态" fixed="right" align="center" field="paymentStatus">
+				<template #default="scope">
+					<el-button  :type="$dictUtils.getDictLabel('payment_status_info', scope.row.paymentStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("payment_status", scope.row.paymentStatus, '未付款')}} </el-button>
+				</template>
+			</vxe-column>
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 <!--				管理员修改-->
@@ -207,8 +221,11 @@
               <el-button 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')" 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>
+				<!--								付款-->
+				<el-button v-if="hasPermission('ccpm:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
+				<el-button v-if="hasPermission('ccpm:user:payment') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
 
-            </template>
+			</template>
           </vxe-column>
         </vxe-table>
         <vxe-pager
@@ -271,7 +288,8 @@
           amounts: [],
           reportNumber: '',
           sourceType: '',
-			no:''
+			no:'',
+			paymentStatus:''
         },
         dataList: [],
         tablePage: {
@@ -287,7 +305,22 @@
 		  isAdmin:false,
 		  isDgsbxBmzr:false,
 		  isKjsz:false,
-		  isXdj:false
+		  isXdj:false,
+		  tooltipConfig: {
+			  showAll: false,
+			  enterable: true,
+			  contentMethod: ({ type, column, row, items, _columnIndex }) => {
+				  const { field } = column
+				  // 重写默认的提示内容
+				  if (field === 'paymentStatus') {
+					  if (row.paymentStatus === '1') {
+						  return '付款时间:' + row.paymentTime;
+					  }
+				  }
+				  // 其余的单元格使用默认行为
+				  return null
+			  }
+		  }
       }
     },
     // reimbursementService: null,
@@ -970,6 +1003,34 @@
 			console.log(user[0].name)
 			this.searchForm.reimBy=user[0].name
 		},
+		//付款
+		payment(row){
+			this.$confirm(`确定付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '1', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
+		//撤回付款
+		rePayment(row){
+			this.$confirm(`确定撤回付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '0', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
     }
   }
 </script>

src/views/ccpm/reimbursement/info/InfoUpdateForm.vue

@@ -69,6 +69,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item v-if="hasPermission('ccpm:user:payment')" label="是否付款" prop="paymentStatus">
+						<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+						<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12" v-if="inputForm.sourceType === '5'">
 					<el-form-item label="采购编号" prop="purchaseNo"
 								  :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -818,7 +824,8 @@
 					procDefId: '',
 					procDefKey: '',
 					formTitle: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				},
 				keyWatch: '',
 				amountKey: '',
@@ -826,7 +833,8 @@
 				isZj:false,
 				isZjbry:false,
 				isSs:false,
-				infoHistory:false
+				infoHistory:false,
+				payment:''
 			}
 		},
 		provide() {
@@ -933,7 +941,8 @@
 					purchaseNo: '',
 					tradeTotalPrice: '',
 					purchaseId: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				}
 				if (method === 'add') {
 					this.title = `新建报销类型`
@@ -977,6 +986,11 @@
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 							this.inputForm.reimbursementType = '0'
 						}
+						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+							this.payment = '已付款'
+						}else {
+							this.payment = '未付款'
+						}
 						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -2211,4 +2225,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/ccpm/reimbursement/info/ReimbursementForm.vue

@@ -58,6 +58,12 @@
             </el-select>
           </el-form-item>
         </el-col>
+		  <el-col :span="12">
+			  <el-form-item v-if="hasPermission('ccpm:user:payment')" label="是否付款" prop="paymentStatus">
+				  <el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+				  <el-input v-else v-model = 'payment' :disabled="true"></el-input>
+			  </el-form-item>
+		  </el-col>
         <el-col :span="12" v-if="inputForm.sourceType === '5'">
           <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -797,7 +803,8 @@
 			procDefId: '',
 			procDefKey: '',
 			formTitle: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         },
         keyWatch: '',
         amountKey: '',
@@ -808,6 +815,7 @@
 		  isSs:false,
 		  isKjsz:false,
 		  isXdj:false,
+		  payment:''
       }
     },
 	  provide() {
@@ -912,7 +920,8 @@
           purchaseNo: '',
           tradeTotalPrice: '',
           purchaseId: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         }
         if (method === 'add') {
           this.title = `新建报销类型`
@@ -955,6 +964,11 @@
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 				  this.inputForm.reimbursementType = '0'
 			  }
+			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+				  this.payment = '已付款'
+			  }else {
+				  this.payment = '未付款'
+			  }
             this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -1505,6 +1519,7 @@
 			  this.dataFiltering()
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
+			  this.inputForm.type = '2'
             this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
               if (this.commonJS.isNotEmpty(data)) {
 				  if (data === '所长报销审核人') {
@@ -2210,4 +2225,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/consultancy/reimbursement/info/InfoForm.vue

@@ -62,6 +62,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col :span="12">
+				<el-form-item v-if="hasPermission('consultancy:user:payment')" label="是否付款" prop="paymentStatus">
+					<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+					<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+				</el-form-item>
+			</el-col>
           <el-col :span="12" v-if="inputForm.sourceType === '5'">
             <el-form-item label="采购编号" prop="purchaseNo"
                           :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -703,8 +709,10 @@
 			procDefId: '',
 			procDefKey: '',
 			formTitle: '',
-			departmentName: ''
-        }
+			departmentName: '',
+			paymentStatus:''
+        },
+		  payment:''
       }
     },
     // reimbursementService: null,
@@ -746,7 +754,8 @@
           purchaseNo: '',
           tradeTotalPrice: '',
           purchaseId: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         }
         if (method === 'add') {
           this.title = `新建报销`
@@ -796,6 +805,11 @@
 				if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 					this.inputForm.reimbursementType = '0'
 				}
+				if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+					this.payment = '已付款'
+				}else {
+					this.payment = '未付款'
+				}
 				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
@@ -957,3 +971,10 @@
     }
   }
 </script>
+<style scoped>
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
+</style>

src/views/consultancy/reimbursement/info/InfoList.vue

@@ -111,6 +111,16 @@
       <!--<el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
         <el-input size="small" v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
       </el-form-item>-->
+		<el-form-item v-if="showHideItem" label="付款状态" prop="paymentStatus">
+			<el-select v-model="searchForm.paymentStatus" placeholder="请选择付款状态" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('payment_status')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
 
       <el-form-item>
         <el-button @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -139,6 +149,7 @@
           show-header-overflow
           show-overflow
           highlight-hover-row
+		  :tooltip-config="tooltipConfig"
           :menu-config="{}"
           :sort-config="{remote:true}"
           :export-config="{
@@ -195,7 +206,11 @@
               <el-button  @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
-
+			<vxe-column  min-width="100" title="付款状态" fixed="right" align="center" field="paymentStatus">
+				<template #default="scope">
+					<el-button  :type="$dictUtils.getDictLabel('payment_status_info', scope.row.paymentStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("payment_status", scope.row.paymentStatus, '未付款')}} </el-button>
+				</template>
+			</vxe-column>
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 				<!--				管理员修改-->
@@ -206,6 +221,9 @@
               <el-button 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')" 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>
+				<!--								付款-->
+				<el-button v-if="hasPermission('consultancy:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
+				<el-button v-if="hasPermission('consultancy:user:payment') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
 
             </template>
           </vxe-column>
@@ -272,7 +290,8 @@
           amounts: [],
           reportNumber: '',
           sourceType: '',
-			no:''
+			no:'',
+			paymentStatus:''
         },
         dataList: [],
         tablePage: {
@@ -286,6 +305,21 @@
 		  isDgsbxBmzr:false,
 		  isZjbry:false,
 		  isAdmin:false,
+		  tooltipConfig: {
+			  showAll: false,
+			  enterable: true,
+			  contentMethod: ({ type, column, row, items, _columnIndex }) => {
+				  const { field } = column
+				  // 重写默认的提示内容
+				  if (field === 'paymentStatus') {
+					  if (row.paymentStatus === '1') {
+						  return '付款时间:' + row.paymentTime;
+					  }
+				  }
+				  // 其余的单元格使用默认行为
+				  return null
+			  }
+		  }
       }
     },
     // reimbursementService: null,
@@ -831,6 +865,34 @@
 			console.log(user[0].name)
 			this.searchForm.reimBy=user[0].name
 		},
+		//付款
+		payment(row){
+			this.$confirm(`确定付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '1', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
+		//撤回付款
+		rePayment(row){
+			this.$confirm(`确定撤回付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '0', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
     }
   }
 </script>

src/views/consultancy/reimbursement/info/ReimbursementForm.vue

@@ -58,6 +58,13 @@
             </el-select>
           </el-form-item>
         </el-col>
+		  <el-col :span="12">
+			  <el-form-item v-if="hasPermission('consultancy:user:payment')" label="是否付款" prop="paymentStatus">
+				  <el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+				  <el-input v-else v-model = 'payment' :disabled="true"></el-input>
+			  </el-form-item>
+		  </el-col>
+
         <el-col :span="12" v-if="inputForm.sourceType === '5'">
           <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -797,7 +804,8 @@
 			procDefId: '',
 			procDefKey: '',
 			formTitle: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         },
         keyWatch: '',
         amountKey: '',
@@ -805,6 +813,7 @@
 		  isZj:false,
 		  isZjbry:false,
 		  isDgsbxBmzr:false,
+		  payment:''
       }
     },
 	  provide() {
@@ -909,7 +918,8 @@
           purchaseNo: '',
           tradeTotalPrice: '',
           purchaseId: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         }
         if (method === 'add') {
           this.title = `新建报销类型`
@@ -952,6 +962,11 @@
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 				  this.inputForm.reimbursementType = '0'
 			  }
+			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+				  this.payment = '已付款'
+			  }else {
+				  this.payment = '未付款'
+			  }
             this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -1451,7 +1466,8 @@
 			  this.dataFiltering()
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
-            this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
+			  this.inputForm.type = '2'
+			  this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
               if (this.commonJS.isNotEmpty(data)) {
 				  if (data === '所长报销审核人') {
 					  this.inputForm.type = '5'
@@ -2150,4 +2166,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/cw/reimbursementApproval/info/InfoForm.vue

@@ -63,6 +63,12 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="12">
+						<el-form-item v-if="hasPermission('cw:user:payment')" label="是否付款" prop="paymentStatus">
+							<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+							<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+						</el-form-item>
+					</el-col>
 					<el-col :span="12" v-if="inputForm.sourceType === '5'">
 						<el-form-item label="采购编号" prop="purchaseNo"
 									  :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -773,8 +779,10 @@
 					procDefId: '',
 					procDefKey: '',
 					formTitle: '',
-					departmentName: ''
-				}
+					departmentName: '',
+					paymentStatus:''
+				},
+				payment:''
 			}
 		},
 		reimbursementApprovalService: null,
@@ -813,7 +821,8 @@
 					purchaseNo: '',
 					tradeTotalPrice: '',
 					purchaseId: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				}
 				if (method === 'add') {
 					this.title = `新建报销`
@@ -834,6 +843,7 @@
 						this.loading = true
 						this.$refs.inputForm.resetFields()
 						this.reimbursementApprovalService.findById(this.inputForm.id).then((data) => {
+							console.log('data',data)
 							this.inputForm = this.recover(this.inputForm, data)
 							this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
 							this.$refs.uploadComponent.clearUpload()
@@ -863,6 +873,11 @@
 							if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 								this.inputForm.reimbursementType = '0'
 							}
+							if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+								this.payment = '已付款'
+							}else {
+								this.payment = '未付款'
+							}
 							this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
 							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 							this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
@@ -1019,3 +1034,10 @@
 		}
 	}
 </script>
+<style scoped>
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
+</style>

src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -110,6 +110,16 @@
 			<el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
 				<el-input v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
 			</el-form-item>
+			<el-form-item v-if="showHideItem" label="付款状态" prop="paymentStatus">
+				<el-select v-model="searchForm.paymentStatus" placeholder="请选择付款状态" clearable>
+					<el-option
+						v-for="item in $dictUtils.getDictList('payment_status')"
+						:key="item.value"
+						:label="item.label"
+						:value="item.value">
+					</el-option>
+				</el-select>
+			</el-form-item>
 
 			<el-form-item>
 				<el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -224,8 +234,8 @@
 								<!--              被驳回后当前申请人重新调整-->
 								<el-button v-if="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('cw:reimbursement:info:del') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
-								<el-button v-if="hasPermission('cw:reimbursement:info:del') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
+								<el-button v-if="hasPermission('cw:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
+								<el-button v-if="hasPermission('cw:user:payment') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
 							</div>
 						</template>
 					</vxe-column>
@@ -291,7 +301,8 @@
 					amounts: [],
 					reportNumber: '',
 					sourceType: '',
-					no:''
+					no:'',
+					paymentStatus:''
 				},
 				dataList: [],
 				tablePage: {
@@ -308,7 +319,7 @@
 				isSs:false,
 				isDgsbxBmzr:false,
 				tooltipConfig: {
-					showAll: true,
+					showAll: false,
 					enterable: true,
 					contentMethod: ({ type, column, row, items, _columnIndex }) => {
 						const { field } = column

src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -58,6 +58,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item v-if="hasPermission('cw:user:payment')" label="是否付款" prop="paymentStatus">
+						<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+						<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12" v-if="inputForm.sourceType === '5'">
 					<el-form-item label="采购编号" prop="purchaseNo"
 								  :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -920,7 +926,8 @@
 					procDefKey: '',
 					formTitle: '',
 					departmentName: '',
-					businessFlag: ''
+					businessFlag: '',
+					paymentStatus:''
 				},
 				keyWatch: '',
 				amountKey: '',
@@ -930,6 +937,7 @@
 				isDgsbxBmzr:false,
 				isZjbry:false,
 				isSs:false,
+				payment:''
 			}
 		},
 		provide() {
@@ -1044,7 +1052,8 @@
 					tradeTotalPrice: '',
 					purchaseId: '',
 					departmentName: '',
-					businessFlag: ''
+					businessFlag: '',
+					paymentStatus:''
 				}
 				if (method === 'add') {
 					this.title = `新建报销类型`
@@ -1087,6 +1096,11 @@
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 							this.inputForm.reimbursementType = '0'
 						}
+						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+							this.payment = '已付款'
+						}else {
+							this.payment = '未付款'
+						}
 						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -1667,6 +1681,7 @@
 								this.dataFiltering()
 								this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 								this.inputForm.files = this.$refs.uploadComponent.getDataList()
+								this.inputForm.type = '2'
 								this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
 									if (this.commonJS.isNotEmpty(data)) {
 										if (data === '所长报销审核人') {
@@ -2504,4 +2519,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/reimbursement/info/InfoList.vue

@@ -102,6 +102,16 @@
       <el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
         <el-input v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
       </el-form-item>
+		<el-form-item v-if="showHideItem" label="付款状态" prop="paymentStatus">
+			<el-select v-model="searchForm.paymentStatus" placeholder="请选择付款状态" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('payment_status')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
 
       <el-form-item>
         <el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -130,6 +140,7 @@
           show-header-overflow
           show-overflow
           highlight-hover-row
+		  :tooltip-config="tooltipConfig"
           :menu-config="{}"
           :sort-config="{remote:true}"
           :export-config="{
@@ -186,7 +197,11 @@
               <el-button @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark">{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
-
+			<vxe-column  min-width="100" title="付款状态" fixed="right" align="center" field="paymentStatus">
+				<template #default="scope">
+					<el-button  :type="$dictUtils.getDictLabel('payment_status_info', scope.row.paymentStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("payment_status", scope.row.paymentStatus, '未付款')}} </el-button>
+				</template>
+			</vxe-column>
           <vxe-column title="操作" min-width="130px" fixed="right" align="center">
             <template  #default="scope">
 <!--				管理员修改-->
@@ -197,7 +212,10 @@
               <el-button v-if="scope.row.type==='2' && checkIsAudit(scope.row)" text type="primary" @click="examine(scope.row)">审核</el-button>
               <el-button 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')" text type="primary" @click="del(scope.row.id)">删除</el-button>
-            </template>
+				<!--								付款-->
+				<el-button v-if="hasPermission('pg:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
+				<el-button v-if="hasPermission('pg:user:payment') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
+			</template>
           </vxe-column>
         </vxe-table>
 
@@ -259,7 +277,8 @@
           department: '',
           remiType: '',
           amounts: [],
-          reportNumber: ''
+          reportNumber: '',
+		  paymentStatus:''
         },
         dataList: [],
         tablePage: {
@@ -274,6 +293,21 @@
 		  isDgsbxBmzr:false,
 		  isAdmin: false,
 		  isKjsz:false,
+		  tooltipConfig: {
+			  showAll: false,
+			  enterable: true,
+			  contentMethod: ({ type, column, row, items, _columnIndex }) => {
+				  const { field } = column
+				  // 重写默认的提示内容
+				  if (field === 'paymentStatus') {
+					  if (row.paymentStatus === '1') {
+						  return '付款时间:' + row.paymentTime;
+					  }
+				  }
+				  // 其余的单元格使用默认行为
+				  return null
+			  }
+		  }
       }
     },
     reimbursementService: null,
@@ -842,6 +876,34 @@
 			console.log(user[0].name)
 			this.searchForm.reimBy=user[0].name
 		},
+		//付款
+		payment(row){
+			this.$confirm(`确定付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '1', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
+		//撤回付款
+		rePayment(row){
+			this.$confirm(`确定撤回付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '0', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
     }
   }
 </script>

src/views/reimbursement/info/InfoUpdateForm.vue

@@ -73,6 +73,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item v-if="hasPermission('pg:user:payment')" label="是否付款" prop="paymentStatus">
+						<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+						<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12" v-if="inputForm.sourceType === '5'">
 					<el-form-item label="采购编号" prop="purchaseNo"
 								  :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -886,14 +892,16 @@
 					procDefId: '',
 					procDefKey: '',
 					formTitle: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				},
 				keyWatch: '',
 				amountKey: '',
 				invoiceReimbursementKey: '',
 				isZj:false,
 				isZjbry:false,
-				infoHistory:false
+				infoHistory:false,
+				payment:''
 			}
 		},
 
@@ -1020,7 +1028,8 @@
 					purchaseNo: '',
 					tradeTotalPrice: '',
 					purchaseId: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				}
 				this.inputForm.id = id
 				this.visible = true
@@ -1058,6 +1067,11 @@
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 							this.inputForm.reimbursementType = '0'
 						}
+						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+							this.payment = '已付款'
+						}else {
+							this.payment = '未付款'
+						}
 						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -2328,4 +2342,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/reimbursement/info/ReimbursementForm.vue

@@ -62,6 +62,12 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12">
+					<el-form-item v-if="hasPermission('pg:user:payment')" label="是否付款" prop="paymentStatus">
+						<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+						<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12" v-if="inputForm.sourceType === '5'">
 					<el-form-item label="采购编号" prop="purchaseNo"
 								  :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -865,7 +871,8 @@
 					procDefId: '',
 					procDefKey: '',
 					formTitle: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				},
 				keyWatch: '',
 				amountKey: '',
@@ -874,6 +881,7 @@
 				isDgsbxBmzr:false,
 				isZjbry:false,
 				isKjsz:false,
+				payment:''
 			}
 		},
 
@@ -998,7 +1006,8 @@
 					purchaseNo: '',
 					tradeTotalPrice: '',
 					purchaseId: '',
-					departmentName: ''
+					departmentName: '',
+					paymentStatus:''
 				}
 				this.inputForm.id = id
 				this.visible = true
@@ -1036,6 +1045,11 @@
 						if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 							this.inputForm.reimbursementType = '0'
 						}
+						if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+							this.payment = '已付款'
+						}else {
+							this.payment = '未付款'
+						}
 						this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement_ping_gu',300,'电子发票附件')
 						this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement_ping_gu')
 						if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -1552,6 +1566,7 @@
 								this.dataFiltering()
 								this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 								this.inputForm.files = this.$refs.uploadComponent.getDataList()
+								this.inputForm.type = '2'
 								taskService.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
 									if (this.commonJS.isNotEmpty(data)) {
 										if (data === '所长报销审核人') {
@@ -2296,4 +2311,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>

src/views/zs/reimbursement/info/InfoForm.vue

@@ -62,6 +62,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col :span="12">
+				<el-form-item v-if="hasPermission('zs:user:payment')" label="是否付款" prop="paymentStatus">
+					<el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+					<el-input v-else v-model = 'payment' :disabled="true"></el-input>
+				</el-form-item>
+			</el-col>
           <el-col :span="12" v-if="inputForm.sourceType === '5'">
             <el-form-item label="采购编号" prop="purchaseNo"
                           :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -703,8 +709,10 @@
 			procDefId: '',
 			procDefKey: '',
 			formTitle: '',
-			departmentName: ''
-        }
+			departmentName: '',
+			paymentStatus:''
+        },
+		  payment:''
       }
     },
     // reimbursementService: null,
@@ -746,7 +754,8 @@
           purchaseNo: '',
           tradeTotalPrice: '',
           purchaseId: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         }
         if (method === 'add') {
           this.title = `新建报销`
@@ -796,6 +805,11 @@
 				if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 					this.inputForm.reimbursementType = '0'
 				}
+				if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+					this.payment = '已付款'
+				}else {
+					this.payment = '未付款'
+				}
 				this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
 				this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
@@ -957,3 +971,10 @@
     }
   }
 </script>
+<style scoped>
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
+</style>

src/views/zs/reimbursement/info/InfoList.vue

@@ -108,6 +108,16 @@
 					 @changeto="(val) => {searchForm.amounts[1] = val}"
 		></InputNumber>
       </el-form-item>
+		<el-form-item v-if="showHideItem" label="付款状态" prop="paymentStatus">
+			<el-select v-model="searchForm.paymentStatus" placeholder="请选择付款状态" clearable>
+				<el-option
+					v-for="item in $dictUtils.getDictList('payment_status')"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
       <!--<el-form-item v-if="showHideItem" label="报告号" prop="reportNumber">
         <el-input size="small" v-model="searchForm.reportNumber" placeholder="请输入报告号" clearable></el-input>
       </el-form-item>-->
@@ -139,6 +149,7 @@
           show-header-overflow
           show-overflow
           highlight-hover-row
+		  :tooltip-config="tooltipConfig"
           :menu-config="{}"
           :sort-config="{remote:true}"
           :export-config="{
@@ -195,7 +206,11 @@
               <el-button  @click="detail(scope.row)" :type="$dictUtils.getDictLabel('status_info', scope.row.type, '')" effect="dark" >{{$dictUtils.getDictLabel("status", scope.row.type, '未开始')}} </el-button>
             </template>
           </vxe-column>
-
+			<vxe-column  min-width="100" title="付款状态" fixed="right" align="center" field="paymentStatus">
+				<template #default="scope">
+					<el-button  :type="$dictUtils.getDictLabel('payment_status_info', scope.row.paymentStatus, '')" effect="dark" >{{$dictUtils.getDictLabel("payment_status", scope.row.paymentStatus, '未付款')}} </el-button>
+				</template>
+			</vxe-column>
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  #default="scope">
 				<!--				管理员修改-->
@@ -206,8 +221,11 @@
               <el-button 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')" 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>
+				<!--								付款-->
+				<el-button v-if="hasPermission('zs:user:payment') && scope.row.paymentStatus !== '1'" text type="primary"  @click="payment(scope.row)">付款</el-button>
+				<el-button v-if="hasPermission('zs:user:payment') && scope.row.paymentStatus === '1'" text type="primary"  @click="rePayment(scope.row)">撤回付款</el-button>
 
-            </template>
+			</template>
           </vxe-column>
         </vxe-table>
         <vxe-pager
@@ -272,7 +290,8 @@
           amounts: [],
           reportNumber: '',
           sourceType: '',
-			no:''
+			no:'',
+			paymentStatus:''
         },
         dataList: [],
         tablePage: {
@@ -286,6 +305,21 @@
 		  isDgsbxBmzr:false,
 		  isZjbry:false,
 		  isAdmin: false,
+		  tooltipConfig: {
+			  showAll: false,
+			  enterable: true,
+			  contentMethod: ({ type, column, row, items, _columnIndex }) => {
+				  const { field } = column
+				  // 重写默认的提示内容
+				  if (field === 'paymentStatus') {
+					  if (row.paymentStatus === '1') {
+						  return '付款时间:' + row.paymentTime;
+					  }
+				  }
+				  // 其余的单元格使用默认行为
+				  return null
+			  }
+		  }
       }
     },
     // reimbursementService: null,
@@ -832,6 +866,34 @@
 			console.log(user[0].name)
 			this.searchForm.reimBy=user[0].name
 		},
+		//付款
+		payment(row){
+			this.$confirm(`确定付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '1', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
+		//撤回付款
+		rePayment(row){
+			this.$confirm(`确定撤回付款吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				let param = {paymentStatus: '0', id: row.id}
+				this.reimbursementService.updatePaymentStatus(param).then((data)=>{
+					this.$message.success(data)
+					this.refreshList()
+				})
+			})
+		},
     }
   }
 </script>

src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -58,6 +58,12 @@
             </el-select>
           </el-form-item>
         </el-col>
+		  <el-col :span="12">
+			  <el-form-item v-if="hasPermission('zs:user:payment')" label="是否付款" prop="paymentStatus">
+				  <el-input v-if="inputForm.paymentStatus === '1'" :disabled="true" v-model = 'payment' class="bold-red"></el-input>
+				  <el-input v-else v-model = 'payment' :disabled="true"></el-input>
+			  </el-form-item>
+		  </el-col>
         <el-col :span="12" v-if="inputForm.sourceType === '5'">
           <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[{required: true, message:'采购编号不能为空', trigger:'blur'},
@@ -797,7 +803,8 @@
 			procDefId: '',
 			procDefKey: '',
 			formTitle: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         },
         keyWatch: '',
         amountKey: '',
@@ -805,6 +812,7 @@
 		  isZj:false,
 		  isZjbry:false,
 		  isDgsbxBmzr:false,
+		  payment:''
       }
     },
 	  provide() {
@@ -909,7 +917,8 @@
           purchaseNo: '',
           tradeTotalPrice: '',
           purchaseId: '',
-          departmentName: ''
+          departmentName: '',
+			paymentStatus:''
         }
         if (method === 'add') {
           this.title = `新建报销类型`
@@ -952,6 +961,11 @@
 			  if (this.commonJS.isEmpty(this.inputForm.reimbursementType)) {
 				  this.inputForm.reimbursementType = '0'
 			  }
+			  if (this.commonJS.isNotEmpty(this.inputForm.paymentStatus) && this.inputForm.paymentStatus === '1'){
+				  this.payment = '已付款'
+			  }else {
+				  this.payment = '未付款'
+			  }
             this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, this.inputForm.invoiceReimbursementFiles, 'reimbursement',300,'电子发票附件')
             this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
             if (this.commonJS.isNotEmpty(this.inputForm.purchaseId)) {
@@ -1451,6 +1465,7 @@
 			  this.dataFiltering()
 			  this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			  this.inputForm.files = this.$refs.uploadComponent.getDataList()
+			  this.inputForm.type = '2'
             this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
               if (this.commonJS.isNotEmpty(data)) {
 				  if (data === '所长报销审核人') {
@@ -2150,4 +2165,9 @@
 	/deep/ .el-input-number .el-input__inner {
 		text-align: left;
 	}
+	.bold-red >>> .el-input__inner {
+		-webkit-text-fill-color: #ff0000 !important;
+		font-weight: bolder;
+		text-align: left;
+	}
 </style>