bding 2 місяців тому
батько
коміт
d77e8c10da

+ 4 - 4
src/components/historicalNotesDlg.vue

@@ -8,10 +8,10 @@
       </div>
       <div>
         <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" border height="400">
-          <el-table-column align="center" prop="Content" label="记录内容" width="180"> </el-table-column>
-          <el-table-column align="center" prop="RemarkType" label="备注类型"> </el-table-column>
-          <el-table-column align="center" prop="SysAdminName" label="创建人"> </el-table-column>
-          <el-table-column align="center" prop="CreateTime" label="创建时间" width="200"> </el-table-column>
+          <el-table-column align="center" prop="Content" label="记录内容" > </el-table-column>
+          <el-table-column align="center" prop="RemarkType" label="备注类型" width="180"> </el-table-column>
+          <el-table-column align="center" prop="SysAdminName" label="创建人" width="100"> </el-table-column>
+          <el-table-column align="center" prop="CreateTime" label="创建时间" width="180"> </el-table-column>
         </el-table>
       </div>
     </el-dialog>

+ 19 - 3
src/views/custom_manage/customList/customShareList.vue

@@ -83,12 +83,12 @@
 								v-if="scope.row.IsSuspend ===1 || scope.row.Status=='潜在'"
 								@click="goDetail(scope.row)"
 								class="mouse-enter"
-								:class="{'color-red':(scope.row.Status.includes('正式')&&scope.row.WeekViewActive===0) || scope.row.IsUserMaker==0}"
+								:class="{'color-red':(scope.row.Status.includes('正式')&&scope.row.WeekViewActive===0) || scope.row.IsUserMaker== 0}"
 								:style="scope.row.Status=='潜在'?'':'color:#bbb;cursor:pointer'">
 									{{scope.row.CompanyName}}
 								</span>
 								<span v-else style="color:#409EFF;cursor:pointer;" @click="goDetail(scope.row)" class="customName"
-								:class="{'isShared':scope.row.IsShared,'color-red':(scope.row.Status.includes('正式')&&scope.row.WeekViewActive===0) || scope.row.IsUserMaker==0}">{{scope.row.CompanyName}}
+								:class="{'isShared':scope.row.IsShared,'color-red':(scope.row.Status.includes('正式')&&scope.row.WeekViewActive===0) || scope.row.IsUserMaker== 0}">{{scope.row.CompanyName}}
 								</span>
 							</el-tooltip>
 							 <img width="15" src="../../../assets/img/icons/remark.png" alt="" v-if="scope.row.RenewalReason||(scope.row.Status==='冻结'&&scope.rowFreezeReason)">
@@ -483,6 +483,7 @@
 				@addOver="addTryOver"
 				@close="isAddTrial=false"/>
 		</el-dialog>
+	 <historical-notes-dlg :historicalNotesDlgVisible.sync="historicalNotesDlgVisible" :CompanyId.sync="historicalNotesId" />
 	</div>
 </template>
 
@@ -497,10 +498,13 @@ import CustomRemarkDialog from './components/customRemarkDialog.vue';
 import ContractInfo from '../compontents/ContractInfo.vue';
 import CompleteInfo from '../compontents/CompleteInfo.vue';
 import Cauthlist from '../compontents/CauthList.vue';
+
+import HistoricalNotesDlg from "@/components/historicalNotesDlg.vue";
+
 export default {
 	name:'',
 	mixins: [ mixin ],
-	components: {TotalDayDialog,AccumulativeFrequencyDlg,permissionView, ShareListDialog,CustomRemarkDialog,ContractInfo,CompleteInfo,Cauthlist},
+	components: {TotalDayDialog,AccumulativeFrequencyDlg,permissionView, ShareListDialog,CustomRemarkDialog,ContractInfo,CompleteInfo,Cauthlist,HistoricalNotesDlg},
 	computed:{
 		isPWang(){
 			return this.adminId == 66
@@ -571,6 +575,7 @@ export default {
 				BtnServiceRecord:'沟通记录',
 				BtnRemarkView:'备注',
 				BtnShare:'设置共享',
+				BtnRemarkViewHistory:'历史备注'
 			},	// 按钮命令列表
 			accumulativeFrequencyDlg:false,//路演业阅读的弹框
 			accumulativeFrequencyItem:{},
@@ -599,6 +604,10 @@ export default {
 			},//销售级联配置
 
 			IsShareGroup:false,//是否为咨询组销售
+
+
+			historicalNotesDlgVisible: false, //历史备注的弹框
+			historicalNotesId: 0,
 		};
 	},
 	methods: {
@@ -694,6 +703,8 @@ export default {
 				this.addTrialHandle(query.data)
 			}else if(query.type=='设置共享' || query.type=='取消共享'){
 				this.shareSetting(query.data)
+			}else if(query.type=='历史备注'){
+				this.historicalNotesClickHandler(query.data)
 			}
 		},
 		// 设置/取消 共享
@@ -1044,6 +1055,11 @@ export default {
 				}
 			})
 		},
+		// 点击了历史留言
+		historicalNotesClickHandler(item) {
+		this.historicalNotesDlgVisible = true;
+		this.historicalNotesId = item.CompanyId;
+		},
 	},
 	created() {
 		this.getSale()