lichong
/
chanpininfo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

123

master
lc18518571399 9 months ago
parent
67ccacef74
commit
9e760ef31e
5 changed files with 102 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      api/app/model/dingdan.js
  2. 124
      api/app/public/dingdan.json
  3. 13
      front/src/renderer/src/assets/json/dingdan.json
  4. 7
      front/src/renderer/src/views/dingdan.vue
  5. 2
      front/src/renderer/src/views/user.vue

9
api/app/model/dingdan.js
View File

@ -105,8 +105,13 @@ module.exports = app => {
type: String, type: String,
default: "" default: ""
}, },
// 品名 // 客户品名
pinming: { kehupinming: {
type: String,
default: ""
},
// 产品
chanpin: {
type: String, type: String,
default: "" default: ""
}, },

124
api/app/public/dingdan.json
View File

@ -13,55 +13,56 @@
"label": "客户编号", "label": "客户编号",
"prop": "kehubianhao", "prop": "kehubianhao",
"type": "text", "type": "text",
"minWidth": 40,
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "简称", "label": "简称",
"prop": "username", "prop": "username",
"type": "text", "type": "text",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "客户名称", "label": "客户名称",
"prop": "kehumingcheng", "prop": "kehumingcheng",
"type": "text", "type": "text",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "产品代码", "label": "产品代码",
"prop": "chanpindaima", "prop": "chanpindaima",
"type": "text", "type": "text",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "厂编", "label": "厂编",
"prop": "changbian", "prop": "changbian",
"type": "text", "type": "text",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
"exportS6": true
}, },
{ {
"label": "货号", "label": "货号",
"prop": "huohao", "prop": "huohao",
"type": "text", "type": "text",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
}, "exportS6": true
{
"label": "单据单位数量",
"prop": "danjudanweishuliang",
"type": "number",
"tableShow": true,
"formShow": true
}, },
{ {
"label": "条码", "label": "条码",
"prop": "tiaoma", "prop": "tiaoma",
"type": "text", "type": "text",
"minWidth": 130,
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true
}, },
@ -69,78 +70,108 @@
"label": "最小单位条码", "label": "最小单位条码",
"prop": "zuixiaodanweitiaoma", "prop": "zuixiaodanweitiaoma",
"type": "text", "type": "text",
"tableShow": false,
"formShow": true,
"exportxiaoshou": true
},
{
"label": "客户品名",
"prop": "kehupinming",
"type": "select",
"minWidth": 150,
"formShow": true,
"tableShow": true, "tableShow": true,
"formShow": true "exportxiaoshou": true
},
{
"label": "产品",
"prop": "chanpin",
"type": "text",
"minWidth": 150,
"formShow": true,
"tableShow": true,
"exportxiaoshou": true
},
{
"label": "单据单位数量",
"prop": "danjudanweishuliang",
"type": "number",
"minWidth": 60,
"tableShow": true,
"formShow": true,
"exportS6": false
}, },
{ {
"label": "修改后销售数量", "label": "修改后销售数量",
"prop": "xiugaihouxiaoshoushuliang", "prop": "xiugaihouxiaoshoushuliang",
"type": "number", "type": "number",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
},
{
"label": "销售金额",
"prop": "xiaoshoujine",
"type": "number",
"formShow": true,
"tableShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "最高采购价", "label": "最高采购价",
"prop": "zuigaocaigoujia", "prop": "zuigaocaigoujia",
"type": "number", "type": "number",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "箱装量", "label": "箱装量",
"prop": "xiangzhuangliang", "prop": "xiangzhuangliang",
"type": "number", "type": "number",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "最大箱装量", "label": "最大箱装量",
"prop": "zuidaxiangzhuangliang", "prop": "zuidaxiangzhuangliang",
"type": "number", "type": "number",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "规格型号", "label": "规格型号",
"prop": "guigexinghao", "prop": "guigexinghao",
"type": "text", "type": "text",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "计量单位", "label": "计量单位",
"prop": "jiliangdanwei", "prop": "jiliangdanwei",
"type": "text", "type": "text",
"tableShow": true, "tableShow": false,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "箱条码", "label": "箱条码",
"prop": "xiangtiaoma", "prop": "xiangtiaoma",
"type": "text", "type": "text",
"tableShow": true, "tableShow": true,
"formShow": true "formShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "最大箱条码", "label": "最大箱条码",
"prop": "zuidaxiangtiaoma", "prop": "zuidaxiangtiaoma",
"type": "text", "type": "text",
"tableShow": true, "tableShow": true,
"formShow": true
},
{
"label": "条码",
"prop": "tiaoma",
"type": "text",
"formShow": true,
"tableShow": true
},
{
"label": "品名",
"prop": "pinming",
"type": "select",
"formShow": true, "formShow": true,
"tableShow": true "exportxiaoshou": true
}, },
{ {
"label": "品名选项", "label": "品名选项",
@ -161,19 +192,20 @@
"prop": "guige", "prop": "guige",
"type": "text", "type": "text",
"formShow": true, "formShow": true,
"tableShow": true "tableShow": false
}, },
{ {
"label": "销售数量", "label": "销售数量",
"prop": "xiaoshoushuliang", "prop": "xiaoshoushuliang",
"type": "number", "type": "number",
"formShow": true, "formShow": true,
"tableShow": true "tableShow": true,
"exportxiaoshou": true
}, },
{ {
"label": "销售金额", "label": "暂无此产品",
"prop": "xiaoshoujine", "prop": "isNotSale",
"type": "number", "type": "boolean",
"formShow": true, "formShow": true,
"tableShow": true "tableShow": true
} }

