From da481078e4f5b1477961398f4722e446df0fa56b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 16:17:17 +0800
Subject: [PATCH] #

---
 pages/business/saleManage/modiSaleManage.vue    |  325 +++++++++++++++++++++++++
 pages/business/saleManage/cstmrDetls.vue        |  320 ++++++++++++++++++++++++
 pages.json                                      |   12 
 pages/business/saleManage/saleManage.vue        |   38 +-
 pages/business/saleManage/saleManageDetails.vue |   36 +-
 5 files changed, 693 insertions(+), 38 deletions(-)

diff --git a/pages.json b/pages.json
index 9ccd954..4162637 100644
--- a/pages.json
+++ b/pages.json
@@ -79,12 +79,24 @@
 			}
 		},
 		{
+			"path": "pages/business/saleManage/modiSaleManage",
+			"style": {
+				"navigationBarTitleText": "淇敼璺熻釜椤圭洰"
+			}
+		},
+		{
 			"path": "pages/business/saleManage/saleManageDetails",
 			"style": {
 				"navigationBarTitleText": "璧勬枡璇︽儏"
 			}
 		},
 		{
+			"path": "pages/business/saleManage/cstmrDetls",
+			"style": {
+				"navigationBarTitleText": "璧勬枡璇︽儏"
+			}
+		},
+		{
 			"path": "pages/business/plan/plan",
 			"style": {
 				"navigationStyle": "custom"
diff --git a/pages/business/saleManage/cstmrDetls.vue b/pages/business/saleManage/cstmrDetls.vue
new file mode 100644
index 0000000..1e2418b
--- /dev/null
+++ b/pages/business/saleManage/cstmrDetls.vue
@@ -0,0 +1,320 @@
+<template>
+	<view>
+		<scroll-view scroll-y="true" >
+			<view class="header">
+				<view class="cstmr-name">
+					<image src="../../../static/image/zuzhibumen.png" mode="aspectFit"></image>
+					<view>{{saleManage.name}}</view>
+				</view>
+				<view class="cstmr-tel">
+					{{saleManage.company$}} | 
+					{{saleManage.money ? saleManage.pcd$ : '--'}} | 
+					{{saleManage.director$ ? saleManage.pcd$ : '--'}}
+				</view>
+			</view>
+			<view class="container">
+				<view><y-title title="鍩烘湰淇℃伅"></y-title></view><view></view>
+				<view class="list-item1">椤圭洰浠e彿</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.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>
+				<view class="list-item1">娣诲姞浜哄憳</view><view class="list-item2 color-main">{{saleManage.createBy$}}</view>
+				<view class="list-item1">娣诲姞鏃堕棿</view><view class="list-item2">{{saleManage.createTime$}}</view>
+				<view class="list-item1">淇敼浜哄憳</view><view class="list-item2">{{saleManage.updateBy$}}</view>
+				<view class="list-item1">淇敼鏃堕棿</view><view class="list-item2 color-main">{{saleManage.updateTime$}}</view>
+			</view>
+			<view class="boxx">
+				
+			</view>
+			
+		</scroll-view>
+		<view class="foot">
+			<button  size="mini" type="warn" @click="del(id)">鍒犻櫎</button>
+		</view>
+		
+		<view>
+			<!-- 杈撳叆妗嗙ず渚� -->
+			<uni-popup ref="inputDialog" type="dialog">
+				<uni-popup-dialog ref="inputClose" mode="input" title="娣诲姞璺熻繘浜�" value="瀵硅瘽妗嗛缃彁绀哄唴瀹�!"
+					placeholder="璇疯緭鍏ュ唴瀹�" @confirm="confirm">
+						<uni-combox :candidates="addFollower.followers" placeholder="璇烽�夋嫨"
+						v-model="addFollower.follower" @input="autoLoad('follower',addFollower.follower)"></uni-combox>
+				</uni-popup-dialog>
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: 0,
+				saleManage: {},
+				cstmr: {
+					id: '',
+					name: '',
+					tel: '',
+					addr: '',
+					cstman: ''
+				},
+				addFollower: {
+					follower: '',
+					followers: '',
+					followerList: []
+				},
+				followers: [],
+				followerIds: [], 
+				cstmrId: ''
+			}
+		},
+		onLoad(option) { 
+			this.id = option.id
+			console.log(option);
+			this.init()
+			this.autoLoad('follower','')
+			setTimeout(()=>{
+				this.getFollowers()
+			},500)
+		},
+		methods: {
+			init() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/cstmr/' + that.id +'/auth',
+					header: {'token' : uni.getStorageSync('token')},
+					method: 'GET',
+					success(res) {
+						res = res.data
+						console.log(res);
+						that.saleManage = res.data
+						that.cstmr = res.data
+						that.cstmrId = that.cstmr.id
+					}
+				})
+			},
+			del(e) {
+				let that = this
+				e = Number(e)
+				uni.request({
+					url: that.baseUrl + '/cstmr/delete/one/' + e,
+					header: {'token' : uni.getStorageSync('token'),
+					},
+					method: 'GET',
+					
+					success(res) {
+						res = res.data
+						if (res.code === 200) {
+							uni.navigateBack()
+						} else if (res.code === 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					}
+				})
+			},
+			addPerson() {
+				this.$refs.inputDialog.open()
+			},
+			// 纭閫夋嫨宸ヤ綔浜�
+			confirm() {
+				let that = this
+				var followerId
+				var followerList = that.addFollower.followerList
+				for (var i = 0;i < followerList.length; i++) {
+					if (followerList[i].name == this.addFollower.follower) {
+						followerId =followerList[i].value
+					}
+				}
+				uni.request({
+					url: that.baseUrl + '/order/followers/add/json',
+					header:{'token':uni.getStorageSync('token'),},
+					data: {
+						orderId: that.cstmrId,
+						followerIds:followerId},
+					method: 'POST',
+					success(result) {
+						var res = result.data
+						that.getFollowers()
+					}
+				})
+				this.addFollower.follower = ''
+			},
+			// 宸ヤ綔浜哄垪琛�
+			autoLoad(type,condition) {
+				let that = this
+				that.addFollower.followers = []
+				that.addFollower.followerList = []
+				uni.request({
+					url: that.baseUrl + '/user/all/get/kv',
+					header:{'token':uni.getStorageSync('token')},
+					data: {condition:condition},
+					method: 'POST',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							var element;
+							if (type == 'follower') {
+								for(element of res.data) {
+									that.addFollower.followers.push(element.name)
+									that.addFollower.followerList.push(element)
+								}
+								return
+							}
+						}
+					}
+				})
+			},
+			getFollowers() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/order/followers/table/auth',
+					header:{'token':uni.getStorageSync('token')},
+					data: {orderId:that.cstmrId},
+					method:'GET',
+					success(res) {
+						res = res.data
+						that.followers = res.data
+					}
+				})
+			},
+			removeFollowers(userId) {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/order/followers/remove/auth',
+					header:{
+						'token':uni.getStorageSync('token'),
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						orderId:that.cstmrId,
+						userId: userId
+						},
+					method:'POST',
+					success(res) {
+						res = res.data
+						that.getFollowers()
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.boxx {
+		display: flex;
+		flex-direction: column;
+	}
+	.header {
+		width: auto;
+		min-height: 110rpx;
+		background-color: #fff;
+		padding: 30px 20px 10px 20px;
+	}
+	.cstmr-name {
+		display: flex;
+		height: 35rpx;
+		line-height: 35rpx;
+		text-indent: 10rpx;
+		font-size: 36rpx;
+		color: #606266;
+	}
+	.cstmr-name image {
+		width: 35rpx;
+		height: 35rpx;
+	}
+	.cstmr-tel {
+		min-height: 60rpx;
+		line-height: 60rpx;
+		font-size: 24rpx;
+		color: #303133;
+	}
+	.container {
+		margin-top: 10px;
+		padding: 10rpx 20rpx 0 20rpx;
+		background-color: #fff;
+		display: grid;
+		grid-template-columns: 1fr 3fr;
+	}
+	.container:last-child {
+		grid-template-columns: 5fr 5fr 2fr;
+		margin-bottom: 120rpx;
+	}
+	.list-item1 {
+		min-height: 45rpx;
+		line-height: 45rpx;
+		color: #909399;
+		text-indent: 30rpx;
+	}
+	.list-item2 {
+		min-height: 45rpx;
+		line-height: 45rpx;
+		color: black;
+	}
+	.color-main {
+		color: #55aaff
+	}
+	.foot {
+		position: fixed;
+		width: 100%;
+		min-height: 100rpx;
+		bottom: 0;
+		margin-bottom: 0;
+		background-color: #fff;
+		border-top: 1px solid #efefef;
+		display: flex;
+		align-items: center;
+	}
+	.list {
+		min-height: 60rpx;
+		margin-top: 20rpx;
+		grid-column: 1 / 10;
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		position: relative;
+	}
+	.list-left {
+		min-height: 60rpx;
+		line-height: 60rpx;
+		padding-left: 20rpx;
+		color: #55aaff
+	}
+	.list-right {
+		min-height: 60rpx;
+		line-height: 60rpx;
+		/* background-color: #222; */
+		padding-right: 30rpx;
+	}
+	.list-none {
+		min-height: 60rpx;
+		margin-top: 20rpx;
+		text-align: center;
+		/* background-color: #303133; */
+		color: #b1b3b8;
+		grid-column: 1 / 10;
+		display: grid;
+		position: relative;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/business/saleManage/modiSaleManage.vue b/pages/business/saleManage/modiSaleManage.vue
new file mode 100644
index 0000000..fdc6ef2
--- /dev/null
+++ b/pages/business/saleManage/modiSaleManage.vue
@@ -0,0 +1,325 @@
+<template>
+	<view>
+		<view class="container">
+			<uni-forms ref="baseForm" :modelValue="baseFormData">
+				<uni-forms-item label="璺熻釜椤圭洰鍚嶇О" required name="name">
+					<uni-easyinput v-model="baseFormData.name" placeholder="璇疯緭鍏ヨ窡韪」鐩悕绉�" />
+				</uni-forms-item>
+				<uni-forms-item label="鐢叉柟鍗曚綅" required name="cstmrId">
+					<view @click="autoLoad('cstmr','')">
+						<uni-combox :candidates="cstmrs" placeholder="璇烽�夋嫨鐢叉柟鍗曚綅" v-model="baseFormData.cstmrId"
+							@input="autoLoad('cstmr',baseFormData.cstmrId)"></uni-combox>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="鎵�灞炲叕鍙�" required name="company">
+					<view @click="autoLoad('company','')">
+						<uni-combox :candidates="companies" placeholder="璇烽�夋墍灞炲叕鍙�" v-model="baseFormData.company"
+							@input="autoLoad('company',baseFormData.company)"></uni-combox>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="棰勭畻閲戦(涓囧厓)" name="money" required>
+					<uni-easyinput v-model="baseFormData.money" placeholder="璇疯緭鍏ラ绠楅噾棰�(涓囧厓)" />
+				</uni-forms-item>
+				<uni-forms-item label="棰勮鎴愪氦鐜�" name="transactionRate" required>
+					<view>
+						<uni-combox :candidates="transactionRates" placeholder="璇烽�夋嫨棰勮鎴愪氦鐜�" 
+						v-model="baseFormData.transactionRate" ></uni-combox>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="璐熻矗浜�" name="director" required>
+					<view @click="autoLoad('user','')">
+						<uni-combox :candidates="directors" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="baseFormData.director"
+							@input="autoLoad('user',baseFormData.director)"></uni-combox>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="浜у搧绫诲瀷" name="orderProductTypeId" required>
+					<view @click="autoLoad('orderProductType','')">
+						<uni-combox :candidates="orderProductTypeIds" placeholder="璇烽�夋嫨浜у搧绫诲瀷" 
+						v-model="baseFormData.orderProductTypeId"
+							@input="autoLoad('orderProductType',baseFormData.orderProductTypeId)"></uni-combox>
+					</view>
+				</uni-forms-item>
+				<uni-forms-item label="鐪佸競鍖�" name="citysData" required>
+					<uni-data-picker @change="areaChange" placeholder="璇烽�夋嫨鐪佸競鍖�" popup-title="璇烽�夋嫨鎵�鍦ㄥ湴鍖�"
+						:localdata="citysData" v-model="baseFormData.pcd">
+					</uni-data-picker>
+				</uni-forms-item>
+				<uni-forms-item label="椤圭洰鍦板潃" name="addr">
+					<uni-easyinput v-model="baseFormData.addr" placeholder="璇疯緭鍏ラ」鐩湴鍧�" />
+				</uni-forms-item>
+				<uni-forms-item label="蹇冨緱浣撲細" name="memoExperience">
+					<uni-easyinput type="textarea" v-model="baseFormData.memoExperience" placeholder="璇疯緭鍏ュ績寰椾綋浼�" />
+				</uni-forms-item>
+				<uni-forms-item label="澶囨敞" name="remarks">
+					<uni-easyinput type="textarea" v-model="baseFormData.remarks" placeholder="璇疯緭鍏ュ娉�" />
+				</uni-forms-item>
+			</uni-forms>
+			<button type="primary" @click="addOrder()">娣诲姞</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import test from '../../../static/js/citys-data.js'
+	import user from '@/pages/api/user/user.js'
+	export default {
+		data() {
+			return {
+				cstmrTypes: [],
+				cstmrType: '',
+				companies: [],
+				directors: [],
+				director: '',
+				cstmrs: [],
+				cstmr: '',
+				cstmrTypeList: [],
+				cstmrList: [],
+				directorList: [],
+				companyList: [],
+				orderProductTypeIds: [],
+				orderProductTypeList: [],
+				baseFormData: {
+					citysData: [],
+					cstmrType: '',
+					company: '',
+					director: '',
+					rela: '',
+					remarks: '',
+					transactionRate: '',
+					cstmrId: '',
+					addr: '',
+					money: ''
+				},
+				transactionRates: ['30%','40%','50%','60%','70%','80%','90%','100%'],
+				rules: {
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '璇疯緭鍏ヨ窡韪」鐩悕绉�',
+						}]
+					},
+					cstmrId: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋嫨鐢叉柟鍗曚綅',
+						}]
+					},
+					company: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋墍灞炲叕鍙�',
+						}]
+					},
+					money: {
+						rules: [{
+							required: true,
+							errorMessage: '璇疯緭鍏ラ绠楅噾棰�',
+						}]
+					},
+					transactionRate: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋嫨棰勮鎴愪氦鐜�',
+						}]
+					},
+					director: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋嫨璐熻矗浜�',
+						}]
+					},
+					orderProductTypeId: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋嫨浜у搧绫诲瀷',
+						}]
+					},
+					citysData: {
+						rules: [{
+							required: true,
+							errorMessage: '璇烽�夋嫨鎵�鍦ㄥ湴鍖�',
+						}]
+					}
+				},
+				// 鍗曢�夋暟鎹簮
+				type$: [{
+					text: '鍐呴攢',
+					value: 1
+				}, {
+					text: '澶栭攢',
+					value: 2
+				}],
+				citysData: [],
+				citysDataTemp: ''
+			}
+		},
+		onReady() {
+			// 闇�瑕佸湪onReady涓缃鍒�
+			this.$refs.baseForm.setRules(this.rules)
+		},
+		onShow() {
+			// 鑾峰彇鐪佸競鍖�
+			this.citysData = test.citysData
+			this.getDetail()
+		},
+		methods: {
+			async getDetail() {
+				let res = await user.getDetail()
+				if (res.code === 200) {
+					this.baseFormData.director = res.data.username
+					res.data['value'] = res.data.username
+					this.directors.push(res.data.username)
+					this.directorList.push(res.data)
+				} 
+			},
+			bindPickerChange: function(e) {
+				this.cstmrTypeIndex = e.detail.value
+				this.baseFormData.cstmrType = this.cstmrTypes[e.detail.value].id
+			},
+			areaChange(e) {
+				this.citysDataTemp = e.detail.value[0].value + ',' + e.detail.value[1].value + ',' + e.detail.value[2]
+					.value
+			},
+			autoLoad(type, condition) {
+				let that = this
+				that.companies = []
+				that.directors = []
+				that.cstmrs = []
+				that.orderProductTypeIds = []
+				var a = that.baseUrl + '/' + type + 'Query/auth'
+				uni.request({
+					url: that.baseUrl + '/' + type + 'Query' + '/auth',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					data: {
+						condition: condition
+					},
+					method: 'GET',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							var element;
+							if (type == 'user') {
+								for (element of res.data) {
+									that.directors.push(element.value)
+									that.directorList.push(element)
+								}
+								return
+							}
+							if (type == 'company') {
+								for (element of res.data) {
+									that.companies.push(element.name)
+									that.listAuth(type)
+									that.companyList.push(element)
+								}
+								return
+							}
+							if (type == 'cstmr') {
+								for (element of res.data) {
+									that.cstmrs.push(element.value)
+									that.cstmrList.push(element)
+								}
+								return
+							}
+							if (type == 'orderProductType') {
+								for (element of res.data) {
+									that.orderProductTypeIds.push(element.value)
+									that.orderProductTypeList.push(element)
+								}
+								return
+							}
+						}
+
+					}
+				})
+			},
+			listAuth(type) {
+
+			},
+			// 娣诲姞璺熻釜椤圭洰
+			addOrder() {
+				let that = this
+				var element;
+				// 鎵�灞炲叕鍙�
+				for (element of that.companyList) {
+					if (element.name == that.baseFormData.company) {
+						that.baseFormData.company = element.id
+					}
+				}
+				for (element of that.cstmrList) {
+					if (element.value == that.baseFormData.cstmrId) {
+						that.baseFormData.cstmrId = element.id
+					}
+				}
+				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
+					}
+				}
+				for (element of that.orderProductTypeList) {
+					if (element.value == that.baseFormData.orderProductTypeId) {
+						that.baseFormData.orderProductTypeId = element.id
+					}
+				}
+				that.baseFormData.transactionRate = Number(that.baseFormData.transactionRate.split('%')[0])
+				this.$refs.baseForm.validate().then(res => {
+					if (res.addr == undefined) {
+						res.addr = ''
+					}
+					if (res.money == undefined) {
+						res.money = ''
+					}
+					if (res.remarks == undefined) {
+						res.remarks = ''
+					}
+					res.pcd = this.citysDataTemp
+					uni.request({
+						url: that.baseUrl + '/order/add/auth',
+						header: {
+							'token': uni.getStorageSync('token'),
+							'content-type': 'application/x-www-form-urlencoded',
+						},
+						data: res,
+						method: 'POST',
+						success(result) {
+							var res = result.data
+							if (res.code === 200) {
+								uni.navigateBack()
+							} else if (res.code === 403) {
+								uni.showToast({
+									title: res.msg,
+									icon: "none",
+									position: 'top'
+								})
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '../../login/login'
+									});
+								}, 1000);
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: "none",
+									position: 'top'
+								})
+							}
+						}
+					})
+				}).catch(err => {})
+			}
+		}
+
+	}
+</script>
+
+<style>
+	.container {
+		min-height: 50rpx;
+		padding: 15px;
+		background-color: #fff;
+		/* background-color: aqua; */
+	}
+</style>
\ No newline at end of file
diff --git a/pages/business/saleManage/saleManage.vue b/pages/business/saleManage/saleManage.vue
index ca09395..f2f4760 100644
--- a/pages/business/saleManage/saleManage.vue
+++ b/pages/business/saleManage/saleManage.vue
@@ -21,9 +21,12 @@
 		</view>
 		<view>
 			<!-- 瀹㈡埛鍒楄〃 -->
