gjy 2 years ago
parent
commit
626149ebb5

+ 24 - 2
pages/mine/company/addcompany.vue

@@ -61,7 +61,7 @@
 			<view class="flex border-bottom mt20 align-center">
 				<view class="left">法定代表人姓名</view>
 				<view class="flex right">
-					<u--input placeholder="输入法定代表人姓名" inputAlign='left' border="none"
+					<u--input disabled placeholder="输入法定代表人姓名" inputAlign='left' border="none"
 						v-model="dataDetails.legalPersonName">
 					</u--input>
 				</view>
@@ -429,11 +429,31 @@
 				// this.isShowimgType = true
 			},
 			confirmValidityPeriod(e) {
+				if(e.value[0]==''&&e.value[0] != '长期'){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "年份不能为空!",
+					})
+					return
+				}else if(e.value[1]==''&&e.value[0] != '长期'){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "月份不能为空!",
+					})
+					return
+				}else if(e.value[2]==''&&e.value[0] != '长期'){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "日期不能为空!",
+					})
+					return
+				}
 				switch (this.dataType) {
 					case 0:
 						if (e.value[0] == '长期') {
 							this.dataDetails.businessTermDate = e.value[0]
 						} else {
+							
 							this.dataDetails.businessTermDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
 						}
 						break
@@ -495,6 +515,7 @@
 						commonId: this.userInfo.id,
 						companyName: this.dataDetails.companyName
 					}).then(res => {
+						console.log(res)
 						if (res.code == 200) {
 							// that.dataDetails.legalPersonName = res.data.name
 						} else {
@@ -506,6 +527,7 @@
 						}
 					})
 					.catch(res => {
+						console.log(res)
 						uni.hideLoading()
 						uni.showToast({
 							title: res.message,
@@ -615,7 +637,7 @@
 					})
 					return true
 				}
-				if (uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [17, 17])) {
+				if (uni.$u.test.rangeLength(this.dataDetails.unifiedSocialCreditCode, [0, 18])) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "统一社会信用代码输出错误!",

+ 13 - 2
pages/mine/index.vue

@@ -271,10 +271,21 @@
 				this.isShowAlert = false
 			},
 			toMyRelease() {
-				uni.$u.route('/pages/release/record');
+				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
+					uni.$u.route('/pages/public/login');
+				} else {uni.$u.route('/pages/release/record');}
+				
 			},
 			goDetailPage(src) {
-				uni.$u.route(src);
+				if (!this.hasLogin || !this.userInfo || this.userName == "立即登录") {
+					if(src!='/pages/mine/helpDescription'){
+						uni.$u.route('/pages/public/login');
+					}else{
+						uni.$u.route(src);
+					}
+					
+				} else {uni.$u.route(src);}
+				
 			},
 			toLogin() {
 				console.log("userInfo", this.userInfo)

+ 3 - 1
pages/release/editRelease.vue

@@ -584,7 +584,9 @@
 							type: 'success',
 							message: "修改成功",
 							complete() {
-								
+								uni.navigateBack({
+									delta:1
+								})
 								_this.dataObj = {
 									commonId: '',
 									cargoOwner: '',

+ 1 - 1
pages/release/lookRelease.vue

@@ -125,7 +125,7 @@
 				<view class="left">任务描述</view>
 			</view>
 			<view class="row">
-				<u--textarea v-model="dataObj.taskDescription" placeholder="请输入内容"></u--textarea>
+				<u--textarea disabled v-model="dataObj.taskDescription" placeholder="请输入内容"></u--textarea>
 			</view>