From e8a4ef3f33e3b8b53170f920a0e8397048de6648 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 09:42:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/contract/contract.vue       | 2 +-
 subpkg/newArchives/newArchives.vue | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 1250c91..5921608 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -158,7 +158,7 @@
 			    applyNo: contract_no
 			  }).then(res => {
 			    if (res.code != 1) {
-			      Toast(res.msg)
+			      Toast(res.msg||'合同未签订')
 			    }
 			    uni.navigateTo({
 			      url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 95ce837..0b0c3af 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -16,7 +16,7 @@
             </u-radio-group>
           </u-form-item>
           <u-form-item label="年龄" required prop="age" borderBottom>
-            <u--input v-model="formData.age" placeholder="请输入年龄"></u--input>
+            <u--input v-model="formData.age" type="number" placeholder="请输入年龄"></u--input>
           </u-form-item>
           <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
             <u--input v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
@@ -255,11 +255,13 @@
         address.brigade_name ? str += address.brigade_name : null;
         return str;
       }
+    },
+    watch:{
+      
     },
     methods: {
       // 新增档案
       async addArchives() {
-        console.log(this.formData);
         try {
           // Toast('开发中')
           // let refsDatas = this.loadRefsDatas();

From 963838d49f4e9a3f03f44f5d1cef346cd7543418 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 11:17:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/newArchives/residents.vue | 13 ++++++++++++-
 subpkg/newArchives/newArchives.vue   | 24 ++++++++++++++----------
 subpkg/newPersonnel/newPersonnel.vue |  7 ++++++-
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/components/newArchives/residents.vue b/components/newArchives/residents.vue
index d6ec1ff..d8ccab9 100644
--- a/components/newArchives/residents.vue
+++ b/components/newArchives/residents.vue
@@ -39,7 +39,7 @@
         </u-form-item>
         <block value="是" v-if="residents.child>0" v-for="(item,index) in residents.child_arr" :key="'child'+index">
           <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
-            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number"></u--input>
+            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number" maxlength="3"></u--input>
           </u-form-item>
           <block v-if="item.age<4">
             <u-form-item labelWidth="auto" label="喂养方式" borderBottom>
@@ -82,6 +82,8 @@
 </template>
 
 <script>
+  
+    import { Toast } from "../../libs/uniApi"
   export default {
     props:{
       readonly: {
@@ -197,6 +199,15 @@
     },
     methods: {
       async validate() {
+        let flag = false;
+        if(this.residents.child) this.residents.child_arr.forEach(item=>{
+          if(item.age==''||item.age<0||item.age>200) flag = true;
+        })
+        if(flag){
+          Toast('请输入年龄');
+          await this.$u.sleep(500);
+          return Promise.reject();
+        }
         return this.$refs.residentsForm.validate();
       },
       // 选择生日
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 0b0c3af..ea5e682 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -5,7 +5,7 @@
         <view class="item">
           <view class="title">基本信息</view>
           <u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
-            <u--input v-model="formData.name" placeholder="请输入姓名"></u--input>
+            <u--input v-model="formData.name" placeholder="请输入姓名(6字以内)" maxlength="6"></u--input>
           </u-form-item>
           <u-form-item label="性别" required prop="sex" borderBottom>
             <u-radio-group v-model="formData.sex" style="margin: 16rpx;">
@@ -16,10 +16,10 @@
             </u-radio-group>
           </u-form-item>
           <u-form-item label="年龄" required prop="age" borderBottom>
-            <u--input v-model="formData.age" type="number" placeholder="请输入年龄"></u--input>
+            <u--input v-model="formData.age" type="number" placeholder="请输入年龄"  maxlength="3"></u--input>
           </u-form-item>
           <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
-            <u--input v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
+            <u--input v-model="formData.id_card" placeholder="请输入身份证号" @input="c_idcard" type="idcard" maxlength="18"></u--input>
           </u-form-item>
           <u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
             <u--input v-model="formData.phone" placeholder="请输入手机号" type="number"></u--input>
@@ -189,7 +189,7 @@
           },
           id_card: {
             required: true,
-            pattern: /^\d{17}[\dX]$|^\d{15}[\dX]$/,
+            pattern: /^\d{17}[\dX]$/,
             message: '请输入正确的身份证号',
             trigger: ['change', 'blur']
           },
@@ -200,9 +200,11 @@
             trigger: ['change', 'blur']
           },
           age: {
-            type: 'number',
             required: true,
-            message: '请输入年龄',
+            // message: '请输入年龄',
+            validator: (rule, value, callback) => {
+              value > 0 && value < 200 ? callback() : callback('请输入正确年龄')
+            },
             trigger: ['blur', 'change']
           },
           name: {
@@ -255,18 +257,20 @@
         address.brigade_name ? str += address.brigade_name : null;
         return str;
       }
-    },
-    watch:{
-      
     },
     methods: {
+      c_idcard(e){
+        this.$nextTick(()=>{
+          this.formData.id_card = e.replace(/[^0-9X]/g, '')
+        })
+      },
       // 新增档案
       async addArchives() {
         try {
           // Toast('开发中')
           // let refsDatas = this.loadRefsDatas();
           // let flag1 = await this.$refs.districtSelectorRef.validate();
-          let flag2 = await this.$refs.residentsRef.validate();
+          await this.$refs.residentsRef.validate();
           // let flag3 = await this.$refs.breedingRef.validate();
           // let flag4 = await this.$refs.plantRef.validate();
           // return console.log(flag1);
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 4524b06..3c0efa5 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -43,7 +43,7 @@
 						</u-radio-group>
 					</u-form-item>
 					<u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
-						<u--input v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
+						<u--input v-model="formData.id_card" placeholder="请输入身份证号" @input="c_idcard" type="idcard"></u--input>
 					</u-form-item>
 					<u-form-item labelWidth="auto" label="是否为小队长" required prop="is_captain" borderBottom>
 						<u-radio-group v-model="formData.is_captain" style="margin: 16rpx;">
@@ -399,6 +399,11 @@ import { Toast } from "../../libs/uniApi"
 		},
 		onShow() {},
 		methods: {
+      c_idcard(e){
+        this.$nextTick(()=>{
+          this.formData.id_card = e.replace(/[^0-9X]/g, '')
+        })
+      },
 			// 上传头像
 			async afterReadAvatar(event) {
 				upLoadImage({

From 5b03e7332e4e4d837a3d2d6c6c88150538832b68 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 11:33:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue   | 2 +-
 subpkg/personnel/personnel.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 9551f23..eae9791 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -18,7 +18,7 @@
 									</block>
 									<block
 										v-else-if="datas.extend&&datas.extend.transaction&&datas.extend.transaction.arr">
-										{{(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元/'+(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元'}}
+										{{(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
 									</block>
 									<block v-else>进行中</block>
 								</block>
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index c81537c..caa16ea 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -109,7 +109,7 @@
 				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
 		</view>
 		<!-- <button class="new_btn" @click.stop="navTo('/subpkg/newPersonnel/newPersonnel')">创建账号</button> -->
-		<mybtn text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
+		<mybtn v-if="$store.state.app.userInfo.company && $store.state.app.userInfo.company.company_type==18" text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
 	</view>
 </template>
 
@@ -213,7 +213,7 @@
 
 		.personnel_list {
 			padding: 28rpx 0;
-			margin-bottom: 130rpx;
+			margin-bottom: 30rpx;
 
 			.card {
 				margin: 0 auto;