@@ -7,7 +7,7 @@ | |||
<div class="label">合同结束日期:</div> | |||
<div> | |||
<el-date-picker | |||
@change="confirmtime()" | |||
@change="confirmtime" | |||
v-model="timelist" | |||
type="daterange" | |||
style="width:250px;" | |||
@@ -379,7 +379,8 @@ export default { | |||
if (res.data) { | |||
// 由用户 | |||
this.$api.api.userVerify({ | |||
orgType:localStorage.getItem('orgType'), | |||
// orgType:localStorage.getItem('orgType'), | |||
orgType:1, | |||
accountId:res.data.sysUser.accountId, | |||
username:res.data.sysUser.username, | |||
agentId:localStorage.getItem('agentId'), | |||
@@ -838,9 +839,10 @@ export default { | |||
//时间选择 | |||
confirmtime(e){ | |||
// console.log(this.timelist) | |||
console.log(e); | |||
if(e){ | |||
this.contractStartDate=this.timelist[0]; | |||
this.contractEndDate=this.timelist[1]; | |||
this.contractStartDate=e[0]; | |||
this.contractEndDate=e[1]; | |||
}else{ | |||
this.contractStartDate=''; | |||
this.contractEndDate=''; | |||
@@ -315,7 +315,8 @@ export default { | |||
if (res.data) { | |||
// 由用户 | |||
this.$api.api.userVerify({ | |||
orgType:localStorage.getItem('orgType'), | |||
// orgType:localStorage.getItem('orgType'), | |||
orgType:2, | |||
accountId:res.data.sysUser.accountId, | |||
username:res.data.sysUser.username, | |||
agentId:localStorage.getItem('agentId'), | |||
@@ -29,9 +29,9 @@ | |||
> | |||
<el-option | |||
v-for="item in houseList" | |||
:key="item.id" | |||
:key="item.orgCode" | |||
:label="item.name" | |||
:value="item.id" | |||
:value="item.orgCode" | |||
> | |||
</el-option> | |||
</el-select> | |||
@@ -152,14 +152,14 @@ | |||
活跃楼盘数 | |||
</div> | |||
<div class="text2" :class="{ tophovese: secindex == 1 }"> | |||
{{ compare.houseQuantity || 0 }} | |||
{{ compare.activeHouseQuantity || 0 }} | |||
</div> | |||
<div class="text33" v-if="selectTime1"> | |||
<div> | |||
对比时段: <span style="text-indent: 20px;">{{compare1.houseQuantity||0}}</span> | |||
对比时段: <span style="text-indent: 20px;">{{compare1.activeHouseQuantity||0}}</span> | |||
</div> | |||
<div :style="compare2.houseQuantity>=0 ? 'color:green;': 'color:red;'"> | |||
{{compare2.houseQuantity||0}} | |||
<div :style="compare2.activeHouseQuantity>=0 ? 'color:green;': 'color:red;'"> | |||
{{compare2.activeHouseQuantity||0}} | |||
</div> | |||
</div> | |||
</div> | |||
@@ -274,7 +274,8 @@ export default { | |||
houseDataAll() { | |||
this.$api.api | |||
.houseDataAll({ | |||
agentId: this.selValue == 0 ? this.choicValue : null, | |||
// agentId: this.selValue == 0 ? this.choicValue : null, | |||
agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'), | |||
orgCode: this.selValue == 1 ? this.choicValue : null, | |||
}) | |||
.then((res) => { | |||
@@ -291,7 +292,8 @@ export default { | |||
contrastStartDate: this.selectTime, | |||
contrastEndDate: this.selectTime1, | |||
dateType: this.dateType, | |||
agentId: this.selValue == 0 ? this.choicValue : null, | |||
// agentId: this.selValue == 0 ? this.choicValue : null, | |||
agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'), | |||
orgCode: this.selValue == 1 ? this.choicValue : null, | |||
}) | |||
.then((res) => { | |||
@@ -475,6 +477,7 @@ export default { | |||
this.$api.api | |||
.findMyOrg({ | |||
orgType: localStorage.getItem("orgType"), | |||
agentId:localStorage.getItem('agentId') | |||
}) | |||
.then((res) => { | |||
this.houseList = res.data; | |||
@@ -1255,7 +1255,7 @@ export default { | |||
let info = getStore({ name: "userInfo" }); | |||
// this.sign=info.sign | |||
// this.orgCode = info.orgCode; | |||
this.orgCode = this.losorgType.getItem('orgCode'); | |||
this.orgCode = localStorage.getItem('orgCode'); | |||
// 权限判断 | |||
// 当他是系统用户时,显示所有,除系统用户之外只显示组织用户 | |||
@@ -43,7 +43,7 @@ | |||
</div> --> | |||
<div class="div-lab"> | |||
<div class="label">筛选起止日期:</div> | |||
<div class="label">合同起止日期:</div> | |||
<el-date-picker | |||
v-model="starTime" | |||
class="div-inp" | |||
@@ -163,7 +163,7 @@ | |||
<!-- 表格 --> | |||
<div class="cen-tab"> | |||
<el-table :data="tableData" stripe style="width: 100%" border> | |||
<el-table :data="tableData" stripe style="width: 100%" > | |||
<el-table-column prop="propertyName" label="楼盘名称" align="center"> | |||
</el-table-column> | |||
<el-table-column | |||
@@ -574,7 +574,8 @@ export default { | |||
if (res.data) { | |||
// 由用户 | |||
this.$api.api.userVerify({ | |||
orgType:localStorage.getItem('orgType'), | |||
// orgType:localStorage.getItem('orgType'), | |||
orgType:3, | |||
accountId:res.data.sysUser.accountId, | |||
username:res.data.sysUser.username, | |||
agentId:localStorage.getItem('agentId'), | |||
@@ -588,7 +589,6 @@ export default { | |||
}else{ | |||
this.ruleForm.managerPassword=res.data.sysUser.resultPwd | |||
} | |||
}) | |||
.catch(err=>{ | |||
console.log(err) | |||
@@ -3,8 +3,8 @@ | |||
* https://cli.vuejs.org/zh/config/ | |||
*/ | |||
// const url = 'http://pigx-gateway' | |||
const url = 'http://39.97.167.65:9999' //测试 | |||
// const url = 'http://192.168.31.169:9999' //长龙 | |||
// const url = 'http://39.97.167.65:9999' //测试 | |||
const url = 'http://192.168.31.169:9999' //长龙 | |||
// const url = 'http://192.168.31.134:9999' //嘉豪 | |||
// const url = 'http://192.168.31.100:9999' //王笑 | |||
// const url = 'http://nitu5e.natappfree.cc' //王笑 | |||