'修复bug'

components/districtSelector/districtSelectorTow.vue

@@ -3,8 +3,8 @@
 		<!-- <view class="title">地区信息</view> -->
 
 		<u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm">
-			<u-form-item label="地址" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
+			<u-form-item label="地址" :required="!readonly" prop="street" @click="changeCity('street', true)" borderBottom>
-				<u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
+				<u--textarea :value="nowAddress" autoHeight readonly disabled></u--textarea>
 			</u-form-item>
 			<u-form-item v-if="!formDataRead.street" label="乡镇" :required="!readonly" prop="street"
 				@click="changeCity('street')" borderBottom>
@@ -68,7 +68,7 @@
 					area: '',
 					street: '',
 					village: '',
-					brigade: '',
+					brigade: ''
 				},
 				formDataRead: {
 					province: false,
@@ -90,10 +90,11 @@
 						trigger: ['change', 'blur']
 					},
 					brigade: {
-						validator: (rule, value, callback) => {
+						required: true,
-							value ? callback() : callback('不能为空')
+						message: '不能为空',
-						},
+						// validator: (rule, value, callback) => {
-						trigger: ['change', 'blur']
+						// 	value ? callback() : callback('不能为空')
+						// },
 					},
 				},
 				streetList: [],
@@ -159,8 +160,9 @@
 				})
 			},
 			// 选择城市
