@@ -242,7 +242,7 @@ export default { | |||||
// 循环数组,给定各种标志 | // 循环数组,给定各种标志 | ||||
if (res.data.length == 0) { | if (res.data.length == 0) { | ||||
// this.$message.warning("您已经被禁用"); | // this.$message.warning("您已经被禁用"); | ||||
this.$message.warning("别看了你进不了"); | |||||
this.$message.warning("账号已禁止登录,请联系管理员恢复"); | |||||
} else if (res.data.length == 1) { | } else if (res.data.length == 1) { | ||||
let idx = res.data[0].orgType; | let idx = res.data[0].orgType; | ||||
localStorage.setItem("orgType", idx); | localStorage.setItem("orgType", idx); | ||||
@@ -128,7 +128,7 @@ export default { | |||||
// 循环数组,给定各种标志 | // 循环数组,给定各种标志 | ||||
if (res.data.length == 0) { | if (res.data.length == 0) { | ||||
// this.$message.warning("您已经被禁用"); | // this.$message.warning("您已经被禁用"); | ||||
this.$message.warning("别看了你进不了"); | |||||
this.$message.warning("账号已禁止登录,请联系管理员恢复"); | |||||
} else if (res.data.length == 1) { | } else if (res.data.length == 1) { | ||||
let idx = res.data[0].orgType; | let idx = res.data[0].orgType; | ||||
localStorage.setItem("orgType", idx); | localStorage.setItem("orgType", idx); | ||||
@@ -123,9 +123,11 @@ | |||||
width="150" | width="150" | ||||
align="center"> | align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<!-- <div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | <div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | ||||
<div v-if="scope.row.lockFlag==1">禁用</div> | |||||
<div v-if="scope.row.lockFlag==1">禁用</div> --> | |||||
<div v-if="scope.row.residueTime >0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column prop="lockFlag" label="状态" align="center"> | <el-table-column prop="lockFlag" label="状态" align="center"> | ||||
@@ -537,7 +539,7 @@ export default { | |||||
}, | }, | ||||
operaRules:{ | operaRules:{ | ||||
operationalPeople: [ | operationalPeople: [ | ||||
{ required: true, message: '请选择运营人员', trigger: 'blur' }, | |||||
{ required: false, message: '请选择运营人员', trigger: 'blur' }, | |||||
], | ], | ||||
}, | }, | ||||
optionsparentId:[],//省份列表 | optionsparentId:[],//省份列表 | ||||
@@ -476,7 +476,7 @@ export default { | |||||
}, | }, | ||||
operaRules:{ | operaRules:{ | ||||
operationalPeople: [ | operationalPeople: [ | ||||
{ required: true, message: '请选择运营人员', trigger: 'blur' }, | |||||
{ required: false, message: '请选择运营人员', trigger: 'blur' }, | |||||
], | ], | ||||
}, | }, | ||||
agentRule:{ | agentRule:{ | ||||
@@ -409,7 +409,7 @@ export default { | |||||
}, | }, | ||||
operaRules:{ | operaRules:{ | ||||
operationalPeople: [ | operationalPeople: [ | ||||
{ required: true, message: '请选择运营人员', trigger: 'blur' }, | |||||
{ required: false, message: '请选择运营人员', trigger: 'blur' }, | |||||
], | ], | ||||
}, | }, | ||||
agentRule:{ | agentRule:{ | ||||
@@ -4,7 +4,7 @@ | |||||
<div class="app-top"> | <div class="app-top"> | ||||
<div class="app-titel" style="margin-top: 5px"> | <div class="app-titel" style="margin-top: 5px"> | ||||
<div class="div-lab"> | <div class="div-lab"> | ||||
<div class="label">添加时间:</div> | |||||
<div class="label">更新时间:</div> | |||||
<el-date-picker | <el-date-picker | ||||
v-model="time" | v-model="time" | ||||
type="daterange" | type="daterange" | ||||
@@ -338,7 +338,7 @@ | |||||
</el-table-column> --> | </el-table-column> --> | ||||
<el-table-column | <el-table-column | ||||
prop="name" | prop="name" | ||||
label="绑定公司时间" | |||||
label="绑定楼盘时间" | |||||
align="center" | align="center" | ||||
width="150" | width="150" | ||||
> | > | ||||
@@ -353,16 +353,15 @@ | |||||
<!-- scope --> | <!-- scope --> | ||||
<el-table-column label="操作" align="center" fixed="right" width="200"> | <el-table-column label="操作" align="center" fixed="right" width="200"> | ||||
<template slot-scope="{ row }"> | <template slot-scope="{ row }"> | ||||
<!-- <el-button type="text" @click="toinifoThereturn()">归还</el-button> --> | |||||
<!-- <el-button type="text" @click="infotranscription()"> | |||||
转写开关 | |||||
</el-button> | |||||
<el-button type="text" @click="acceptance()">验收</el-button> | |||||
<el-button type="text" @click="toinfobinding()">绑定</el-button> | |||||
<el-button type="text" @click="infoeditor()">修改</el-button> | |||||
<el-button type="text" @click="toinifodelete()">删除</el-button> --> | |||||
<!-- <el-button v-if="row.receiveType == 2 && euq_index_back" type="text" @click="toinifoThereturn()">归还</el-button> | |||||
<el-button v-if="equ_index_change" type="text" @click="infotranscription()">转写方式</el-button> | |||||
<el-button v-if="equ_index_auto" type="text" @click="isAutoSwitch()">自动转写</el-button> | |||||
<el-button v-if="row.acceptanceStatus == 1 && equ_index_makeSure" type="text" @click="acceptance()">验收</el-button> | |||||
<el-button v-if="row.acceptanceStatus != (1 || 0) && euq_index_normal" type="text" @click="getRight()">恢复正常</el-button> | |||||
<el-button v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2" type="text" @click="toinfobinding()">绑定</el-button> | |||||
<el-button v-if="equ_index_del&&row.receiveType!=2" type="text" @click="toinifodelete()">删除</el-button> --> | |||||
<el-dropdown @command="handleCommand($event, row)"> | |||||
<el-dropdown v-if="(row.receiveType == 2 && euq_index_back)||equ_index_change||equ_index_auto||(row.acceptanceStatus == 1 && equ_index_makeSure)||(row.acceptanceStatus != (1 || 0) && euq_index_normal)||(orgType == 0 && equ_index_bind&&row.receiveType!=2)||(equ_index_del&&row.receiveType!=2)" @command="handleCommand($event, row)" trigger="click"> | |||||
<span style="color: #409eff; font-size: 12px; margin-left: 10px; cursor: pointer;"> | <span style="color: #409eff; font-size: 12px; margin-left: 10px; cursor: pointer;"> | ||||
更多<i class="el-icon-arrow-down el-icon--right"></i> | 更多<i class="el-icon-arrow-down el-icon--right"></i> | ||||
</span> | </span> | ||||
@@ -372,10 +371,7 @@ | |||||
v-if="row.receiveType == 2 && euq_index_back" | v-if="row.receiveType == 2 && euq_index_back" | ||||
>归还</el-dropdown-item | >归还</el-dropdown-item | ||||
> | > | ||||
<!-- <el-dropdown-item | |||||
command="receive" | |||||
>领用</el-dropdown-item | |||||
> --> | |||||
<el-dropdown-item | <el-dropdown-item | ||||
command="infotranscription" | command="infotranscription" | ||||
v-if="equ_index_change" | v-if="equ_index_change" | ||||
@@ -399,7 +395,7 @@ | |||||
v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2" | v-if="orgType == 0 && equ_index_bind&&row.receiveType!=2" | ||||
>绑定</el-dropdown-item | >绑定</el-dropdown-item | ||||
> | > | ||||
<!-- <el-dropdown-item command="infoeditor">修改</el-dropdown-item> --> | |||||
<el-dropdown-item command="infoeditor">修改</el-dropdown-item> | |||||
<el-dropdown-item command="toinifodelete" v-if="equ_index_del&&row.receiveType!=2" | <el-dropdown-item command="toinifodelete" v-if="equ_index_del&&row.receiveType!=2" | ||||
>删除</el-dropdown-item | >删除</el-dropdown-item | ||||
> | > | ||||
@@ -749,18 +745,18 @@ export default { | |||||
value: "1", | value: "1", | ||||
label: "未验收", | label: "未验收", | ||||
}, | }, | ||||
{ | |||||
value: "2", | |||||
label: "维修中", | |||||
}, | |||||
{ | |||||
value: "3", | |||||
label: "更换中", | |||||
}, | |||||
{ | |||||
value: "4", | |||||
label: "已报损", | |||||
}, | |||||
// { | |||||
// value: "2", | |||||
// label: "维修中", | |||||
// }, | |||||
// { | |||||
// value: "3", | |||||
// label: "更换中", | |||||
// }, | |||||
// { | |||||
// value: "4", | |||||
// label: "已报损", | |||||
// }, | |||||
], | ], | ||||
offStatusList: [ | offStatusList: [ | ||||
{ | { | ||||
@@ -30,7 +30,6 @@ | |||||
<div class="label">领用状态:</div> | <div class="label">领用状态:</div> | ||||
<el-select | <el-select | ||||
class="div-inp" | class="div-inp" | ||||
multiple | |||||
clearable | clearable | ||||
collapse-tags | collapse-tags | ||||
v-model="searchForm.receiveType" | v-model="searchForm.receiveType" | ||||
@@ -74,7 +73,7 @@ | |||||
</el-table-column> | </el-table-column> | ||||
<el-table-column prop="receiveEndTime" label="归还时间" align="center"> | <el-table-column prop="receiveEndTime" label="归还时间" align="center"> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column prop="receiveType" label="归还状态" align="center"> | |||||
<el-table-column prop="receiveType" label="领用状态" align="center"> | |||||
<template slot-scope="{ row }"> | <template slot-scope="{ row }"> | ||||
{{ | {{ | ||||
row.receiveType == 1 | row.receiveType == 1 | ||||
@@ -346,16 +346,16 @@ | |||||
<!-- <div style="color: #2671e2" @click="toinifoThereturn()"> | <!-- <div style="color: #2671e2" @click="toinifoThereturn()"> | ||||
修改指示灯状态 | 修改指示灯状态 | ||||
</div> --> | </div> --> | ||||
<el-dropdown @command="handleCommand($event, row)"> | |||||
<el-dropdown v-if="(row.receiveType==2&&equ_state_take)||(row.houseName&&equ_state_take)||equ_state_open||equ_state_WiFi||equ_state_Voice" @command="handleCommand($event, row)" trigger="click"> | |||||
<span style="color: #409eff; font-size: 12px; margin-left: 10px;cursor: pointer;"> | <span style="color: #409eff; font-size: 12px; margin-left: 10px;cursor: pointer;"> | ||||
更多<i class="el-icon-arrow-down el-icon--right"></i> | 更多<i class="el-icon-arrow-down el-icon--right"></i> | ||||
</span> | </span> | ||||
<el-dropdown-menu slot="dropdown"> | <el-dropdown-menu slot="dropdown"> | ||||
<!-- <el-dropdown-item command="toinifoThereturn" v-if="row.receiveType == 2" >归还</el-dropdown-item> --> | <!-- <el-dropdown-item command="toinifoThereturn" v-if="row.receiveType == 2" >归还</el-dropdown-item> --> | ||||
<el-dropdown-item command="toinifoThereturn" v-if="row.userName&&equ_state_take" | |||||
<el-dropdown-item command="toinifoThereturn" v-if="row.receiveType==2 &&equ_state_take" | |||||
>归还</el-dropdown-item | >归还</el-dropdown-item | ||||
> | > | ||||
<el-dropdown-item command="receive" v-if="!row.userName&&equ_state_take" | |||||
<el-dropdown-item command="receive" v-if="row.houseName&&equ_state_take" | |||||
>领用</el-dropdown-item | >领用</el-dropdown-item | ||||
> | > | ||||
<el-dropdown-item command="lightStatusChange" | <el-dropdown-item command="lightStatusChange" | ||||
@@ -995,7 +995,7 @@ export default { | |||||
.then(() => { | .then(() => { | ||||
this.$api.api | this.$api.api | ||||
.audioStatusControl({ | .audioStatusControl({ | ||||
imeis: row.imei, | |||||
imei: row.imei, | |||||
simAudioStatus: row.simAudioStatus == "true" ? "false" : "true", | simAudioStatus: row.simAudioStatus == "true" ? "false" : "true", | ||||
}) | }) | ||||
.then((res) => { | .then((res) => { | ||||
@@ -74,7 +74,7 @@ | |||||
</div> | </div> | ||||
<div class="div-lab"> | <div class="div-lab"> | ||||
<div class="label">客户意向:</div> | |||||
<div class="label">画像标签:</div> | |||||
<el-select | <el-select | ||||
class="div-inp" | class="div-inp" | ||||
multiple | multiple | ||||
@@ -244,7 +244,8 @@ export default { | |||||
pickerOptions: { | pickerOptions: { | ||||
disabledDate(time) { | disabledDate(time) { | ||||
//根据当前日期 --- 禁止选中之后的日期 | //根据当前日期 --- 禁止选中之后的日期 | ||||
return time.getTime() > Date.now(); | |||||
// console.log(time.toLocaleDateString()); | |||||
return time.getTime() > Date.now() - 8.64e6 | |||||
}, | }, | ||||
}, | }, | ||||
role:'', | role:'', | ||||
@@ -108,9 +108,9 @@ | |||||
<el-form-item label="错误词" prop="wrongWord"> | <el-form-item label="错误词" prop="wrongWord"> | ||||
<el-input v-model="ruleForm.wrongWord" maxlength="8" clearable></el-input> | <el-input v-model="ruleForm.wrongWord" maxlength="8" clearable></el-input> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="描述:" prop="memo"> | |||||
<!-- <el-form-item label="描述:" prop="memo"> | |||||
<el-input type="textarea" v-model="ruleForm.memo" maxlength="50" show-word-limit clearable></el-input> | <el-input type="textarea" v-model="ruleForm.memo" maxlength="50" show-word-limit clearable></el-input> | ||||
</el-form-item> | |||||
</el-form-item> --> | |||||
</el-form> | </el-form> | ||||
<div slot="footer" class="dialog-footer"> | <div slot="footer" class="dialog-footer"> | ||||
<el-button @click="dialogVisible = false">取 消</el-button> | <el-button @click="dialogVisible = false">取 消</el-button> | ||||
@@ -25,7 +25,7 @@ | |||||
<template slot-scope="scope" style=""> | <template slot-scope="scope" style=""> | ||||
<span v-if="sys_dept_edit" style="color: #2671e2" @click="bianji(scope.row)">编辑</span> | <span v-if="sys_dept_edit" style="color: #2671e2" @click="bianji(scope.row)">编辑</span> | ||||
<span | <span | ||||
v-if="sys_dept_del&&(tableData.length-1==scope.$index)" | |||||
v-if="sys_dept_del" | |||||
style="color: #2671e2; margin-left: 10px" | style="color: #2671e2; margin-left: 10px" | ||||
@click="del(scope.row)" | @click="del(scope.row)" | ||||
>移除</span | >移除</span | ||||
@@ -846,7 +846,7 @@ | |||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
<div | <div | ||||
style="line-height: 30px; margin-left: 10px" | |||||
style="line-height: 30px; margin-left: 10px; cursor: pointer;" | |||||
@click="delArea(index, 0)" | @click="delArea(index, 0)" | ||||
> | > | ||||
取消 | 取消 | ||||
@@ -890,7 +890,7 @@ | |||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
<div | <div | ||||
style="line-height: 30px; margin-left: 10px" | |||||
style="line-height: 30px; margin-left: 10px;cursor: pointer;" | |||||
@click="delArea(index, 1)" | @click="delArea(index, 1)" | ||||
> | > | ||||
取消 | 取消 | ||||
@@ -940,7 +940,7 @@ | |||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
<div | <div | ||||
style="line-height: 30px; margin-left: 10px" | |||||
style="line-height: 30px; margin-left: 10px; cursor: pointer;" | |||||
@click="delArea(index, 1)" | @click="delArea(index, 1)" | ||||
> | > | ||||
取消 | 取消 | ||||
@@ -948,7 +948,7 @@ | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
<div style="line-height: 30px" @click="addArea">添加条件</div> | |||||
<div style="line-height: 30px; cursor: pointer;" @click="addArea">添加条件</div> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -223,9 +223,11 @@ | |||||
<el-table-column prop="address" label="服务状态" align="center"> | <el-table-column prop="address" label="服务状态" align="center"> | ||||
<template slot-scope="scope"> | <template slot-scope="scope"> | ||||
<!-- {{ row.serviceStatus == 0 ? "在服务期内" : "已过期" }} --> | <!-- {{ row.serviceStatus == 0 ? "在服务期内" : "已过期" }} --> | ||||
<div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<!-- <div v-if="scope.row.residueTime >0&&scope.row.lockFlag==0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | <div v-if="scope.row.residueTime <=0&&scope.row.lockFlag==0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | ||||
<div v-if="scope.row.lockFlag==1">禁用</div> | |||||
<div v-if="scope.row.lockFlag==1">禁用</div> --> | |||||
<div v-if="scope.row.residueTime >0">在服务期内({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
<div v-if="scope.row.residueTime <=0">过期({{scope.row.residueTime*1>=0?scope.row.residueTime:scope.row.residueTime*-1}})</div> | |||||
</template> | </template> | ||||
</el-table-column> | </el-table-column> | ||||
<el-table-column prop="lockFlag" label="状态" align="center"> | <el-table-column prop="lockFlag" label="状态" align="center"> | ||||
@@ -413,7 +415,7 @@ | |||||
style="width: 200px" | style="width: 200px" | ||||
:disabled='passFlag' | :disabled='passFlag' | ||||
show-password | show-password | ||||
v-model.number="accountForm.managerPassword" | |||||
v-model="accountForm.managerPassword" | |||||
></el-input> | ></el-input> | ||||
</el-form-item> | </el-form-item> | ||||
</el-form> | </el-form> | ||||
@@ -702,10 +704,10 @@ export default { | |||||
}, | }, | ||||
accountRules: { | accountRules: { | ||||
managerPhone: [ | managerPhone: [ | ||||
{ required: true, message: "请填写账号", trigger: "change" }, | |||||
{ required: true, message: "请填写账号", trigger: "blur" }, | |||||
{ validator: validatePass1, trigger: "blur" }], | { validator: validatePass1, trigger: "blur" }], | ||||
managerPassword: [ | managerPassword: [ | ||||
{ required: true, message: "请填写密码", trigger: "change" }, | |||||
{ required: true, message: "请填写密码", trigger: "blur" }, | |||||
{ min: 6, max: 18, message: '请输入6~18位,数字或字母组合的密码', trigger: 'blur' } | { min: 6, max: 18, message: '请输入6~18位,数字或字母组合的密码', trigger: 'blur' } | ||||
], | ], | ||||
}, | }, | ||||
@@ -754,7 +756,7 @@ export default { | |||||
}, | }, | ||||
operaRules: { | operaRules: { | ||||
operationalPeople: [ | operationalPeople: [ | ||||
{ required: true, message: "请选择运营人员", trigger: "blur" }, | |||||
{ required: false, message: "请选择运营人员", trigger: "blur" }, | |||||
], | ], | ||||
}, | }, | ||||
agentRule: { | agentRule: { | ||||
@@ -5,7 +5,7 @@ | |||||
// const url = 'http://pigx-gateway' | // const url = 'http://pigx-gateway' | ||||
const url = 'http://39.97.167.65:9999' //测试 | const url = 'http://39.97.167.65:9999' //测试 | ||||
// const url = 'http://192.168.31.169:9999' //长龙 | // const url = 'http://192.168.31.169:9999' //长龙 | ||||
const url = 'http://192.168.31.134:9999' //嘉豪 | |||||
// const url = 'http://192.168.31.134:9999' //嘉豪 | |||||
// const url = 'http://192.168.31.100:9999' //王笑 | // const url = 'http://192.168.31.100:9999' //王笑 | ||||
// const url = 'http://nitu5e.natappfree.cc' //王笑 | // const url = 'http://nitu5e.natappfree.cc' //王笑 | ||||