13
front/src/renderer/src/assets/json/dingdan.json
View File

@ -75,14 +75,23 @@
"exportxiaoshou": true "exportxiaoshou": true
}, },
{ {
"label": "品名", "label": "客户品名",
"prop": "pinming", "prop": "kehupinming",
"type": "select", "type": "select",
"minWidth": 150, "minWidth": 150,
"formShow": true, "formShow": true,
"tableShow": true, "tableShow": true,
"exportxiaoshou": true "exportxiaoshou": true
}, },
{
"label": "产品",
"prop": "chanpin",
"type": "text",
"minWidth": 150,
"formShow": true,
"tableShow": true,
"exportxiaoshou": true
},
{ {
"label": "单据单位数量", "label": "单据单位数量",
"prop": "danjudanweishuliang", "prop": "danjudanweishuliang",

7
front/src/renderer/src/views/dingdan.vue
View File

@ -161,6 +161,9 @@ export default {
let item = {} let item = {}
for (let j = 0; j < that.tableHeader.length; j++) { for (let j = 0; j < that.tableHeader.length; j++) {
let headerItem = that.tableHeader[j]; let headerItem = that.tableHeader[j];
if (headerItem.prop === "kehupinming") {
item['kehupinming'] = element["客户品名"] || element["品名"]
}
if (element[headerItem.label]) { if (element[headerItem.label]) {
if (headerItem.type === "text") { if (headerItem.type === "text") {
item[headerItem.prop] = element[headerItem.label] item[headerItem.prop] = element[headerItem.label]
@ -509,7 +512,7 @@ export default {
["sheet1"]: jsonWorkSheet, ["sheet1"]: jsonWorkSheet,
} }
}; };
return this.$XLSX.writeFile(workBook, `销售订单${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xlsx`); return this.$XLSX.writeFile(workBook, `销售订单${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xls`);
}) })
.catch(() => { .catch(() => {
ElMessage({ ElMessage({
@ -582,7 +585,7 @@ export default {
["sheet1"]: jsonWorkSheet, ["sheet1"]: jsonWorkSheet,
} }
}; };
return this.$XLSX.writeFile(workBook, `S6订单${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xlsx`); return this.$XLSX.writeFile(workBook, `S6订单${dayjs().format("YYYY-MM-DD_HH-mm-ss")}.xls`);
}) })
.catch(() => { .catch(() => {
ElMessage({ ElMessage({

2
front/src/renderer/src/views/user.vue
View File

@ -209,7 +209,7 @@ export default {
async searchData() { async searchData() {
let params = {} let params = {}
if (this.searchParams.username) { if (this.searchParams.username) {
params["username"] = this.searchParams.username params["username"] = { $regex: `${_.trim(this.searchParams.username)}`, $options: 'i' }
} }
this.updateSeach(params) this.updateSeach(params)
}, },

Write Preview
Loading…
Cancel
Save