Commit 2bc074bd authored by 黄奎's avatar 黄奎

页面修改

parent 7782f054
......@@ -29,7 +29,7 @@
<el-form-item :label="$t('admin.admin_Department')">
<treeselect class="w200 fl" style="height:34px !important;margin-top: 5px !important"
:options="departmentList" v-model="msg.RB_Department_Id" :label="$t('pub.unlimitedSel')"
:normalizer="normalizer" @select="changeDepart" />
:normalizer="normalizer" @select="changeDepart" placeholder="请选择部门" />
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -692,7 +692,8 @@
}
}
if (this.$route.query.RB_Department_Id && Number(this.$route.query.RB_Department_Id) > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
this.msg.DepartmentId = Number(this.$route.query.RB_Department_Id);
this.employeeMsg.departmentId = Number(this.$route.query.RB_Department_Id);
this.getEmployee();
}
if (this.$route.query.EnterID && Number(this.$route.query.EnterID) > 0) {
......
......@@ -19,7 +19,7 @@
</el-select>
</template>
<treeselect style="margin-right: 20px;width:200px;" class="radius-input" :options="departmentList" v-model="parameters.RB_Department_Id"
:label="$t('pub.unlimitedSel')" :normalizer="normalizer" @select="changeDepart" />
:label="$t('pub.unlimitedSel')" :normalizer="normalizer" @select="changeDepart" placeholder="请选择部门" />
<el-select
v-model="parameters.empId"
style="margin-right: 20px;height: 40px;"
......
......@@ -233,22 +233,23 @@
let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd"))]
let query = {};
//客户总数
if (type == 1) {
query = {
blank: "y",
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
RB_Branch_Id: item.BranchId,
RB_Department_Id: item.RB_Department_Id,
EnterID: item.EnterID,
}
}
//今日新增
else if (type == 2) {
query = {
EnterTime: Time,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
RB_Branch_Id: item.BranchId,
RB_Department_Id: item.RB_Department_Id,
EnterID: item.EnterID,
blank: "y",
}
}
......@@ -256,9 +257,9 @@
else if (type == 3) {
query = {
activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
RB_Branch_Id: item.BranchId,
RB_Department_Id: item.RB_Department_Id,
EnterID: item.EnterID,
blank: "y",
}
}
......@@ -267,9 +268,9 @@
query = {
activationTime: Time,
activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
RB_Branch_Id: item.BranchId,
RB_Department_Id: item.RB_Department_Id,
EnterID: item.EnterID,
blank: "y",
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment