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
d45ce397
Commit
d45ce397
authored
Jan 15, 2020
by
王栋源
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wdy
parent
16de9d38
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
4 deletions
+15
-4
jiaxiya/app/base/db/metadata/apps/platform.js
+1
-0
jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
+1
-1
jiaxiya/app/base/service/impl/transfer/tmjsonfileSve.js
+2
-2
jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
+7
-1
jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
+4
-0
No files found.
jiaxiya/app/base/db/metadata/apps/platform.js
View file @
d45ce397
...
...
@@ -129,6 +129,7 @@ module.exports = {
"PROVIDE_MATERIAL"
:
"上传卖家资料"
,
"PAY_OVER"
:
"尾款已支付"
,
"BUYER_EXPRESS"
:
"邮寄资料"
,
"MATERIAL_PROVIDE"
:
"资料已收到"
,
"BUYER_PROVIDE_MATERIAL"
:
"确认收件"
,
"SUBMIT_TO_SBJ"
:
"提交官方"
,
"SBJ_ACCEPT"
:
"商标局受理"
,
...
...
jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
View file @
d45ce397
...
...
@@ -13,7 +13,7 @@ module.exports={
{
"title"
:
"控制信息"
,
ctls
:[
{
"type"
:
"select"
,
"dicKey"
:
"transfer_status
show
"
,
"label"
:
"转让状态"
,
"prop"
:
"transfer_status"
,
"labelField"
:
"label"
,
"valueField"
:
"value"
,
"style"
:
""
,
"isButton"
:
true
},
{
"type"
:
"select"
,
"dicKey"
:
"transfer_status"
,
"label"
:
"转让状态"
,
"prop"
:
"transfer_status"
,
"labelField"
:
"label"
,
"valueField"
:
"value"
,
"style"
:
""
,
"isButton"
:
true
},
// {"type":"select","refModel":"pmproduct","isMulti":false,"label":"所属产品","prop":"pmproduct_id","labelField":"name","valueField":"id","style":""},
]
},
...
...
jiaxiya/app/base/service/impl/transfer/tmjsonfileSve.js
View file @
d45ce397
...
...
@@ -19,8 +19,8 @@ class TmjsonfileService extends ServiceBase {
if
(
lastinfo
){
lasttime
=
lastinfo
[
0
].
updated_at
.
toISOString
().
split
(
"T"
)[
0
];
}
//
var sql = "select * from bi_trademarktransaction where updated_at>='"+lasttime+"'";
var
sql
=
"select * from bi_trademarktransaction where id=175342"
;
var
sql
=
"select * from bi_trademarktransaction where updated_at>='"
+
lasttime
+
"'"
;
//
var sql = "select * from bi_trademarktransaction where id=175342";
var
tminfos
=
await
this
.
connectionigirl
.
query
(
sql
);
var
sources
=
[];
if
(
tminfos
[
0
])
{
...
...
jiaxiya/app/base/service/impl/transfer/tradetransferSve.js
View file @
d45ce397
...
...
@@ -511,7 +511,7 @@ class TradetransferService extends ServiceBase {
}
async
uppaymentstatus
()
{
var
selsql
=
"select * from trade_transfer where transfer_status='PROVIDE_MATERIAL'"
;
var
selsql
=
"select * from trade_transfer where transfer_status='PROVIDE_MATERIAL'
or transfer_status='BUYER_EXPRESS'
"
;
var
transferinfos
=
await
this
.
dao
.
customQuery
(
selsql
);
var
obj
=
{
action
:
"QueryTradeProduceList"
...
...
@@ -536,6 +536,12 @@ class TradetransferService extends ServiceBase {
faillist
.
push
(
transferinfo
.
ali_bizid
);
}
}
if
(
aliorderindex
>
-
1
&&
aliorder
[
aliorderindex
].
BuyerStatus
==
22
)
{
var
upd
=
await
this
.
dao
.
model
.
update
({
transfer_status
:
"MATERIAL_PROVIDE"
},
{
where
:
{
ali_bizid
:
transferinfo
.
ali_bizid
}
});
if
(
!
upd
)
{
faillist
.
push
(
transferinfo
.
ali_bizid
);
}
}
}
}
return
{
...
...
jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js
View file @
d45ce397
...
...
@@ -29,6 +29,10 @@
var
that
=
this
;
if
(
k
=
"alisubmit"
)
{
debugger
;
if
(
model
.
transfer_status
==
"PAY_OVER"
||
model
.
transfer_status
==
"MATERIAL_PROVIDE"
){
that
.
$message
.
warning
(
"状态不可修改"
);
return
;
}
this
.
$root
.
postReq
(
"/web/transfer/tradetransferCtl/submit"
,
model
).
then
(
function
(
d
)
{
if
(
d
.
status
>
-
1
)
{
$
(
"[name='grdid']"
).
show
();
...
...
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