修改

pages/register/index.vue

@@ -1,227 +1,236 @@
-<template>
-	<view class="content">
-		<view class="one">
-			<uni-forms ref="valiForm" :rules="rules" :modelValue="form" labelWidth="80px">
-				<uni-forms-item label="用户名" required name="name">
-					<uni-easyinput v-model="form.name" placeholder="请输入用户名(厂商可以填写工厂名称)" />
-				</uni-forms-item>
-				<uni-forms-item label="性别" required name="gender">
-					<uni-data-checkbox v-model="form.gender" :localdata="genderList" />
-				</uni-forms-item>
-				<uni-forms-item label="联系电话" required name="tel">
-					<uni-easyinput v-model="form.tel" placeholder="请输入联系电话" />
-				</uni-forms-item>
-				<uni-forms-item label="密码" required name="password">
-					<uni-easyinput type="password" v-model="form.password" placeholder="请输入密码" />
-				</uni-forms-item>
-				<uni-forms-item label="角色" required name="role">
-					<uni-data-select v-model="form.role" :localdata="roleList" @change="rolechange"></uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item v-if="disabled" label="所属街道" required name="street">
-					<uni-data-select v-model="form.street" :localdata="streetList" @change="streetchange">
-					</uni-data-select>
-				</uni-forms-item>
-				<uni-forms-item v-if="disabled" label="所属社区">
-					<uni-data-select v-model="form.community" :localdata="commList" @change="commchange">
-					</uni-data-select>
-				</uni-forms-item>
-			</uni-forms>
-			<button class="button" type="primary" @click="submit('valiForm')">注册</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				disabled: true,
-				form: {},
-				// 校验规则
-				rules: {
-					name: {
-						rules: [{
-							required: true,
-							errorMessage: '姓名不能为空'
-						}]
-					},
-					tel: {
-						rules: [{
-							required: true,
-							errorMessage: '联系电话不能为空'
-						}, {
-							format: 'number',
-							errorMessage: '联系电话只能输入数字'
-						}]
-					},
-					password: {
-						rules: [{
-							required: true,
-							errorMessage: '密码不能为空'
-						}]
-					},
-					gender: {
-						rules: [{
-							required: true,
-							errorMessage: '性别不能为空'
-						}]
-					},
-					role: {
-						rules: [{
-							required: true,
-							errorMessage: '角色不能为空'
-						}]
-					},
-				},
-				// 字典表
-				roleList: [],
-				genderList: [],
-				streetList: [],
-				commList: []
-			}
-		},
-		async onLoad() {
-			const that = this;
-			await that.search();
-			await that.searchOther();
-		},
-		methods: {
-			async search() {
-				const that = this;
-				uni.getStorage({
-					key: 'openid',
-					success: function(res) {
-						that.$set(that.form, `openid`, res.data);
-						that.$set(that.form, `status`, '0');
-					},
-					fail: async function(err) {
-						uni.showToast({
-							title: '未获取到opneid',
-							icon: 'none'
-						})
-					},
-				})
-			},
-			// 角色选择
-			rolechange(role) {
-				const that = this;
-				if (role == 'cs') that.$set(that, `disabled`, false);
-				else that.$set(that, `disabled`, true);
-			},
-			// 所属街道选择
-			async streetchange(belong) {
-				const that = this;
-				that.$set(that.form, `street`, belong);
-				//所属社区
-				const res = await that.$api('/Office', 'GET', {
-					belong,
-					type: '1',
-					is_use: '0'
-				})
-				if (res.errcode == '0') {
-					let commList = []
-					for (let val of res.data) {
-						commList.push({
-							text: val.name,
-							value: val._id
-						})
-					}
-					that.$set(that, `commList`, commList);
-				}
-			},
-			// 所属社区
-			commchange(community) {
-				const that = this;
-				that.$set(that.form, `community`, community);
-			},
-			// 登录
-			submit(ref) {
-				const that = this;
-				that.$refs[ref].validate().then(async params => {
-					const res = await that.$api(`/User`, 'POST', that.form);
-					if (res.errcode == '0') {
-						uni.showToast({
-							title: '注册信息成功',
-							icon: 'none'
-						})
-						uni.navigateBack({
-							delta: 1
-						})
-					} else {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none'
-						})
-					}
-				}).catch(err => {
-					console.log('err', err);
-				})
-			},
-			async searchOther() {
-				const that = this;
-				let res;
-				//性别
-				res = await that.$api('/DictData', 'GET', {
-					type: 'gender',
-					is_use: '0'
-				})
-				if (res.errcode == '0') {
-					let genderList = []
-					for (let val of res.data) {
-						genderList.push({
-							text: val.label,
-							value: val.value
-						})
-					}
-					that.$set(that, `genderList`, genderList);
-				}
-				//角色
-				res = await that.$api('/Role', 'GET', {
-					is_use: '0'
-				})
-				if (res.errcode == '0') {
-					let roleList = []
-					for (let val of res.data) {
-						roleList.push({
-							text: val.name,
-							value: val.code
-						})
-					}
-					that.$set(that, `roleList`, roleList);
-				}
-				//所属街道
-				res = await that.$api('/Office', 'GET', {
-					type: '0',
-					is_use: '0'
-				})
-				if (res.errcode == '0') {
-					let streetList = []
-					for (let val of res.data) {
-						streetList.push({
-							text: val.name,
-							value: val._id
-						})
-					}
-					that.$set(that, `streetList`, streetList);
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		display: flex;
-		flex-direction: column;
-
-		.one {
-			padding: 3vw;
-
-			.button {
-				background-color: var(--f3CColor);
-				color: var(--mainColor);
-				font-size: var(--font14Size);
-			}
-		}
-	}
-</style>
+<template>
+	<view class="content">
+		<view class="one">
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="form" labelWidth="80px">
+				<uni-forms-item label="用户名" required name="name">
+					<uni-easyinput v-model="form.name" placeholder="请输入用户名(厂商可以填写工厂名称)" />
+				</uni-forms-item>
+				<uni-forms-item label="性别" required name="gender">
+					<uni-data-checkbox v-model="form.gender" :localdata="genderList" />
+				</uni-forms-item>
+				<uni-forms-item label="联系电话" required name="tel">
+					<uni-easyinput v-model="form.tel" placeholder="请输入联系电话" />
+				</uni-forms-item>
+				<uni-forms-item label="密码" required name="password">
+					<uni-easyinput type="password" v-model="form.password" placeholder="请输入密码" />
+				</uni-forms-item>
+				<uni-forms-item label="角色" required name="role">
+					<uni-data-select v-model="form.role" :localdata="roleList" @change="rolechange"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item v-if="disabledOne" label="所属街道" required name="street">
+					<uni-data-select v-model="form.street" :localdata="streetList" @change="streetchange">
+					</uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item v-if="disabledTwo" label="所属社区">
+					<uni-data-select v-model="form.community" :localdata="commList" @change="commchange">
+					</uni-data-select>
+				</uni-forms-item>
+			</uni-forms>
+			<button class="button" type="primary" @click="submit('valiForm')">注册</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				disabledOne: true,
+				disabledTwo: true,
+				form: {},
+				// 校验规则
+				rules: {
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '姓名不能为空'
+						}]
+					},
+					tel: {
+						rules: [{
+							required: true,
+							errorMessage: '联系电话不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '联系电话只能输入数字'
+						}]
+					},
+					password: {
+						rules: [{
+							required: true,
+							errorMessage: '密码不能为空'
+						}]
+					},
+					gender: {
+						rules: [{
+							required: true,
+							errorMessage: '性别不能为空'
+						}]
+					},
+					role: {
+						rules: [{
+							required: true,
+							errorMessage: '角色不能为空'
+						}]
+					},
+				},
+				// 字典表
+				roleList: [],
+				genderList: [],
+				streetList: [],
+				commList: []
+			}
+		},
+		async onLoad() {
+			const that = this;
+			await that.search();
+			await that.searchOther();
+		},
+		methods: {
+			async search() {
+				const that = this;
+				uni.getStorage({
+					key: 'openid',
+					success: function(res) {
+						that.$set(that.form, `openid`, res.data);
+						that.$set(that.form, `status`, '0');
+					},
+					fail: async function(err) {
+						uni.showToast({
+							title: '未获取到opneid',
+							icon: 'none'
+						})
+					},
+				})
+			},
+			// 角色选择
+			rolechange(role) {
+				const that = this;
+				if (role == 'cs') {
+					that.$set(that, `disabledOne`, false);
+					that.$set(that, `disabledTwo`, false);
+				} else if (role == 'sqry') {
+					that.$set(that, `disabledOne`, true);
+					that.$set(that, `disabledTwo`, true);
+				} else {
+					that.$set(that, `disabledOne`, true);
+					that.$set(that, `disabledTwo`, false);
+				}
+			},
+			// 所属街道选择
+			async streetchange(belong) {
+				const that = this;
+				that.$set(that.form, `street`, belong);
+				//所属社区
+				const res = await that.$api('/Office', 'GET', {
+					belong,
+					type: '1',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let commList = []
+					for (let val of res.data) {
+						commList.push({
+							text: val.name,
+							value: val._id
+						})
+					}
+					that.$set(that, `commList`, commList);
+				}
+			},
+			// 所属社区
+			commchange(community) {
+				const that = this;
+				that.$set(that.form, `community`, community);
+			},
+			// 登录
+			submit(ref) {
+				const that = this;
+				that.$refs[ref].validate().then(async params => {
+					const res = await that.$api(`/User`, 'POST', that.form);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '注册信息成功',
+							icon: 'none'
+						})
+						uni.navigateBack({
+							delta: 1
+						})
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				}).catch(err => {
+					console.log('err', err);
+				})
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				//性别
+				res = await that.$api('/DictData', 'GET', {
+					type: 'gender',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let genderList = []
+					for (let val of res.data) {
+						genderList.push({
+							text: val.label,
+							value: val.value
+						})
+					}
+					that.$set(that, `genderList`, genderList);
+				}
+				//角色
+				res = await that.$api('/Role', 'GET', {
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let roleList = []
+					for (let val of res.data) {
+						roleList.push({
+							text: val.name,
+							value: val.code
+						})
+					}
+					that.$set(that, `roleList`, roleList);
+				}
+				//所属街道
+				res = await that.$api('/Office', 'GET', {
+					type: '0',
+					is_use: '0'
+				})
+				if (res.errcode == '0') {
+					let streetList = []
+					for (let val of res.data) {
+						streetList.push({
+							text: val.name,
+							value: val._id
+						})
+					}
+					that.$set(that, `streetList`, streetList);
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+
+		.one {
+			padding: 3vw;
+
+			.button {
+				background-color: var(--f3CColor);
+				color: var(--mainColor);
+				font-size: var(--font14Size);
+			}
+		}
+	}
+</style>

pagesMy/user/index.vue

@@ -33,7 +33,7 @@
 										<text>所属街道：</text>
 										<text>{{item.zhStreet||'暂无'}}</text>
 									</view>
-									<view class="other">
+									<view class="other" v-if="item.role =='sqry'">
 										<text>所属社区：</text>
 										<text>{{item.zhCommunity||'暂无'}}</text>
 									</view>
@@ -145,7 +145,7 @@
 					status: status,
 				}
 				let res;
-				res = await that.$api(`/User/queryInfo`, 'GET', {
+				res = await that.$api(`/User`, 'GET', {
 					...info,
 					...that.searchInfo
 				});
@@ -193,13 +193,13 @@
 					else return '暂无'
 				}
 			},
-			// 确认发货
+			// 审核
 			async toExam(item, type) {
 				const that = this;
 				let user = that.user;
 				let obj = {}
-				if (type == '0') obj.status == '1'
-				else obj.status == '2'
+				if (type == '0') obj.status = '1'
+				else obj.status = '2'
 				uni.showModal({
 					title: '提示',
 					content: '是否要确认审批?',

unpackage/dist/dev/mp-weixin/pages/register/index.js

@@ -218,7 +218,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var _default = {
   data: function data() {
     return {
-      disabled: true,
+      disabledOne: true,
+      disabledTwo: true,
       form: {},
       // 校验规则
       rules: {
@@ -335,7 +336,16 @@ var _default = {
     // 角色选择
     rolechange: function rolechange(role) {
       var that = this;
-      if (role == 'cs') that.$set(that, "disabled", false);else that.$set(that, "disabled", true);
+      if (role == 'cs') {
+        that.$set(that, "disabledOne", false);
+        that.$set(that, "disabledTwo", false);
+      } else if (role == 'sqry') {
+        that.$set(that, "disabledOne", true);
+        that.$set(that, "disabledTwo", true);
+      } else {
+        that.$set(that, "disabledOne", true);
+        that.$set(that, "disabledTwo", false);
+      }
     },
     // 所属街道选择
     streetchange: function streetchange(belong) {

unpackage/dist/dev/mp-weixin/pagesMy/user/index.js

@@ -290,7 +290,7 @@ var _default = {
                   status: status
                 };
                 _context3.next = 6;
-                return that.$api("/User/queryInfo", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
+                return that.$api("/User", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));
               case 6:
                 res = _context3.sent;
                 if (res.errcode == '0') {
@@ -357,7 +357,7 @@ var _default = {
         if (data) return data.name;else return '暂无';
       }
     },
-    // 确认发货
+    // 审核
     toExam: function toExam(item, type) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
@@ -369,7 +369,7 @@ var _default = {
                 that = _this2;
                 user = that.user;
                 obj = {};
-                if (type == '0') obj.status == '1';else obj.status == '2';
+                if (type == '0') obj.status = '1';else obj.status = '2';
                 uni.showModal({
                   title: '提示',
                   content: '是否要确认审批?',