Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
59b77ba8
Commit
59b77ba8
authored
Jan 08, 2020
by
王昆
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xggsve-order-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order-dev
parents
0c1a93a3
81e8c757
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
3 deletions
+25
-3
xggsve-order/app/base/db/models/order/oprocess.js
+22
-0
xggsve-order/app/base/db/models/order/oproduct.js
+1
-1
xggsve-order/app/base/db/models/order/oproductprocess.js
+2
-2
No files found.
xggsve-order/app/base/db/models/order/oprocess.js
0 → 100644
View file @
59b77ba8
'use strict'
/**
* 订单流程表
*/
module
.
exports
=
function
(
db
,
DataTypes
)
{
return
db
.
define
(
'oorderdeliver'
,
{
name
:
{
type
:
DataTypes
.
STRING
,
field
:
'name'
,
allowNull
:
false
,
defaultValue
:
''
,
comment
:
'流程名称'
},
status
:
{
type
:
DataTypes
.
STRING
,
field
:
'status'
,
allowNull
:
false
,
defaultValue
:
''
,
comment
:
'流程状态'
},
createdAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'created_at'
,
allowNull
:
false
,
defaultValue
:
DataTypes
.
NOW
},
updatedAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'updated_at'
,
allowNull
:
false
,
defaultValue
:
DataTypes
.
NOW
},
deletedAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'deleted_at'
,
allowNull
:
true
}
},
{
timestamps
:
true
,
underscore
:
true
,
paranoid
:
true
,
version
:
true
,
tableName
:
'o_order_deliver'
,
comment
:
'订单交付表'
,
});
}
xggsve-order/app/base/db/models/order/oproduct.js
View file @
59b77ba8
...
...
@@ -9,7 +9,7 @@ module.exports = function (db, DataTypes) {
desc
:
{
type
:
DataTypes
.
STRING
(
200
),
field
:
'desc'
,
allowNull
:
false
,
defaultValue
:
""
,
comment
:
'产品描述'
},
pid
:
{
type
:
DataTypes
.
BIGINT
,
field
:
'pid'
,
allowNull
:
true
,
comment
:
'父ID'
},
isChoose
:
{
type
:
DataTypes
.
BOOLEAN
,
field
:
'is_choose'
,
allowNull
:
false
,
defaultValue
:
false
,
comment
:
'是否选择'
},
sort
:
{
type
:
DataTypes
.
INTEGER
,
field
:
'sort'
,
allowNull
:
false
,
defaultValue
:
1
,
comment
:
'排序'
},
sort
:
{
type
:
DataTypes
.
INTEGER
,
field
:
'sort'
,
allowNull
:
false
,
defaultValue
:
1
000
,
comment
:
'排序'
},
createdAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'created_at'
,
allowNull
:
false
,
defaultValue
:
DataTypes
.
NOW
},
updatedAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'updated_at'
,
allowNull
:
false
,
defaultValue
:
DataTypes
.
NOW
},
deletedAt
:
{
type
:
DataTypes
.
DATE
,
field
:
'deleted_at'
,
allowNull
:
true
},
...
...
xggsve-order/app/base/db/models/order/oproductprocess.js
View file @
59b77ba8
...
...
@@ -6,8 +6,8 @@
module
.
exports
=
function
(
db
,
DataTypes
)
{
return
db
.
define
(
'oproductprocess'
,
{
productId
:
{
type
:
DataTypes
.
STRING
,
field
:
'product_id'
,
allowNull
:
true
,
comment
:
'产品ID'
},
name
:
{
type
:
DataTypes
.
STRING
(
200
),
field
:
'name'
,
allowNull
:
false
,
defaultValue
:
""
,
comment
:
'产品名称'
},
status
:
{
type
:
DataTypes
.
STRING
,
field
:
'status'
,
allowNull
:
true
,
comment
:
'状态'
},
//
name: { type: DataTypes.STRING(200), field: 'name', allowNull: false, defaultValue:"", comment:'产品名称'},
//
status: {type: DataTypes.STRING, field: 'status', allowNull: true, comment:'状态' },
func
:
{
type
:
DataTypes
.
STRING
,
field
:
'func'
,
allowNull
:
false
,
comment
:
'状态执行方法名称'
},
nextStatus
:
{
type
:
DataTypes
.
STRING
,
field
:
'next_status'
,
allowNull
:
true
,
comment
:
'下一个状态'
},
name1
:
{
type
:
DataTypes
.
STRING
,
field
:
'name1'
,
allowNull
:
true
,
comment
:
'状态1'
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment