From 616d744db19c6f85c834252fa4eeb1dd59d12fc7 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 8 Jul 2022 10:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B9=E7=94=A8=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui-finmanage-ui/src/main.js | 8 ++++++-
.../feiyongshenqing/expense.vue | 2 +-
.../feiyongshenqing/expenseAdd.vue | 6 +++++
.../feiyongguanli/chooseVinNo.vue | 2 +-
.../feiyongguanli/feiyongDaiBanInfo.vue | 22 +++++++++++++++++--
.../feiyongguanli/feiyongEdit.vue | 7 +++++-
.../feiyongguanli/feiyongYiBanInfo.vue | 11 +++++++++-
7 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/main.js b/anrui-buscenter/anrui-finmanage-ui/src/main.js
index 3209d60a88..cbb824e2db 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/main.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/main.js
@@ -77,7 +77,10 @@ function getUserInfo() {
userSid: data.sid,
orgSid: data.organizationSid, // 单位sid
Orgname: data.organizationName,
- dwjb: data.dwjb
+ dwjb: data.dwjb,
+ orgNamePath: data.orgNamePath, // 使用组织全路径名称
+ orgSidPath: data.orgSidPath, // 使用组织全路径Sid
+ pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
}
// 结果存入缓存
window.sessionStorage.setItem('staffSid', user.staffSid)
@@ -89,6 +92,9 @@ function getUserInfo() {
window.sessionStorage.setItem('user', user)
window.sessionStorage.setItem('departmentName', user.departmentName)
window.sessionStorage.setItem('departmentSid', user.departmentSid)
+ window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
+ window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
+ window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
new Vue({
el: '#app',
router,
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue
index f692ee5d90..d4647923af 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue
@@ -263,7 +263,7 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
- this.list.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue
index ef78913d02..1b368ad2df 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue
@@ -282,6 +282,11 @@ export default {
})
},
submitVehicleApply() {
+ if (!this.checked) {
+ this.formobj.isVeh = 0
+ } else {
+ this.formobj.isVeh = 1
+ }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
@@ -309,6 +314,7 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {}
+ this.checked = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/chooseVinNo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/chooseVinNo.vue
index 700abb8ea6..d5b1243968 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/chooseVinNo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/chooseVinNo.vue
@@ -8,7 +8,7 @@