|
@@ -48,7 +48,7 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="选择日期">
|
|
|
|
|
|
+ <el-form-item label="出单日期">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="uploadDate"
|
|
v-model="uploadDate"
|
|
style="width: 240px"
|
|
style="width: 240px"
|
|
@@ -58,9 +58,25 @@
|
|
range-separator="-"
|
|
range-separator="-"
|
|
start-placeholder="开始日期"
|
|
start-placeholder="开始日期"
|
|
end-placeholder="结束日期"
|
|
end-placeholder="结束日期"
|
|
|
|
+ @change="cleanBindDate()"
|
|
></el-date-picker>
|
|
></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
+ <el-form-item label="绑定日期">
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-model="bindDate"
|
|
|
|
+ style="width: 240px"
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
+ format="yyyy-MM-dd"
|
|
|
|
+ type="daterange"
|
|
|
|
+ range-separator="-"
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
+ @change="cleanUploadDate()"
|
|
|
|
+ ></el-date-picker>
|
|
|
|
+ </el-form-item>
|
|
|
|
+
|
|
|
|
+
|
|
<el-form-item>
|
|
<el-form-item>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
|
|
>搜索
|
|
>搜索
|
|
@@ -107,7 +123,10 @@
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.promotersCount }}
|
|
{{ scope.row.promotersCount }}
|
|
- <el-button v-if="$store.getters.roles[0] == 'admin' ||$store.getters.roles[0] == 'bdManager' || $store.getters.roles[0] == 'supplyChainAdmin' " size="mini" type="text" @click="editCount(scope.row)">编辑</el-button>
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ v-if="$store.getters.roles[0] == 'admin' ||$store.getters.roles[0] == 'bdManager' || $store.getters.roles[0] == 'supplyChainAdmin' "
|
|
|
|
+ size="mini" type="text" @click="editCount(scope.row)">编辑
|
|
|
|
+ </el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
@@ -123,13 +142,13 @@
|
|
{{ scope.row.sampleRate}}
|
|
{{ scope.row.sampleRate}}
|
|
</template>
|
|
</template>
|
|
</el-table-column>-->
|
|
</el-table-column>-->
|
|
- <!-- <el-table-column
|
|
|
|
- label="(总)未领样数"
|
|
|
|
- align="center"
|
|
|
|
- prop="notSampleCount"
|
|
|
|
- width="100px"
|
|
|
|
- >
|
|
|
|
- </el-table-column>-->
|
|
|
|
|
|
+ <!-- <el-table-column
|
|
|
|
+ label="(总)未领样数"
|
|
|
|
+ align="center"
|
|
|
|
+ prop="notSampleCount"
|
|
|
|
+ width="100px"
|
|
|
|
+ >
|
|
|
|
+ </el-table-column>-->
|
|
<el-table-column label="发样数" align="center" prop="sendTotalCount" width="100px">
|
|
<el-table-column label="发样数" align="center" prop="sendTotalCount" width="100px">
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
@@ -251,7 +270,7 @@
|
|
dicts: ["sys_normal_disable"],
|
|
dicts: ["sys_normal_disable"],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- submitUserId:null,
|
|
|
|
|
|
+ submitUserId: null,
|
|
promotersCountLoading: false,
|
|
promotersCountLoading: false,
|
|
promotersCount: null,
|
|
promotersCount: null,
|
|
editCountVisible: false,
|
|
editCountVisible: false,
|
|
@@ -304,6 +323,7 @@
|
|
orderEndDate: undefined,
|
|
orderEndDate: undefined,
|
|
},
|
|
},
|
|
uploadDate: [new Date(), new Date()],
|
|
uploadDate: [new Date(), new Date()],
|
|
|
|
+ bindDate: [],
|
|
//查询参数所用下拉数据
|
|
//查询参数所用下拉数据
|
|
queryParamsList: {
|
|
queryParamsList: {
|
|
personList: [],
|
|
personList: [],
|
|
@@ -320,6 +340,7 @@
|
|
let dd = date.getDate();
|
|
let dd = date.getDate();
|
|
dd = dd < 10 ? "0" + dd : dd;
|
|
dd = dd < 10 ? "0" + dd : dd;
|
|
this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
|
|
this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
|
|
|
|
+ this.bindDate = [];
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
@@ -328,12 +349,19 @@
|
|
});
|
|
});
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ cleanBindDate(){
|
|
|
|
+ this.bindDate = [];
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ cleanUploadDate(){
|
|
|
|
+ this.uploadDate = [];
|
|
|
|
+ },
|
|
submitPromotersCount() {
|
|
submitPromotersCount() {
|
|
if (!!this.promotersCount) {
|
|
if (!!this.promotersCount) {
|
|
this.promotersCountLoading = true;
|
|
this.promotersCountLoading = true;
|
|
submitPromotersCount({
|
|
submitPromotersCount({
|
|
- userId : this.submitUserId,
|
|
|
|
- promotersCount:this.promotersCount,
|
|
|
|
|
|
+ userId: this.submitUserId,
|
|
|
|
+ promotersCount: this.promotersCount,
|
|
mediaId: 2,
|
|
mediaId: 2,
|
|
})
|
|
})
|
|
.then((res) => {
|
|
.then((res) => {
|
|
@@ -360,6 +388,12 @@
|
|
/** 导出按钮操作 */
|
|
/** 导出按钮操作 */
|
|
handleExport() {
|
|
handleExport() {
|
|
this.downLoadLoading = true;
|
|
this.downLoadLoading = true;
|
|
|
|
+
|
|
|
|
+ if (!!this.bindDate) {
|
|
|
|
+ this.queryParams.bindStartDate = this.bindDate[0],
|
|
|
|
+ this.queryParams.bindEndDate = this.bindDate[1]
|
|
|
|
+ }
|
|
|
|
+
|
|
downFilePost(
|
|
downFilePost(
|
|
"/isv/supply_chain/exportBdReportListV2",
|
|
"/isv/supply_chain/exportBdReportListV2",
|
|
this.addDateRange(
|
|
this.addDateRange(
|
|
@@ -367,7 +401,7 @@
|
|
this.uploadDate,
|
|
this.uploadDate,
|
|
"orderStartDate",
|
|
"orderStartDate",
|
|
"orderEndDate"
|
|
"orderEndDate"
|
|
- )
|
|
|
|
|
|
+ ),
|
|
).then((res) => {
|
|
).then((res) => {
|
|
let blob = new Blob([res], {
|
|
let blob = new Blob([res], {
|
|
type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
|
type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
|
@@ -404,6 +438,10 @@
|
|
if (this.roleId == 'bd') {
|
|
if (this.roleId == 'bd') {
|
|
this.queryParams.collectSampleId = this.userId
|
|
this.queryParams.collectSampleId = this.userId
|
|
}
|
|
}
|
|
|
|
+ if (!!this.bindDate) {
|
|
|
|
+ this.queryParams.bindStartDate = this.bindDate[0],
|
|
|
|
+ this.queryParams.bindEndDate = this.bindDate[1]
|
|
|
|
+ }
|
|
getBdReportListV2(
|
|
getBdReportListV2(
|
|
this.addDateRange(
|
|
this.addDateRange(
|
|
this.queryParams,
|
|
this.queryParams,
|
|
@@ -444,6 +482,7 @@
|
|
let dd = date.getDate();
|
|
let dd = date.getDate();
|
|
dd = dd < 10 ? "0" + dd : dd;
|
|
dd = dd < 10 ? "0" + dd : dd;
|
|
this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
|
|
this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
|
|
|
|
+ this.bindDate = [];
|
|
this.resetForm("queryForm");
|
|
this.resetForm("queryForm");
|
|
this.queryParams.pageNum = 1;
|
|
this.queryParams.pageNum = 1;
|
|
this.handleQuery();
|
|
this.handleQuery();
|