13.9bug修复

src/views/dataReport_manage/components/noRenewalReasonDia/addRemark.vue

@@ -8,7 +8,7 @@
     <div class="dialog-box">
       <el-form :model="remarkForm" ref="remarkFormRef">
         <el-form-item prop="text" :rules="{required:true,message:'备注不能为空',trigger:'blur'}">
-          <el-input v-model="remarkForm.text" placeholder="请输入备注信息" type="textarea"
+          <el-input v-model.trim="remarkForm.text" placeholder="请输入备注信息" type="textarea"
           style="width: 505px;" :rows="9"></el-input>
         </el-form-item>
       </el-form>
@@ -35,6 +35,14 @@
         }
       }
     },
+    watch:{
+      isShow(value){
+        if(value){
+          this.remarkForm.text=""
+          this.$refs.remarkFormRef && this.$refs.remarkFormRef.clearValidate()
+        }
+      }
+    },
     methods: {
       save(){
         this.$refs.remarkFormRef.validate(valid=>{

src/views/dataReport_manage/incrementalList.vue

@@ -279,7 +279,7 @@ export default {
 				DataType: this.filterObj.data_type == '新增试用客户' ? '新增试用' : this.filterObj.data_type,
 				Keyword:this.searchVal,
 				IsExport:true,
-				IsConfirm:this.filterObj.data_type=='未续约客户'?this.isNotRenewedConfirm:-1,
+				IsConfirm:this.filterObj.data_type=='未续约客户'?1:-1,
 				CompanyAscribeId:this.noRenewalReasonId
 			};
 			for (let key in obj) {
@@ -456,6 +456,7 @@ export default {
 			this.getTableData()
 		},
 		notRenewedConfirmChange(){
+			this.tabsActiveName = '试用'
 			this.noRenewalReasonId=''
 			this.page_no = 1;
 			this.getTableData()
@@ -480,7 +481,7 @@ export default {
 				EndDate: this.end_date,
 				StartDate: this.start_date,
 				DataType: this.filterObj.data_type == '新增试用客户' ? '新增试用' : this.filterObj.data_type,
-				TryOutType:this.filterObj.data_type=='未续约客户'? this.tabsActiveName : '',
+				TryOutType:this.filterObj.data_type=='未续约客户' && this.isNotRenewedConfirm==1? this.tabsActiveName : '',
 				IsConfirm:this.filterObj.data_type=='未续约客户'?this.isNotRenewedConfirm:-1,
 				CompanyAscribeId:this.noRenewalReasonId
 			}
@@ -604,6 +605,7 @@ export default {
 			dataMainInterface.addNotRenewedRemark(params).then(res=>{
 				if(res.Ret == 200){
 					this.$message.success("添加成功")
+					this.getTableData()
 					this.isAddRemarkShow=false
 					this.selectItemRow={}
 				}

src/views/dataReport_manage/stockCutomList.vue

@@ -390,7 +390,7 @@ export default {
 				DataType: this.filterObj.data_type,
 				Keyword:this.searchVal,
 				TryOutType:this.filterObj.data_type=='未续约客户'? this.tabsActiveName : '',
-				IsConfirm:this.filterObj.data_type=='未续约客户'?1:-1,
+				IsConfirm:-1,
 				CompanyAscribeId:this.noRenewalReasonId,
 			}
 			dataMainInterface.stackList(params).then(res => {