diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index 9ac9e257..33d8e705 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -105,7 +105,6 @@ ref="underForm" :model="underForm" :label-width="100" - :rules="formValidate" > @@ -133,9 +132,6 @@ export default { modalType: 0, // 添加或编辑标识 modalVisible: false, // 添加或编辑显示 modalTitle: "", // 添加或编辑标题 - drop: false, // 展开搜索框 - dropDownContent: "展开", // 展开标签文字 - dropDownIcon: "ios-arrow-down", // 展开图标 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -146,17 +142,6 @@ export default { underForm: { // 下架原因 reason: "", }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 @@ -379,16 +364,6 @@ export default { this.selectList = e; this.selectCount = e.length; }, - dropDown() { - if (this.drop) { - this.dropDownContent = "展开"; - this.dropDownIcon = "ios-arrow-down"; - } else { - this.dropDownContent = "收起"; - this.dropDownIcon = "ios-arrow-up"; - } - this.drop = !this.drop; - }, getDataList() { this.loading = true; // 带多条件搜索参数获取表单数据 diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue index 895f23fb..114fceee 100644 --- a/manager/src/views/goods/goods-info/goodsApply.vue +++ b/manager/src/views/goods/goods-info/goodsApply.vue @@ -105,16 +105,6 @@ goodsAuditForm: { // 商品编辑表单 is_auth: 1, }, - form: { - // 添加或编辑表单对象初始化数据 - goodsName: "", - sn: "", - marketEnable: "", - price: "", - sellerName: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/goods/goods-refund/index.vue b/manager/src/views/goods/goods-refund/index.vue deleted file mode 100644 index 75a7b91f..00000000 --- a/manager/src/views/goods/goods-refund/index.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - diff --git a/manager/src/views/goods/goods-review/index.vue b/manager/src/views/goods/goods-review/index.vue index c837f4ae..5bfb371c 100644 --- a/manager/src/views/goods/goods-review/index.vue +++ b/manager/src/views/goods/goods-review/index.vue @@ -114,16 +114,6 @@ export default { startDate: "", // 起始时间 endDate: "", // 终止时间 }, - form: { - // 添加或编辑表单对象初始化数据 - memberName: "", - storeName: "", - shopDisable: "", - id: "", - createTime: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/lili-dialog/goods-dialog.vue b/manager/src/views/lili-dialog/goods-dialog.vue index ed8cf77a..ba878753 100644 --- a/manager/src/views/lili-dialog/goods-dialog.vue +++ b/manager/src/views/lili-dialog/goods-dialog.vue @@ -111,9 +111,11 @@ export default { initGoods(res) { if (res.result.records.length !=0) { + console.log(this.selectedWay); res.result.records.forEach((item) => { item.selected = false; item.___type = "goods"; //设置为goods让pc wap知道标识 + this.selectedWay.forEach(e => { if (e.id === item.id) { item.selected = true diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue index 3c283d43..1fed5b96 100644 --- a/manager/src/views/lili-dialog/index.vue +++ b/manager/src/views/lili-dialog/index.vue @@ -25,9 +25,6 @@ export default { flag: false, // modal显隐 }; }, - props: ["types"], - watch: {}, - mounted() {}, methods: { // 关闭弹窗 clickClose() { @@ -51,13 +48,17 @@ export default { } this.clickClose(); }, - open(type) { + open(type, mutiple) { this.flag = true; if (type == "goods") { this.goodsFlag = true; + if (mutiple) { + this.singleGoods() + } } else { this.goodsFlag = false; } + }, close() { this.flag = false; diff --git a/manager/src/views/lili-dialog/link-dialog.vue b/manager/src/views/lili-dialog/link-dialog.vue index a5294ce5..0c68f0e3 100644 --- a/manager/src/views/lili-dialog/link-dialog.vue +++ b/manager/src/views/lili-dialog/link-dialog.vue @@ -40,7 +40,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.$refs["lili-component"][0].type = "single"; //如果商品页面设置成为单选 + this.$refs["lili-component"][0].type = "single"; //商品页面设置成为单选 }); this.wap.forEach((item) => { diff --git a/manager/src/views/lili-dialog/template/marketing.vue b/manager/src/views/lili-dialog/template/marketing.vue index 4b89cd6d..04af40de 100644 --- a/manager/src/views/lili-dialog/template/marketing.vue +++ b/manager/src/views/lili-dialog/template/marketing.vue @@ -65,7 +65,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { @@ -113,7 +113,7 @@ export default { }, { title: "店铺名称", - key: "sellerName", + key: "storeName", tooltip: true, }, { diff --git a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue index 42da8019..c74d4b48 100644 --- a/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue +++ b/manager/src/views/lili-floor-renovation/modelList/newGoodsSort.vue @@ -176,12 +176,16 @@ export default { handleSelectGoods(item) { // 调起选择商品 console.warn(item); if (item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink (val) { this.selected.url = this.$options.filters.formatLinkType(val); }, selectedGoodsData (val) { + console.log(val); let goods = val[0] console.log(this.selected); this.selected.img = goods.thumbnail diff --git a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue index 2a93c86f..11b369b6 100644 --- a/manager/src/views/lili-floor-renovation/modelList/notEnough.vue +++ b/manager/src/views/lili-floor-renovation/modelList/notEnough.vue @@ -108,7 +108,10 @@ export default { }, handleSelectGoods(item) { // 调起选择链接弹窗 if(item) this.selected = item; - this.$refs.liliDialog.open('goods') + this.$refs.liliDialog.open('goods', 'single') + setTimeout(() => { + this.$refs.liliDialog.goodsData = [this.selected] + }, 500); }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/lili-floor-renovation/modelList/recommend.vue b/manager/src/views/lili-floor-renovation/modelList/recommend.vue index 588709dc..d37a34a2 100644 --- a/manager/src/views/lili-floor-renovation/modelList/recommend.vue +++ b/manager/src/views/lili-floor-renovation/modelList/recommend.vue @@ -241,7 +241,7 @@ export default { }, handleSelectGoods(item) { // 调起选择商品 - this.$refs.liliDialog.open("goods"); + this.$refs.liliDialog.open('goods', 'single') }, selectedLink(val) { this.selected.url = this.$options.filters.formatLinkType(val); diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue index 3b99a5fd..8e60beaf 100644 --- a/manager/src/views/order/flow/refundLog.vue +++ b/manager/src/views/order/flow/refundLog.vue @@ -57,14 +57,6 @@ export default { isRefund: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, columns: [ { title: "售后单号", diff --git a/manager/src/views/order/order/fictitiousOrderList.vue b/manager/src/views/order/order/fictitiousOrderList.vue index 50387891..5256a2cb 100644 --- a/manager/src/views/order/order/fictitiousOrderList.vue +++ b/manager/src/views/order/order/fictitiousOrderList.vue @@ -106,16 +106,6 @@ orderStatus: "" }, selectDate: null, // 下单时间 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index 545b8ed6..2005fe73 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -212,7 +212,7 @@
  • 应付金额: ¥{{ orderInfo.order.priceDetailDTO.flowPrice }}¥{{ orderInfo.order.priceDetailDTO.flowPrice | unitPrice }}
  • diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index a36f93c8..beda900e 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -64,16 +64,6 @@ export default { orderStatus: "", }, selectDate: null, - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/order/receipt/receipt.vue b/manager/src/views/order/receipt/receipt.vue index 52f36e32..1018b8a5 100644 --- a/manager/src/views/order/receipt/receipt.vue +++ b/manager/src/views/order/receipt/receipt.vue @@ -114,20 +114,10 @@ receiptStatus: "", // 起始时间 }, shopsData: [], // 店铺数据 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, params: { pageNumber: 1, - pageSize: 1, + pageSize: 10, }, - // 表单验证规则 - formValidate: {}, submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 diff --git a/manager/src/views/promotion/coupon/couponPublish.vue b/manager/src/views/promotion/coupon/couponPublish.vue index cc017088..07102b18 100644 --- a/manager/src/views/promotion/coupon/couponPublish.vue +++ b/manager/src/views/promotion/coupon/couponPublish.vue @@ -70,7 +70,7 @@
    - +
    @@ -392,6 +392,14 @@ export default { ); this.$router.go(-1); }, + openSkuList() { // 显示商品选择器 + this.$refs.skuSelect.open("goods"); + let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList)) + data.forEach(e => { + e.id = e.skuId + }) + this.$refs.skuSelect.goodsData = data; + }, changeSelect(e) { // 已选商品批量选择 this.selectedGoods = e; @@ -424,25 +432,19 @@ export default { }, selectedGoodsData(item) { // 回显已选商品 - let ids = []; let list = []; - this.form.promotionGoodsList.forEach((e) => { - ids.push(e.skuId); - }); item.forEach((e) => { - if (!ids.includes(e.id)) { list.push({ goodsName: e.goodsName, price: e.price, originalPrice: e.price, quantity: e.quantity, storeId: e.storeId, - sellerName: e.sellerName, + storeName: e.storeName, skuId: e.id, }); - } }); - this.form.promotionGoodsList.push(...list); + this.form.promotionGoodsList = list; }, getGoodsCategory(e) { // 获取级联选择器商品分类id diff --git a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue index d8646b58..082b27ac 100644 --- a/manager/src/views/promotion/pointsGoods/editPointsGoods.vue +++ b/manager/src/views/promotion/pointsGoods/editPointsGoods.vue @@ -5,19 +5,19 @@

    积分商品信息

    - +
    {{ form.goodsSku.goodsName }}
    - +
    {{ form.goodsSku.id }}
    - -
    {{ form.goodsSku.sellerName }}
    + +
    {{ form.goodsSku.storeName }}
    - +
    {{ form.goodsSku.price | unitPrice('¥') }}
    - +
    {{ form.goodsSku.quantity }}
    @@ -90,9 +90,7 @@
    -
    @@ -65,9 +39,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -78,17 +49,6 @@ export default { endDate: "", // 终止时间 }, selectDate: null, // 选择一个事件段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -227,8 +187,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -248,35 +206,6 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, detail(v) { let id = v.id; this.$router.push({ diff --git a/manager/src/views/seller/bill/bill.vue b/manager/src/views/seller/bill/bill.vue index d014ce8e..2a4f5b3c 100644 --- a/manager/src/views/seller/bill/bill.vue +++ b/manager/src/views/seller/bill/bill.vue @@ -24,11 +24,10 @@ - -
    +
    @@ -38,32 +37,6 @@ - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    -
    @@ -76,9 +49,6 @@ export default { data() { return { loading: true, // 表单加载状态 - modalType: 0, // 添加或编辑标识 - modalVisible: false, // 添加或编辑显示 - modalTitle: "", // 添加或编辑标题 searchForm: { // 搜索框初始化对象 pageNumber: 1, // 当前页数 @@ -90,17 +60,6 @@ export default { billStatus:"" //状态 }, selectDate: null, // 选择一个时间段 - form: { - // 添加或编辑表单对象初始化数据 - sn: "", - sellerName: "", - startTime: "", - endTime: "", - billPrice: "", - }, - // 表单验证规则 - formValidate: {}, - submitLoading: false, // 添加或编辑提交状态 selectList: [], // 多选数据 selectCount: 0, // 多选计数 columns: [ @@ -201,28 +160,20 @@ export default { init() { this.getDataList(); }, - changePage(v) { + changePage(v) { // 改变页码 this.searchForm.pageNumber = v; this.getDataList(); }, - changePageSize(v) { + changePageSize(v) { // 改变页数 this.searchForm.pageSize = v; this.getDataList(); }, - handleSearch() { + handleSearch() { // 搜索 this.searchForm.pageNumber = 1; this.searchForm.pageSize = 10; this.getDataList(); }, - changeSort(e) { - this.searchForm.sort = e.key; - this.searchForm.order = e.order; - if (e.order === "normal") { - this.searchForm.order = ""; - } - this.getDataList(); - }, - changeSelect(e) { + changeSelect(e) { // 表格选中 this.selectList = e; this.selectCount = e.length; }, @@ -235,8 +186,6 @@ export default { getDataList() { this.loading = true; - // this.searchForm - this.searchForm.startTime && (this.searchForm.startTime = this.$options.filters.unixToDate( this.searchForm.startTime / 1000 @@ -256,43 +205,7 @@ export default { this.total = this.data.length; this.loading = false; }, - handleSubmit() { - this.$refs.form.validate((valid) => { - if (valid) { - this.submitLoading = true; - if (this.modalType === 0) { - // 添加 避免编辑后传入id等数据 记得删除 - delete this.form.id; - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } else { - // 编辑 - this.postRequest("/bill/insertOrUpdate", this.form).then((res) => { - this.submitLoading = false; - if (res.success) { - this.$Message.success("操作成功"); - this.getDataList(); - this.modalVisible = false; - } - }); - } - } - }); - }, - add() { - this.modalType = 0; - this.modalTitle = "添加"; - this.$refs.form.resetFields(); - delete this.form.id; - this.modalVisible = true; - }, - detail(v) { + detail(v) { // 账单详情 let id = v.id; this.$router.push({ name: "bill-detail", @@ -314,14 +227,10 @@ export default { this.getDataList(); } }); - // 模拟请求成功 - //this.$Message.success("操作成功"); - //this.$Modal.remove(); - //this.getDataList(); }, }); }, - delAll() { + delAll() { // 多选删除数据 if (this.selectCount <= 0) { this.$Message.warning("您还未选择要删除的数据"); return; diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 5c56535a..308af93e 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -305,7 +305,7 @@ export default { }, { title: "商家名称", - key: "sellerName", + key: "storeName", }, { title: "售后单类型", diff --git a/manager/src/views/statistics/order/refundOrder.vue b/manager/src/views/statistics/order/refundOrder.vue index 6e37b7fe..65753284 100644 --- a/manager/src/views/statistics/order/refundOrder.vue +++ b/manager/src/views/statistics/order/refundOrder.vue @@ -38,7 +38,7 @@
    店铺名称 - {{res.sellerName}} + {{res.storeName}}
    创建时间