diff --git a/front/src/renderer/src/views/chanpin.vue b/front/src/renderer/src/views/chanpin.vue index 480be45..baf9c20 100644 --- a/front/src/renderer/src/views/chanpin.vue +++ b/front/src/renderer/src/views/chanpin.vue @@ -138,11 +138,11 @@ export default { let headerItem = that.tableHeader[j]; if (element[headerItem.label]) { if (headerItem.type === "text") { - item[headerItem.prop] = element[headerItem.label] + item[headerItem.prop] = _.trim(element[headerItem.label]) } else if (headerItem.type === "number") { item[headerItem.prop] = Number(element[headerItem.label]) } else if (headerItem.type === "date") { - item[headerItem.prop] = dayjs(`${element[headerItem.label] ? "20" + element[headerItem.label].replace("\t","") : ""}`).format("YYYY-MM-DD HH:mm:ss") + item[headerItem.prop] = dayjs(`${element[headerItem.label] ? "20" + element[headerItem.label].replace("\t", "") : ""}`).format("YYYY-MM-DD HH:mm:ss") } } } diff --git a/front/src/renderer/src/views/dingdan.vue b/front/src/renderer/src/views/dingdan.vue index 1703f4c..f2b65f0 100644 --- a/front/src/renderer/src/views/dingdan.vue +++ b/front/src/renderer/src/views/dingdan.vue @@ -166,7 +166,7 @@ export default { } if (element[headerItem.label]) { if (headerItem.type === "text") { - item[headerItem.prop] = element[headerItem.label] + item[headerItem.prop] = _.trim(element[headerItem.label]) } else if (headerItem.type === "number") { item[headerItem.prop] = Number(element[headerItem.label]) } else if (headerItem.type === "date") { diff --git a/front/src/renderer/src/views/user.vue b/front/src/renderer/src/views/user.vue index 2bcc302..c752c09 100644 --- a/front/src/renderer/src/views/user.vue +++ b/front/src/renderer/src/views/user.vue @@ -138,7 +138,7 @@ export default { let headerItem = that.tableHeader[j]; if (element[headerItem.label]) { if (headerItem.type === "text") { - item[headerItem.prop] = element[headerItem.label] + item[headerItem.prop] = _.trim(element[headerItem.label]) } else if (headerItem.type === "number") { item[headerItem.prop] = Number(element[headerItem.label]) } else if (headerItem.type === "date") { diff --git a/模版/66.xls b/模版/66.xls new file mode 100644 index 0000000..7cfe1a9 Binary files /dev/null and b/模版/66.xls differ diff --git a/模版/S6直营销售单导入模板.xls b/模版/S6直营销售单导入模板.xls deleted file mode 100644 index 3c2ad3b..0000000 Binary files a/模版/S6直营销售单导入模板.xls and /dev/null differ diff --git a/模版/产品信息(模板).xls b/模版/产品信息(模板).xls deleted file mode 100644 index 99e1dce..0000000 Binary files a/模版/产品信息(模板).xls and /dev/null differ diff --git a/模版/产品信息8月25日.xls b/模版/产品信息8月25日.xls new file mode 100644 index 0000000..3ad22c8 Binary files /dev/null and b/模版/产品信息8月25日.xls differ diff --git a/模版/客户编码文档(1).xls b/模版/客户编码文档(1).xls deleted file mode 100644 index a5fb2d9..0000000 Binary files a/模版/客户编码文档(1).xls and /dev/null differ diff --git a/模版/客户编码文档.xls b/模版/客户编码文档.xls new file mode 100644 index 0000000..a51e217 Binary files /dev/null and b/模版/客户编码文档.xls differ diff --git a/模版/销售订单修改导出(审核版).xlsx b/模版/销售订单修改导出(审核版).xlsx deleted file mode 100644 index 9103594..0000000 Binary files a/模版/销售订单修改导出(审核版).xlsx and /dev/null differ diff --git a/模版/销售订单导入准备表(1).xlsx b/模版/销售订单导入准备表(1).xlsx deleted file mode 100644 index de9ee78..0000000 Binary files a/模版/销售订单导入准备表(1).xlsx and /dev/null differ diff --git a/模版/销售订单导入准备表.xlsx b/模版/销售订单导入准备表.xlsx index 477bc2d..c44d3b5 100644 Binary files a/模版/销售订单导入准备表.xlsx and b/模版/销售订单导入准备表.xlsx differ diff --git a/模版/销售订单导入准备表0.xlsx b/模版/销售订单导入准备表0.xlsx deleted file mode 100644 index 363e94b..0000000 Binary files a/模版/销售订单导入准备表0.xlsx and /dev/null differ diff --git a/模版/销售订单导出第一步(未审核版).xlsx b/模版/销售订单导出第一步(未审核版).xlsx deleted file mode 100644 index f3c973f..0000000 Binary files a/模版/销售订单导出第一步(未审核版).xlsx and /dev/null differ diff --git a/模版/销售订单未导入产品.xlsx b/模版/销售订单未导入产品.xlsx deleted file mode 100644 index e8d1602..0000000 Binary files a/模版/销售订单未导入产品.xlsx and /dev/null differ diff --git a/模版/顺鑫订单(3).xlsx b/模版/顺鑫订单(3).xlsx new file mode 100644 index 0000000..1fac6ca Binary files /dev/null and b/模版/顺鑫订单(3).xlsx differ