Merge branch 'yh281' into debug

README.md

@@ -3,4 +3,4 @@
 	1. ui使用vant 未全部引入 按需在page.json中配置
 	2. utils/config 中为项目配置
 	3. master分支为线上分支、debug为测试分支
-	4. 小程序审核账号：shenhe----123456
+	4. 小程序审核账号：shenhe----hongze123.

pages-approve/businessTrip/add.vue

@@ -54,6 +54,18 @@
                 <input v-model="formData.otherVehicle" style="width:100%;height:100%" type="text" placeholder="请输入交通工具">
             </view>
         </view>
+        <view class="form-item itinerary-form">
+            <view class="label">行程说明</view>
+            <view class="content">
+                <textarea
+                    maxlength="-1"
+                    style="width:100%" 
+                    v-model="formData.Itinerary" 
+                    placeholder="请输入行程说明" 
+                    auto-height
+                />
+            </view>
+        </view>
 
         <view class="partner-box" style="margin-top:20rpx">
             <view class="form-item" v-for="(item,index) in formData.partner" :key="item.AdminId">
@@ -149,7 +161,8 @@ export default {
                 reason:'',
                 vehicle:'',
                 otherVehicle:'',
-                partner:[]
+                partner:[],
+                Itinerary:''
             },
             areaList,
             showDestination:false,
@@ -198,7 +211,8 @@ export default {
                 Reason:this.formData.reason,
                 Transportation:this.formData.otherVehicle?`${this.formData.vehicle}-${this.formData.otherVehicle}`:this.formData.vehicle,
                 PeerPeopleId:pids.join(','),
-                PeerPeopleName:pnames.join(',')
+                PeerPeopleName:pnames.join(','),
+                Itinerary:this.formData.Itinerary
             }
             if(!params.ArriveDate){
                 uni.showToast({
@@ -235,6 +249,13 @@ export default {
                 })
                 return
             }
+            if(!params.Itinerary){
+                uni.showToast({
+                    title:'请输入行程说明',
+                    icon:'none'
+                })
+                return
+            }
 
             const res=this.id?await apiEditApply({...params,BusinessApplyId:Number(this.id)}):await apiAddApply(params)
             if(res.code===200){
@@ -324,6 +345,7 @@ export default {
                     this.formData.backDate=res.data.ReturnDate
                     this.formData.destination=[res.data.Province,res.data.City]
                     this.formData.reason=res.data.Reason
+                    this.formData.Itinerary=res.data.Itinerary
                     this.formData.vehicle=res.data.Transportation.split('-')[0]
                     this.formData.otherVehicle=res.data.Transportation.split('-')[1]?res.data.Transportation.split('-')[1]:''
                     if(res.data.PeerPeopleName){
@@ -448,5 +470,8 @@ export default {
             border: 1px solid #3385FF;
 		}
 	}
+    .itinerary-form{
+        align-items: flex-start;
+    }
 }
 </style>

pages-approve/businessTrip/detail.vue

@@ -45,6 +45,12 @@
                     <text>{{info.Transportation.indexOf('其他')!=-1?info.Transportation.split('-')[1]:info.Transportation}}</text>
                 </view>
             </view>
+            <view class="info-item">
+                <view class="label">行程说明</view>
+                <view class="content">
+                    <text>{{info.Itinerary}}</text>
+                </view>
+            </view>
             <view class="info-item" v-if="info.PeerPeopleName">
                 <view class="label">同行人</view>
                 <view class="content">