|
@@ -1,14 +1,22 @@
|
|
|
<template>
|
|
|
<div class="orderImport pagePadding">
|
|
|
- <div v-if="tableData && tableData.length > 0" class="tr" style="padding:10px 0 0 0">
|
|
|
-
|
|
|
+ <div
|
|
|
+ v-if="tableData && tableData.length > 0"
|
|
|
+ class="tr"
|
|
|
+ style="padding: 10px 0 0 0"
|
|
|
+ >
|
|
|
<el-button @click="cancel" :size="'mini'">取消</el-button>
|
|
|
- <el-button type="primary" @click="submit" :size="'mini'">提交</el-button>
|
|
|
+ <el-button type="primary" @click="submit" :size="'mini'">提交</el-button>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
|
|
|
</div>
|
|
|
- <ex-table :columns="columns" :table="table" :data="tableData" style="margin:15px 0 0 0">
|
|
|
+ <ex-table
|
|
|
+ :columns="columns"
|
|
|
+ :table="table"
|
|
|
+ :data="tableData"
|
|
|
+ style="margin: 15px 0 0 0"
|
|
|
+ >
|
|
|
<template #operation="{ scope }">
|
|
|
<el-tooltip effect="dark" content="删除" placement="top">
|
|
|
<i class="el-icon-delete tb-icon" @click="del(scope)"></i>
|
|
@@ -116,11 +124,19 @@ export default {
|
|
|
// let r = /^\+?[1-9][0-9]*$/;
|
|
|
// let tableOk = true;
|
|
|
this.ruleForm.order_addr = [];
|
|
|
- list.forEach((v1, index) => {
|
|
|
- let b = Object.values(v1);
|
|
|
- let numFlag = false;
|
|
|
|
|
|
- try {
|
|
|
+ try {
|
|
|
+ list.forEach((v1, index) => {
|
|
|
+ let b = Object.values(v1);
|
|
|
+ let numFlag = false;
|
|
|
+ if (b[5] == 0 || b[6] == 0) {
|
|
|
+ this.$message.warning(
|
|
|
+ `excel表格第${index + 1}行,单价,数量的值不能为0`
|
|
|
+ );
|
|
|
+ numFlag = true;
|
|
|
+ throw Error();
|
|
|
+ }
|
|
|
+
|
|
|
if (!isNaN(b[5]) && !isNaN(b[6]) && !isNaN(b[7])) {
|
|
|
} else {
|
|
|
this.$message.warning(
|
|
@@ -135,32 +151,32 @@ export default {
|
|
|
numFlag = true;
|
|
|
throw Error();
|
|
|
}
|
|
|
- } catch (e) {}
|
|
|
- if (numFlag) {
|
|
|
- return;
|
|
|
- }
|
|
|
- // let item = this.get_code(b[3], b[4], b[5]);
|
|
|
- let model = {
|
|
|
- platform_code: b[0] + "",
|
|
|
- po_code: b[1] + "",
|
|
|
- platform_time: this.formatDate(b[2]) + "",
|
|
|
- sale_source: b[3] + "",
|
|
|
- plat_code: b[4] + "",
|
|
|
- price: b[5] + "",
|
|
|
- num: b[6] + "",
|
|
|
- // before_discount_all_price: b[7] + "",
|
|
|
- before_discount_all_price: b[7] + "",
|
|
|
- // after_price: b[9] + "",
|
|
|
- activity_name: b[8] + "",
|
|
|
- mode: b[9] + "",
|
|
|
- contactor: b[10] + "",
|
|
|
- mobile: b[11] + "",
|
|
|
- addr: b[12] + "",
|
|
|
- order_remark: b[13] + "",
|
|
|
- };
|
|
|
+ // if (numFlag) {
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // let item = this.get_code(b[3], b[4], b[5]);
|
|
|
+ let model = {
|
|
|
+ platform_code: b[0] + "",
|
|
|
+ po_code: b[1] + "",
|
|
|
+ platform_time: this.formatDate(b[2]) + "",
|
|
|
+ sale_source: b[3] + "",
|
|
|
+ plat_code: b[4] + "",
|
|
|
+ price: b[5] + "",
|
|
|
+ num: b[6] + "",
|
|
|
+ // before_discount_all_price: b[7] + "",
|
|
|
+ before_discount_all_price: b[7] + "",
|
|
|
+ // after_price: b[9] + "",
|
|
|
+ activity_name: b[8] + "",
|
|
|
+ mode: b[9] + "",
|
|
|
+ contactor: b[10] + "",
|
|
|
+ mobile: b[11] + "",
|
|
|
+ addr: b[12] + "",
|
|
|
+ order_remark: b[13] + "",
|
|
|
+ };
|
|
|
|
|
|
- this.tableData.push(model);
|
|
|
- });
|
|
|
+ this.tableData.push(model);
|
|
|
+ });
|
|
|
+ } catch (e) {}
|
|
|
|
|
|
console.log(this.tableData);
|
|
|
},
|