Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/DataCenter

.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", //测试
             // 镇江研发结束
             // 测试

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,

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;
 };

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,