gjy 2 년 전
부모
커밋
27d26424b4

+ 2 - 2
config/index.js

@@ -5,8 +5,8 @@ const dev = {
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
-	baseUrlNew: 'http://192.168.110.67:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.67:9888/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',

+ 1 - 1
pages/task/audit/Issueandreceipt_task_details.vue

@@ -469,7 +469,7 @@
 												response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
 												if (response.data.data[i]
 													.workflowHistoricTasks[len].auditMind
-												) {
+												&&response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##")!=-1) {
 													response.data.data[i].auditMind =
 														response.data.data[i]
 														.workflowHistoricTasks[len]

+ 1 - 1
pages/task/audit/freight_settlement_approvalcopy.vue

@@ -46,7 +46,7 @@
 					<view class="top_info">{{dataobj.remark}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
-					<view>合计</view>
+					<view>合计(元)</view>
 					<view class="top_info">{{num}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">

+ 1 - 1
pages/task/audit/freight_settlement_detailscopy.vue

@@ -46,7 +46,7 @@
 					<view class="top_info">{{dataobj.remark}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
-					<view>合计</view>
+					<view>合计(元)</view>
 					<view class="top_info">{{num}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">

+ 1 - 1
pages/task/audit/universalityAudit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style='margin-bottom:280rpx;'>
+	<view style='padding-bottom:280rpx;'>
 		<view class="topInfo">
 			<view class="topInfo-item">
 				<view class="flex info">

+ 4 - 1
pages/universalityAudit/addaduit.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class='container'>
 		<view>
 			<u-form :model="dataobj" ref="uForm">
 				<u-form-item class='typeform'  :border-bottom='false' label="类型"><view style='color:#000;width:100%;text-align:right;' @click='typeselect'>{{dataobj.businessType?dataobj.businessType+" >":'请选择类型 >'}}</view></u-form-item>
@@ -193,6 +193,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.container{
+		padding-bottom: 20rpx;
+	}
 page {
 		background: #F5F6FA;
 	}