-			<view class="c-list" @click="getDetails(item.id)" v-for="(item,index) in csmtrList" :key="index">
-				<view class="titles">
-					<y-title :title="item.name"></y-title>
+			<view class="c-list" v-for="(item,index) in csmtrList" :key="index">
+				<view class="titles" @click="getDetails(item.cstmrId)">
+					<view style="flex: 1;">
+						<y-title :title="item.name"></y-title>
+					</view>
+					<uni-icons class="opt-icon" type="right" size="20" color="#b9b9b9"></uni-icons>
 				</view>
 				<view class="cstmrs">
 					<view class="cstmrs-item">
@@ -36,7 +39,7 @@
 						<view class="list-item1">椤圭洰浠e彿</view><view class="list-item2">{{item.uuid}}</view>
 					</view>
 					<view class="cstmrs-item">
-						<view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
+						<view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2 color-main" @click="goDetls(item.id)">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
 					</view>
 					<view class="cstmrs-item">
 						<view class="list-item1">鎵�灞炲尯鍩�</view><view class="list-item2">{{item.pcd$ ? item.pcd$ : '--'}}</view>
@@ -68,23 +71,6 @@
 					<view class="cstmrs-item">
 						<view class="list-item1">鐘舵��</view><view class="list-item2">{{item.status$ ? item.status$ : '--'}}</view>
 					</view>
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
-					
 				</view>
 			</view>
 		</view>
