diff --git a/package.json b/package.json index de489f4..bfa5970 100644 --- a/package.json +++ b/package.json @@ -67,9 +67,11 @@ "printjs": "^1.1.0", "qiniu-js": "^2.5.5", "qrcodejs2": "0.0.2", + "regenerator-runtime": "^0.14.1", "screenfull": "4.2.0", "showdown": "1.9.0", "sortablejs": "^1.15.0", + "svg-baker-runtime": "^1.4.7", "v-viewer": "^1.5.1", "view-design": "^4.3.2", "vue": "2.6.10", @@ -78,6 +80,7 @@ "vue-qr": "^2.5.0", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", + "vue-style-loader": "^4.1.3", "vue-ueditor-wrap": "^2.4.1", "vuedraggable": "2.20.0", "vuex": "3.1.0", diff --git a/src/components/deliveryRecord/index.vue b/src/components/deliveryRecord/index.vue index 8ab9ba5..8b20077 100644 --- a/src/components/deliveryRecord/index.vue +++ b/src/components/deliveryRecord/index.vue @@ -234,7 +234,7 @@ export default { if (lebData.export.length) { data = data.concat(lebData.export) excelData.page++ - } + } } createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); return diff --git a/src/layout/navBars/breadcrumb/setings.vue b/src/layout/navBars/breadcrumb/setings.vue index 7d8c287..4557081 100644 --- a/src/layout/navBars/breadcrumb/setings.vue +++ b/src/layout/navBars/breadcrumb/setings.vue @@ -443,7 +443,6 @@ export default { themeSelect["--prev-bg-menuBarColor"] = "#fff"; themeSelect["--prev-MenuActiveColor"] = "#fff"; if (val == "theme-1") { - console.log("1111111"); themeSelect["--prev-bg-menu-hover-ba-color"] = "#4073FA"; themeSelect["--prev-bg-menuBar"] = "#282c34"; themeSelect["--prev-border-color-lighter"] = "#282c34"; diff --git a/src/views/order/orderCancellate.vue b/src/views/order/orderCancellate.vue index c332192..d43d4fb 100644 --- a/src/views/order/orderCancellate.vue +++ b/src/views/order/orderCancellate.vue @@ -5,7 +5,8 @@ + @keyup.enter.native="searchOrder" + /> 搜索 @@ -14,15 +15,17 @@
- + :row-key="(row) => { return row.product_id }" @selection-change="handleSelectionChange" + :header-cell-style="{ background: '#F0F5FF' }" + > + - + @@ -69,7 +72,6 @@ 核销 -
@@ -92,8 +94,8 @@ export default { dialogVisible: false, loading: false, code: '', - order_id: "", - orderData: "", + order_id: '', + orderData: '', multipleSelection: [], ids: [], verify_code: '', //核销码 @@ -115,21 +117,26 @@ export default { // if (!this.code) { // return this.$message.warning('输入核销码!') // } - if (!this.verify_code) { - return this.$message.warning('输入核销码!') - } + // if (!this.verify_code) { + // return this.$message.warning('输入核销码!') + // } if (!this.multipleSelection.length) { return this.$message.warning('请选择核销商品!') } const data = [] + let verify_code = '' this.multipleSelection.map((item) => { if (item.refund_num > 0) { data.push({ id: item.order_product_id, num: item.refund_num }) + if (!verify_code) verify_code = item.verify_code } + }); + if (!verify_code) { + return this.$message.warning('输入核销码!') + } - }) - goCancellationApi(this.order_id, { verify_code: this.verify_code, data: data }).then(res => { + goCancellationApi(this.order_id, { verify_code: verify_code, data: data }).then(res => { this.$message.success(res.message) this.dialogVisible = false this.$emit('getList', '') @@ -138,10 +145,11 @@ export default { }) }, productDetails(code, type = false) { - if (type) { this.code = code } - else { - this.code = ""; - this.verify_code = ""; + if (type) { + this.code = code + } else { + this.code = '' + this.verify_code = '' } this.loading = true orderCancellationApi(code).then(res => { @@ -160,8 +168,8 @@ export default { }, resetData() { this.orderData = {}, - this.productList = []; - this.code = "" + this.productList = [] + this.code = '' }, // 选择商品 handleSelectionChange(val) { diff --git a/src/views/order/orderCancellate/index.vue b/src/views/order/orderCancellate/index.vue index 073f9b4..6e3eb51 100644 --- a/src/views/order/orderCancellate/index.vue +++ b/src/views/order/orderCancellate/index.vue @@ -36,7 +36,7 @@ 搜索 - 重置 + 重置