|
@@ -35,6 +35,9 @@
|
|
|
<el-input v-model="listQuery.couponCode" clearable class="filter-item" style="width: 150px;"
|
|
|
placeholder="请输入优惠券号" />
|
|
|
|
|
|
+ <el-input v-model="listQuery.goodsName" clearable class="filter-item" style="width: 160px;"
|
|
|
+ placeholder="请输入商品名称" />
|
|
|
+
|
|
|
<el-select v-model="listQuery.fraId" style="width: 160px" class="filter-item" placeholder="请选择加盟商" clearable
|
|
|
filterable>
|
|
|
<el-option v-for="item in fras" :key="item.id" :label="item.fraName" :value="item.id" />
|
|
@@ -272,7 +275,8 @@
|
|
|
<br />
|
|
|
<span style="font-weight: 600;">加盟商家:</span> {{ scope.row.fraName }}<br />
|
|
|
<span style="font-weight: 600;">商家电话:</span> {{ scope.row.fraTel }}<br />
|
|
|
- <span v-if="scope.row.shop"><span style="font-weight: 600;">销售门店:</span> {{ scope.row.shop.shopName }}<br /></span>
|
|
|
+ <span v-if="scope.row.shop"><span style="font-weight: 600;">销售门店:</span> {{ scope.row.shop.shopName
|
|
|
+ }}<br /></span>
|
|
|
<span style="font-weight: 600;">销售类型:</span> {{ assignTypeMap[scope.row.assignType] }}<br />
|
|
|
</div>
|
|
|
</template>
|
|
@@ -1650,6 +1654,11 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
getList() {
|
|
|
+ if (this.listQuery.goodsName && this.listQuery.goodsName.length < 2) {
|
|
|
+ this.$message.warning("请至少输入2位长度的商品名称");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
this.listLoading = true;
|
|
|
if (this.listQuery.timeArray && this.listQuery.timeArray.length === 2) {
|
|
|
this.listQuery.start = this.listQuery.timeArray[0];
|
|
@@ -2006,7 +2015,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
});
|
|
|
- },
|
|
|
+ },
|
|
|
confirmReassign() {
|
|
|
this.$refs["reassignForm"].validate((valid) => {
|
|
|
if (valid) {
|
|
@@ -2805,134 +2814,134 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
<style>
|
|
|
- .pagination-container {
|
|
|
- margin-top: 0px;
|
|
|
- padding: 5px 16px !important;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .accept {
|
|
|
- background-color: #cc5858;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .completed {
|
|
|
- background-color: #999;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .waiting {
|
|
|
- background-color: #73bfec;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .nobook {
|
|
|
- background-color: #bebbbb;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .cancel {
|
|
|
- background-color: #bebbbb;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .processing {
|
|
|
- background-color: rgb(169 201 234);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- .detail-container {
|
|
|
- width: 80%;
|
|
|
- padding: 20px 20px 20px 20px;
|
|
|
- margin: 20px auto;
|
|
|
- }
|
|
|
-
|
|
|
- .operate-container {
|
|
|
- background: #f2f6fc;
|
|
|
- height: 80px;
|
|
|
- margin: -20px -20px 0;
|
|
|
- line-height: 80px;
|
|
|
- }
|
|
|
-
|
|
|
- .operate-button-container {
|
|
|
- float: right;
|
|
|
- margin-right: 20px;
|
|
|
- }
|
|
|
-
|
|
|
- .table-layout {
|
|
|
- margin-top: 20px;
|
|
|
- border-left: 1px solid #dcdfe6;
|
|
|
- border-top: 1px solid #dcdfe6;
|
|
|
- }
|
|
|
-
|
|
|
- .table-cell {
|
|
|
- height: 60px;
|
|
|
- line-height: 20px;
|
|
|
- border-right: 1px solid #dcdfe6;
|
|
|
- border-bottom: 1px solid #dcdfe6;
|
|
|
- padding: 10px;
|
|
|
- font-size: 14px;
|
|
|
- color: #606266;
|
|
|
- text-align: center;
|
|
|
- white-space: pre-wrap;
|
|
|
- /* overflow: hidden; */
|
|
|
- }
|
|
|
-
|
|
|
- .table-cell-title {
|
|
|
- border-right: 1px solid #dcdfe6;
|
|
|
- border-bottom: 1px solid #dcdfe6;
|
|
|
- padding: 10px;
|
|
|
- background: #f2f6fc;
|
|
|
- text-align: center;
|
|
|
- font-size: 14px;
|
|
|
- color: #303133;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table th.gutter {
|
|
|
- display: table-cell !important;
|
|
|
- }
|
|
|
-
|
|
|
- .el-button+.el-button {
|
|
|
- margin-left: 0px;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table colgroup.gutter {
|
|
|
- display: table-cell !important;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .warning-row {
|
|
|
- background: oldlace;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table .success-row {
|
|
|
- background: #f0f9eb;
|
|
|
- }
|
|
|
-
|
|
|
- .color-danger {
|
|
|
- color: #f56c6c;
|
|
|
- font-size: 18px;
|
|
|
- }
|
|
|
-
|
|
|
- .color-rebuy {
|
|
|
- color: #09afff;
|
|
|
- font-size: 18px;
|
|
|
- }
|
|
|
-
|
|
|
- .el-dialog .el-cascader {
|
|
|
- width: 400px;
|
|
|
- }
|
|
|
-
|
|
|
- .fixed-width .el-button--mini {
|
|
|
- width: auto;
|
|
|
- min-width: 60px;
|
|
|
- }
|
|
|
-
|
|
|
- .el-step.is-center .el-step__description {
|
|
|
- padding-left: 18%;
|
|
|
- padding-right: 18%;
|
|
|
- }
|
|
|
-
|
|
|
- .el-table th.gutter {
|
|
|
- display: table-cell !important;
|
|
|
- }
|
|
|
-
|
|
|
- .el-icon-copy-document {
|
|
|
- margin-left: 5px;
|
|
|
- color: #46a6ff;
|
|
|
- cursor: pointer;
|
|
|
- }
|
|
|
+.pagination-container {
|
|
|
+ margin-top: 0px;
|
|
|
+ padding: 5px 16px !important;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .accept {
|
|
|
+ background-color: #cc5858;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .completed {
|
|
|
+ background-color: #999;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .waiting {
|
|
|
+ background-color: #73bfec;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .nobook {
|
|
|
+ background-color: #bebbbb;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .cancel {
|
|
|
+ background-color: #bebbbb;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .processing {
|
|
|
+ background-color: rgb(169 201 234);
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
+.detail-container {
|
|
|
+ width: 80%;
|
|
|
+ padding: 20px 20px 20px 20px;
|
|
|
+ margin: 20px auto;
|
|
|
+}
|
|
|
+
|
|
|
+.operate-container {
|
|
|
+ background: #f2f6fc;
|
|
|
+ height: 80px;
|
|
|
+ margin: -20px -20px 0;
|
|
|
+ line-height: 80px;
|
|
|
+}
|
|
|
+
|
|
|
+.operate-button-container {
|
|
|
+ float: right;
|
|
|
+ margin-right: 20px;
|
|
|
+}
|
|
|
+
|
|
|
+.table-layout {
|
|
|
+ margin-top: 20px;
|
|
|
+ border-left: 1px solid #dcdfe6;
|
|
|
+ border-top: 1px solid #dcdfe6;
|
|
|
+}
|
|
|
+
|
|
|
+.table-cell {
|
|
|
+ height: 60px;
|
|
|
+ line-height: 20px;
|
|
|
+ border-right: 1px solid #dcdfe6;
|
|
|
+ border-bottom: 1px solid #dcdfe6;
|
|
|
+ padding: 10px;
|
|
|
+ font-size: 14px;
|
|
|
+ color: #606266;
|
|
|
+ text-align: center;
|
|
|
+ white-space: pre-wrap;
|
|
|
+ /* overflow: hidden; */
|
|
|
+}
|
|
|
+
|
|
|
+.table-cell-title {
|
|
|
+ border-right: 1px solid #dcdfe6;
|
|
|
+ border-bottom: 1px solid #dcdfe6;
|
|
|
+ padding: 10px;
|
|
|
+ background: #f2f6fc;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 14px;
|
|
|
+ color: #303133;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table th.gutter {
|
|
|
+ display: table-cell !important;
|
|
|
+}
|
|
|
+
|
|
|
+.el-button+.el-button {
|
|
|
+ margin-left: 0px;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table colgroup.gutter {
|
|
|
+ display: table-cell !important;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .warning-row {
|
|
|
+ background: oldlace;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table .success-row {
|
|
|
+ background: #f0f9eb;
|
|
|
+}
|
|
|
+
|
|
|
+.color-danger {
|
|
|
+ color: #f56c6c;
|
|
|
+ font-size: 18px;
|
|
|
+}
|
|
|
+
|
|
|
+.color-rebuy {
|
|
|
+ color: #09afff;
|
|
|
+ font-size: 18px;
|
|
|
+}
|
|
|
+
|
|
|
+.el-dialog .el-cascader {
|
|
|
+ width: 400px;
|
|
|
+}
|
|
|
+
|
|
|
+.fixed-width .el-button--mini {
|
|
|
+ width: auto;
|
|
|
+ min-width: 60px;
|
|
|
+}
|
|
|
+
|
|
|
+.el-step.is-center .el-step__description {
|
|
|
+ padding-left: 18%;
|
|
|
+ padding-right: 18%;
|
|
|
+}
|
|
|
+
|
|
|
+.el-table th.gutter {
|
|
|
+ display: table-cell !important;
|
|
|
+}
|
|
|
+
|
|
|
+.el-icon-copy-document {
|
|
|
+ margin-left: 5px;
|
|
|
+ color: #46a6ff;
|
|
|
+ cursor: pointer;
|
|
|
+}
|
|
|
</style>
|