diff --git a/admin/.env.development b/admin/.env.development index f7f9754..81d8bcc 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -2,9 +2,9 @@ ENV = 'development' # base api -# VUE_APP_BASE_API = 'http://127.0.0.1:18091' +VUE_APP_BASE_API = 'http://127.0.0.1:18091' # VUE_APP_BASE_API = 'http://124.71.134.146:18091' -VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn' +# VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn' # VUE_APP_BASE_API = 'http://wangyi.test.jiutianda.cn' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, @@ -15,3 +15,4 @@ VUE_APP_BASE_API = 'https://crmeb.test.jiutianda.cn' # Detail: https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js VUE_CLI_BABEL_TRANSPILE_MODULES = true + diff --git a/admin/.env.production b/admin/.env.production index cd6aada..73ce5ae 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -2,5 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://124.71.134.146:18091' +# VUE_APP_BASE_API = 'http://124.71.134.146:18091' +VUE_APP_BASE_API = 'http://119.45.21.129:18091' diff --git a/admin/src/views/ck/ckstock/index.vue b/admin/src/views/ck/ckstock/index.vue index e8fb4be..b1a0019 100644 --- a/admin/src/views/ck/ckstock/index.vue +++ b/admin/src/views/ck/ckstock/index.vue @@ -115,11 +115,6 @@ - - - - - - + - - - - - - - - + - @@ -147,16 +134,6 @@ :value="scope.row.originCountry != null ? scope.row.originCountry : ''"> - - - - - - diff --git a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue index 729b213..13474dd 100644 --- a/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue +++ b/admin/src/views/ck/ckwarehouse/components/BillEdit/index.vue @@ -23,9 +23,16 @@ - +
{{ scope.row.goodsCode }}
 + + +
{{ scope.row.cargoSpec }}
+ + + +
{{ scope.row.stockName }}
@@ -62,77 +69,34 @@ - - - - - -
- -
- - - - - - -
{{ scope.row.cargoNumber }}
- - - - - - -
{{ scope.row.itemNumber }}
- - - - - - -
{{ scope.row.bookNumber }}
- - - - - - -
{{ scope.row.customsNo }}
- - - - - - -
{{ scope.row.listNumber }}
- - + + - +
{{ scope.row.cargoNum }}
- - - -
{{ scope.row.cargoWt }}
- - - - - - -
{{ scope.row.cargoVol }}
- - - - + + + + + + + + + + + + + + + +
{{ scope.row.unitPrice }}
@@ -170,34 +134,28 @@ - - -
{{ scope.row.cargoSpec }}
- - - - - - -
- -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -220,8 +178,8 @@ - - + @@ -437,7 +395,7 @@ export default { { required: true, message: "库场不能为空", trigger: "change" } ], custId: [ - { required: true, message: "货主不能为空", trigger: "change" } + { required: true, message: "供应商不能为空", trigger: "change" } ], currType: [ { required: true, message: "币种不能为空", trigger: "blur" }, diff --git a/admin/src/views/ck/ckwarehouse/index.vue b/admin/src/views/ck/ckwarehouse/index.vue index 60b635b..84f010b 100644 --- a/admin/src/views/ck/ckwarehouse/index.vue +++ b/admin/src/views/ck/ckwarehouse/index.vue @@ -59,7 +59,7 @@ - + - - - - - - - + - + - - + + - - - - @@ -152,14 +148,7 @@ :value="scope.row.originCountry != null ? scope.row.originCountry : ''"> - - - - - - + @@ -221,17 +210,6 @@ export default { optionsProp: 'stockCode', optionsLabel: 'stockName', }, - { - label: '项号', - prop: 'bookNumber', - type: 'text', - }, - { - label: '核注清单号', - prop: 'listNumber', - type: 'text', - labelWidth: '90px' - }, { label: '有效期至', prop: 'excTime', @@ -243,13 +221,8 @@ export default { prop: 'billNumber', type: 'text', }, - // { - // label: '船舶名称', - // prop: 'vesselName', - // type: 'text', - // }, { - label: '商品编码', + label: '货物编号', prop: 'hsCode', type: 'text', }, @@ -258,11 +231,6 @@ export default { prop: 'cargoName', type: 'text', }, - // { - // label: '航次', - // prop: 'voyageNo', - // type: 'text', - // }, { label: '货架名称', prop: 'shelfName', @@ -271,11 +239,6 @@ export default { optionsProp: 'shelfName', optionsLabel: 'shelfName', }, - { - label: '报关单号', - prop: 'customsNo', - type: 'text', - }, { label: '单据日期', prop: 'queryTime', @@ -283,16 +246,11 @@ export default { options: datePickerOpts() }, { - label: '货主名称', + label: '供应商', prop: 'custName', type: 'text', }, - { - label: '贸易性质', - prop: 'tradType', - type: 'select', - getOptions: () => this.dict.type.sys_trade_nature, - }, + ], activeName: ['1', '2', '3'], pickerOptions: { @@ -437,7 +395,7 @@ export default { { required: true, message: "库场名称不能为空", trigger: "blur" } ], custName: [ - { required: true, message: "货主名称不能为空", trigger: "blur" } + { required: true, message: "供应商不能为空", trigger: "blur" } ], } }; diff --git a/admin/src/views/pub/notice/pubnotice-add-and-update.vue b/admin/src/views/pub/notice/pubnotice-add-and-update.vue index 5ec7e03..9df5ae5 100644 --- a/admin/src/views/pub/notice/pubnotice-add-and-update.vue +++ b/admin/src/views/pub/notice/pubnotice-add-and-update.vue @@ -7,18 +7,11 @@ - - - - - - - @@ -27,37 +20,37 @@ + + - - + + - - + + - + - - @@ -66,14 +59,6 @@ - - - - - - - @@ -88,13 +73,6 @@ - - - - - - - @@ -128,7 +106,6 @@ export default { deptTreeOptions: [], // 部门树数据 dataForm: { noticeId: "", - bizId: '', noticeType: '', type: '', noticeSource: '', @@ -139,7 +116,6 @@ export default { noticeTime: '', smsStatus: "0", status: "0", - remark: '', deptId: "", updatestamp: '', syncstamp: '', @@ -154,9 +130,6 @@ export default { smsStatus: [ {required: true, message: '短信状态 为必填项', trigger: 'blur'} ], - status: [ - {required: true, message: '状态 为必填项', trigger: 'blur'} - ], deptId: [ {required: true, message: '请选择部门', trigger: ['blur', 'change']} ], diff --git a/app/package-lock.json b/app/package-lock.json index ee8d0b9..abebf47 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,34 +1,8 @@ { "name": "app", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "app", - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "json-bigint": "^1.0.0" - } - }, - "node_modules/bignumber.js": { - "version": "9.3.1", - "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.3.1.tgz", - "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==", - "engines": { - "node": "*" - } - }, - "node_modules/json-bigint": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/json-bigint/-/json-bigint-1.0.0.tgz", - "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==", - "dependencies": { - "bignumber.js": "^9.0.0" - } - } - }, "dependencies": { "bignumber.js": { "version": "9.3.1", diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/MyMetaObjectHandler.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/MyMetaObjectHandler.java new file mode 100644 index 0000000..4fb2c8c --- /dev/null +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/admin/config/MyMetaObjectHandler.java @@ -0,0 +1,22 @@ +package com.zbkj.admin.config; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class MyMetaObjectHandler implements MetaObjectHandler { + + @Override + public void insertFill(MetaObject metaObject) { + this.setFieldValByName("createTime", new Date(), metaObject); + this.setFieldValByName("updateTime", new Date(), metaObject); + } + + @Override + public void updateFill(MetaObject metaObject) { + this.setFieldValByName("updateTime", new Date(), metaObject); + } +} \ No newline at end of file diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmHouse.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmHouse.java index bc4ee31..da03ba3 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmHouse.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmHouse.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.FieldFill; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -102,6 +103,7 @@ public class PmHouse implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 修改人 @@ -112,6 +114,7 @@ public class PmHouse implements Serializable { * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 租户ID diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmMaintenanceOrder.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmMaintenanceOrder.java index 37e04c4..b2185af 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmMaintenanceOrder.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmMaintenanceOrder.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -114,6 +115,7 @@ public class PmMaintenanceOrder implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 修改人 @@ -124,6 +126,7 @@ public class PmMaintenanceOrder implements Serializable { * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 租户ID diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java index f5af93f..38833f3 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmOwner.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.zbkj.modules.autogencode.entity.PmTenant; import io.swagger.annotations.ApiModelProperty; @@ -122,6 +123,7 @@ public class PmOwner implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 修改人 @@ -132,6 +134,7 @@ public class PmOwner implements Serializable { * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 租户ID diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java index 6310497..eb4365e 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenant.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.zbkj.modules.autogencode.entity.PmTenantHouse; import io.swagger.annotations.ApiModelProperty; @@ -78,6 +79,7 @@ public class PmTenant implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 修改人 @@ -88,6 +90,7 @@ public class PmTenant implements Serializable { * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 租户ID diff --git a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java index ac8d4c3..b09052b 100644 --- a/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java +++ b/crmeb/crmeb-admin/src/main/java/com/zbkj/modules/autogencode/entity/PmTenantHouse.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -125,6 +126,7 @@ public class PmTenantHouse implements Serializable { * 创建时间 */ @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 修改人 @@ -135,6 +137,7 @@ public class PmTenantHouse implements Serializable { * 修改时间 */ @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 租户ID