From 3334d4402759187b2b2b48a94733b33e13d0012a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 04 十一月 2023 13:53:58 +0800
Subject: [PATCH] #
---
pages/business/saleManage/modiSaleManage.vue | 43 +++++++++++++++++++--
pages/business/saleManage/cstmrDetls.vue | 21 +++-------
pages/business/saleManage/saleManage.vue | 4 +-
pages/business/saleManage/saleManageDetails.vue | 29 +++++++++-----
4 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/pages/business/saleManage/cstmrDetls.vue b/pages/business/saleManage/cstmrDetls.vue
index 1e2418b..6949f5d 100644
--- a/pages/business/saleManage/cstmrDetls.vue
+++ b/pages/business/saleManage/cstmrDetls.vue
@@ -14,22 +14,15 @@
</view>
<view class="container">
<view><y-title title="鍩烘湰淇℃伅"></y-title></view><view></view>
- <view class="list-item1">椤圭洰浠ｅ彿</view><view class="list-item2">{{saleManage.uuid}}</view>
-
- <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{saleManage.cstmrId$}}</view>
- <view class="list-item1">椤圭洰鎬婚噾棰�</view><view class="list-item2">{{saleManage.money}}</view>
-
- <view class="list-item1">鎵�灞炲叕鍙�</view><view class="list-item2">{{saleManage.company$}}</view>
-
+ <view class="list-item1">瀹㈡埛浠ｅ彿</view><view class="list-item2">{{saleManage.uuid}}</view>
+ <view class="list-item1">鎵�灞為儴闂�</view><view class="list-item2">{{saleManage.deptId$}}</view>
+ <view class="list-item1">瀹㈡埛绫诲埆</view><view class="list-item2">{{saleManage.cstmrType$}}</view>
<view class="list-item1">鐪佸競鍖�</view><view class="list-item2">{{saleManage.pcd$ ? saleManage.pcd$ : '--'}}</view>
- <view class="list-item1">椤圭洰鍦板潃</view><view class="list-item2">{{saleManage.addr}}</view>
- <view class="list-item1">璐熻矗浜�</view><view class="list-item2">{{saleManage.director$}}</view>
+ <view class="list-item1">瀹㈡埛鑱旂郴浜�</view><view class="list-item2">{{saleManage.contacts ? saleManage.contacts : '--'}}</view>
+ <view class="list-item1">鍖哄垎</view><view class="list-item2">{{saleManage.type$ ? saleManage.type$ : '--'}}</view>
+ <view class="list-item1">瀹㈡埛琛屼笟</view><view class="list-item2 color-main">{{saleManage.industry ? saleManage.industry : '--'}}</view>
+ <view class="list-item1">浜у搧绫诲埆</view><view class="list-item2">{{saleManage.productCategory ? saleManage.productCategory : '--'}}</view>
<view class="list-item1">澶囨敞</view><view class="list-item2">{{saleManage.remarks ? saleManage.remarks : '--'}}</view>
-
- <view class="list-item1">椤圭洰棰勭畻閲戦(涓�)</view><view class="list-item2">{{saleManage.money ? saleManage.money : '--'}}</view>
-
- <view class="list-item1">椤圭洰棰勪及鎴愪氦鐜�</view><view class="list-item2">{{saleManage.transactionRate ? saleManage.transactionRate : '--'}}</view>
-
</view>
<view class="container">
<view><y-title title="鍏朵粬淇℃伅"></y-title></view><view></view>
diff --git a/pages/business/saleManage/modiSaleManage.vue b/pages/business/saleManage/modiSaleManage.vue
index adc2b84..8062a57 100644
--- a/pages/business/saleManage/modiSaleManage.vue
+++ b/pages/business/saleManage/modiSaleManage.vue
@@ -79,6 +79,9 @@
orderProductTypeIds: [],
orderProductTypeList: [],
baseFormData: {
+ id: '',
+ memoExperience: '',
+ status: 0,
citysData: [],
cstmrType: '',
company: '',
@@ -149,8 +152,11 @@
text: '澶栭攢',
value: 2
}],
+ id: 0,
citysData: [],
- citysDataTemp: ''
+ citysDataTemp: '',
+ memoExperience: '',
+ status: 0
}
},
onReady() {
@@ -161,6 +167,30 @@
// 鑾峰彇鐪佸競鍖�
this.citysData = test.citysData
this.getDetail()
+ },
+ onLoad: function(option) {
+ let _this = this
+ const eventChannel = this.getOpenerEventChannel();
+ eventChannel.emit('acceptDataFromOpenedPage', {data: 'data from test page'});
+ eventChannel.emit('someEvent', {data: 'data from test page for someEvent'});
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('saleManage', function(data) {
+ data = data.data
+ console.log(data);
+ _this.cstmrList = [{value: data.cstmrId$,id: data.cstmrId}]
+ _this.companyList = [{name: data.company$,id: data.company}]
+ _this.directorList = [{value: data.director$,id: data.director}]
+ _this.orderProductTypeList = [{value: data.orderProductTypeId$,id: data.orderProductTypeId}]
+ data.cstmrId = data.cstmrId$
+ data.company = data.company$
+ data.director = data.director$
+ data.orderProductTypeId = data.orderProductTypeId$
+ _this.citysDataTemp = data.pcd
+ _this.id = data.id
+ _this.memoExperience = data.memoExperience
+ _this.status = data.status
+ _this.baseFormData = data
+ })
},
methods: {
async getDetail() {
@@ -253,8 +283,6 @@
}
}
for (element of that.directorList) {
- console.log(that.directorList);
- console.log(that.baseFormData.director);
if (element.value == that.baseFormData.director) {
that.baseFormData.director = element.id
}
@@ -276,8 +304,11 @@
res.remarks = ''
}
res.pcd = this.citysDataTemp
+ res.id = this.id
+ res.memoExperience = this.memoExperience
+ res.status = this.status
uni.request({
- url: that.baseUrl + '/order/add/auth',
+ url: that.baseUrl + '/order/update/auth',
header: {
'token': uni.getStorageSync('token'),
'content-type': 'application/x-www-form-urlencoded',
@@ -287,7 +318,9 @@
success(result) {
var res = result.data
if (res.code === 200) {
- uni.navigateBack()
+ uni.navigateBack({
+ delta: 2
+ })
} else if (res.code === 403) {
uni.showToast({
title: res.msg,
diff --git a/pages/business/saleManage/saleManage.vue b/pages/business/saleManage/saleManage.vue
index f2f4760..e90d2aa 100644
--- a/pages/business/saleManage/saleManage.vue
+++ b/pages/business/saleManage/saleManage.vue
@@ -22,7 +22,7 @@
<view>
<!-- 瀹㈡埛鍒楄〃 -->
<view class="c-list" v-for="(item,index) in csmtrList" :key="index">
- <view class="titles" @click="getDetails(item.cstmrId)">
+ <view class="titles" @click="getDetails(item.id)">
<view style="flex: 1;">
<y-title :title="item.name"></y-title>
</view>
@@ -39,7 +39,7 @@
<view class="list-item1">椤圭洰浠ｅ彿</view><view class="list-item2">{{item.uuid}}</view>
</view>
<view class="cstmrs-item">
- <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2 color-main" @click="goDetls(item.id)">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
+ <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2 color-main" @click="goDetls(item.cstmrId)">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
</view>
<view class="cstmrs-item">
<view class="list-item1">鎵�灞炲尯鍩�</view><view class="list-item2">{{item.pcd$ ? item.pcd$ : '--'}}</view>
diff --git a/pages/business/saleManage/saleManageDetails.vue b/pages/business/saleManage/saleManageDetails.vue
index 0ebd44a..c1f55e4 100644
--- a/pages/business/saleManage/saleManageDetails.vue
+++ b/pages/business/saleManage/saleManageDetails.vue
@@ -13,16 +13,20 @@
</view>
</view>
<view class="container">
+
<view><y-title title="鍩烘湰淇℃伅"></y-title></view><view></view>
- <view class="list-item1">瀹㈡埛浠ｅ彿</view><view class="list-item2">{{saleManage.uuid}}</view>
- <view class="list-item1">鎵�灞為儴闂�</view><view class="list-item2">{{saleManage.deptId$}}</view>
- <view class="list-item1">瀹㈡埛绫诲埆</view><view class="list-item2">{{saleManage.cstmrType$}}</view>
+ <view class="list-item1">椤圭洰浠ｅ彿</view><view class="list-item2">{{saleManage.uuid}}</view>
+ <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{saleManage.cstmrId$}}</view>
+ <view class="list-item1">椤圭洰鎬婚噾棰�</view><view class="list-item2">{{saleManage.money}}</view>
+ <view class="list-item1">鎵�灞炲叕鍙�</view><view class="list-item2">{{saleManage.company$}}</view>
<view class="list-item1">鐪佸競鍖�</view><view class="list-item2">{{saleManage.pcd$ ? saleManage.pcd$ : '--'}}</view>
- <view class="list-item1">瀹㈡埛鑱旂郴浜�</view><view class="list-item2">{{saleManage.contacts ? saleManage.contacts : '--'}}</view>
- <view class="list-item1">鍖哄垎</view><view class="list-item2">{{saleManage.type$ ? saleManage.type$ : '--'}}</view>
- <view class="list-item1">瀹㈡埛琛屼笟</view><view class="list-item2 color-main">{{saleManage.industry ? saleManage.industry : '--'}}</view>
- <view class="list-item1">浜у搧绫诲埆</view><view class="list-item2">{{saleManage.productCategory ? saleManage.productCategory : '--'}}</view>
+ <view class="list-item1">椤圭洰鍦板潃</view><view class="list-item2">{{saleManage.addr}}</view>
+ <view class="list-item1">璐熻矗浜�</view><view class="list-item2">{{saleManage.director$}}</view>
<view class="list-item1">澶囨敞</view><view class="list-item2">{{saleManage.remarks ? saleManage.remarks : '--'}}</view>
+ <view class="list-item1">椤圭洰棰勭畻閲戦(涓�)</view><view class="list-item2">{{saleManage.money ? saleManage.money : '--'}}</view>
+ <view class="list-item1">椤圭洰棰勪及鎴愪氦鐜�</view><view class="list-item2">{{saleManage.transactionRate ? saleManage.transactionRate : '--'}}</view>
+
+
</view>
<view class="container">
<view><y-title title="鍏朵粬淇℃伅"></y-title></view><view></view>
@@ -91,7 +95,7 @@
init() {
let that = this
uni.request({
- url: that.baseUrl + '/cstmr/' + that.id +'/auth',
+ url: that.baseUrl + '/order/' + that.id +'/auth',
header: {'token' : uni.getStorageSync('token')},
method: 'GET',
success(res) {
@@ -213,9 +217,14 @@
}
})
},
- modi() {
+ modi(id) {
+ let _this = this
uni.navigateTo({
- url: '/pages/business/saleManage/modiSaleManage'
+ url: '/pages/business/saleManage/modiSaleManage',
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+ res.eventChannel.emit('saleManage', { data: _this.saleManage })
+ }
})
}
}
--
Gitblit v1.9.1