Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
wly-APP
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘川
wly-APP
Commits
9f3bc467
Commit
9f3bc467
authored
Aug 04, 2022
by
chuan.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
违约任务 确认、罚分申诉、 违约任务详情新增+联调
parent
de39528b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1178 additions
and
21 deletions
+1178
-21
manifest.json
manifest.json
+2
-2
pages.json
pages.json
+32
-0
breakwords-mission-appeal.nvue
.../breakwords-mission-appeal/breakwords-mission-appeal.nvue
+561
-0
breakwords-mission-confirm.nvue
...reakwords-mission-confirm/breakwords-mission-confirm.nvue
+41
-14
breakwords-mission-detail.nvue
.../breakwords-mission-detail/breakwords-mission-detail.nvue
+507
-0
breakwords-mission.nvue
pages/breakwords-mission/breakwords-mission.nvue
+13
-3
api.helper.js
servers/api.helper.js
+2
-2
breakwords.js
servers/breakwords.js
+20
-0
No files found.
manifest.json
View file @
9f3bc467
...
@@ -116,8 +116,8 @@
...
@@ -116,8 +116,8 @@
"changeOrigin"
:
true
"changeOrigin"
:
true
},
},
"/wmdpwebservices"
:
{
"/wmdpwebservices"
:
{
//
"target"
:
"http://221.10.127.60:5000/sczx"
,
"target"
:
"http://221.10.127.60:5000/sczx"
,
"target"
:
"https://10.0.134.182:9002"
,
//
"target"
:
"https://10.0.134.182:9002"
,
"changeOrigin"
:
true
"changeOrigin"
:
true
},
},
"/adapter"
:
{
"/adapter"
:
{
...
...
pages.json
View file @
9f3bc467
...
@@ -822,6 +822,38 @@
...
@@ -822,6 +822,38 @@
//
"enablePullDownRefresh"
:
true
//
"enablePullDownRefresh"
:
true
}
}
},
},
{
"path"
:
"pages/breakwords-mission-appeal/breakwords-mission-appeal"
,
"style"
:
{
"app-plus"
:
{
"titleNView"
:
{
"titleAlign"
:
"left"
,
"titleColor"
:
"#333"
,
"titleSize"
:
"17px"
,
"backgroundColor"
:
"transparent"
,
"titleText"
:
"罚分申诉 "
,
"autoBackButton"
:
true
}
}
//
"enablePullDownRefresh"
:
true
}
},
{
"path"
:
"pages/breakwords-mission-detail/breakwords-mission-detail"
,
"style"
:
{
"app-plus"
:
{
"titleNView"
:
{
"titleAlign"
:
"left"
,
"titleColor"
:
"#333"
,
"titleSize"
:
"17px"
,
"backgroundColor"
:
"transparent"
,
"titleText"
:
"违约任务详情 "
,
"autoBackButton"
:
true
}
}
//
"enablePullDownRefresh"
:
true
}
},
{
{
"path"
:
"pages/breakwords-handle/breakwords-handle"
,
"path"
:
"pages/breakwords-handle/breakwords-handle"
,
"style"
:
{
"style"
:
{
...
...
pages/breakwords-mission-appeal/breakwords-mission-appeal.nvue
0 → 100644
View file @
9f3bc467
This diff is collapsed.
Click to expand it.
pages/breakwords-mission-confirm/breakwords-mission-confirm.nvue
View file @
9f3bc467
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<view class="header-bg">
<view class="header-bg">
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
<image class="header-bg-img" src="@/static/image/nav_bg@3x.png" mode="scaleToFill"></image>
</view>
</view>
<view class="main"
:style="mainHeight"
>
<view class="main">
<view class="block-detal">
<view class="block-detal">
<view class="block-detal-head">
<view class="block-detal-head">
<text class="detal-head-item-value detal-head-item-value-first">{{missionDetail.createdate}}</text>
<text class="detal-head-item-value detal-head-item-value-first">{{missionDetail.createdate}}</text>
...
@@ -164,12 +164,44 @@
...
@@ -164,12 +164,44 @@
<view class="children-block">
<view class="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
</image>
</image>
<text class="children-block-text">
ddd
</text>
<text class="children-block-text">
{{ contactLetterDetail.receiveRecorderName}}
</text>
</view>
</view>
<view class="children-block">
<view class="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
</image>
</image>
<text class="children-block-text">ddd</text>
<text class="children-block-text">{{ contactLetterDetail.receiveRecorderTime}}</text>
</view>
</view>
<view class="text-block">
<text class="middle-date">物流单号</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="uni-input-text">{{ contactLetterDetail.shipLogisticsNo}}</text>
</view>
</view>
</view>
</view>
<view class="text-block text-block-last">
<text class="middle-date">物流公司</text>
<view class="middle-date-des uni-list picker-year">
<view class="uni-list-cell">
<view class="uni-list-cell-db">
<text class="uni-input-text">{{ contactLetterDetail.shipLogistics}}</text>
</view>
</view>
</view>
</view>
<view class="text-block-children ">
<view class="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
</image>
<text class="children-block-text">{{ contactLetterDetail.shipRecorderName}}</text>
</view>
<view class="children-block">
<image class="children-block-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode="">
</image>
<text class="children-block-text">{{ contactLetterDetail.shipTime}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -178,7 +210,7 @@
...
@@ -178,7 +210,7 @@
<view class="bottom-area"></view>
<view class="bottom-area"></view>
<view class="bottom">
<view class="bottom">
<button class="btn" type="default" @tap="submit">
<button class="btn" type="default" @tap="submit">
<text class="btn-text">
提交
</text>
<text class="btn-text">
确认
</text>
</button>
</button>
</view>
</view>
</view>
</view>
...
@@ -192,7 +224,7 @@
...
@@ -192,7 +224,7 @@
import {
import {
apiGetContactLetterDetail,
apiGetContactLetterDetail,
apiDoReceiveInfo
apiDoReceive
Confirm
Info
} from '@/servers/breakwords.js'
} from '@/servers/breakwords.js'
export default {
export default {
...
@@ -290,15 +322,10 @@
...
@@ -290,15 +322,10 @@
async submit() {
async submit() {
const params = {
const params = {
'taskAssignmentId': this.condition.taskAssignmentId,
'taskAssignmentId': this.condition.taskAssignmentId,
'receiveAddress': this.condition.receiveAddress,
'isReceiveConfirmed': '是',
'contactUser': this.condition.contactUser,
'receiveConfirmUserId': this.userInfo.code,
'contactPhone': this.condition.receiveContactPhone,
'receiveConfirmUserName': this.userInfo.name,
'expectInsuredValue': this.condition.expectInsuredValue,
'expectLogistics': this.condition.expectLogistics,
'receiveRecorderId': this.userInfo.code,
'receiveRecorderName': this.userInfo.name,
'contactLetterId': this.condition.entryDataList[0].contactLetterId,
'contactLetterId': this.condition.entryDataList[0].contactLetterId,
'bundledProducts': this.condition.bundledProducts
}
}
uni.showLoading({
uni.showLoading({
title: '加载中'
title: '加载中'
...
@@ -306,7 +333,7 @@
...
@@ -306,7 +333,7 @@
setTimeout(function() {
setTimeout(function() {
uni.hideLoading();
uni.hideLoading();
}, 2000);
}, 2000);
const res = await apiDoReceiveInfo(params)
const res = await apiDoReceive
Confirm
Info(params)
uni.hideLoading();
uni.hideLoading();
uni.navigateBack()
uni.navigateBack()
}
}
...
...
pages/breakwords-mission-detail/breakwords-mission-detail.nvue
0 → 100644
View file @
9f3bc467
This diff is collapsed.
Click to expand it.
pages/breakwords-mission/breakwords-mission.nvue
View file @
9f3bc467
...
@@ -51,9 +51,11 @@
...
@@ -51,9 +51,11 @@
</view> -->
</view> -->
</view>
</view>
</view>
</view>
<button v-if="
handleStatustext(item) !=='--'" class="item-btn" type="default
"
<button v-if="
activeTabIndex===0 && handleStatustext(item) !=='--'" class="item-btn
"
@click="checkOrderStatus(item)"><text
type="default"
@click="checkOrderStatus(item)"><text
class="item-btn-text">{{handleStatustext(item)}}</text></button>
class="item-btn-text">{{handleStatustext(item)}}</text></button>
<button v-if="activeTabIndex===1" class="item-btn" type="default"
@click="checkOrderDetail(item)"><text class="item-btn-text">查看详情</text></button>
</view>
</view>
</cell>
</cell>
<cell>
<cell>
...
@@ -194,7 +196,7 @@
...
@@ -194,7 +196,7 @@
"appurl": "T00001STE",
"appurl": "T00001STE",
"requestid": "-203",
"requestid": "-203",
"ticketId": "T00001STE",
"ticketId": "T00001STE",
"entryType": "
4
",
"entryType": "
3
",
"status": "已处理",
"status": "已处理",
"viloationName": "影响质量",
"viloationName": "影响质量",
"childTypeName": "childTypeName",
"childTypeName": "childTypeName",
...
@@ -329,9 +331,17 @@
...
@@ -329,9 +331,17 @@
break
break
case 3:
case 3:
entryType = '6'
entryType = '6'
uni.navigateTo({
url: `/pages/breakwords-mission-appeal/breakwords-mission-appeal?info=${JSON.stringify(item)}&pageType=${entryType}`
})
break
break
}
}
},
checkOrderDetail(item) {
uni.navigateTo({
url: `/pages/breakwords-mission-detail/breakwords-mission-detail?info=${JSON.stringify(item)}&pageType=10`
})
}
}
}
}
}
}
...
...
servers/api.helper.js
View file @
9f3bc467
...
@@ -179,8 +179,8 @@ class Request {
...
@@ -179,8 +179,8 @@ class Request {
// config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
// config.baseUrl = 'http://api.c0331.dev.guanyingyun.com'
config
.
baseUrl
=
'http://221.10.127.60:5000/cyj'
config
.
baseUrl
=
'http://221.10.127.60:5000/cyj'
}
else
if
(
config
.
url
.
indexOf
(
'wmdpwebservices'
)
!==
-
1
)
{
}
else
if
(
config
.
url
.
indexOf
(
'wmdpwebservices'
)
!==
-
1
)
{
config
.
baseUrl
=
'https://10.0.134.182:9002'
//
config.baseUrl = 'https://10.0.134.182:9002'
//
config.baseUrl = 'http://221.10.127.60:5000/sczx'
config
.
baseUrl
=
'http://221.10.127.60:5000/sczx'
// config.baseUrl = ''
// config.baseUrl = ''
}
else
{
}
else
{
config
.
baseUrl
=
'http://221.10.127.60:5000/wlySap'
config
.
baseUrl
=
'http://221.10.127.60:5000/wlySap'
...
...
servers/breakwords.js
View file @
9f3bc467
...
@@ -120,6 +120,26 @@ export async function apiDoReceiveInfo(params) {
...
@@ -120,6 +120,26 @@ export async function apiDoReceiveInfo(params) {
return
res
return
res
}
}
/**
* 易商-填写收货确认信息接口
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiDoReceiveConfirmInfo
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/wmdpwebservices/trackInformation/doReceivedConfirmInfo'
,
params
)
return
res
}
/**
* 易商-填写收货罚分申诉信息接口
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiDoReceiveApprovalInfo
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/wmdpwebservices/closeopinion/approval'
,
params
)
return
res
}
/**
/**
* 查询处理单
* 查询处理单
* @param name 账户名
* @param name 账户名
...
...
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