修改报销

pages/reimbursement/get_request_funds.vue

@@ -108,12 +108,12 @@
 			},
 			//获取信息
 			getList() {
-				this.$api.doRequest('get', '/expenseInfo/getInfo', {
+				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
 					id: this.id,
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.detailData = res.data.data
-						this.imglist= this.detailData.addressUrl.split(',')
+						this.imglist = this.detailData.addressUrl.split(',')
 					}
 				})
 			},

pages/reimbursement/request_funds.vue

@@ -280,9 +280,14 @@
 							if (that.imglist.length > 0) {
 								that.detailData.addressUrl = that.imglist.toString()
 							}
+							uni.showLoading({
+								title: "加载中",
+								mask: true
+							})
 							that.$api.doRequest('post', theInterface, that.detailData)
 								.then(res => {
 									if (res.data.code == 200) {
+										uni.hideLoading()
 										that.$api.msg('提交成功')
 										uni.navigateTo({
 											url: '/pages/reimbursement/the_reimbursement'
@@ -297,7 +302,7 @@
 			},
 			//获取信息
 			getRequest() {
-				this.$api.doRequest('get', '/expenseInfo/getInfo', {
+				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
 					id: this.id,
 				}).then(res => {
 					if (res.data.code == 200) {

pages/reimbursement/selectWarehouse.vue

@@ -28,21 +28,21 @@
 </template>
 
 <script>
-	import helper from '@/common/helper.js'; 
+	import helper from '@/common/helper.js';
 	export default {
 		data() {
 			return {
 				inputKeyword: '',
 				newList: [],
-				newSelectList:[],
+				newSelectList: [],
 				filterNewList: [],
-				moreList:[],
+				moreList: [],
 				compId: '',
-				warehouseType:"",
+				warehouseType: "",
 			}
 		},
 		onShow() {
-			this.newSelectList =  uni.getStorageSync('theWarehouseList');
+			this.newSelectList = uni.getStorageSync('theWarehouseList');
 		},
 		onLoad(options) {
 			this.warehouseType = options.warehouseType
@@ -59,19 +59,19 @@
 			}
 		},
 		methods: {
-			confirm(item){
+			confirm(item) {
 				let _list = uni.getStorageSync('theWarehouseList');
-				if(_list==''){
-					_list=[]
+				if (_list == '') {
+					_list = []
 				}
-				if(_list.length<=20){
+				if (_list.length <= 20) {
 					_list = _list.filter(function(val) {
-						if (val.warehouseName!=item.warehouseName) {
+						if (val.warehouseName != item.warehouseName) {
 							return val
 						}
 					})
 					_list.unshift(item)
-				}else{
+				} else {
 					_list.unshift(item).pop(item)
 				}
 				uni.setStorageSync('theWarehouseList', _list);
@@ -81,15 +81,20 @@
 				})
 			},
 			getWarehouse() {
+				uni.showLoading({
+					title: '查询仓库',
+					mask: true
+				})
 				var that = this
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
 					compId: uni.getStorageSync("pcUserInfo").compId,
 					warehouseType: '1'
 				}).then(res => {
+					uni.hideLoading()
 					if (res.data.data.length != 0) {
 						that.newList = res.data.data
 						that.moreList = res.data.data
-						
+
 					}
 				})
 			},

pages/reimbursement/the_reimbursement.vue

@@ -38,8 +38,10 @@
 				<view style="display: flex;justify-content: flex-end;margin-top: 30rpx;">
 					<!-- v-if="item.status == '已驳回'" -->
 					<!-- v-if="item.status == '已驳回'" -->
-					<view class="wenzi1 audit" @click="deleExpense(item)">删除</view>
-					<view class="wenzi1 audit" @click="requestFunds(3,item)">编辑</view>
+					<view class="wenzi1 audit" @click="deleExpense(item)"
+						v-if="!item.approveStatus||item.status=='已完成'">删除</view>
+					<view class="wenzi1 audit" @click="requestFunds(3,item)"
+						v-if="item.approveStatus=='待内勤审核'&&item.status!='已完成'&&item.status!='已付款'">编辑</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
 			</view>