From 1f1fe4dec60141c0f3f164f474ebc0b5b519e3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?=
 <yanggehui@chalco-steering.com>
Date: Thu, 20 Jan 2022 10:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=20?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/setting.js                    |  24 +++
 pages/about/index.vue              |   1 +
 pages/account-management/index.vue | 180 ++++++++++++++++++--
 pages/add-account/index.vue        | 262 +++++++++++++++++++++++++++--
 pages/add-paper/index.vue          |   2 +-
 5 files changed, 446 insertions(+), 23 deletions(-)

diff --git a/apis/setting.js b/apis/setting.js
index 4ea84ee..742b965 100644
--- a/apis/setting.js
+++ b/apis/setting.js
@@ -6,3 +6,27 @@ export function employeeName(data) {
     data
   })
 }
+// 新增员工
+export function addEmployee(data) {
+  return http.post({
+    url: '/yyt-uec/enterprise/add/employee?userId='+data.userId +'&enterpriseId=' +data.enterpriseId,
+    data
+  })
+}
+// 员工列表
+export function employeeList(data) {
+	return http.get({
+		url: '/yyt-uec/enterprise/get/employee-list',
+		data
+	})
+}
+// 删除员工
+export function deleteEmployee(data) {
+	return http.post({
+		url: '/yyt-uec/enterprise/delete/employee?enterpriseId='+data.enterpriseId,
+		data
+	})
+}
+
+
+
diff --git a/pages/about/index.vue b/pages/about/index.vue
index c608e22..48c4e6c 100644
--- a/pages/about/index.vue
+++ b/pages/about/index.vue
@@ -51,6 +51,7 @@ export default {
 		font-size: 64rpx;
 		color: #000000;
 		font-weight: 400;
+		margin-top: 40rpx;
 	}
 	.about-subtext {
 		font-size: 28rpx;
diff --git a/pages/account-management/index.vue b/pages/account-management/index.vue
index 03dc090..5c417d9 100644
--- a/pages/account-management/index.vue
+++ b/pages/account-management/index.vue
@@ -7,26 +7,137 @@
 				<view slot="right" class="add-account" @click="addAccount">添加账号</view>
 			</uni-nav-bar>
 		</view>
+		<view class="">
+			<scroll-list style="touch-action: none" ref="orderRef" :option="orderOption" @load="orderUp" @refresh="orderDown">
+				<view class="account-list" v-for="(item,index) in list" :key="index">
+					<view class="account-iamge-width"><image class="list-image" src="../../static/imgs/client-credit-list/client-default.png" mode=""></image></view>
+					<view class="account-text">
+						<view class="account-name"><text>{{item.name}}-{{item.title}}</text></view>
+						<view class="account-phone"><text>{{item.mobile}}</text></view>
+					</view>
+					<view class="account-delete" @click="deleteAccount(item)"><text>删除账号</text></view>
+				</view>
+			</scroll-list>
+		</view>
+		<uni-popup ref="popup" type="dialog">
+		    <uni-popup-dialog type="info" mode="base" title="确认删除该账号？" :duration="2000" :before-close="true" @close="close" @confirm="confirm">
+				<view class="account-dialog-text">
+					<text>账号删除后无法在使用系统，请谨慎操作</text>
+				</view>
+			</uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import { back, go2, uploadFile } from '@/utils/hook.js'
-	export default {
-		data() {
-			return {
-				
+import { back, go2, uploadFile } from '@/utils/hook.js'
+import { employeeList,deleteEmployee } from '@/apis/setting.js'
+export default {
+	data() {
+		return {
+			orderOption: {
+				size: 10,
+				auto: true,
+				emptyText: '暂无用户~',
+				background: '#F7F8FA',
+				fontSize: '40rpx'
+			},
+			params: {
+				asc: '',
+				desc: ''
+			},
+			pagination: {
+				pageNum: 0, // 初始会执行一次下拉加载
+				pageSize: 10
+			},
+			list:[],
+			deleteId:''
+		}
+	},
+	onShow() {
+		this.getList()
+	},
+	methods: {
+		back,
+		addAccount() {
+			go2('add-account')
+		},
+		deleteAccount(item){
+			// deleteEmployee
+			this.$refs.popup.open()
+			this.deleteId = item.id
+		},
+		confirm(){
+			var params= {
+				id:this.deleteId,
+				enterpriseId: this.$store.state.supplierInfo.id,
 			}
+			deleteEmployee(params)
+				.then(res => {
+					if (res) {
+						uni.showToast({
+							title: '删除成功',
+							icon: 'success'
+						})
+						this.close()
+					} 
+				})
+				.catch(err => {
+					reject(err)
+				})
+		},
+		close(){
+			 this.$refs.popup.close()
+		},
+		// 获取用户列表
+		getList() {
+			return new Promise((resolve, reject) => {
+				employeeList({ ...this.params, ...this.pagination })
+					.then(res => {
+						if (res) {
+							if (this.pagination.pageNum == 1) {
+								this.list = res.records
+							} else {
+								this.list = this.list.concat(res.records)
+							}
+							resolve({ list: this.list, total: res.total })
+						} else {
+							reject()
+						}
+					})
+					.catch(err => {
+						reject(err)
+					})
+			})
+		},
+		//用户分页
+		orderUp(page) {
+			this.pagination.pageNum++
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.orderRef.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.orderRef.loadFail()
+				})
 		},
-		methods: {
-			back,
-			addAccount(){}
+		//用户分页
+		orderDown() {
+			this.pagination.pageNum = 1
+			this.getList()
+				.then(({ list, total }) => {
+					this.$refs.orderRef.refreshSuccess({ list, total })
+				})
+				.catch(() => {
+					this.$refs.orderRef.refreshFail()
+				})
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-.account-management{
+.account-management {
 	.account-management-title {
 		width: 100%;
 		font-size: 36rpx;
@@ -35,12 +146,59 @@
 		text-align: center;
 		font-weight: 500;
 	}
-	.add-account{
+	.add-account {
 		font-size: 28rpx;
-		color: #007AFF;
+		color: #007aff;
 		text-align: right;
 		line-height: 40rpx;
 		font-weight: 500;
 	}
+	.list-image {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50rpx;
+	}
+	.account-list {
+		display: flex;
+		align-items: center;
+		height: 148rpx;
+		background-color: #ffffff;
+	}
+	.account-name {
+		font-size: 30rpx;
+		color: #333333;
+		letter-spacing: 0;
+		font-weight: 500;
+	}
+	.account-phone {
+		font-size: 26rpx;
+		color: #888888;
+		letter-spacing: 0;
+		text-align: left;
+		line-height: 32rpx;
+		font-weight: 400;
+	}
+	.account-delete {
+		font-size: 28rpx;
+		color: #f5222d;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 400;
+	}
+	.account-text {
+		width: 60%;
+		line-height: 60rpx;
+	}
+	.account-iamge-width {
+		margin-left: 32rpx;
+		width: 15%;
+	}
+	.account-dialog-text{
+		font-size: 28rpx;
+		color: #969799;
+		text-align: center;
+		line-height: 40rpx;
+		font-weight: 400;
+	}
 }
 </style>
diff --git a/pages/add-account/index.vue b/pages/add-account/index.vue
index 8183fd0..81f751d 100644
--- a/pages/add-account/index.vue
+++ b/pages/add-account/index.vue
@@ -1,22 +1,262 @@
 <template>
-	<view>
-		
+	<view class="add-account">
+		<view>
+			<uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="">
+				<view class="add-account-title">新增企业账号</view>
+				<view slot="left"></view>
+				<view slot="right"></view>
+			</uni-nav-bar>
+		</view>
+		<view class="">
+			<view class="add-paper-list">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">手机号</text>
+				</view>
+				<view class="add-paper-input">
+					<qn-easyinput
+						type="number"
+						:maxlength="11"
+						:styles="{ disableColor: '#fff' }"
+						v-model="form.mobile"
+						:inputBorder="false"
+						text="right"
+						placeholder="请输入手机号"
+					></qn-easyinput>
+				</view>
+			</view>
+			<view class="add-paper-border"></view>
+			<view class="add-paper-list">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">用户号</text>
+				</view>
+				<view class="add-paper-input">
+					<qn-easyinput type="text" :styles="{ disableColor: '#fff' }" v-model="form.name" :inputBorder="false" text="right" placeholder="请输入用户号"></qn-easyinput>
+				</view>
+			</view>
+			<view class="add-paper-border"></view>
+			<view class="add-paper-list" @click="paperpopupShow()">
+				<view>
+					<text class="add-paper-start"><uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons></text>
+					<text class="add-paper-text">职务</text>
+				</view>
+				<!-- categoryId -->
+				<view class="">
+					<text v-if="form.title === ''" class="add-paph-text">点击选择职务</text>
+					<text v-else>{{ form.title }}</text>
+					<text><uni-icons type="right" color="#000000" size="18"></uni-icons></text>
+				</view>
+			</view>
+		</view>
+		<view class="uploud-btn">
+			<view class=""><button type="primary" class="btn-class" plain="true" @click="cencelList()">取消</button></view>
+			<view class=""><button type="primary" class="btn-class-upload" @click="uploadData()">确认</button></view>
+		</view>
+		<uni-popup ref="paperpopup" type="bottom">
+			<view class="popup_modal">
+				<!-- <slot name="title"><view class="popup_modal-title">选择纸种</view></slot> -->
+				<scroll-view scroll-y="true" class="popup_modal-scroll">
+					<view @click="paperSelectChange(item)" class="popup_modal-scroll-item" v-for="item in paperList" :key="item.id">{{ item.name }}</view>
+					<uGap></uGap>
+					<view class="cencel-btn" @click="cencelbtn">取消</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
+import { back, go2, uploadFile } from '@/utils/hook.js'
+import uGap from '@/components/u-gap/u-gap.vue'
+import { addEmployee } from '@/apis/setting.js'
+const validateFields = ['mobile', 'name', 'title']
+export default {
+	data() {
+		return {
+			form: {
+				title: ''
+			},
+			paperList: [
+				{
+					name: '管理员',
+					id: '1'
+				},
+				{
+					name: '业务员',
+					id: '2'
+				},
+				{
+					name: '司机',
+					id: '3'
+				},
+				{
+					name: '分切',
+					id: '4'
+				},
+				{
+					name: '库管',
+					id: '5'
+				}
+			]
+		}
+	},
+	components: { uGap },
+	methods: {
+		back,
+		paperpopupShow() {
+			this.$refs.paperpopup.open('bottom')
+		},
+		paperSelectChange(item) {
+			this.$set(this.form, 'title', item.name)
+			this.$refs.paperpopup.close()
 		},
-		methods: {
-			
+		cencelbtn() {
+			this.$refs.paperpopup.close()
+		},
+		cencelList(){
+			back()
+		},
+		uploadData() {
+			for (let i = 0; i < validateFields.length; i++) {
+				if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') {
+					uni.showToast({
+						title: '请完善信息',
+						icon: 'none'
+					})
+					return
+				}
+			}
+			var params = {
+				...this.form,
+				enterpriseId: this.$store.state.supplierInfo.id,
+				// userId:this.$store.state.userInfo.userId,
+			}
+			addEmployee(params).then(res => {
+				if (res) {
+					uni.showToast({
+						title: '添加成功',
+						icon: 'success'
+					})
+					setTimeout(() => {
+						back()
+					}, 1000)
+				}
+			})
 		}
 	}
+}
 </script>
 
-<style>
-
+<style lang="scss">
+.add-account {
+	.add-account-title {
+		width: 100%;
+		font-size: 36rpx;
+		color: #000000;
+		letter-spacing: 0;
+		text-align: center;
+		font-weight: 500;
+	}
+	.add-account {
+		font-size: 28rpx;
+		color: #007aff;
+		text-align: right;
+		line-height: 40rpx;
+		font-weight: 500;
+	}
+	.add-paper-border {
+		border-bottom: 2rpx solid #d8d8d8;
+		margin-left: 32rpx;
+	}
+	.add-paper-list {
+		height: 88rpx;
+		background: #ffffff;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-left: 32rpx;
+		padding-right: 32rpx;
+	}
+	.add-paper-text {
+		font-size: 28rpx;
+		color: #000000;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.add-paper-start {
+		font-size: 28rpx;
+		color: #f5222d;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.add-paper-input {
+		width: 40%;
+	}
+	.popup_modal {
+		width: 750rpx;
+		height: 600rpx;
+		background-color: #fff;
+		border-radius: 10rpx 10rpx 0 0;
+		.popup_modal-title {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			width: 750rpx;
+			height: 88rpx;
+			font-weight: 600;
+			border-bottom: 2rpx solid #d8d8d8;
+		}
+		.popup_modal-scroll {
+			width: 750rpx;
+			height: 600rpx;
+			.popup_modal-scroll-item {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				width: 750rpx;
+				height: 88rpx;
+				padding: 0rpx 32rpx;
+				border-bottom: 2rpx solid #d8d8d8;
+			}
+		}
+	}
+	.cencel-btn {
+		font-size: 32rpx;
+		color: #646566;
+		text-align: center;
+		line-height: 44rpx;
+		font-weight: 400;
+		margin-top: 40rpx;
+	}
+	.add-paph-text {
+		font-size: 28rpx;
+		color: #888888;
+		letter-spacing: 0;
+		font-weight: 400;
+	}
+	.btn-class {
+		height: 88rpx;
+		border-radius: 10rpx;
+		line-height: 80rpx;
+		width: 150px;
+	}
+	.btn-class-upload {
+		height: 88rpx;
+		border-radius: 10rpx;
+		line-height: 80rpx;
+		width: 200px;
+	}
+	.uploud-btn {
+		    display: flex;
+		    justify-content: space-between;
+		    padding: 20rpx 32rpx;
+		    background-color: #ffffff;
+		    position: absolute;
+		    bottom: 0rpx;
+		    width: 100%;
+	}
+}
 </style>
diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue
index 643de8b..0700d46 100644
--- a/pages/add-paper/index.vue
+++ b/pages/add-paper/index.vue
@@ -589,7 +589,7 @@ export default {
 	}
 	.add-paper-border {
 		border-bottom: 2rpx solid #d8d8d8;
-		margin-left: 16px;
+		margin-left: 32rpx;
 	}
 	.paper-price {
 		background-color: #ffffff;