From 7b866bd2c5ec57c6a7b75ad8febbc634181294b9 Mon Sep 17 00:00:00 2001 From: zhangminghua Date: Thu, 1 Dec 2022 16:51:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E3=80=81=E5=BC=80=E7=A5=A8=E6=98=8E=E7=BB=86=E8=A1=A8=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 2 +- api/app/lib/models/contract_detail.js | 6 +++--- api/app/lib/models/invoice_detail.js | 28 +++++++++++++-------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index cd44ee8..9a66814 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -45,7 +45,7 @@ "-g postgres://FashionAdmin:123456@10.8.30.36:5432/data_center", "--redisHost localhost", "--redisPort 6379", - "--apiEmisUrl http://10.8.30.103:14000", //开发 + "--apiEmisUrl http://localhost:14000", //开发 // "--apiEmisUrl http://10.8.30.161:1111", //测试 // 镇江研发结束 // 测试 diff --git a/api/app/lib/models/contract_detail.js b/api/app/lib/models/contract_detail.js index fbcb77a..2959cb1 100644 --- a/api/app/lib/models/contract_detail.js +++ b/api/app/lib/models/contract_detail.js @@ -17,7 +17,7 @@ module.exports = dc => { }, year: { type: DataTypes.STRING, - allowNull: true, + allowNull: false, defaultValue: null, comment: "年度", primaryKey: false, @@ -26,7 +26,7 @@ module.exports = dc => { }, serialNo: { type: DataTypes.INTEGER, - allowNull: true, + allowNull: false, defaultValue: null, comment: "序号", primaryKey: false, @@ -35,7 +35,7 @@ module.exports = dc => { }, number: { type: DataTypes.STRING, - allowNull: true, + allowNull: false, defaultValue: null, comment: "编号", primaryKey: false, diff --git a/api/app/lib/models/invoice_detail.js b/api/app/lib/models/invoice_detail.js index cc79220..0e4c13f 100644 --- a/api/app/lib/models/invoice_detail.js +++ b/api/app/lib/models/invoice_detail.js @@ -13,7 +13,7 @@ module.exports = dc => { comment: null, primaryKey: true, field: "id", - autoIncrement: false + autoIncrement: true }, year: { type: DataTypes.STRING, @@ -44,7 +44,7 @@ module.exports = dc => { }, department: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "部门：申请部门", primaryKey: false, @@ -53,7 +53,7 @@ module.exports = dc => { }, sale: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "销售人员：申请人", primaryKey: false, @@ -62,7 +62,7 @@ module.exports = dc => { }, contractNo: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "合同编号", primaryKey: false, @@ -71,7 +71,7 @@ module.exports = dc => { }, customer: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "客户名称：【甲方名称】", primaryKey: false, @@ -80,7 +80,7 @@ module.exports = dc => { }, item: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "项目名称", primaryKey: false, @@ -89,7 +89,7 @@ module.exports = dc => { }, amount: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "合同金额：【合同金额\n（元）】", primaryKey: false, @@ -98,7 +98,7 @@ module.exports = dc => { }, changeAmount: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "变更后合同金额", primaryKey: false, @@ -107,7 +107,7 @@ module.exports = dc => { }, invoiceNo: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "发票号码：《发票申请单》【发票号】一个发票号码一个行数据", primaryKey: false, @@ -116,7 +116,7 @@ module.exports = dc => { }, invoiceType: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "开票类型:《发票申请单》\n【发票类型】", primaryKey: false, @@ -125,7 +125,7 @@ module.exports = dc => { }, invoiceDate: { type: DataTypes.DATEONLY, - allowNull: false, + allowNull: true, defaultValue: null, comment: "开票日期：《发票申请单》\n【开票日期】", primaryKey: false, @@ -134,7 +134,7 @@ module.exports = dc => { }, invoiceAmount: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "开票金额：《发票申请单》【发票金额】取财务填写数据", primaryKey: false, @@ -143,7 +143,7 @@ module.exports = dc => { }, outputTax: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "销项税额：《发票申请单》-销项税额", primaryKey: false, @@ -152,7 +152,7 @@ module.exports = dc => { }, total: { type: DataTypes.STRING, - allowNull: false, + allowNull: true, defaultValue: null, comment: "合计：自动算出\n（开票金额+销项税额）", primaryKey: false, From 612b3d7defebf2f8068e902a854372805b86da33 Mon Sep 17 00:00:00 2001 From: ww664853070 Date: Fri, 2 Dec 2022 10:14:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?(*)=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/models/customerContactsFollup.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/app/lib/models/customerContactsFollup.js b/api/app/lib/models/customerContactsFollup.js index 53537c1..0c5a119 100644 --- a/api/app/lib/models/customerContactsFollup.js +++ b/api/app/lib/models/customerContactsFollup.js @@ -4,7 +4,7 @@ module.exports = dc => { const DataTypes = dc.ORM; const sequelize = dc.orm; - const ReserveItemReport = sequelize.define("reserveItemReport", { + const CustomerContactsFollowup = sequelize.define("customerContactsFollowup", { id: { type: DataTypes.INTEGER, allowNull: false, @@ -60,6 +60,6 @@ module.exports = dc => { }, { tableName: "customer_contacts_followup", }); - dc.models.ReserveItemReport = ReserveItemReport; - return ReserveItemReport; + dc.models.CustomerContactsFollowup = CustomerContactsFollowup; + return CustomerContactsFollowup; }; \ No newline at end of file