Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/reimbursement/request_funds.vue

@@ -22,14 +22,14 @@
 					</view>
 				</view>
 			</view>
-			<view class="c-row" v-if="detailData.purpose == '库点费用'&&reType == 2">
+			<!-- <view class="c-row" v-if="detailData.purpose == '库点费用'&&reType == 2">
 				<view class="title">仓储费</view>
 				<view class="con-list">
 					<view @click='show3=true'>{{detailData.flag}}
 						<u-icon name="arrow-right" color=""></u-icon>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<u-picker :range="typeList1" range-key="value" @confirm='typeCheck1($event)' v-model="show3"
 				mode="selector">
 			</u-picker>
@@ -159,7 +159,7 @@
 				show2: false,
 				showWare: false,
 				detailData: {
-					flag: '否',
+					// flag: '否',
 					purpose: '库点费用',
 					remark: "",
 					wareExpenseType: '杂费',
@@ -173,6 +173,7 @@
 					identification: '1',
 					costType: '3',
 					agent: '',
+					storageFeeFlag:'',
 					totalDistribution: '0',
 				},
 				fileList1: [],
@@ -226,6 +227,9 @@
 					{
 						value: "加油费"
 					},
+					{
+						value: "仓储费"
+					},
 				],
 				namelist: [{
 						name: "黑龙江中天昊元贸易有限公司"
@@ -316,6 +320,8 @@
 			}
 		},
 		onLoad(options) {
+			this.detailData.payerHeader = uni.getStorageSync('compName1').company
+			this.$forceUpdate()
 			this.reType = options.reType
 			this.expensesType = options.expensesType
 			if (this.reType == 2 || this.expensesType == 2) {
@@ -331,8 +337,6 @@
 			}
 		},
 		onShow() {
-			this.detailData.payerHeader = uni.getStorageSync('compName1').company
-			this.$forceUpdate()
 			this.warehouseInfo = uni.getStorageSync('theWarehouse');
 			if (this.warehouseInfo && this.detailData.purpose == "库点费用") {
 				this.detailData.warehouseName = this.warehouseInfo.warehouseName
@@ -509,6 +513,10 @@
 					this.$api.msg('金额不能为空')
 					return
 				}
+				if (this.detailData.amountMoney < 0.01 || this.detailData.amountMoney > 100000000) {
+				    this.$api.msg('金额输入错误')
+				    return
+				}
 				var that = this
 				var title
 				var theInterface
@@ -531,12 +539,15 @@
 						if (res.confirm) {
 							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 							that.detailData.agent = uni.getStorageSync('userInfo').userName
-							that.detailData.identification = that.detailData.identification
-							that.detailData.paymentIdentifi = that.detailData.paymentIdentifi
-							that.detailData.costType = that.detailData.costType
+							// that.detailData.identification = that.detailData.identification
+							// that.detailData.paymentIdentifi = that.detailData.paymentIdentifi
+							// that.detailData.costType = that.detailData.costType
 							that.detailData.expensesType = that.reType
 							that.detailData.fieldName = uni.getStorageSync('userInfo').userName
-							that.detailData.totalDistribution = that.detailData.totalDistribution
+							// that.detailData.totalDistribution = that.detailData.totalDistribution
+							if(that.detailData.wareExpenseType == '仓储费'){
+								that.detailData.storageFeeFlag = 1
+							}
 							if (that.imglist.length > 0) {
 								that.detailData.addressUrl = that.imglist.toString()
 							}

pages/task/audit/charge_against_revenue_detail.vue

@@ -576,7 +576,7 @@
 							}
 							console.log(response.data.data)
 							this.auditList = response.data.data
-							var time2=new Date(this.auditList[0].createDate).getTime()
+							var time2=new Date(this.auditInfo.createDate).getTime()
 							var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 							this.auditList.unshift({
 								operatorTitle:this.auditInfo.creater.substring(0,2),