Browse Source

init

newStyle
lancer 2 years ago
parent
commit
12f33f24ba
12 changed files with 51 additions and 25 deletions
  1. +1
    -1
      src/views/Customer/AgentManagement.vue
  2. +1
    -1
      src/views/Customer/CompanyRecord.vue
  3. +1
    -0
      src/views/Customer/SalesStage.vue
  4. +1
    -0
      src/views/Equipment/index.vue
  5. +1
    -1
      src/views/ReceivingRecords/index.vue
  6. +8
    -6
      src/views/Scheduling/index.vue
  7. +11
    -4
      src/views/Statistics/dataScreeAge.vue
  8. +11
    -4
      src/views/Statistics/dataScreeOrg.vue
  9. +11
    -4
      src/views/Statistics/dataScreeSys.vue
  10. +1
    -0
      src/views/Template/taboo.vue
  11. +2
    -2
      src/views/building/index.vue
  12. +2
    -2
      vue.config.js

+ 1
- 1
src/views/Customer/AgentManagement.vue View File

@@ -411,7 +411,7 @@ export default {
}else{ }else{
this.addagentobj.managerPassword='' this.addagentobj.managerPassword=''
} }
this.resetFlag=false
this.resetFlag=true
this.passFlag=false this.passFlag=false
callback(); callback();




+ 1
- 1
src/views/Customer/CompanyRecord.vue View File

@@ -347,7 +347,7 @@ export default {
}else{ }else{
this.addagentobj.managerPassword='' this.addagentobj.managerPassword=''
} }
this.resetFlag=false
this.resetFlag=true
this.passFlag=false this.passFlag=false
callback(); callback();




+ 1
- 0
src/views/Customer/SalesStage.vue View File

