Merge branch 'master' into cygx_crm_14.4.1

src/views/custom_manage/compontents/Ctimeline.vue

@@ -17,7 +17,7 @@
 					<span v-if="activity.Operation=='freeze'&&activity.ApproveContent" class="freeze-text" @click="showFreeze(activity)">冻结理由</span>
 					<span v-if="(specialOperationList.includes(activity.Operation))&&activity.ApproveContent" @click="showRemark(activity)" class="freeze-text">未续约说明</span>
 					<!-- <span v-if="activity.Operation=='try_out'&&!isHasTryOutRenewalReason" class="freeze-text" @click="showAddRemark(activity)">添加说明</span> -->
-					<span v-if="isShowBtn&&index==firstTryOutIdx" class="freeze-text" @click="showAddRemark(activity)">添加未续约说明</span>
+					<span v-if="activity.Remark=='正式转试用'" class="freeze-text" @click="showAddRemark(activity)">添加未续约说明</span>
 					<span v-if="activity.Operation==='close'&&activity.ApproveContent" @click="showCloseRemark(activity)" class="freeze-text">关闭理由</span>
 				</el-timeline-item>
 			</el-timeline>
@@ -177,6 +177,7 @@ export default {
 		},
 		// 显示添加说明弹窗
 		showAddRemark(e){
+			console.log(e);
 			this.activeActivity=e
 			this.isShowAddDia=true
 		},

src/views/dataReport_manage/components/abnormalRenewalChart.vue

@@ -34,7 +34,7 @@ export default {
         }
     },
     created() {
-        this.date=[this.$moment().format('YYYY-01'),this.$moment().format('YYYY-MM')]
+        this.date=[this.$moment().format('2023-01'),this.$moment().format('YYYY-MM')]
     },
     mounted() {
         this.getData()