@@ -172,6 +158,7 @@
 							return
 						}
 						var res = result.data
+						console.log(res);
 						if (res.code === 200) {
 							let list = res.data.records
 							that.csmtrList = that.reload ? list : that.csmtrList.concat(list);
@@ -245,6 +232,11 @@
 					url: '/pages/business/saleManage/saleManageDetails?id=' + id
 				})
 			},
+			goDetls(id) {
+				uni.navigateTo({
+					url: '/pages/business/saleManage/cstmrDetls?id=' + id
+				})
+			},
 			// ---
 			search() {
 				
@@ -294,6 +286,7 @@
 		padding-left: 10rpx;
 		text-indent: 5rpx;
 		margin-top: 10rpx;
+		display: flex;
 	}
 	.cstmrs {
 		display: flex;
@@ -303,6 +296,9 @@
 	.cstmrs-item {
 		display: flex;
 	}
+	.color-main {
+		color: #55aaff
+	}
 	/* .title {
 		height: 60rpx;
 		line-height: 70rpx;
diff --git a/pages/business/saleManage/saleManageDetails.vue b/pages/business/saleManage/saleManageDetails.vue
index f976a2b..789e15d 100644
--- a/pages/business/saleManage/saleManageDetails.vue
+++ b/pages/business/saleManage/saleManageDetails.vue
@@ -14,14 +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.name}}</view>
-				<view class="list-item1">鎵�灞炲叕鍙�</view><view class="list-item2">{{saleManage.company$}}</view>
+				<view class="list-item1">瀹㈡埛浠e彿</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.director$ ? saleManage.director$ : '--'}}</view>
-				<view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{saleManage.cstmrId$  ? saleManage.cstmrId$ : '--'}}</view>
-				<view class="list-item1">椤圭洰閲戦</view><view class="list-item2 color-main">{{saleManage.money ? saleManage.money : '--'}}</view>
-				<view class="list-item1">椤圭洰鍦板潃</view><view class="list-item2">{{saleManage.addr ? saleManage.addr : '--'}}</view>
-				<view class="list-item1">澶囨敞</view><view class="list-item2">{{saleManage.memo  ? saleManage.memo : '--'}}</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>
 			<view class="container">
 				<view><y-title title="鍏朵粬淇℃伅"></y-title></view><view></view>
@@ -30,20 +31,15 @@
 				<view class="list-item1">淇敼浜哄憳</view><view class="list-item2">{{saleManage.updateBy$}}</view>
 				<view class="list-item1">淇敼鏃堕棿</view><view class="list-item2 color-main">{{saleManage.updateTime$}}</view>
 			</view>
-			<view class="container">
-				<view><y-title title="璺熻繘浜�"></y-title></view><view></view><view><uni-icons @click="addPerson()" type="plus" size="20" color="#55aaff"></uni-icons></view>
-				<view class="list" v-for="(item,index) in followers" :key="index">
-					<view class="list-left">{{item.userName}}</view>
-					<view class="list-right"><button size="mini" style="float: right;" type="warn" @click="removeFollowers(item.userId)">绉婚櫎</button></view>
-				</view>
-				<view class="list-none" v-show="followers.length == 0">
-					<text>鏆傛棤璺熻繘浜�</text>
-				</view>
+			<view class="boxx">
+				
 			</view>
 			
 		</scroll-view>
 		<view class="foot">
+			<button  size="mini" type="default" @click="del(id)">淇敼</button>
 			<button  size="mini" type="warn" @click="del(id)">鍒犻櫎</button>
+			<button  size="mini" type="primary" @click="del(id)">鍑哄樊</button>
 		</view>
 		
 		<view>
@@ -84,6 +80,7 @@
 		},
 		onLoad(option) { 
 			this.id = option.id
+			console.log(option);
 			this.init()
 			this.autoLoad('follower','')
 			setTimeout(()=>{
@@ -94,11 +91,12 @@
 			init() {
 				let that = this
 				uni.request({
-					url: that.baseUrl + '/order/' + that.id +'/auth',
+					url: that.baseUrl + '/cstmr/' + that.id +'/auth',
 					header: {'token' : uni.getStorageSync('token')},
 					method: 'GET',
 					success(res) {
 						res = res.data
+						console.log(res);
 						that.saleManage = res.data
 						that.cstmr = res.data
 						that.cstmrId = that.cstmr.id
@@ -220,6 +218,10 @@
 </script>
 
 <style>
+	.boxx {
+		display: flex;
+		flex-direction: column;
+	}
 	.header {
 		width: auto;
 		min-height: 110rpx;

--
Gitblit v1.9.1