@@ -136,6 +136,7 @@ computed: {
sort: "", // 联系人 sort: "", // 联系人
remarks: "", // 联系人手机号 remarks: "", // 联系人手机号
}; };
this.$refs.ruleForm.resetFields()
}, },
zkhousePage() { zkhousePage() {
this.$api.api this.$api.api


+ 1
- 0
src/views/Equipment/index.vue View File

@@ -956,6 +956,7 @@ export default {
batchId: "", batchId: "",
remark: "", remark: "",
}; };
this.$refs.addForm.resetFields()
}, },
resetBind() { resetBind() {
this.bindForm = { this.bindForm = {


+ 1
- 1
src/views/ReceivingRecords/index.vue View File

@@ -275,7 +275,7 @@
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="markAdvisor" label="标记客户" align="center">
<el-table-column prop="markAdvisor" label="标记顾问" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.markAdvisor == 0 ? "未标记" : "已标记" }} {{ row.markAdvisor == 0 ? "未标记" : "已标记" }}
</template> </template>


+ 8
- 6
src/views/Scheduling/index.vue View File

@@ -83,14 +83,16 @@
<el-table <el-table
:data="tableData" :data="tableData"
stripe stripe
height="400"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
style="width: 100%" style="width: 100%"
:header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="name" label="顾问名" align="center">
<el-table-column prop="name" label="顾问名" >
</el-table-column> </el-table-column>
<el-table-column prop="name" label="状态" align="center">
<el-table-column prop="name" label="状态" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == 0">空闲</span> <span v-if="scope.row.status == 0">空闲</span>
<span v-if="scope.row.status == 1">接待中</span> <span v-if="scope.row.status == 1">接待中</span>
@@ -100,17 +102,17 @@
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="上次接待结束时间" label="上次接待结束时间"
align="center"
> >
</el-table-column> </el-table-column>


<el-table-column prop="date" label="有无排班" align="center">
<el-table-column prop="date" label="有无排班" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.hasSchedule == 1">有排班</span> <span v-if="scope.row.hasSchedule == 1">有排班</span>
<span v-if="scope.row.hasSchedule == 0">无排班</span> <span v-if="scope.row.hasSchedule == 0">无排班</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="操作" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="switchstatus(scope.row,2)" v-if="scope.row.status == 0&&sch_index_pause">暂停接待</el-button> <el-button type="text" @click="switchstatus(scope.row,2)" v-if="scope.row.status == 0&&sch_index_pause">暂停接待</el-button>
<el-button type="text" @click="switchstatus(scope.row,0)" v-if="scope.row.status == 2&&sch_index_pause">空闲</el-button> <el-button type="text" @click="switchstatus(scope.row,0)" v-if="scope.row.status == 2&&sch_index_pause">空闲</el-button>


+ 11
- 4
src/views/Statistics/dataScreeAge.vue View File

@@ -427,7 +427,7 @@ export default {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
// console.log(timeDate); // console.log(timeDate);
if (idx == 1 || idx == 3) {
if (idx == 1 ) {
// 接待量 // 接待量
this.secondTab.yesterdayReceptionList.map((item) => { this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16)); timeDate.push(item.time.substring(11, 16));
@@ -447,9 +447,16 @@ export default {
arr2.push(item.data); arr2.push(item.data);
}); });
} }
// if (idx == 3) {
// // 活跃设备
// }
if (idx == 3) {
// 活跃设备
this.secondTab.todayActiveEquipmentList.map((item) => {
timeDate.push(item.time.substring(11, 16));
arr2.push(item.data);
});
this.secondTab.yesterdayActiveEquipmentList.map((item) => {
arr1.push(item.data);
});
}
let arr = [ let arr = [
{ {
name: Strname[0], name: Strname[0],


+ 11
- 4
src/views/Statistics/dataScreeOrg.vue View File

@@ -400,7 +400,7 @@ export default {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
// console.log(timeDate); // console.log(timeDate);
if (idx == 1 || idx == 3) {
if (idx == 1 ) {
// 接待量 // 接待量
this.secondTab.yesterdayReceptionList.map((item) => { this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16)); timeDate.push(item.time.substring(11, 16));
@@ -420,9 +420,16 @@ export default {
arr2.push(item.data); arr2.push(item.data);
}); });
} }
// if (idx == 3) {
// // 活跃设备
// }
if (idx == 3) {
// 活跃设备
this.secondTab.todayActiveEquipmentList.map((item) => {
timeDate.push(item.time.substring(11, 16));
arr2.push(item.data);
});
this.secondTab.yesterdayActiveEquipmentList.map((item) => {
arr1.push(item.data);
});
}
let arr = [ let arr = [
{ {
name: Strname[0], name: Strname[0],


+ 11
- 4
src/views/Statistics/dataScreeSys.vue View File

@@ -425,7 +425,7 @@ export default {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
// console.log(timeDate); // console.log(timeDate);
if (idx == 1 || idx == 3) {
if (idx == 1 ) {
// 接待量 // 接待量
this.secondTab.yesterdayReceptionList.map((item) => { this.secondTab.yesterdayReceptionList.map((item) => {
timeDate.push(item.time.substring(11, 16)); timeDate.push(item.time.substring(11, 16));
@@ -445,9 +445,16 @@ export default {
arr2.push(item.data); arr2.push(item.data);
}); });
} }
// if (idx == 3) {
// // 活跃设备
// }
if (idx == 3) {
// 活跃设备
this.secondTab.todayActiveEquipmentList.map((item) => {
timeDate.push(item.time.substring(11, 16));
arr2.push(item.data);
});
this.secondTab.yesterdayActiveEquipmentList.map((item) => {
arr1.push(item.data);
});
}
let arr = [ let arr = [
{ {
name: Strname[0], name: Strname[0],


+ 1
- 0
src/views/Template/taboo.vue View File

@@ -86,6 +86,7 @@
<el-dialog <el-dialog
:title="editFlag ? '编辑' : '新增'" :title="editFlag ? '编辑' : '新增'"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
@close='$refs.ruleForm.resetFields();'
> >
<el-form <el-form
:model="ruleForm" :model="ruleForm"


+ 2
- 2
src/views/building/index.vue View File

@@ -572,7 +572,7 @@ export default {
// alert("手机号码不合法,请重新输入"); // alert("手机号码不合法,请重新输入");
callback(new Error("手机号格式错误,请重新输入")); callback(new Error("手机号格式错误,请重新输入"));
}else{ }else{
// 验证电话号码
// 验证电话号码
this.$api.api.verPhone(value).then((res) => { this.$api.api.verPhone(value).then((res) => {
// console.log(res); // console.log(res);
// 判断数据是否已经有了 // 判断数据是否已经有了
@@ -611,7 +611,7 @@ export default {
}else{ }else{
this.ruleForm.managerPassword='' this.ruleForm.managerPassword=''
} }
this.resetFlag=false
this.resetFlag=true
this.passFlag=false this.passFlag=false
callback(); callback();




+ 2
- 2
vue.config.js View File

@@ -3,9 +3,9 @@
* https://cli.vuejs.org/zh/config/ * https://cli.vuejs.org/zh/config/
*/ */
// 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' //王笑




Loading…
Cancel
Save