Merge branch 'yb_back5.9' into debug

pages-approve/activity/list.vue

@@ -75,10 +75,21 @@
 								<view class="info" v-if="item.MatterContent">事项内容：{{item.MatterContent}} </view>
 								
 								<view class="info">添加时间：{{item.CreateTime|formatTime}}</view>
+								<view class="info" v-if="item.EditReason" style="display: flex;">
+									<view>最近修改记录：</view> 
+									<view>
+										<view>{{item.EditReason}}</view>
+										<view style="color: #999;">{{item.ModifyTime|formatTime}}</view>
+									</view>	
+								</view>
 								
-								<view class="bot-btns" v-if="haveActiyityStart(item)">
-										<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'del')">删除</van-button>
-										<van-button type="primary" color="#3385FF" class="btn" size="small" block round @click.stop="handleAction(item,'edit')">修改</van-button>
+								<view class="bot-btns">
+										<van-button type="primary" plain color="#3385FF" class="btn" size="small" block round 
+											v-if="!item.ButtonAuth.RemoveDisabled"
+											@click.stop="handleAction(item,'del')">删除</van-button>
+										<van-button type="primary" color="#3385FF" class="btn" size="small" block round 
+											v-if="!item.ButtonAuth.EditDisabled"
+											@click.stop="handleAction(item,'edit')">修改</van-button>
 								</view>
 						</view>
 				</view>
@@ -337,8 +348,8 @@
 
 				.info {
 					margin-bottom: 16rpx;
-					text-indent: -140rpx;
-					margin-left: 140rpx;
+					/* text-indent: -140rpx;
+					margin-left: 140rpx; */
 				}
 
 				.info:last-child {

pages-roadshow/addMatter/index.vue

@@ -33,6 +33,17 @@
 				placeholder="请输入事项内容" 
 				@change="bindInputHandle('matterContent',$event)"
 			/>
+			<van-field
+				v-if="edit_matter_id"
+				:value="formData.EditReason"
+				clickable
+				label="修改原因" 
+				type="textarea" 
+				rows="1" 
+				autosize 
+				placeholder="请输入修改原因" 
+				@change="bindInputHandle('EditReason',$event)"
+			/>
 		</van-form>
 
 		<div class="submit-bot">
@@ -78,6 +89,7 @@
 					startTime: '',
 					endTime: '',
 					matterContent: "",
+					EditReason:''
 				},
 				weekMap: new Map([
 					['1','周一'],
@@ -114,12 +126,13 @@
 					StartWeek: moment(this.formData.startTime
 					).format('ddd'),
 					EndWeek: moment(this.formData.endTime
-					).format('ddd')
+					).format('ddd'),
 				}
 	
 				// 发送请求
 				const { code } = this.edit_matter_id ? await editMatter({
 					RsMattersId: Number(this.edit_matter_id),
+					EditReason:this.formData.EditReason,
 					...params
 				}) : await addMatter(params);
 	
@@ -198,13 +211,13 @@
 				this.formData = {
 					startTime: startTime,
 					endTime: endTime,
-					matterContent: ''
+					matterContent: '',
 				};
 				
 				/* 编辑时回显表单 */
 				if(options.edit_matter_id) {
 					const { form,edit_matter_id } = options;
-					this.formData = {...this.formData,...JSON.parse(form)};
+					this.formData = {...this.formData,...JSON.parse(form),EditReason:''};
 					this.edit_matter_id = Number(edit_matter_id);
 				}
 				// console.log(this.formData)

pages-roadshow/myCalendar/index.vue

@@ -15,7 +15,8 @@
 			linkUrl() {
 				const token = uni.getStorageSync('token');
 				const { RoleTypeCode } = JSON.parse(uni.getStorageSync('userInfo'));
-				return `${linkRoadshowUrl}/roadshow/mine?token=${token}&role=${RoleTypeCode}`;
+				//return `${linkRoadshowUrl}/roadshow/mine?token=${token}&role=${RoleTypeCode}`;
+                return `http://192.168.77.31:3000/xcx_h5/ssbg/roadshow/mine?token=${token}&role=${RoleTypeCode}`;
 			}
 		}
 	}

pages-roadshow/sellerCalendar/index.vue

@@ -0,0 +1,26 @@
+<template>
+	<view>
+		<web-view :src="linkUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	import { linkRoadshowUrl } from '@/utils/config.js';
+	export default {
+		data() {
+			return {
+			};
+			
+		},
+		computed: {
+			linkUrl() {
+				const token = uni.getStorageSync('token');
+				return `${linkRoadshowUrl}/roadshow/seller?token=${token}`;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages.json

@@ -188,6 +188,12 @@
 				  "navigationBarTitleText": "研究员日历"
 				}
 			 },
+			{
+				"path": "sellerCalendar/index",
+				"style": {
+				  "navigationBarTitleText": "销售员日历"
+				}
+			 },
 			 {
 				"path": "myCalendar/index",
 				"style": {

pages/workbench/index.vue

@@ -44,6 +44,11 @@
 					{
 						label: '路演管理',
 						child: [
+							{
+								label: '销售员日历',
+								url: '/pages-roadshow/sellerCalendar/index',
+								img: require('@/static/icon-8.png')
+							},
 							{
 								label: '研究员日历',
 								url: '/pages-roadshow/researcherCalendar/index',