-			changeCity(type) {
+			changeCity(type, toast=false) {
-				if (this.$props.readonly) return;
+				if(toast) return Toast('不可修改该区域')
+				if (this.$props.readonly) return ;
 				if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
 				this.changeType = type;
 				this.showProvince = true;
@@ -170,13 +172,15 @@
 				return this[this.changeType + 'List'];
 			},
 			// 选中城市
-			confirm(e) {
+			async confirm(e) {
 				let flag = false; //清空所选标记
 				if (this.formData[this.changeType] != e.value[0][this.changeType + '_code']) flag = true;
 				if (this.changeType == 'brigade') {
 					this.formData.brigade = e.value[0].id;
 					this.formDataText.brigade = e.value[0].brigade_name;
 					this.showProvince = false;
+					await this.$nextTick();
+					this.$refs.districtForm.validate();
 					return;
 				}
 				this.formData[this.changeType] = e.value[0][this.changeType + '_code'];

components/task/index.vue

@@ -3,7 +3,7 @@
 		<u-sticky bgColor="#f5f5f5" offsetTop="44px">
 			<!-- <u-tabs :list="tabLists" @click="changeCurrent" lineColor='#3274F9' :scrollable="false"
         inactiveStyle='color:#666' activeStyle="color:#3274F9"></u-tabs> -->
-			<uni-segmented-control :current="current" :values="['全部','已完成','未完成']" styleType="text"
+			<uni-segmented-control :current="current" :values="['全部','已完成','进行中']" styleType="text"
 				@clickItem="changeCurrent" activeColor="#0022C7"></uni-segmented-control>
 		</u-sticky>
 		<view class="c_task_index_list">
@@ -39,7 +39,7 @@
 				// }, {
 				//   name: '已完成'
 				// }, {
-				//   name: '未完成'
+				//   name: '进行中'
 				// }],
 				loadConfig: {
 					page: 1,
@@ -70,7 +70,7 @@
 							this.status = 3;
 							break;
 						case 2:
-							this.status = 5;
+							this.status = 2;
 							break;
 						default:
 							this.status = 0;

subpkg/contract/contract.vue

@@ -10,7 +10,7 @@
       </view>
     </view> -->
 		<view class="contract_list">
-			<view class="item" v-for="(item,index) in list" :key="item.id">
+			<view class="item" v-for="(item,index) in list" :key="item.id"  @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
 				<view class="personnel_list">
 					<view class="cards">
 						<view class="cards_head">
@@ -55,7 +55,7 @@
 									</view>
 								</view>
 							</view>
-							<view class="right" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
+							<view class="right" @click.stop="navToContract(item.contract_no)">
 								<uni-icons type="paperclip" color="#0022C7"></uni-icons>
 								<view>查看</view>
 							</view>
@@ -124,6 +124,9 @@
 	import {
 		contractList
 	} from "@/api/contract.js"
+	import {
+	  download_file
+	} from "@/api/junziqian.js"
 	export default {
 		data() {
 			return {
@@ -150,6 +153,18 @@
 						url: url
 					}) : Toast('暂未开放')
 			},
+			navToContract (contract_no) {
+			  download_file({
+			    applyNo: contract_no
+			  }).then(res => {
+			    if (res.code != 1) {
+			      Toast(res.msg)
+			    }
+			    uni.navigateTo({
+			      url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
+			    })
+			  })
+			},
 			initLoadConfig() {
 				this.loadConfig.page = 1;
 				this.loadConfig.status = "loadmore";

subpkg/finance/finance.vue

@@ -26,7 +26,7 @@
 					<text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons @click="updateEye()"
 						:type="eyeType?'eye-filled':'eye-slash-filled'" color="#fff"></uni-icons>
 				</view>
-				<view class="price" v-show="eyeType">{{userInfo.day_money_count?userInfo.day_money_count.toFixed(2):'0.00'}}元</view>
+				<view class="price" v-show="eyeType">{{userInfo.user_money?userInfo.user_money:'0.00'}}元</view>
 				<view class="price" v-show="!eyeType">****元</view>
 				<view class="bubble">
 					<!-- <image src="../../static/img/contract/bubble.png"></image> -->

subpkg/newPersonnel/newPersonnel.vue

@@ -5,12 +5,12 @@
 				<view class="cards">
 					<view class="avter">
 						<view class="">
-							用户头像:
+							<text style="color: #f76c7f;font-weight: bold;">*</text>用户头像:
 						</view>
 						<view class="">
 							<view class="" v-if="formData.avatar">
 								<!-- {{formData.avatar}} -->
-								<image :src="formData.avatar" alt="" style="width:243.57rpx;height:150rpx;">
+								<image :src="formData.avatar" alt="" style="width:150rpx;height:150rpx;">
 								</image>
 							</view>
 							<view class="uplode" v-else>
@@ -57,7 +57,7 @@
 				</view>
 				<view class="cards">
 					<view style="margin-bottom:30rpx ;">
-						身份证照:
+						<text style="color: #f76c7f;font-weight: bold;">*</text>身份证照:
 					</view>
 					<view class="up_list">
 						<view class="" v-if="formData.qualification.id_card">
@@ -106,7 +106,7 @@
 
 				<view class="cards">
 					<view style="margin-bottom:30rpx ;">
-						银行卡照:
+						<text style="color: #f76c7f;font-weight: bold;">*</text>银行卡照:
 					</view>
 					<view class="up_list">
 						<view class="" v-if="formData.qualification.bank_account">
@@ -286,7 +286,7 @@
 					</u-upload>
 				</u-form-item> -->
 			</u--form>
-			<button @click="addAcountNum" type="primary" class="btn">创建</button>
+			<button @click="addAcountNum" type="primary" class="btn" style="margin: 28rpx;">创建</button>
 		</view>
 	</view>
 </template>
@@ -300,6 +300,7 @@
 	} from "@/api/oaUser.js"
 	import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
 	import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器
+import { Toast } from "../../libs/uniApi"
 	export default {
 		components: {
 			districtSelector,
@@ -422,7 +423,10 @@
 			},
 			// 创建账号
 			addAcountNum() {
+				if(!this.formData.avatar)return Toast('头像未上传');
 				let flag = this.$refs.districtSelectorRef.validate();
+				if(!this.formData.qualification.id_card||!this.formData.qualification.id_card_b)return Toast('身份证未上传');
+				if(!this.formData.qualification.bank_account||!this.formData.qualification.bank_account_b)return Toast('银行卡未上传');
 				this.$refs.uForm.validate().then(async (e) => {
 					if (e && flag) {
 						uni.showLoading()
@@ -546,7 +550,7 @@
 		.btn {
 			margin-top: 32rpx;
 			// margin-bottom: 40rpx;
-			width: 100%;
+			// width: 100%;
 			height: 84rpx;
 			background: $theme-oa-color;
 			border-radius: 42rpx 42rpx 42rpx 42rpx;