Merge remote-tracking branch 'origin/master'

src/main/java/com/jd/zfjyjgfwpt/service/impl/FrontServiceImpl.java

@@ -758,6 +758,7 @@ public class FrontServiceImpl implements FrontServiceI {
     public Map<String, Object> login(JSONObject obj) {
         obj.put("DLSHI", "");
         obj.put("DLQX", "");
+        obj.put("logintype", "重庆门户");
 
         // 登录
         HttpResponse response = HttpUtil.createPost(RemoteUrlConstants.getLogin())

src/main/resources/static/main/complaint.html

@@ -108,6 +108,17 @@
 			</el-form>
 			<button class="but-form_qg" @click="submitComplaint">提&nbsp交</button>
 		</div>
+
+		<el-dialog
+				title="提示"
+				:visible.sync="centerDialogVisible"
+				width="30%">
+			<span>与当前经纪人并无交易记录，是否查询所有交易记录？</span>
+			<span slot="footer" class="dialog-footer">
+					<el-button @click="centerDialogVisible = false">取 消</el-button>
+					<el-button type="primary" @click="getAllRecord">确 定</el-button>
+				</span>
+		</el-dialog>
 	</main>
 	<!-- 底部 -->
 	<div class="foot">
@@ -176,6 +187,7 @@
 						'companyName': '',
 						'address': ''
 					},
+					centerDialogVisible: false
 				}
 			},
 			created: function () {
@@ -184,6 +196,9 @@
 				// if (complaintInfo.type == 1) {
 				// 	this.getAjax();
 				// }
+
+				this.tradeRecordParam.userId = sessionStorage.getItem('phone');
+				this.tradeRecordParam.cyrybh = JSON.parse(sessionStorage.getItem('complaintInfo')).id;
 				this.getAjax();
 				this.submitParam.type = complaintInfo.type;
 				this.submitParam.respondentId = complaintInfo.id;
@@ -192,6 +207,11 @@
 
 			},
 			methods: {
+				getAllRecord() {
+					this.tradeRecordParam.cyrybh = '';
+					this.getAjax('reSearch');
+					this.centerDialogVisible = false;
+				},
 				personifo() {
 					if (this.submitParam.type == 0) {
 						location.href = "basicinfo.html?id=" + this.submitParam.respondentId
@@ -211,10 +231,7 @@
 					this.submitParam.type = 2;
 					console.log(this.submitParam)
 				},
-				getAjax() {
-					this.tradeRecordParam.userId = sessionStorage.getItem('phone');
-					this.tradeRecordParam.cyrybh = JSON.parse(sessionStorage.getItem('complaintInfo')).id;
-					// this.tradeRecordParam.cyrybh = '1240151';
+				getAjax(tag) {
 					var _this = this;
 					var param = this.tradeRecordParam;
 					$.ajax({
@@ -226,6 +243,11 @@
 							if (json.count > 0) {
 								_this.options = json.data;
 							} else {
+								if (tag == 'reSearch') {
+									_this.centerDialogVisible = false;
+								} else {
+									_this.centerDialogVisible = true;
+								}
 								_this.options = [];
 							}
 						},