mkm/new_shop_mer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

核销码

Browse Source
This commit is contained in:
1154079537 2024-05-14 17:58:54 +08:00
parent 58728db898
commit ee5f03d3e8
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -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",

2
src/components/deliveryRecord/index.vue
View File

@ -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

1
src/layout/navBars/breadcrumb/setings.vue
View File

@ -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";

52
src/views/order/orderCancellate.vue
View File

@ -5,7 +5,8 @@
<el-form label-width="80px" size="small">
<el-form-item v-if="!isColum" label="核销码：">
<el-input v-model="code" placeholder="请输入核销码" class="selWidth" size="small"
@keyup.enter.native="searchOrder" />
@keyup.enter.native="searchOrder"
/>
<el-button size="small" type="primary" @click="searchOrder">搜索</el-button>
</el-form-item>
<el-form-item label="订单号：">
@ -14,15 +15,17 @@
</el-form>
<div style="margin-top: 20px;">
<el-table ref="multipleSelection" :data="productList" tooltip-effect="dark" size="mini"
:row-key="(row) => { return row.product_id }" @selection-change="handleSelectionChange"
:header-cell-style="{ background: '#F0F5FF' }">
<el-table-column align="center" type="selection" :selectable="judgeSelect" min-width="50" />
:row-key="(row) => { return row.product_id }" @selection-change="handleSelectionChange"
:header-cell-style="{ background: '#F0F5FF' }"
>
<el-table-column align="center" type="selection" :selectable="judgeSelect" min-width="50"/>
<el-table-column align="center" label="商品信息" min-width="200">
<template slot-scope="scope">
<div class="acea-row" style="align-items: center;">
<div class="demo-image__preview">
<el-image :src="scope.row.cart_info.product.image"
:preview-src-list="[scope.row.cart_info.product.image]" />
:preview-src-list="[scope.row.cart_info.product.image]"
/>
</div>
<span class="priceBox" style="width: 150px;">{{ scope.row.cart_info.product.store_name }}</span>
</div>
@ -43,10 +46,10 @@
<span class="priceBox">待核销</span>
</template>
</el-table-column>
<el-table-column align="center" prop="product_num" label="总数" min-width="80" />
<el-table-column align="center" prop="product_num" label="总数" min-width="80"/>
<el-table-column label="核销码" align="center" min-width="180">
<template slot-scope="scope">
<el-input v-model="verify_code" class="priceBox" />
<el-input v-model="scope.row.verify_code" class="priceBox"/>
</template>
</el-table-column>
<!-- <el-table-column label="待核销数量" align="center" min-width="120">
@ -58,7 +61,7 @@
:max="scope.row.max_num"
class="priceBox"
@change="limitNum(scope.row)"
/>
/>
</template>
</el-table-column> -->
</el-table>
@ -69,7 +72,6 @@
<el-button type="primary" @click="handleCancellation" size="small">核销</el-button>
</span>
</el-dialog>
</div>
</template>
@ -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) {

2
src/views/order/orderCancellate/index.vue
View File

@ -36,7 +36,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
</el-form-item>
</el-form>
</div>