diff --git a/App.vue b/App.vue
index 77ceb18..6dc2038 100644
--- a/App.vue
+++ b/App.vue
@@ -2,7 +2,7 @@
   //#ifdef APP-PLUS
   const jpushModule = uni.requireNativePlugin("JG-JPush");
   // #endif
-  import { loginShopAccount } from "@/api/oaUser.js"
+  import { loginShopAccount, userInfo } from "@/api/oaUser.js"
   export default {
     onLaunch: async function(info) {
       // let noticeArr = []
@@ -33,10 +33,13 @@
             user: data,
             token: res.data.token
           })
+          this.$store.dispatch('initConfig');
           let {
             data
           } = await userInfo();
           this.$store.commit('setUserInfo', data);
+          // uni.$emit('home_initUserInfo', data);
+          return ;
         }catch(e){
           console.log(e);
         }
diff --git a/api/oaUser.js b/api/oaUser.js
index d685271..f298d6c 100644
--- a/api/oaUser.js
+++ b/api/oaUser.js
@@ -25,6 +25,11 @@ export const userInfo = (data) => oahttp.get('/user/info', data)
  */
 export const changePassword = (data) => oahttp.post('/user/changePassword', data)
 
+/**
+ * 获取当前公司已创建的小队
+ */
+export const userCompanyBrigade = (data) => oahttp.get('/user/company_brigade', data)
+
 /**
  * 新增人员
  */
@@ -35,7 +40,6 @@ export const loginAdd = (data) => oahttp.post('/login/add', data)
  */
 export const userSetInfo = (data) => oahttp.post('/user/setInfo', data)
 
-
 /**
  * 设置是否为队长
  */
@@ -64,4 +68,4 @@ export const destroyAccount = (data) => oahttp.post('/user/destroy_account', dat
 /**
  * 商城登录
  */
-export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data)
+export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true })
diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b6666ad..33b3bdc 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -2,7 +2,7 @@
 	<view class="c_card">
 		<view class="f_card">
 			<view class="item" @click="navTo('/subpkg/topUp/topUp')">
-				<view>履约保证总金额(元)</view>
+				<view>押金(元)</view>
 				<view class="price" v-if="company.deposit">{{cCount(+company.deposit)}}</view>
 				<view class="price" v-else>0.00</view>
 			</view>
@@ -115,8 +115,9 @@
           });
           uni.navigateTo({
           	url: url,
-            success() {
-              uni.hideLoading()
+            success:(res)=> {
+              uni.hideLoading();
+              res.eventChannel.emit('company_money', { company_money: this.company.company_money })
             }
           })
         }else Toast('暂未开放')
@@ -125,9 +126,9 @@
 				this.loadConfig.page = 1;
 				this.loadConfig.status = "loadmore";
 				this.list = [];
-				this.initList();
+				this.loadList();
 			},
-			async initList() {
+			async loadList() {
 				if (this.loadConfig.status == "nomore") return;
 				this.loadConfig.status = "loading";
 				let res;
diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue
index 8218591..915fbb0 100644
--- a/components/districtSelector/districtSelectorTow.vue
+++ b/components/districtSelector/districtSelectorTow.vue
@@ -18,7 +18,7 @@
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 			<u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom>
-				<u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
+				<u--input :value="formDataText.brigade" style="pointer-events: none;" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 		</u--form>
@@ -36,6 +36,9 @@
 		commonVillage,
 		commonBrigade
 	} from "@/api/oaPbulic.js"
+  import {
+    userCompanyBrigade
+  } from "@/api/oaUser.js"
 	import {
 		Toast
 	} from "../../libs/uniApi"
@@ -163,7 +166,10 @@
 			changeCity(type, toast=false) {
 				if(toast) return Toast('不可修改该区域')
 				if (this.$props.readonly) return ;
-				if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
+				if (this[type + 'List'].length == 0) {
+          if(type=='brigade') return Toast('小队已经建立完毕');
+          return Toast('请先选择上一级地区');
+        }
 				this.changeType = type;
 				this.showProvince = true;
 			},
@@ -229,10 +235,20 @@
 				commonBrigade({
 					brigade: code
 				}).then(res => {
+          // 过滤掉不能选择的小队,只能选择本公司负责的小队
           let f_arr = this.$store.state.app.userInfo.company?.responsible_area?.split(',')||[];
 					this.brigadeList = res.data.filter(item=>{
             return f_arr.find(t=>item.id==t);
           });
+          // 过滤掉公司已经创建的小队
+          userCompanyBrigade().then((e)=>{
+            this.brigadeList = this.brigadeList.filter(item=>{
+              return !e.data.find(t=>t==item.id);
+            })
+            this.formData.brigade = '';
+            this.formDataRead.brigade = '';
+            this.formDataText.brigade = '';
+          })
 				})
 			},
 		}
diff --git a/components/newArchives/banquetBirthday.vue b/components/newArchives/banquetBirthday.vue
index 6f40702..f4a7ba2 100644
--- a/components/newArchives/banquetBirthday.vue
+++ b/components/newArchives/banquetBirthday.vue
@@ -1,61 +1,88 @@
-
 <template>
-  <view class="card">
-    <view class="title">寿宴</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="时间" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="人数" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="请包办" required prop="notes" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无交通工具" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无住宿" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>寿宴</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <picker mode="date" @change="changeDate" :disabled="readonly">
+          <u-form-item labelWidth="auto" label="时间" required prop="start_date" borderBottom>
+            <u--input :value="formData.start_date" style="pointer-events: none;" placeholder="请选择时间" disabled
+              disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <u-form-item labelWidth="auto" label="地点" required prop="address" borderBottom>
+          <u--input v-model="formData.address" placeholder="请输入地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+          <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="请包办" required prop="serve" borderBottom>
+          <u-radio-group v-model="formData.serve" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index"
+              :label="item.label" :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="perform" borderBottom>
+          <u-radio-group v-model="formData.perform" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无交通工具" required prop="vehicle" borderBottom>
+          <u-radio-group v-model="formData.vehicle" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无住宿" required prop="in_hotel" borderBottom>
+          <u-radio-group v-model="formData.in_hotel" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      },
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          start_date: "", //时间\日期
+          address: "", //地点
+          people_count: "", //人数
+          serve: "", // 包办服务
+          perform: "", //演出
+          vehicle: "", //交通工具
+          in_hotel: "", //住宿
         },
         rules: {
 
@@ -63,7 +90,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -90,8 +142,7 @@
       },
       // 选择时间
       changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
+        this.formData.start_date = e.detail.value;
       },
       // 新增开设店铺
       pushBreedingList() {
@@ -114,12 +165,44 @@
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/banquetFullMoon.vue b/components/newArchives/banquetFullMoon.vue
index 23caefe..cae75cb 100644
--- a/components/newArchives/banquetFullMoon.vue
+++ b/components/newArchives/banquetFullMoon.vue
@@ -1,61 +1,88 @@
-
 <template>
-  <view class="card">
-    <view class="title">满月酒</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="时间" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="人数" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="请包办" required prop="notes" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无交通工具" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无住宿" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>满月酒</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <picker mode="date" @change="changeDate" :disabled="readonly">
+          <u-form-item labelWidth="auto" label="时间" required prop="start_date" borderBottom>
+            <u--input :value="formData.start_date" style="pointer-events: none;" placeholder="请选择时间" disabled
+              disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <u-form-item labelWidth="auto" label="地点" required prop="address" borderBottom>
+          <u--input v-model="formData.address" placeholder="请输入地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+          <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="请包办" required prop="serve" borderBottom>
+          <u-radio-group v-model="formData.serve" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index"
+              :label="item.label" :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="perform" borderBottom>
+          <u-radio-group v-model="formData.perform" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无交通工具" required prop="vehicle" borderBottom>
+          <u-radio-group v-model="formData.vehicle" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无住宿" required prop="in_hotel" borderBottom>
+          <u-radio-group v-model="formData.in_hotel" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      },
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          start_date: "", //时间\日期
+          address: "", //地点
+          people_count: "", //人数
+          serve: "", // 包办服务
+          perform: "", //演出
+          vehicle: "", //交通工具
+          in_hotel: "", //住宿
         },
         rules: {
 
@@ -63,7 +90,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -90,8 +142,7 @@
       },
       // 选择时间
       changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
+        this.formData.start_date = e.detail.value;
       },
       // 新增开设店铺
       pushBreedingList() {
@@ -114,12 +165,44 @@
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/banquetFuneral.vue b/components/newArchives/banquetFuneral.vue
index 384474f..8b24d4a 100644
--- a/components/newArchives/banquetFuneral.vue
+++ b/components/newArchives/banquetFuneral.vue
@@ -1,74 +1,98 @@
-
 <template>
-  <view class="card">
-    <view class="title">白事</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="人数" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="请包办" required prop="notes" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无主持仪式" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无交通工具" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无住宿" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无墓地" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>白事</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="地点" required prop="address" borderBottom>
+          <u--input v-model="formData.address" placeholder="请输入地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+          <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="请包办" required prop="serve" borderBottom>
+          <u-radio-group v-model="formData.serve" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index"
+              :label="item.label" :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="perform" borderBottom>
+          <u-radio-group v-model="formData.perform" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无主持仪式" required prop="host" borderBottom>
+          <u-radio-group v-model="formData.host" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无交通工具" required prop="vehicle" borderBottom>
+          <u-radio-group v-model="formData.vehicle" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无住宿" required prop="in_hotel" borderBottom>
+          <u-radio-group v-model="formData.in_hotel" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无墓地" required prop="graveyard" borderBottom>
+          <u-radio-group v-model="formData.graveyard" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      },
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          address: "", //地点
+          people_count: "", //人数
+          serve: "", // 包办服务
+          perform: "", //演出
+          host: "", //主持
+          vehicle: "", //交通工具
+          in_hotel: "", //住宿
+          graveyard: "", //墓地
         },
         rules: {
 
@@ -76,7 +100,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -103,8 +152,7 @@
       },
       // 选择时间
       changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
+        this.formData.start_date = e.detail.value;
       },
       // 新增开设店铺
       pushBreedingList() {
@@ -127,12 +175,44 @@
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/banquetMarry.vue b/components/newArchives/banquetMarry.vue
index 784f562..5aae8af 100644
--- a/components/newArchives/banquetMarry.vue
+++ b/components/newArchives/banquetMarry.vue
@@ -1,69 +1,96 @@
-
 <template>
-  <view class="card">
-    <view class="title">婚宴</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="时间" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="人数" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="请包办" required prop="notes" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无主持仪式" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无交通工具" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无住宿" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>婚宴</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <picker mode="date" @change="changeDate" :disabled="readonly">
+          <u-form-item labelWidth="auto" label="时间" required prop="start_date" borderBottom>
+            <u--input :value="formData.start_date" style="pointer-events: none;" placeholder="请选择时间" disabled disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <u-form-item labelWidth="auto" label="地点" required prop="address" borderBottom>
+          <u--input v-model="formData.address" placeholder="请输入地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+          <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="请包办" required prop="serve" borderBottom>
+          <u-radio-group v-model="formData.serve" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index"
+              :label="item.label" :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="perform" borderBottom>
+          <u-radio-group v-model="formData.perform" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无主持仪式" required prop="host" borderBottom>
+          <u-radio-group v-model="formData.host" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无交通工具" required prop="vehicle" borderBottom>
+          <u-radio-group v-model="formData.vehicle" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无住宿" required prop="in_hotel" borderBottom>
+          <u-radio-group v-model="formData.in_hotel" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      },
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          start_date: "", //时间\日期
+          address: "", //地点
+          people_count: "", //人数
+          serve: "", // 包办服务
+          perform: "", //演出
+          host: "", //主持
+          vehicle: "", //交通工具
+          in_hotel: "", //住宿
         },
         rules: {
 
@@ -71,7 +98,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -98,8 +150,7 @@
       },
       // 选择时间
       changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
+        this.formData.start_date = e.detail.value;
       },
       // 新增开设店铺
       pushBreedingList() {
@@ -122,12 +173,44 @@
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/banquetOther.vue b/components/newArchives/banquetOther.vue
index e7caddc..b7df11c 100644
--- a/components/newArchives/banquetOther.vue
+++ b/components/newArchives/banquetOther.vue
@@ -1,64 +1,93 @@
-
 <template>
-  <view class="card">
-    <view class="title">其他庆祝宴</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="宴席类型" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="时间" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="人数" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="请包办" required prop="notes" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无交通工具" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无住宿" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>其他庆祝宴</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="宴席类型" required prop="types" borderBottom>
+          <u--input v-model="formData.types" placeholder="请输入宴席类型"></u--input>
+        </u-form-item>
+        <picker mode="date" @change="changeDate" :disabled="readonly">
+          <u-form-item labelWidth="auto" label="时间" required prop="start_date" borderBottom>
+            <u--input :value="formData.start_date" style="pointer-events: none;" placeholder="请选择时间" disabled
+              disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <u-form-item labelWidth="auto" label="地点" required prop="address" borderBottom>
+          <u--input v-model="formData.address" placeholder="请输入地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+          <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="请包办" required prop="serve" borderBottom>
+          <u-radio-group v-model="formData.serve" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:2,label:'酒店'},{value:1,label:'一条龙'},{value:0,label:'只请厨师'}]" :key="index"
+              :label="item.label" :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无歌舞表演" required prop="perform" borderBottom>
+          <u-radio-group v-model="formData.perform" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无交通工具" required prop="vehicle" borderBottom>
+          <u-radio-group v-model="formData.vehicle" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无住宿" required prop="in_hotel" borderBottom>
+          <u-radio-group v-model="formData.in_hotel" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      },
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          types: "", //宴席类型
+          start_date: "", //时间\日期
+          address: "", //地点
+          people_count: "", //人数
+          serve: "", // 包办服务
+          perform: "", //演出
+          host: "", //主持
+          vehicle: "", //交通工具
+          in_hotel: "", //住宿
         },
         rules: {
 
@@ -66,7 +95,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -93,8 +147,7 @@
       },
       // 选择时间
       changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
+        this.formData.start_date = e.detail.value;
       },
       // 新增开设店铺
       pushBreedingList() {
@@ -117,12 +170,44 @@
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue
index 7345791..f795307 100644
--- a/components/newArchives/breeding.vue
+++ b/components/newArchives/breeding.vue
@@ -1,333 +1,323 @@
 <template>
-	<view class="content">
-		<view class="tit">
-			<text v-if="readonly">更新时间: {{update_time}}</text>
-			<text>养殖信息</text>
+  <view class="content">
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>养殖信息</text>
 
-		</view>
-		<view class="card">
+    </view>
+    <view class="card">
 
 
-			<!-- <view class="title">养殖信息</view> -->
+      <!-- <view class="title">养殖信息</view> -->
 
-			<u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-				<u-form-item labelWidth="auto" label="有无养殖培训" required prop="breeding_training" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.breeding_training" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="有无注册成立养殖公司" required prop="breeding_company" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.breeding_company" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" labelPosition="top" label="备注" required prop="notes" borderBottom>
-					<u--textarea :disabled="readonly" v-model="formData.notes" autoHeight placeholder="请输入备注"
-						border="surround" count></u--textarea>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="养殖类型" required prop="breeding_type" borderBottom>
-					<u--input :readonly="readonly" v-model="formData.breeding_type" placeholder="请输入养殖类型"></u--input>
-				</u-form-item>
-				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'">
-					<u-form-item labelWidth="auto" label="养殖开始时间" required prop="breeding_time" borderBottom>
-						<u--input :value="formData.breeding_time" placeholder="请选择养殖开始时间" disabled
-							disabledColor="#fff"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-				</picker>
-				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'mature_time'">
-					<u-form-item labelWidth="auto" label="上市时间" required prop="mature_time" borderBottom>
-						<u--input :value="formData.mature_time" placeholder="请选择上市时间" disabled
-							disabledColor="#fff"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
-					</u-form-item>
-				</picker>
-				<u-form-item labelWidth="auto" label="产量(斤)" required prop="yield" borderBottom>
-					<u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量(斤)" type="number"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="预计收益(元)" required prop="estimated_income" borderBottom>
-					<u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)" type="number"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools"
-					borderBottom>
-					<u--textarea :disabled="readonly" v-model="formData.farm_tools" autoHeight placeholder="请输入农资农具收益情况"
-						border="surround" count></u--textarea>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="是否生态养殖" required prop="ecological_farming" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.ecological_farming" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="现代化程度(%)" required prop="modernization" borderBottom>
-					<u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度(%)"  type="number" maxlength="3"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="预售卖价格(元/500g)" required prop="pre_price" borderBottom>
-					<u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.method_sales" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'自销'},{value:0,label:'定点销售'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="有无加工仓储" required prop="processing_storage" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.processing_storage" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="有无宣传推广" required prop="promote" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.promote" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="有无运输" required prop="transportation" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.transportation" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" label="是否有扩大经营需求" required prop="expand_business_needs" borderBottom>
-					<u-radio-group :disabled="readonly" v-model="formData.expand_business_needs" style="margin: 16rpx;">
-						<u-radio :customStyle="{marginRight: '16px'}"
-							v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
-							:label="item.label" :name="item.value">
-						</u-radio>
-					</u-radio-group>
-				</u-form-item>
-				<u-form-item labelWidth="auto" labelPosition="top" label="需求描述" prop="demand" borderBottom>
-					<u--textarea :disabled="readonly" v-model="formData.demand" autoHeight placeholder="请输入需求描述"
-						border="surround" count></u--textarea>
-				</u-form-item>
-				<u-form-item labelWidth="auto" labelPosition="top" label="政策补助" prop="policy_subsidies" borderBottom>
-					<u--textarea :disabled="readonly" v-model="formData.policy_subsidies" autoHeight
-						placeholder="请输入政策补助" border="surround" count></u--textarea>
-				</u-form-item>
-			</u--form>
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="有无养殖培训" required prop="breeding_training" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.breeding_training" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无注册成立养殖公司" required prop="breeding_company" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.breeding_company" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" labelPosition="top" label="备注" required prop="notes" borderBottom>
+          <u--textarea :disabled="readonly" v-model="formData.notes" autoHeight placeholder="请输入备注" border="surround"
+            count></u--textarea>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="养殖类型" required prop="breeding_type" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.breeding_type" placeholder="请输入养殖类型"></u--input>
+        </u-form-item>
+        <picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'">
+          <u-form-item labelWidth="auto" label="养殖开始时间" required prop="breeding_time" borderBottom>
+            <u--input :value="formData.breeding_time" style="pointer-events: none;" placeholder="请选择养殖开始时间" disabled disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'mature_time'">
+          <u-form-item labelWidth="auto" label="上市时间" required prop="mature_time" borderBottom>
+            <u--input :value="formData.mature_time" style="pointer-events: none;" placeholder="请选择上市时间" disabled disabledColor="#fff"></u--input>
+            <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+        </picker>
+        <u-form-item labelWidth="auto" label="产量(斤)" required prop="yield" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量(斤)" type="number"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="预计收益(元)" required prop="estimated_income" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)"
+            type="number"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" labelPosition="top" label="农资农具使用情况" required prop="farm_tools" borderBottom>
+          <u--textarea :disabled="readonly" v-model="formData.farm_tools" autoHeight placeholder="请输入农资农具使用情况"
+            border="surround" count></u--textarea>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="是否生态养殖" required prop="ecological_farming" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.ecological_farming" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="现代化程度(%)" required prop="modernization" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度(%)" type="number"
+            maxlength="3"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="预售卖价格(元/500g)" required prop="pre_price" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.method_sales" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'自销'},{value:0,label:'定点销售'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无加工仓储" required prop="processing_storage" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.processing_storage" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无宣传推广" required prop="promote" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.promote" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无运输" required prop="transportation" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.transportation" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="是否有扩大经营需求" required prop="expand_business_needs" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.expand_business_needs" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" labelPosition="top" label="需求描述" prop="demand" borderBottom>
+          <u--textarea :disabled="readonly" v-model="formData.demand" autoHeight placeholder="请输入需求描述" border="surround"
+            count></u--textarea>
+        </u-form-item>
+        <u-form-item labelWidth="auto" labelPosition="top" label="政策补助" prop="policy_subsidies" borderBottom>
+          <u--textarea :disabled="readonly" v-model="formData.policy_subsidies" autoHeight placeholder="请输入政策补助"
+            border="surround" count></u--textarea>
+        </u-form-item>
+      </u--form>
 
-		</view>
+    </view>
 
 
-	</view>
+  </view>
 
 
 </template>
 
 <script>
-	export default {
-		props: {
-			readonly: {
-				type: Boolean,
-				default: false
-			},
-			datas: {
-				type: Object,
-				default: null
-			},
-			update_time: {
-				type: String,
-				default: null
-			}
-		},
-		data() {
-			return {
-				landPlanList: ['自己养', '出租', '代养', '租更多地扩大养殖'],
-				formData: {
-					// "breeding_training": 1, //有无养殖培训
-					// "breeding_company": 0, //有无注册成立种殖公司
-					// "notes": "试试备注", //备注
-					// "breeding_type": 22, //养殖类型
-					// "breeding_time": "2022-07-22", //养殖开始时间
-					// "mature_time": "2022-07-22", //上市时间
-					// "yield": 600, //产量
-					// "estimated_income": 1500, //预计收益
-					// "farm_tools": "收割机一台,打米机一台", //农资农具使用情况
-					// "ecological_farming": 1, //是否生态养殖
-					// "modernization": 30, //现代化程度
-					// "pre_price": "30.00", //预售卖价格
-					// "method_sales": 1, //销售方式
-					// "processing_storage": 0, //有无加工仓储
-					// "promote": 0, //有无宣传推广
-					// "transportation": 0, //有无运输
-					// "expand_business_needs": 0, //是否有扩大经营需求
-					// "demand": "没有述求", //养殖述求
-					// "policy_subsidies": "无补助" ,//政策补助
-					"breeding_training": "", //有无养殖培训
-					"breeding_company": "", //有无注册成立种殖公司
-					"notes": "", //备注
-					"breeding_type": "", //养殖类型
-					"area": "", //面积
-					"breeding_time": "", //养殖开始时间
-					"mature_time": "", //上市时间
-					"yield": "", //产量
-					"estimated_income": "", //预计收益
-					"farm_tools": "", //农资农具使用情况
-					"ecological_farming": "", //是否生态养殖
-					"modernization": "", //现代化程度
-					"pre_price": "", //预售卖价格
-					"method_sales": "", //销售方式
-					"processing_storage": "", //有无加工仓储
-					"promote": "", //有无宣传推广
-					"transportation": "", //有无运输
-					"expand_business_needs": "", //是否有扩大经营需求
-					"demand": "", //养殖述求
-					"policy_subsidies": "" //政策补助
-				},
-				rules: {
+  export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      }
+    },
+    data() {
+      return {
+        landPlanList: ['自己养', '出租', '代养', '租更多地扩大养殖'],
+        formData: {
+          // "breeding_training": 1, //有无养殖培训
+          // "breeding_company": 0, //有无注册成立种殖公司
+          // "notes": "试试备注", //备注
+          // "breeding_type": 22, //养殖类型
+          // "breeding_time": "2022-07-22", //养殖开始时间
+          // "mature_time": "2022-07-22", //上市时间
+          // "yield": 600, //产量
+          // "estimated_income": 1500, //预计收益
+          // "farm_tools": "收割机一台,打米机一台", //农资农具使用情况
+          // "ecological_farming": 1, //是否生态养殖
+          // "modernization": 30, //现代化程度
+          // "pre_price": "30.00", //预售卖价格
+          // "method_sales": 1, //销售方式
+          // "processing_storage": 0, //有无加工仓储
+          // "promote": 0, //有无宣传推广
+          // "transportation": 0, //有无运输
+          // "expand_business_needs": 0, //是否有扩大经营需求
+          // "demand": "没有述求", //养殖述求
+          // "policy_subsidies": "无补助" ,//政策补助
+          "breeding_training": "", //有无养殖培训
+          "breeding_company": "", //有无注册成立种殖公司
+          "notes": "", //备注
+          "breeding_type": "", //养殖类型
+          "area": "", //面积
+          "breeding_time": "", //养殖开始时间
+          "mature_time": "", //上市时间
+          "yield": "", //产量
+          "estimated_income": "", //预计收益
+          "farm_tools": "", //农资农具使用情况
+          "ecological_farming": "", //是否生态养殖
+          "modernization": "", //现代化程度
+          "pre_price": "", //预售卖价格
+          "method_sales": "", //销售方式
+          "processing_storage": "", //有无加工仓储
+          "promote": "", //有无宣传推广
+          "transportation": "", //有无运输
+          "expand_business_needs": "", //是否有扩大经营需求
+          "demand": "", //养殖述求
+          "policy_subsidies": "" //政策补助
+        },
+        rules: {
 
-				}
-			}
-		},
-		created() {
-			this.initRules();
-			if (this.$props.readonly && this.$props.datas) {
-				this.formData = this.$props.datas;
-				let keys = Object.keys(this.formData);
-				keys.forEach(item => {
-					if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
-					  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
-					} 
-				})
-			}
-		},
-		watch: {
-			datas(newValue, oldValue) {
-				if (this.$props.readonly && newValue) {
-					this.formData = this.$props.datas;
-					let keys = Object.keys(this.formData);
-					keys.forEach(item => {
-						if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
-						  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
-						} 
-					})
-				}
-			}
-		},
-		methods: {
-			// 初始化校验
-			initRules() {
-				let arr = Object.keys(this.formData);
-				let white = ['demand', 'policy_subsidies'];
-				arr = arr.filter(item => {
-					return !white.includes(item);
-				})
-				arr.forEach(key => {
-					this.rules[key] = {
-						validator: (rule, value, callback) => {
-							this.$refs.breedingForm.clearValidate(rule.field);
-							value.trim() !== '' ? callback() : callback('不能为空');
-						},
-						trigger: ['change', 'blur']
-					}
-				})
-			},
-			// 校验
-			async validate() {
-				return await this.$refs.breedingForm.validate();
-			},
-			// 选择土地规划
-			changeLanPlan(e) {
-				let index = e.currentTarget.dataset.index;
-				this.formData.planning = e.detail.value;
-			},
-			// 选择时间
-			changeDate(e) {
-				let data = e.currentTarget.dataset;
-				this.formData[data.value] = e.detail.value;
-			},
-		},
-	}
+        }
+      }
+    },
+    created() {
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
+    },
+    methods: {
+      // 初始化校验
+      initRules() {
+        let arr = Object.keys(this.formData);
+        let white = ['demand', 'policy_subsidies'];
+        arr = arr.filter(item => {
+          return !white.includes(item);
+        })
+        arr.forEach(key => {
+          this.rules[key] = {
+            validator: (rule, value, callback) => {
+              this.$refs.breedingForm.clearValidate(rule.field);
+              value.trim() !== '' ? callback() : callback('不能为空');
+            },
+            trigger: ['change', 'blur']
+          }
+        })
+      },
+      // 校验
+      async validate() {
+        return await this.$refs.breedingForm.validate();
+      },
+      // 选择土地规划
+      changeLanPlan(e) {
+        let index = e.currentTarget.dataset.index;
+        this.formData.planning = e.detail.value;
+      },
+      // 选择时间
+      changeDate(e) {
+        let data = e.currentTarget.dataset;
+        this.formData[data.value] = e.detail.value;
+      },
+    },
+  }
 </script>
 
 <style lang="scss">
-	.card {
-		background-color: #fff;
-		margin: 28rpx;
-		padding: 28rpx;
-		margin-top: 0;
-		padding-top: 0;
-		border-radius: 0 0 14rpx 14rpx;
-	}
+  .card {
+    background-color: #fff;
+    margin: 28rpx;
+    padding: 28rpx;
+    margin-top: 0;
+    padding-top: 0;
+    border-radius: 0 0 14rpx 14rpx;
+  }
 
-	.tit {
-		margin: 28rpx 28rpx 0 28rpx;
-		padding: 28rpx 28rpx 0 28rpx;
-		border-radius: 14rpx 14rpx 0 0;
-		background-color: $theme-oa-color;
-		color: white;
-		height: 100rpx;
-		display: flex;
-		justify-content: space-between;
+  .tit {
+    margin: 28rpx 28rpx 0 28rpx;
+    padding: 28rpx 28rpx 0 28rpx;
+    border-radius: 14rpx 14rpx 0 0;
+    background-color: $theme-oa-color;
+    color: white;
+    height: 100rpx;
+    display: flex;
+    justify-content: space-between;
+  }
 
-	}
+  .title {
+    font-weight: 500;
+    font-size: 34rpx;
 
-	.title {
-		font-weight: 500;
-		font-size: 34rpx;
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #0122c7;
+      content: "";
+      display: inline-block;
+      margin-right: 8rpx;
+    }
+  }
 
-		&::before {
-			width: 8rpx;
-			height: 26rpx;
-			border-radius: 4rpx;
-			background-color: #0122c7;
-			content: "";
-			display: inline-block;
-			margin-right: 8rpx;
-		}
-	}
+  .delete {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: #f56c6c;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 
-	.delete {
-		margin: 22rpx 0;
-		// margin-bottom: 40rpx;
-		width: 100%;
-		height: 64rpx;
-		line-height: 64rpx;
-		background: #f56c6c;
-		border-radius: 14rpx;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-	}
-
-	.plus {
-
-		margin: 22rpx 0;
-
-		// margin-bottom: 40rpx;
-
-		width: 100%;
-
-		height: 64rpx;
-
-		line-height: 64rpx;
-
-		background: $theme-oa-color;
-
-		border-radius: 14rpx;
-
-		font-size: 28rpx;
-
-		color: #fff;
-
-		text-align: center;
-
-	}
+  .plus {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: $theme-oa-color;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 </style>
\ No newline at end of file
diff --git a/components/newArchives/deepProcessing.vue b/components/newArchives/deepProcessing.vue
index aabf1e7..b07e573 100644
--- a/components/newArchives/deepProcessing.vue
+++ b/components/newArchives/deepProcessing.vue
@@ -1,183 +1,202 @@
 <!-- 深加工 -->
 <template>
-  <view class="card">
-    <view class="title">深加工</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="是否在经营" required prop="shop_front" borderBottom>
-        <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <block v-if="formData.shop_front">
-        <u-form-item labelWidth="auto" label="有无建设用地" required prop="shop_front" borderBottom>
-          <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>深加工</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="是否在经营" required prop="is_manage" borderBottom>
+          <u-radio-group v-model="formData.is_manage" style="margin: 16rpx;">
             <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
               :name="item.value">
             </u-radio>
           </u-radio-group>
         </u-form-item>
-        <u-form-item labelWidth="auto" label="面积" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入面积"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="经营地点" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="材料来源" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无销售渠道" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无技术指导" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无品牌" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无宣传推广" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无运输" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" required prop="farm_tools" borderBottom>
-          <u--textarea v-model="formData.farm_tools" autoHeight placeholder="请输入经营诉求" border="surround"
-            count></u--textarea>
-        </u-form-item>
-      </block>
-      <block v-else>
-        <u-form-item labelWidth="auto" label="有无建设用地" required prop="shop_front" borderBottom>
-          <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <picker :range="storeTypeList" mode="selector" @change="changeLanPlan">
-          <u-form-item labelWidth="auto" label="经营类型" required prop="planning" borderBottom>
-            <u--input :value="storeTypeList[formData.planning]" placeholder="请选择经营类型" disabled
-              disabledColor="#fff"></u--input>
-            <u-icon slot="right" name="arrow-right"></u-icon>
+        <block v-if="formData.is_manage">
+          <u-form-item labelWidth="auto" label="有无建设用地" required prop="construction_land" borderBottom>
+            <u-radio-group v-model="formData.construction_land" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
           </u-form-item>
-        </picker>
-        <u-form-item labelWidth="auto" label="经营地点" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="人数" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无食堂" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="材料来源" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="自动化办公程度" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无用工需求" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无品牌" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无宣传推广" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="库存情况" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无运输" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" required prop="farm_tools" borderBottom>
-          <u--textarea v-model="formData.farm_tools" autoHeight placeholder="请输入经营诉求" border="surround"
-            count></u--textarea>
-        </u-form-item>
-      </block>
-    </u--form>
+          <u-form-item labelWidth="auto" label="面积(m²)" required prop="land_area" borderBottom>
+            <u--input v-model="formData.land_area" type="number" placeholder="请输入面积(m²)"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="经营地点" required prop="manage_place" borderBottom>
+            <u--input v-model="formData.manage_place" placeholder="请输入经营地点"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="材料来源" required prop="source_materials" borderBottom>
+            <u--input v-model="formData.source_materials" placeholder="请输入材料来源"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无销售渠道" required prop="marketing_channel" borderBottom>
+            <u-radio-group v-model="formData.marketing_channel" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无技术指导" required prop="technical_guidance" borderBottom>
+            <u-radio-group v-model="formData.technical_guidance" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无品牌" required prop="brand" borderBottom>
+            <u-radio-group v-model="formData.brand" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无宣传推广" required prop="advertising" borderBottom>
+            <u-radio-group v-model="formData.advertising" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无运输" required prop="transport" borderBottom>
+            <u-radio-group v-model="formData.transport" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" prop="business_appeal" borderBottom>
+            <u--textarea v-model="formData.business_appeal" autoHeight placeholder="请输入经营诉求" border="surround"
+              count></u--textarea>
+          </u-form-item>
+        </block>
+        <block v-else>
+          <u-form-item labelWidth="auto" label="有无建设用地" required prop="construction_land" borderBottom>
+            <u-radio-group v-model="formData.construction_land" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <picker :range="storeTypeList" mode="selector" @change="changeLanPlan">
+            <u-form-item labelWidth="auto" label="经营类型" required prop="manage_type" borderBottom>
+              <u--input :value="storeTypeList[formData.manage_type]" style="pointer-events: none;" placeholder="请选择经营类型"
+                disabled disabledColor="#fff"></u--input>
+              <u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          </picker>
+          <u-form-item labelWidth="auto" label="经营地点" required prop="manage_place" borderBottom>
+            <u--input v-model="formData.manage_place" placeholder="请输入经营地点"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+            <u--input v-model="formData.people_count" placeholder="请输入人数"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无食堂" required prop="canteen" borderBottom>
+            <u-radio-group v-model="formData.canteen" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="材料来源" required prop="source_materials" borderBottom>
+            <u--input v-model="formData.source_materials" placeholder="请输入材料来源"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="自动化办公程度" required prop="automation" borderBottom>
+            <u--input v-model="formData.automation" placeholder="请输入自动化办公程度"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无用工需求" required prop="employment" borderBottom>
+            <u-radio-group v-model="formData.employment" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无品牌" required prop="brand" borderBottom>
+            <u-radio-group v-model="formData.brand" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无宣传推广" required prop="advertising" borderBottom>
+            <u-radio-group v-model="formData.advertising" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="库存情况" required prop="repertory" borderBottom>
+            <u--input v-model="formData.repertory" placeholder="请输入库存情况"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无运输" required prop="transport" borderBottom>
+            <u-radio-group v-model="formData.transport" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" prop="business_appeal" borderBottom>
+            <u--textarea v-model="formData.business_appeal" autoHeight placeholder="请输入经营诉求" border="surround"
+              count></u--textarea>
+          </u-form-item>
+        </block>
+      </u--form>
+
+    </view>
   </view>
 </template>
 
 <script>
   export default {
-    props:{
-      readonly: {
-        type: Boolean,
-        default: false
-      },
-      datas:{
-        type: Object,
-        default: null
-      }
+    props: {
+    	readonly: {
+    		type: Boolean,
+    		default: false
+    	},
+    	datas: {
+    		type: Object,
+    		default: null
+    	},
+    	update_time: {
+    		type: String,
+    		default: null
+    	},
     },
     data() {
       return {
         storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
-          manage: '',
-          // construction_land
-          // type
-          // area
-          // count
-          // canteen
-          
+          is_manage: "", //是否拥有门面
+          construction_land: "", //有无建设用地
+          land_area: "", //面积
+          manage_place: "", //经营地点
+          source_materials: "", //材料来源
+          marketing_channel: "", //有无销售渠道
+          technical_guidance: "", //有无技术指导
+          brand: "", //有无品牌
+          advertising: "", //有无宣传推广
+          transport: "", //有无运输
+          business_appeal: "", //经营诉求
+          manage_type: "", //经营类型
+          people_count: "", //人数
+          canteen: "", //食堂
+          automation: "", //自动化办公程度
+          employment: "", //用工需求
+          repertory: "", //库存
         },
         rules: {
 
@@ -185,12 +204,37 @@
       }
     },
     created() {
-      this.initRules()
+    	this.initRules();
+    	if (this.$props.readonly && this.$props.datas) {
+    		this.formData = this.$props.datas;
+    		let keys = Object.keys(this.formData);
+    		keys.forEach(item => {
+    			if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+    			  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+    			} 
+    		})
+    	}
+    },
+    watch: {
+    	datas(newValue, oldValue) {
+    		if (this.$props.readonly && newValue) {
+    			this.formData = this.$props.datas;
+    			let keys = Object.keys(this.formData);
+    			keys.forEach(item => {
+    				if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+    				  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+    				} 
+    			})
+    		}
+    	}
     },
     methods: {
       // 初始化校验
       initRules() {
         let arr = Object.keys(this.formData);
+        arr = arr.filter(item=>{
+          return item!="business_appeal"
+        })
         arr.forEach(key => {
           this.rules[key] = {
             validator: (rule, value, callback) => {
@@ -205,43 +249,55 @@
       async validate() {
         return await this.$refs.breedingForm.validate();;
       },
-      // 选择土地规划
+      // 选择经营类型
       changeLanPlan(e) {
         let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
+        this.formData.manage_type = e.detail.value;
       },
+      
     },
   }
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/components/newArchives/houseDecoration.vue b/components/newArchives/houseDecoration.vue
index 7dd9a89..67ee412 100644
--- a/components/newArchives/houseDecoration.vue
+++ b/components/newArchives/houseDecoration.vue
@@ -1,143 +1,177 @@
-<template>
-  <view class="card">
-    <view class="title">装房</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="房屋面积" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="装修风格" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="装修地点" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="装修预算" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="装修类型" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'私人'},{value:0,label:'公共建设'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-        
-      </u-form-item>
-    </u--form>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
-        formData: {
-          shop_front: '', //有无门面
-        },
-        rules: {
-
-        }
-      }
-    },
-    created() {
-      this.initRules()
-    },
-    methods: {
-      // 初始化校验
-      initRules() {
-        let arr = Object.keys(this.formData);
-        arr.forEach(key => {
-          this.rules[key] = {
-            validator: (rule, value, callback) => {
-              this.$refs.breedingForm.clearValidate(rule.field);
-              value.trim() !== '' ? callback() : callback('不能为空');
-            },
-            trigger: ['change', 'blur']
-          }
-        })
-      },
-      // 校验
-      async validate() {
-        return await this.$refs.breedingForm.validate();;
-      },
-      // 选择土地规划
-      changeLanPlan(e) {
-        let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
-      },
-    },
-  }
-</script>
-
-<style lang="scss">
-  .card{
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
-  }
-  .title {
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #0122c7;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view>
+    <view class="tit">
+    	<text v-if="readonly">更新时间: {{update_time}}</text>
+    	<text>装房</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="房屋面积(m²)" required prop="house_area" borderBottom>
+          <u--input :readonly="readonly" type="number" v-model="formData.house_area" placeholder="请输入房屋面积(m²)"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="装修风格" required prop="decoration_style" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.decoration_style" placeholder="请输入装修风格"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="装修地点" required prop="decoration_site" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.decoration_site" placeholder="请输入装修地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="装修预算" required prop="budget" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.budget" placeholder="请输入装修预算"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="装修类型" required prop="decoration_type" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.decoration_type" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'私人'},{value:0,label:'公共建设'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+          
+        </u-form-item>
+      </u--form>
+    
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      }
+    },
+    data() {
+      return {
+        formData: {
+          house_area: '',
+          decoration_style: '',
+          decoration_site: '',
+          budget: '',
+          decoration_type: ''
+        },
+        rules: {
+
+        }
+      }
+    },
+    created() {
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
+    },
+    methods: {
+      // 初始化校验
+      initRules() {
+        let arr = Object.keys(this.formData);
+        arr.forEach(key => {
+          this.rules[key] = {
+            validator: (rule, value, callback) => {
+              this.$refs.breedingForm.clearValidate(rule.field);
+              value.trim() !== '' ? callback() : callback('不能为空');
+            },
+            trigger: ['change', 'blur']
+          }
+        })
+      },
+      // 校验
+      async validate() {
+        return await this.$refs.breedingForm.validate();;
+      },
+    },
+  }
+</script>
+
+<style lang="scss">
+  .card {

+    background-color: #fff;

+    margin: 28rpx;

+    padding: 28rpx;

+    margin-top: 0;

+    padding-top: 0;

+    border-radius: 0 0 14rpx 14rpx;

+  }

+

+  .tit {

+    margin: 28rpx 28rpx 0 28rpx;

+    padding: 28rpx 28rpx 0 28rpx;

+    border-radius: 14rpx 14rpx 0 0;

+    background-color: $theme-oa-color;

+    color: white;

+    height: 100rpx;

+    display: flex;

+    justify-content: space-between;

+  }
+  .title {
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #0122c7;
+      content: "";
+      display: inline-block;
+      margin-right: 8rpx;
+    }
+  }
+
+  .delete {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: #f56c6c;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
+
+  .plus {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: $theme-oa-color;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 </style>
\ No newline at end of file
diff --git a/components/newArchives/houseRenovate.vue b/components/newArchives/houseRenovate.vue
index 4d74f45..2609004 100644
--- a/components/newArchives/houseRenovate.vue
+++ b/components/newArchives/houseRenovate.vue
@@ -1,133 +1,164 @@
-<template>
-  <view class="card">
-    <view class="title">翻新</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" labelPosition="top" label="维护内容" required prop="policy_subsidies" borderBottom>
-        <u--textarea v-model="formData.policy_subsidies" autoHeight placeholder="请输入维护内容" border="surround"
-          count></u--textarea>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="维护类型" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'换'},{value:0,label:'修'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-    </u--form>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
-        formData: {
-          shop_front: '', //有无门面
-        },
-        rules: {
-
-        }
-      }
-    },
-    created() {
-      this.initRules()
-    },
-    methods: {
-      // 初始化校验
-      initRules() {
-        let arr = Object.keys(this.formData);
-        arr.forEach(key => {
-          this.rules[key] = {
-            validator: (rule, value, callback) => {
-              this.$refs.breedingForm.clearValidate(rule.field);
-              value.trim() !== '' ? callback() : callback('不能为空');
-            },
-            trigger: ['change', 'blur']
-          }
-        })
-      },
-      // 校验
-      async validate() {
-        return await this.$refs.breedingForm.validate();;
-      },
-      // 选择土地规划
-      changeLanPlan(e) {
-        let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
-      },
-    },
-  }
-</script>
-
-<style lang="scss">
-  .card{
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
-  }
-  .title {
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #0122c7;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view>
+    <view class="tit">
+    	<text v-if="readonly">更新时间: {{update_time}}</text>
+    	<text>翻新房屋</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" labelPosition="top" label="维护内容" required prop="maintenance_contents" borderBottom>
+          <u--textarea :readonly="readonly" v-model="formData.maintenance_contents" autoHeight placeholder="请输入维护内容" border="surround"
+            count></u--textarea>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="维护类型" required prop="maintenance_type" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.maintenance_type" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'换'},{value:0,label:'修'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+      </u--form>
+    
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      }
+    },
+    data() {
+      return {
+        formData: {
+          maintenance_contents: '',
+          maintenance_type: ''
+        },
+        rules: {
+
+        }
+      }
+    },
+    created() {
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
+    },
+    methods: {
+      // 初始化校验
+      initRules() {
+        let arr = Object.keys(this.formData);
+        arr.forEach(key => {
+          this.rules[key] = {
+            validator: (rule, value, callback) => {
+              this.$refs.breedingForm.clearValidate(rule.field);
+              value.trim() !== '' ? callback() : callback('不能为空');
+            },
+            trigger: ['change', 'blur']
+          }
+        })
+      },
+      // 校验
+      async validate() {
+        return await this.$refs.breedingForm.validate();;
+      },
+    },
+  }
+</script>
+
+<style lang="scss">
+  .card {

+    background-color: #fff;

+    margin: 28rpx;

+    padding: 28rpx;

+    margin-top: 0;

+    padding-top: 0;

+    border-radius: 0 0 14rpx 14rpx;

+  }

+

+  .tit {

+    margin: 28rpx 28rpx 0 28rpx;

+    padding: 28rpx 28rpx 0 28rpx;

+    border-radius: 14rpx 14rpx 0 0;

+    background-color: $theme-oa-color;

+    color: white;

+    height: 100rpx;

+    display: flex;

+    justify-content: space-between;

+  }
+  .title {
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #0122c7;
+      content: "";
+      display: inline-block;
+      margin-right: 8rpx;
+    }
+  }
+
+  .delete {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: #f56c6c;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
+
+  .plus {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: $theme-oa-color;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 </style>
\ No newline at end of file
diff --git a/components/newArchives/houseRepair.vue b/components/newArchives/houseRepair.vue
index 7ed750e..b7178f1 100644
--- a/components/newArchives/houseRepair.vue
+++ b/components/newArchives/houseRepair.vue
@@ -1,66 +1,103 @@
 <template>
-  <view class="card">
-    <view class="title">修房</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="修房类型" required prop="shop_front" borderBottom>
-        <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'自建'},{value:0,label:'外包'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="建设面积" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="房屋风格" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="修建地址" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="预算" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无绿化" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无装修" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="房屋类型" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'私人'},{value:0,label:'公共建设'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="修建地照片" required prop="planting_company" borderBottom>
-        
-      </u-form-item>
-    </u--form>
-
+  <view>
+    <view class="tit">
+    	<text v-if="readonly">更新时间: {{update_time}}</text>
+    	<text>修房</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="修房类型" required prop="construction_type" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.construction_type" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'自建'},{value:0,label:'外包'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="建设面积(m²)" required prop="construction_area" borderBottom>
+          <u--input :readonly="readonly" type="number" v-model="formData.construction_area" placeholder="请输入建设面积(m²)"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="房屋风格" required prop="house_style" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.house_style" placeholder="请输入房屋风格"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="修建地址" required prop="construction_site" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.construction_site" placeholder="请输入修建地址"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="预算" required prop="budget" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.budget" placeholder="请输入预算"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无绿化" required prop="afforest" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.afforest" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="有无装修" required prop="fitment" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.fitment" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="房屋类型" required prop="house_type" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.house_type" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'私人'},{value:0,label:'公共建设'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="修建地照片" required prop="construction_site_img" borderBottom>
+          	<u-upload :fileList="formData.construction_site_img?[{url:formData.construction_site_img}]:[]"
+          		@afterRead="afterReadAvatar" @delete="formData.construction_site_img=''" :deletable="!readonly" :maxCount="1" width="250rpx" height="180rpx">
+              <view class="uplode">
+              	<u-icon name="plus-circle-fill" color="#0022C7" size="28"></u-icon>
+              	上传照片
+              	<view class="up" style="opacity: 0;">
+              	</view>
+              </view>
+          	</u-upload>
+        </u-form-item>
+      </u--form>
+    
+    </view>
   </view>
 </template>
 
 <script>
+  import {
+  	upLoadImage
+  } from "@/api/file.js"
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      }
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          construction_type: '',
+          construction_area: '',
+          house_style: '',
+          construction_site: '',
+          budget: '',
+          afforest: '',
+          fitment: '',
+          house_type: '',
+          construction_site_img: ''
         },
         rules: {
 
@@ -68,7 +105,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -88,42 +150,38 @@
       async validate() {
         return await this.$refs.breedingForm.validate();;
       },
-      // 选择土地规划
-      changeLanPlan(e) {
-        let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
-      },
+     // 上传图片
+     afterReadAvatar(event) {
+     	upLoadImage({
+     		filePath: event.file.url,
+     		name: 'file'
+     	}).then(res => {
+     		this.formData.construction_site_img = res.data.uri
+     	})
+     },
     },
   }
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
     background-color: #fff;
     margin: 28rpx;
     padding: 28rpx;
-    border-radius: 14rpx;
+    margin-top: 0;
+    padding-top: 0;
+    border-radius: 0 0 14rpx 14rpx;
+  }
+
+  .tit {
+    margin: 28rpx 28rpx 0 28rpx;
+    padding: 28rpx 28rpx 0 28rpx;
+    border-radius: 14rpx 14rpx 0 0;
+    background-color: $theme-oa-color;
+    color: white;
+    height: 100rpx;
+    display: flex;
+    justify-content: space-between;
   }
   .title {
     font-weight: 500;
@@ -165,4 +223,24 @@
     color: #fff;
     text-align: center;
   }
+  
+  .uplode {
+  	width: 250rpx;
+  	height: 180rpx;
+  	box-sizing: border-box;
+  	padding-top: 30rpx;
+  	border-radius: 15rpx;
+  	border: 1px solid $theme-oa-color;
+  	display: flex;
+  	flex-direction: column;
+  	align-items: center;
+  	justify-content: space-around;
+  	color: $theme-oa-color;
+  	position: relative;
+  
+  	.up {
+  		position: absolute;
+  		color: transparent;
+  	}
+  }
 </style>
\ No newline at end of file
diff --git a/components/newArchives/houseTransaction.vue b/components/newArchives/houseTransaction.vue
index 789f666..003c79e 100644
--- a/components/newArchives/houseTransaction.vue
+++ b/components/newArchives/houseTransaction.vue
@@ -1,57 +1,84 @@
 <template>
-  <view class="card">
-    <view class="title">买卖房</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="地点" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="房型" required prop="cultivated_area" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="几房" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="面积" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="朝向" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="楼层" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="装修类型" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'精装'},{value:0,label:'清水'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="预算" required prop="notes" borderBottom>
-        <u--input v-model="formData.cultivated_area" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="付款类型" required prop="planting_company" borderBottom>
-        <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'按揭'},{value:0,label:'全款'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>  
-      </u-form-item>
-    </u--form>
-
+  <view>
+    <view class="tit">
+    	<text v-if="readonly">更新时间: {{update_time}}</text>
+    	<text>买卖房</text>
+    </view>
+    <view class="card">
+      
+      <!-- <view class="title">买卖房</view> -->
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="地点" required prop="place" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.place" placeholder="请输入房屋地点"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="房型" required prop="house_type" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.house_type" placeholder="请输入房型"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="几房" required prop="rooms" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.rooms" placeholder="请输入几房"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="面积(m²)" required prop="house_area" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.house_area" type="number" placeholder="请输入房屋面积(m²)"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="朝向" required prop="orientation" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.orientation" placeholder="请输入房屋朝向"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="楼层" required prop="floor" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.floor" type="number" placeholder="请输入楼层"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="装修类型" required prop="fitment" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.fitment" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'精装'},{value:0,label:'清水'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="预算" required prop="budget" borderBottom>
+          <u--input :readonly="readonly" v-model="formData.budget" placeholder="请输入预算"></u--input>
+        </u-form-item>
+        <u-form-item labelWidth="auto" label="付款类型" required prop="payment_type" borderBottom>
+          <u-radio-group :disabled="readonly" v-model="formData.payment_type" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'按揭'},{value:0,label:'全款'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>  
+        </u-form-item>
+      </u--form>
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      },
+      update_time: {
+        type: String,
+        default: null
+      }
+    },
     data() {
       return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          place: "",
+          house_type: "",
+          rooms: "",
+          house_area: "",
+          orientation:"",
+          floor: "",
+          fitment: "",
+          budget: "",
+          payment_type: ""
         },
         rules: {
 
@@ -59,7 +86,32 @@
       }
     },
     created() {
-      this.initRules()
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+            .formData[item] != undefined) {
+            parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) : null;
+          }
+        })
+      }
+    },
+    watch: {
+      datas(newValue, oldValue) {
+        if (this.$props.readonly && newValue) {
+          this.formData = this.$props.datas;
+          let keys = Object.keys(this.formData);
+          keys.forEach(item => {
+            if (!isNaN(this.formData[item]) && this.formData[item] != '' && this.formData[item] != null && this
+              .formData[item] != undefined) {
+              parseFloat(this.formData[item]) != 'NaN' ? this.formData[item] = parseFloat(this.formData[item]) :
+                null;
+            }
+          })
+        }
+      }
     },
     methods: {
       // 初始化校验
@@ -79,42 +131,29 @@
       async validate() {
         return await this.$refs.breedingForm.validate();;
       },
-      // 选择土地规划
-      changeLanPlan(e) {
-        let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
-      },
     },
   }
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
     background-color: #fff;
     margin: 28rpx;
     padding: 28rpx;
-    border-radius: 14rpx;
+    margin-top: 0;
+    padding-top: 0;
+    border-radius: 0 0 14rpx 14rpx;
+  }
+
+  .tit {
+    margin: 28rpx 28rpx 0 28rpx;
+    padding: 28rpx 28rpx 0 28rpx;
+    border-radius: 14rpx 14rpx 0 0;
+    background-color: $theme-oa-color;
+    color: white;
+    height: 100rpx;
+    display: flex;
+    justify-content: space-between;
   }
   .title {
     font-weight: 500;
diff --git a/components/newArchives/plant.vue b/components/newArchives/plant.vue
index 068c0e9..5d55888 100644
--- a/components/newArchives/plant.vue
+++ b/components/newArchives/plant.vue
@@ -17,7 +17,7 @@
 				</u-form-item>
 				<picker :range="landPlanList" :disabled="readonly" mode="selector" @change="changeLanPlan">
 					<u-form-item labelWidth="auto" label="土地规划" required prop="planning" borderBottom>
-						<u--input :value="landPlanList[formData.planning]" placeholder="请选择规划" disabled
+						<u--input :value="landPlanList[formData.planning]" style="pointer-events: none;" placeholder="请选择规划" disabled
 							disabledColor="#fff"></u--input>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
@@ -50,14 +50,14 @@
 				</u-form-item>
 				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'">
 					<u-form-item labelWidth="auto" label="种植开始时间" required prop="breeding_time" borderBottom>
-						<u--input :value="formData.breeding_time" placeholder="请选择种植开始时间" disabled
+						<u--input :value="formData.breeding_time" style="pointer-events: none;" placeholder="请选择种植开始时间" disabled
 							disabledColor="#fff"></u--input>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
 				</picker>
 				<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'mature_time'">
 					<u-form-item labelWidth="auto" label="上市时间" required prop="mature_time" borderBottom>
-						<u--input :value="formData.mature_time" placeholder="请选择上市时间" disabled
+						<u--input :value="formData.mature_time" style="pointer-events: none;" placeholder="请选择上市时间" disabled
 							disabledColor="#fff"></u--input>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
@@ -68,9 +68,9 @@
 				<u-form-item labelWidth="auto" label="预计收益(元)" required prop="estimated_income" borderBottom>
 					<u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)" type="number"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools"
+				<u-form-item labelWidth="auto" labelPosition="top" label="农资农具使用情况" required prop="farm_tools"
 					borderBottom>
-					<u--textarea :disabled="readonly" v-model="formData.farm_tools" autoHeight placeholder="请输入农资农具收益情况"
+					<u--textarea :disabled="readonly" v-model="formData.farm_tools" autoHeight placeholder="请输入农资农具使用情况"
 						border="surround" count></u--textarea>
 				</u-form-item>
 				<u-form-item labelWidth="auto" label="是否生态种植" required prop="ecological_farming" borderBottom>
diff --git a/components/newArchives/residents.vue b/components/newArchives/residents.vue
index f96c31a..8075f62 100644
--- a/components/newArchives/residents.vue
+++ b/components/newArchives/residents.vue
@@ -1,318 +1,331 @@
-<!-- 常住人口 -->
-<template>
-  <view class="card">
-    <view class="title">常住人口</view>
-    <u--form labelPosition="left" :model="residents" :rules="rules" ref="residentsForm">
-      <block value="人口">
-        <block value="人员信息" v-for="(item, family_index) in residents.family" :key="'user'+family_index">
-          <u-form-item label="姓名" required prop="family.name" borderBottom>
-            <u--input v-model="item.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
-          </u-form-item>
-          <picker mode="date" value="1990-01-01" @change="changebirth_time" :disabled="readonly" :data-index="index">
-            <u-form-item labelWidth="auto" label="出生日期" required prop="family.birth_time" borderBottom>
-              <u--input :value="item.birth_time" placeholder="请选择出生日期" readonly></u--input>
-              <u-icon slot="right" name="arrow-right"></u-icon>
-            </u-form-item>
-          </picker>
-          <picker mode="selector" :range="situationList" @change="changesituation" :disabled="readonly" :data-index="index">
-            <u-form-item labelWidth="auto" label="就业情况" required prop="family.situation" borderBottom>
-              <u--input :value="situationList[item.situation]" placeholder="请选择就业情况" readonly></u--input>
-              <u-icon slot="right" name="arrow-right"></u-icon>
-            </u-form-item>
-          </picker>
-          <u-form-item labelWidth="auto" label="技能特长" required prop="family" borderBottom>
-            <u--input v-model="item.skills" :readonly="readonly" placeholder="请输入技能特长"></u--input>
-          </u-form-item>
-          <button v-if="!readonly" class="delete"
-            @click="removeFamily(index)">删除以上信息</button>
-        </block>
-        <button v-if="!readonly" class="plus" @click="pushFamily">添加常住人口</button>
-      </block>
-      <block value="婴幼儿信息">
-        <u-form-item labelWidth="auto" label="是否存在学生、婴幼儿" required prop="child" borderBottom>
-          <u-radio-group v-model="residents.child" :disabled="readonly" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <block value="是" v-if="residents.child>0" v-for="(item,child_arr_index) in residents.child_arr" :key="'child'+child_arr_index">
-          <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
-            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number" maxlength="2"></u--input>
-          </u-form-item>
-          <block v-if="item.age<4">
-            <u-form-item labelWidth="auto" label="喂养方式" borderBottom>
-              <u-radio-group v-model="item.feeding" :disabled="readonly" style="margin: 16rpx;">
-                <u-radio :customStyle="{marginRight: '16px'}"
-                  v-for="(item, index) in [{value:1,label:'母乳'},{value:0,label:'奶粉'}]" :key="index" :label="item.label"
-                  :name="item.value">
-                </u-radio>
-              </u-radio-group>
-            </u-form-item>
-          </block>
-          <block v-else>
-            <u-form-item label="年级" borderBottom>
-              <u--input v-model="item.grade" :readonly="readonly" placeholder="请输入年级"></u--input>
-            </u-form-item>
-            <u-form-item labelWidth="auto" label="是否补课" borderBottom>
-              <u-radio-group v-model="item.is_lesson" style="margin: 16rpx;" :disabled="readonly">
-                <u-radio :customStyle="{marginRight: '16px'}"
-                  v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-                  :name="item.value">
-                </u-radio>
-              </u-radio-group>
-            </u-form-item>
-            <u-form-item v-if="item.is_lesson>0" label-width="auto" labelPosition="top" label="补课内容" borderBottom>
-              <u--textarea v-model="item.lessons" :disabled="readonly" autoHeight placeholder="请输入需要的课程" border="surround"
-                count></u--textarea>
-            </u-form-item>
-          </block>
-          <u-form-item label-width="auto" labelPosition="top" label="备注" borderBottom>
-            <u--textarea v-model="item.notes" autoHeight :disabled="readonly"placeholder="请输入备注" border="surround" count></u--textarea>
-          </u-form-item>
-          <button v-if="residents.child_arr.length>1&&!readonly" class="delete"
-            @click="removeChildArr(index)">删除以上信息</button>
-        </block>
-        <button v-if="residents.child>0&&!readonly" class="plus" @click="pushChildArr">添加学生、婴幼儿</button>
-      </block>
-
-    </u--form>
-  </view>
-</template>
-
-<script>
-  
-    import { Toast } from "../../libs/uniApi"
-  export default {
-    props:{
-      readonly: {
-        type: Boolean,
-        default: false
-      },
-      datas: {
-        type: Object,
-        default: null
-      }
-    },
-    data() {
-      return {
-        situationList: [ "做工地的","厂里打工","公司职员","政府上班","种地","在家赋闲","其他"],
-        // 常住人口
-        residents: {
-          family: [
-            // {
-            //   name: '',
-            //   birth_time: '',
-            //   situation: '', // 工作
-            //   skills: '', // 技能
-            // }
-          ],
-          child: '', //是否存在婴幼儿
-          child_arr: [ //婴幼儿列表
-            {
-              age: '',
-              feeding: '', //喂养方式
-              grade: '', //年级
-              is_lesson: '', //是否补课
-              lessons: '', //课程
-              notes: '' //备注
-            }
-          ],
-          // family: [{
-          //   name: '超出',
-          //   birth_time: '1988-08-08',
-          //   situation: 1, // 工作
-          //   skills: '豆腐干大锅饭', // 技能
-          // }],
-          // child: 1, //是否存在婴幼儿
-          // child_arr: [ //婴幼儿列表
-          //   {
-          //     age: '3',
-          //     feeding: 1, //喂养方式
-          //     grade: '三', //年级
-          //     is_lesson: 1, //是否补课
-          //     lessons: '数学', //课程
-          //     notes: '没有' //备注
-          //   }
-          // ],
-        },
-        rules: {
-          family: {
-            validator: (rule, value, callback ) => {
-              if (Array.isArray(value) && value.length > 0) {
-                for (let i = 0; i < value.length; i++) {
-                  const item = value[i];
-                  for (const key in item) {
-                    // 检查每个属性值是否为空
-                    if (!item[key]&&item[key]!==0) {
-                      callback(new Error('以上四项基本信息必填'));
-                      return;
-                    }
-                  }
-                }
-                // 数组每个属性都不为空，校验通过
-                callback();
-              } else {
-                // 数组为空，校验未通过
-                callback(new Error('数组不能为空'));
-              }
-            },
-            trigger: ['change', 'blur']
-          },
-          child: {
-            validator: (rule, value, callback )=>{
-              typeof value==='number'?callback():callback('不能为空')
-            },
-            trigger: ['change', 'blur']
-          },
-        }
-      }
-    },
-    watch:{
-      datas(newValue, oldValue){
-        if(this.$props.readonly&&newValue){
-          this.residents = this.$props.datas;
-          if(!isNaN(this.residents.child))this.residents.child = +this.residents.child;
-          this.residents.family.forEach(item=>{
-            if(!isNaN(item.situation))item.situation = +item.situation;
-          })
-          this.residents.child_arr.forEach(item=>{
-            if(!isNaN(item.feeding))item.feeding = +item.feeding;
-            if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson;
-          })
-        }
-      }
-    },
-    mounted() {
-      if(this.$props.readonly){
-        this.residents = this.$props.datas;
-        if(!isNaN(this.residents.child))this.residents.child = +this.residents.child;
-        this.residents.family.forEach(item=>{
-          if(!isNaN(item.situation))item.situation = +item.situation;
-        })
-        this.residents.child_arr.forEach(item=>{
-          if(!isNaN(item.feeding))item.feeding = +item.feeding;
-          if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson;
-        })
-      }
-    },
-    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();
-      },
-      // 选择生日
-      changebirth_time(e) {
-        let index = e.currentTarget.dataset.index;
-        this.residents.family[index].birth_time = e.detail.value;
-      },
-      // 选择就业
-      changesituation(e) {
-        let index = e.currentTarget.dataset.index;
-        this.residents.family[index].situation = e.detail.value;
-      },
-      // 添加人口
-      pushFamily() {
-        this.residents.family.push({
-          name: '',
-          birth_time: '',
-          situation: '', // 工作
-          skills: '', // 技能
-        })
-      },
-      // 删除人口
-      removeFamily(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.residents.family.splice(index, 1);
-            }
-          }
-        })
-      },
-      // 添加婴幼儿
-      pushChildArr() {
-        this.residents.child_arr.push({
-          age: '',
-          feeding: '', //喂养方式
-          grade: '', //年级
-          is_lesson: '', //是否补课
-          lessons: '', //课程
-          notes: '' //备注
-        })
-      },
-      // 删除婴幼儿
-      removeChildArr(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.residents.child_arr.splice(index, 1);
-            }
-          }
-        })
-      },
-
-    },
-  }
-</script>
-
-<style lang="scss">
-  .card{
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
-  }
-  .title {
-    font-weight: 500;
-    font-size: 34rpx;
-  
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #0122c7;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 64rpx;
-    line-height: 64rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
+<!-- 常住人口 -->
+<template>
+  <view class="card">
+    <view class="title">常住人口</view>
+    <u--form labelPosition="left" :model="residents" :rules="rules" ref="residentsForm">
+      <block value="人口">
+        <block value="人员信息" v-for="(item, family_index) in residents.family" :key="'user'+family_index">
+          <u-form-item label="姓名" required prop="family.name" borderBottom>
+            <u--input v-model="item.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
+          </u-form-item>
+          <picker mode="date" value="1990-01-01" @change="changebirth_time" :disabled="readonly" :data-index="family_index">
+            <u-form-item labelWidth="auto" label="出生日期" required prop="family.birth_time" borderBottom>
+              <u--input :value="item.birth_time" style="pointer-events: none;" placeholder="请选择出生日期" readonly></u--input>
+              <u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          </picker>
+          <picker mode="selector" :range="situationList" @change="changesituation" :disabled="readonly" :data-index="family_index">
+            <u-form-item labelWidth="auto" label="就业情况" required prop="family.situation" borderBottom>
+              <u--input :value="situationList[item.situation]" style="pointer-events: none;" placeholder="请选择就业情况" readonly></u--input>
+              <u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          </picker>
+          <u-form-item labelWidth="auto" label="技能特长" required prop="family" borderBottom>
+            <u--input v-model="item.skills" :readonly="readonly" placeholder="请输入技能特长"></u--input>
+          </u-form-item>
+          <button v-if="!readonly" class="delete"
+            @click="removeFamily(family_index)">删除以上信息</button>
+        </block>
+        <button v-if="!readonly" class="plus" @click="pushFamily">添加常住人口</button>
+      </block>
+      <block value="婴幼儿信息">
+        <u-form-item labelWidth="auto" label="是否存在学生、婴幼儿" required prop="child" borderBottom>
+          <u-radio-group v-model="residents.child" :disabled="readonly" style="margin: 16rpx;">
+            <u-radio :customStyle="{marginRight: '16px'}"
+              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
+              :name="item.value">
+            </u-radio>
+          </u-radio-group>
+        </u-form-item>
+        <block value="是" v-if="residents.child>0" v-for="(item,child_arr_index) in residents.child_arr" :key="'child'+child_arr_index">
+          <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
+            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number" maxlength="2"></u--input>
+          </u-form-item>
+          <block v-if="item.age<4">
+            <u-form-item labelWidth="auto" label="喂养方式" borderBottom>
+              <u-radio-group v-model="item.feeding" :disabled="readonly" style="margin: 16rpx;">
+                <u-radio :customStyle="{marginRight: '16px'}"
+                  v-for="(item, index) in [{value:1,label:'母乳'},{value:0,label:'奶粉'}]" :key="index" :label="item.label"
+                  :name="item.value">
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+          </block>
+          <block v-else>
+            <u-form-item label="年级" borderBottom>
+              <u--input v-model="item.grade" :readonly="readonly" placeholder="请输入年级"></u--input>
+            </u-form-item>
+            <u-form-item labelWidth="auto" label="是否补课" borderBottom>
+              <u-radio-group v-model="item.is_lesson" style="margin: 16rpx;" :disabled="readonly">
+                <u-radio :customStyle="{marginRight: '16px'}"
+                  v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
+                  :name="item.value">
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
+            <u-form-item v-if="item.is_lesson>0" label-width="auto" labelPosition="top" label="补课内容" borderBottom>
+              <u--textarea v-model="item.lessons" :disabled="readonly" autoHeight placeholder="请输入需要的课程" border="surround"
+                count></u--textarea>
+            </u-form-item>
+          </block>
+          <u-form-item label-width="auto" labelPosition="top" label="备注" borderBottom>
+            <u--textarea v-model="item.notes" autoHeight :disabled="readonly"placeholder="请输入备注" border="surround" count></u--textarea>
+          </u-form-item>
+          <button v-if="residents.child_arr.length>1&&!readonly" class="delete"
+            @click="removeChildArr(child_arr_index)">删除以上信息</button>
+        </block>
+        <button v-if="residents.child>0&&!readonly" class="plus" @click="pushChildArr">添加学生、婴幼儿</button>
+      </block>
+
+    </u--form>
+  </view>
+</template>
+
+<script>
+  
+    import { Toast } from "../../libs/uniApi"
+  export default {
+    props:{
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        situationList: [ "做工地的","厂里打工","公司职员","政府上班","种地","在家赋闲","其他"],
+        // 常住人口
+        residents: {
+          family: [
+            // {
+            //   name: '',
+            //   birth_time: '',
+            //   situation: '', // 工作
+            //   skills: '', // 技能
+            // }
+          ],
+          child: '', //是否存在婴幼儿
+          child_arr: [ //婴幼儿列表
+            {
+              age: '',
+              feeding: '', //喂养方式
+              grade: '', //年级
+              is_lesson: '', //是否补课
+              lessons: '', //课程
+              notes: '' //备注
+            }
+          ],
+          // family: [{
+          //   name: '超出',
+          //   birth_time: '1988-08-08',
+          //   situation: 1, // 工作
+          //   skills: '豆腐干大锅饭', // 技能
+          // }],
+          // child: 1, //是否存在婴幼儿
+          // child_arr: [ //婴幼儿列表
+          //   {
+          //     age: '3',
+          //     feeding: 1, //喂养方式
+          //     grade: '三', //年级
+          //     is_lesson: 1, //是否补课
+          //     lessons: '数学', //课程
+          //     notes: '没有' //备注
+          //   }
+          // ],
+        },
+        rules: {
+          family: {
+            validator: (rule, value, callback ) => {
+              if (Array.isArray(value) && value.length > 0) {
+                for (let i = 0; i < value.length; i++) {
+                  const item = value[i];
+                  for (const key in item) {
+                    // 检查每个属性值是否为空
+                    if (!item[key]&&item[key]!==0) {
+                      callback(new Error('以上四项基本信息必填'));
+                      return;
+                    }
+                  }
+                }
+                // 数组每个属性都不为空，校验通过
+                callback();
+              } else {
+                // 数组为空，校验未通过
+                callback(new Error('数组不能为空'));
+              }
+            },
+            trigger: ['change', 'blur']
+          },
+          child: {
+            validator: (rule, value, callback )=>{
+              typeof value==='number'?callback():callback('不能为空')
+            },
+            trigger: ['change', 'blur']
+          },
+        }
+      }
+    },
+    watch:{
+      datas(newValue, oldValue){
+        if(this.$props.readonly&&newValue){
+          this.residents = this.$props.datas;
+          if(!isNaN(this.residents.child))this.residents.child = +this.residents.child;
+          this.residents.family.forEach(item=>{
+            if(!isNaN(item.situation))item.situation = +item.situation;
+          })
+          this.residents.child_arr.forEach(item=>{
+            if(!isNaN(item.feeding))item.feeding = +item.feeding;
+            if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson;
+          })
+        }
+      }
+    },
+    mounted() {
+      if(this.$props.readonly){
+        this.residents = this.$props.datas;
+        if(!isNaN(this.residents.child))this.residents.child = +this.residents.child;
+        this.residents.family.forEach(item=>{
+          if(!isNaN(item.situation))item.situation = +item.situation;
+        })
+        this.residents.child_arr.forEach(item=>{
+          if(!isNaN(item.feeding))item.feeding = +item.feeding;
+          if(!isNaN(item.is_lesson))item.is_lesson = +item.is_lesson;
+        })
+      }
+    },
+    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();
+      },
+      // 选择生日
+      changebirth_time(e) {
+        let index = e.currentTarget.dataset.index;
+        this.residents.family[index].birth_time = e.detail.value;
+      },
+      // 选择就业
+      changesituation(e) {
+        let index = e.currentTarget.dataset.index;
+        this.residents.family[index].situation = e.detail.value;
+      },
+      // 添加人口
+      pushFamily() {
+        this.residents.family.push({
+          name: '',
+          birth_time: '',
+          situation: '', // 工作
+          skills: '', // 技能
+        })
+      },
+      // 删除人口
+      removeFamily(index) {
+        uni.showModal({
+          confirmColor: '#f56c6c',
+          content: '确定删除吗?',
+          success: (res) => {
+            if (res.confirm) {
+              this.residents.family.splice(index, 1);
+            }
+          }
+        })
+      },
+      // 添加婴幼儿
+      pushChildArr() {
+        this.residents.child_arr.push({
+          age: '',
+          feeding: '', //喂养方式
+          grade: '', //年级
+          is_lesson: '', //是否补课
+          lessons: '', //课程
+          notes: '' //备注
+        })
+      },
+      // 删除婴幼儿
+      removeChildArr(index) {
+        uni.showModal({
+          confirmColor: '#f56c6c',
+          content: '确定删除吗?',
+          success: (res) => {
+            if (res.confirm) {
+              this.residents.child_arr.splice(index, 1);
+            }
+          }
+        })
+      },
+
+    },
+  }
+</script>
+
+<style lang="scss">
+  .card {

+    background-color: #fff;

+    margin: 28rpx;

+    padding: 28rpx;

+    margin-top: 0;

+    padding-top: 0;

+    border-radius: 0 0 14rpx 14rpx;

+  }

+

+  .tit {

+    margin: 28rpx 28rpx 0 28rpx;

+    padding: 28rpx 28rpx 0 28rpx;

+    border-radius: 14rpx 14rpx 0 0;

+    background-color: $theme-oa-color;

+    color: white;

+    height: 100rpx;

+    display: flex;

+    justify-content: space-between;

+  }
+  .title {
+    font-weight: 500;
+    font-size: 34rpx;
+  
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #0122c7;
+      content: "";
+      display: inline-block;
+      margin-right: 8rpx;
+    }
+  }
+  .delete {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: #f56c6c;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
+
+  .plus {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: $theme-oa-color;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 </style>
\ No newline at end of file
diff --git a/components/newArchives/store.vue b/components/newArchives/store.vue
index 3616408..839343c 100644
--- a/components/newArchives/store.vue
+++ b/components/newArchives/store.vue
@@ -1,15 +1,9 @@
 <template>
-
-
 	<view class="content">
-
 		<view class="tit">
 			<text v-if="readonly">更新时间: {{update_time}}</text>
 			<text>开设店铺</text>
-
 		</view>
-
-
 		<view class="card">
 			<!-- <view class="title">开设店铺</view> -->
 			<u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
@@ -29,7 +23,7 @@
 				</u-form-item>
 				<picker :range="storeTypeList" :disabled="readonly" mode="selector" @change="changeType">
 					<u-form-item labelWidth="auto" label="经营类型" required prop="type" borderBottom>
-						<u--input :value="storeTypeList[formData.type]" placeholder="请选择经营类型" disabled
+						<u--input :value="storeTypeList[formData.type]"  style="pointer-events: none;" placeholder="请选择经营类型" disabled
 							disabledColor="#fff"></u--input>
 						<u-icon slot="right" name="arrow-right"></u-icon>
 					</u-form-item>
diff --git a/components/newArchives/thickProcessing.vue b/components/newArchives/thickProcessing.vue
index 874880a..a14068a 100644
--- a/components/newArchives/thickProcessing.vue
+++ b/components/newArchives/thickProcessing.vue
@@ -1,167 +1,202 @@
-<!-- 深加工 -->
+<!-- 粗加工 -->
 <template>
-  <view class="card">
-    <view class="title">粗加工</view>
-    <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
-      <u-form-item labelWidth="auto" label="是否在经营" required prop="shop_front" borderBottom>
-        <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
-          <u-radio :customStyle="{marginRight: '16px'}"
-            v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
-            :name="item.value">
-          </u-radio>
-        </u-radio-group>
-      </u-form-item>
-      <block v-if="formData.shop_front">
-        <u-form-item labelWidth="auto" label="有无建设用地" required prop="shop_front" borderBottom>
-          <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
+  <view>
+    <view class="tit">
+      <text v-if="readonly">更新时间: {{update_time}}</text>
+      <text>粗加工</text>
+    </view>
+    <view class="card">
+      <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
+        <u-form-item labelWidth="auto" label="是否在经营" required prop="is_manage" borderBottom>
+          <u-radio-group v-model="formData.is_manage" style="margin: 16rpx;">
             <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+              v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
               :name="item.value">
             </u-radio>
           </u-radio-group>
         </u-form-item>
-        <u-form-item labelWidth="auto" label="面积" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入面积"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="经营地点" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="材料来源" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无销售渠道" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无技术指导" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无品牌" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无宣传推广" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无运输" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" required prop="farm_tools" borderBottom>
-          <u--textarea v-model="formData.farm_tools" autoHeight placeholder="请输入经营诉求" border="surround"
-            count></u--textarea>
-        </u-form-item>
-      </block>
-      <block v-else>
-        <u-form-item labelWidth="auto" label="有无建设用地" required prop="shop_front" borderBottom>
-          <u-radio-group v-model="formData.shop_front" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <picker :range="storeTypeList" mode="selector" @change="changeLanPlan">
-          <u-form-item labelWidth="auto" label="经营类型" required prop="planning" borderBottom>
-            <u--input :value="storeTypeList[formData.planning]" placeholder="请选择经营类型" disabled
-              disabledColor="#fff"></u--input>
-            <u-icon slot="right" name="arrow-right"></u-icon>
+        <block v-if="formData.is_manage">
+          <u-form-item labelWidth="auto" label="有无建设用地" required prop="construction_land" borderBottom>
+            <u-radio-group v-model="formData.construction_land" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
           </u-form-item>
-        </picker>
-        <u-form-item labelWidth="auto" label="经营地点" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="人数" required prop="cultivated_area" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入经营地点"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无食堂" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="材料来源" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="自动化办公程度" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无用工需求" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无品牌" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无宣传推广" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="库存情况" required prop="notes" borderBottom>
-          <u--input v-model="formData.cultivated_area" placeholder="请输入门面环境"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="auto" label="有无运输" required prop="planting_company" borderBottom>
-          <u-radio-group v-model="formData.planting_company" style="margin: 16rpx;">
-            <u-radio :customStyle="{marginRight: '16px'}"
-              v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
-              :name="item.value">
-            </u-radio>
-          </u-radio-group>
-        </u-form-item>
-        <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" required prop="farm_tools" borderBottom>
-          <u--textarea v-model="formData.farm_tools" autoHeight placeholder="请输入经营诉求" border="surround"
-            count></u--textarea>
-        </u-form-item>
-      </block>
-    </u--form>
+          <u-form-item labelWidth="auto" label="面积(m²)" required prop="land_area" borderBottom>
+            <u--input v-model="formData.land_area" type="number" placeholder="请输入面积(m²)"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="经营地点" required prop="manage_place" borderBottom>
+            <u--input v-model="formData.manage_place" placeholder="请输入经营地点"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="材料来源" required prop="source_materials" borderBottom>
+            <u--input v-model="formData.source_materials" placeholder="请输入材料来源"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无销售渠道" required prop="marketing_channel" borderBottom>
+            <u-radio-group v-model="formData.marketing_channel" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无技术指导" required prop="technical_guidance" borderBottom>
+            <u-radio-group v-model="formData.technical_guidance" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无品牌" required prop="brand" borderBottom>
+            <u-radio-group v-model="formData.brand" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无宣传推广" required prop="advertising" borderBottom>
+            <u-radio-group v-model="formData.advertising" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无运输" required prop="transport" borderBottom>
+            <u-radio-group v-model="formData.transport" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" prop="business_appeal" borderBottom>
+            <u--textarea v-model="formData.business_appeal" autoHeight placeholder="请输入经营诉求" border="surround"
+              count></u--textarea>
+          </u-form-item>
+        </block>
+        <block v-else>
+          <u-form-item labelWidth="auto" label="有无建设用地" required prop="construction_land" borderBottom>
+            <u-radio-group v-model="formData.construction_land" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <picker :range="storeTypeList" mode="selector" @change="changeLanPlan">
+            <u-form-item labelWidth="auto" label="经营类型" required prop="manage_type" borderBottom>
+              <u--input :value="storeTypeList[formData.manage_type]" style="pointer-events: none;" placeholder="请选择经营类型"
+                disabled disabledColor="#fff"></u--input>
+              <u-icon slot="right" name="arrow-right"></u-icon>
+            </u-form-item>
+          </picker>
+          <u-form-item labelWidth="auto" label="经营地点" required prop="manage_place" borderBottom>
+            <u--input v-model="formData.manage_place" placeholder="请输入经营地点"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="人数" required prop="people_count" borderBottom>
+            <u--input v-model="formData.people_count" type="number" placeholder="请输入人数"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无食堂" required prop="canteen" borderBottom>
+            <u-radio-group v-model="formData.canteen" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="材料来源" required prop="source_materials" borderBottom>
+            <u--input v-model="formData.source_materials" placeholder="请输入材料来源"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="自动化办公程度" required prop="automation" borderBottom>
+            <u--input v-model="formData.automation" placeholder="请输入自动化办公程度"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无用工需求" required prop="employment" borderBottom>
+            <u-radio-group v-model="formData.employment" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无品牌" required prop="brand" borderBottom>
+            <u-radio-group v-model="formData.brand" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无宣传推广" required prop="advertising" borderBottom>
+            <u-radio-group v-model="formData.advertising" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="库存情况" required prop="repertory" borderBottom>
+            <u--input v-model="formData.repertory" placeholder="请输入库存情况"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="有无运输" required prop="transport" borderBottom>
+            <u-radio-group v-model="formData.transport" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'有'},{value:0,label:'无'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item labelWidth="auto" labelPosition="top" label="经营诉求" prop="business_appeal" borderBottom>
+            <u--textarea v-model="formData.business_appeal" autoHeight placeholder="请输入经营诉求" border="surround"
+              count></u--textarea>
+          </u-form-item>
+        </block>
+      </u--form>
 
+    </view>
   </view>
 </template>
 
 <script>
   export default {
+    props: {
+    	readonly: {
+    		type: Boolean,
+    		default: false
+    	},
+    	datas: {
+    		type: Object,
+    		default: null
+    	},
+    	update_time: {
+    		type: String,
+    		default: null
+    	},
+    },
     data() {
       return {
         storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
         formData: {
-          shop_front: '', //有无门面
+          is_manage: "", //是否拥有门面
+          construction_land: "", //有无建设用地
+          land_area: "", //面积
+          manage_place: "", //经营地点
+          source_materials: "", //材料来源
+          marketing_channel: "", //有无销售渠道
+          technical_guidance: "", //有无技术指导
+          brand: "", //有无品牌
+          advertising: "", //有无宣传推广
+          transport: "", //有无运输
+          business_appeal: "", //经营诉求
+          manage_type: "", //经营类型
+          people_count: "", //人数
+          canteen: "", //食堂
+          automation: "", //自动化办公程度
+          employment: "", //用工需求
+          repertory: "", //库存
         },
         rules: {
 
@@ -169,12 +204,37 @@
       }
     },
     created() {
-      this.initRules()
+    	this.initRules();
+    	if (this.$props.readonly && this.$props.datas) {
+    		this.formData = this.$props.datas;
+    		let keys = Object.keys(this.formData);
+    		keys.forEach(item => {
+    			if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+    			  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+    			} 
+    		})
+    	}
+    },
+    watch: {
+    	datas(newValue, oldValue) {
+    		if (this.$props.readonly && newValue) {
+    			this.formData = this.$props.datas;
+    			let keys = Object.keys(this.formData);
+    			keys.forEach(item => {
+    				if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
+    				  parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
+    				} 
+    			})
+    		}
+    	}
     },
     methods: {
       // 初始化校验
       initRules() {
         let arr = Object.keys(this.formData);
+        arr = arr.filter(item=>{
+          return item!="business_appeal"
+        })
         arr.forEach(key => {
           this.rules[key] = {
             validator: (rule, value, callback) => {
@@ -189,43 +249,55 @@
       async validate() {
         return await this.$refs.breedingForm.validate();;
       },
-      // 选择土地规划
+      // 选择经营类型
       changeLanPlan(e) {
         let index = e.currentTarget.dataset.index;
-        this.formData.planning = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-      // 新增开设店铺
-      pushBreedingList() {
-        this.formData.push({})
-      },
-      // 删除开设店铺
-      removeBreedingList(index) {
-        uni.showModal({
-          confirmColor: '#f56c6c',
-          content: '确定删除吗?',
-          success: (res) => {
-            if (res.confirm) {
-              this.formData.splice(index, 1);
-            }
-          }
-        })
+        this.formData.manage_type = e.detail.value;
       },
+      
     },
   }
 </script>
 
 <style lang="scss">
-  .card{
+  .card {
+
     background-color: #fff;
+
     margin: 28rpx;
+
     padding: 28rpx;
-    border-radius: 14rpx;
+
+    margin-top: 0;
+
+    padding-top: 0;
+
+    border-radius: 0 0 14rpx 14rpx;
+
   }
+
+
+
+  .tit {
+
+    margin: 28rpx 28rpx 0 28rpx;
+
+    padding: 28rpx 28rpx 0 28rpx;
+
+    border-radius: 14rpx 14rpx 0 0;
+
+    background-color: $theme-oa-color;
+
+    color: white;
+
+    height: 100rpx;
+
+    display: flex;
+
+    justify-content: space-between;
+
+  }
+
   .title {
     font-weight: 500;
     font-size: 34rpx;
diff --git a/config/app.js b/config/app.js
index 18a6061..888baa8 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,15 +1,20 @@
 let httpApiThree;
 let httpApi;
+let httpApiTwo;
 
 // 正式使用的域名
-httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
+// httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试
 // httpApi = 'https://preview-worker-task.lihaink.cn' //预上线
-// httpApi = 'https://worker-task.lihaink.cn' //正式
+httpApi = 'https://worker-task.lihaink.cn' //正式
+
+// 物流
+httpApiTwo = 'https://logistics.lihaink.cn' //正式环境
+// httpApiTwo = 'https://ceshi-logistics.lihaink.cn' //测试环境
 
 
-httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
+// httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试
 // httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线
-// httpApiThree = 'https://worker-task.lihaink.cn' //正式
+httpApiThree = 'https://worker-task.lihaink.cn' //正式
 // #ifdef H5
 // httpApiThree = 'baseUrlTest' //生产
 // #endif
@@ -33,6 +38,7 @@ module.exports = {
 	// 请求域名 格式： https://您的域名
 	HTTP_REQUEST_URL: httpApi,
 	HTTP_REQUEST_URL_THREE: httpApiThree,
+	HTTP_REQUEST_URL_TWO: httpApiTwo,
 
 	// #ifdef H5
 	//H5接口是浏览器地址
diff --git a/manifest.json b/manifest.json
index f67ad1e..4a6d424 100644
--- a/manifest.json
+++ b/manifest.json
@@ -60,7 +60,8 @@
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx4789d9f1b50390ba",
+                        // "appid" : "wx4789d9f1b50390ba",
+                        "appid" : "wx9d68c92b550ddd1e", // 商城
                         "UniversalLinks" : "https://worker-task.lihaink.cn/"
                     }
                 },
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 1ca1f39..0094e25 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -184,6 +184,7 @@
     mapState
   } from 'vuex';
   import bj from "@/static/animation/home.json"
+  import { userInfo } from "@/api/oaUser.js"
   //#ifdef APP-PLUS
   var jpushModule = uni.requireNativePlugin("JG-JPush");
   // #endif
@@ -202,7 +203,7 @@
         is_captain: 0,
         notArr: [],
         orderList: [],
-        // oaHomeData: [],
+        oaHomeData: [],
         src: "https://cdn.uviewui.com/uview/album/1.jpg",
         assessData: [{
             num: "0",
@@ -241,6 +242,9 @@
     onLoad() {
       this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
       this.options.data = bj;
+      // uni.$on('home_initUserInfo', (data=null)=>{
+      //   this.initUserInfo(data);
+      // });
       //#ifdef APP-PLUS
       let that = this;
       jpushModule.addNotificationListener(function(result) {
@@ -257,6 +261,12 @@
       // this.getUserIndex()
       // this.getIndexList()
       if(uni.getStorageSync('uniMP'))this.uniMP = true;
+      userInfo().then(({data})=>{
+        this.$store.commit('setUserInfo', data);
+        this.initUserInfo(data);
+        this.$store.dispatch('initConfig');
+        // console.log('更新信息', data);
+      });
       this.getApproveList();
       this.initUserInfo();
       this.showToask();
@@ -273,21 +283,53 @@
       }
     },
     computed: {
-      oaHomeData() {
-        const route = '/pages/oaHome/oaHome';
-        let arr = [];
-        this.$store.state.config?.config?.menu?.forEach((item) => {
-          if (item.paths.includes(route)) {
-            arr = item.children;
-          }
-        })
-        if (arr.length >= 8) {
-          arr = arr.slice(0, 7);
-          let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes(
-            '/pages/moreFun/moreFun'));
-          arr.push(obj);
+      // oaHomeData() {
+      //   const route = '/pages/oaHome/oaHome';
+      //   let arr = [];
+      //   this.$store.state.config?.config?.menu?.forEach((item) => {
+      //     if (item.paths.includes(route)) {
+      //       arr = item.children;
+      //     }
+      //   })
+      //   if (arr.length >= 8) {
+      //     arr = arr.slice(0, 7);
+      //     let obj = this.$store.state.config?.config?.menu?.find(item => item.paths.includes(
+      //       '/pages/moreFun/moreFun'));
+      //     arr.push(obj);
+      //   }
+      //   return arr;
+      // },
+    },
+    watch: {
+      '$store.state.app.token':{
+        handler: function(n, o){
+          userInfo().then(({data})=>{
+            // console.log(data);
+            this.$store.commit('setUserInfo', data);
+            this.initUserInfo(data);
+            this.$store.dispatch('initConfig');
+          });
+        }
+      },
+      '$store.state.config.config.menu': {
+        immediate: true,
+        deep: true,
+        handler: function(n, o){
+          const route = '/pages/oaHome/oaHome';
+          let arr = [];
+          n.forEach((item) => {
+            if (item.paths.includes(route)) {
+              arr = item.children;
+            }
+          })
+          if (arr.length >= 8) {
+            arr = arr.slice(0, 7);
+            let obj = n.find(item => item.paths.includes(
+              '/pages/moreFun/moreFun'));
+            arr.push(obj);
+          }
+          this.oaHomeData = arr;
         }
-        return arr;
       }
     },
     methods: {
@@ -324,7 +366,8 @@
           url: "/pages/logistics/index",
         });
       },
-      initUserInfo() {
+      initUserInfo(data=null) {
+        if(data) return this.myOaInfo = data;
         this.$store.state.app.userInfo ?
           (this.myOaInfo = this.$store.state.app.userInfo) :
           (this.myOaInfo.avatar = "");
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index a4d982f..b07ff3e 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -1,18 +1,18 @@
 <template>
-	<view class="">
-		<!-- <view class="top_box">
+  <view class="">
+    <!-- <view class="top_box">
       <view class="item" :class="current==0?'active':''" @click="current=0">基本信息</view>
       <view class="item" :class="current==1?'active':''" @click="current=1">商机信息</view>
     </view> -->
-		<u-sticky bgColor="#fff">
-			<u-tabs :list="tabLists" style="background-color: #0022C7;" @click="changeCurrent" lineColor='white'
-				:scrollable="false" lineWidth='40' inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
-		</u-sticky>
-		<u-skeleton :style="{'margin': skeleton?28+'rpx':0}" :loading="skeleton" :animate="true" title rows="6"
-			rows-width="100%" rowsHeight="56">
-			<u--form v-show="current==0" labelPosition="left" :model="formData" ref="archives">
+    <u-sticky bgColor="#fff">
+      <u-tabs :list="tabLists" style="background-color: #0022C7;" @click="changeCurrent" lineColor='white'
+        :scrollable="false" lineWidth='40' inactiveStyle='color:white' activeStyle="color:white"></u-tabs>
+    </u-sticky>
+    <u-skeleton :style="{'margin': skeleton?28+'rpx':0}" :loading="skeleton" :animate="true" title rows="6"
+      rows-width="100%" rowsHeight="56">
+      <u--form v-show="current==0" labelPosition="left" :model="formData" ref="archives">
 
-				<!-- 	<view class="card">
+        <!-- 	<view class="card">
 					<view class="item">
 						<view class="title">基本信息</view>
 						<u-form-item labelWidth="auto" label="姓名" required prop="name" borderBottom>
@@ -80,549 +80,565 @@
 					</view>
 				</view>
  -->
-				<view class="personnel_list">
-					<view class="cards">
-						<view class="card_head">
-							<text>人员姓名: {{formData.name}}</text>
-						</view>
-						<view class="card_content">
-							<view class="right">
-								<view class="">
-									<text>性别 :</text>
-									<text> {{formData.sex==1?'男':'女'}}</text>
-								</view>
-								<view class="">
-									<text>年龄 :</text>
-									<text>{{formData.age+'岁'}}</text>
-								</view>
-								<view class="">
-									<text>联系方式 :</text>
-									<text>{{formData.phone}}</text>
-								</view>
-								<view class="">
-									<text>身份证号 :</text>
-									<text>{{formData.id_card}}</text>
-								</view>
-								<view class="hr">
-								</view>
-								<view class="">
-									<text>居住地址 :</text>
-									<text>{{nowAddress}}</text>
-								</view>
-								<view class="">
-									<text>详细地址 :</text>
-									<text>{{formData.address}}</text>
-								</view>
-								<view class="check_view_group">
-									<text>汽车是否到家 :</text>
-									<u-radio-group v-model="formData.highway" :disabled="readonly" class="radio">
-										<u-radio :customStyle="{marginRight: '20px'}"
-											v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]"
-											:key="index" :label="item.label" :name="item.value">
-										</u-radio>
-									</u-radio-group>
-								</view>
-								<view class="check_view_group">
-									<text>是否使用智能手机 :</text>
-									<u-radio-group v-model="formData.smart_phone" :disabled="readonly"
-										 class="radio">
-										<u-radio :customStyle="{marginRight: '20px'}"
-											v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]"
-											:key="index" :label="item.label" :name="item.value">
-										</u-radio>
-									</u-radio-group>
-								</view>
-							</view>
+        <view class="personnel_list">
+          <view class="cards">
+            <view class="card_head">
+              <text>人员姓名: {{formData.name}}</text>
+            </view>
+            <view class="card_content">
+              <view class="right">
+                <view class="">
+                  <text>性别 :</text>
+                  <text> {{formData.sex==1?'男':'女'}}</text>
+                </view>
+                <view class="">
+                  <text>年龄 :</text>
+                  <text>{{formData.age+'岁'}}</text>
+                </view>
+                <view class="">
+                  <text>联系方式 :</text>
+                  <text>{{formData.phone}}</text>
+                </view>
+                <view class="">
+                  <text>身份证号 :</text>
+                  <text>{{formData.id_card}}</text>
+                </view>
+                <view class="hr">
+                </view>
+                <view class="">
+                  <text>居住地址 :</text>
+                  <text>{{nowAddress}}</text>
+                </view>
+                <view class="">
+                  <text>详细地址 :</text>
+                  <text>{{formData.address}}</text>
+                </view>
+                <view class="check_view_group">
+                  <text>汽车是否到家 :</text>
+                  <u-radio-group v-model="formData.highway" :disabled="readonly" class="radio">
+                    <u-radio :customStyle="{marginRight: '20px'}"
+                      v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+                      :label="item.label" :name="item.value">
+                    </u-radio>
+                  </u-radio-group>
+                </view>
+                <view class="check_view_group">
+                  <text>是否使用智能手机 :</text>
+                  <u-radio-group v-model="formData.smart_phone" :disabled="readonly" class="radio">
+                    <u-radio :customStyle="{marginRight: '20px'}"
+                      v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+                      :label="item.label" :name="item.value">
+                    </u-radio>
+                  </u-radio-group>
+                </view>
+              </view>
 
 
 
 
-						</view>
+            </view>
 
 
 
 
 
-					</view>
+          </view>
 
-					<view class="cards" v-for="(item, family_index) in formData.family" :key="'user'+family_index">
-						<view class="card_head">
-							<text>常住人口</text>
-						</view>
-						<view class="card_content">
-							<view class="right">
-								<view class="">
-									<text>姓名 :</text>
-									<text> {{item.name}}</text>
-								</view>
-								<view class="">
-									<text>出生日期 :</text>
-									<text>{{item.birth_time}}</text>
-								</view>
-								<view class="">
-									<text>就业情况 :</text>
-									<text>{{ situationList[item.situation] }}</text>
-								</view>
-								<view class="">
-									<text>技能特长 :</text>
-									<text>{{item.skills}}</text>
-								</view>
-								<view class="check_view_group">
-									<text>是否存在学生、婴幼儿 :</text>
-									<u-radio-group v-model="formData.child" :disabled="readonly"  class="radio">
-										<u-radio :customStyle="{marginRight: '20px'}"
-											v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]"
-											:key="index" :label="item.label" :name="item.value">
-										</u-radio>
-									</u-radio-group>
-								</view>
+          <view class="cards" v-for="(item, family_index) in formData.family" :key="'user'+family_index">
+            <view class="card_head">
+              <text>常住人口</text>
+            </view>
+            <view class="card_content">
+              <view class="right">
+                <view class="">
+                  <text>姓名 :</text>
+                  <text> {{item.name}}</text>
+                </view>
+                <view class="">
+                  <text>出生日期 :</text>
+                  <text>{{item.birth_time}}</text>
+                </view>
+                <view class="">
+                  <text>就业情况 :</text>
+                  <text>{{ situationList[item.situation] }}</text>
+                </view>
+                <view class="">
+                  <text>技能特长 :</text>
+                  <text>{{item.skills}}</text>
+                </view>
+                <view class="check_view_group">
+                  <text>是否存在学生、婴幼儿 :</text>
+                  <u-radio-group v-model="formData.child" :disabled="readonly" class="radio">
+                    <u-radio :customStyle="{marginRight: '20px'}"
+                      v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index"
+                      :label="item.label" :name="item.value">
+                    </u-radio>
+                  </u-radio-group>
+                </view>
 
 
-							</view>
+              </view>
 
-						</view>
-					</view>
+            </view>
+          </view>
 
 
-					<view class="cards" v-if="formData.child>0" v-for="(item,child_arr_index) in formData.child_arr"
-						:key="'child'+child_arr_index">
-						<view class="card_head">
-							<text>婴幼儿信息</text>
-						</view>
-						<view class="card_content" v-if='item.age>4'>
-							<view class="right">
-								<view class="">
-									<text>年龄 :</text>
-									<text>{{item.age + '岁'}}</text>
-								</view>
-								<view class="check_view_group">
-									<text>年级 :</text>
-									<text>{{item.grade}}</text>
-								</view>
-								<view class="check_view_group">
-									<text>是否补课 :</text>
-									<u-radio-group v-model="item.is_lesson"  class="radio" :disabled="readonly">
-										<u-radio :customStyle="{marginRight: '20px'}"
-											v-for="(item, index) in [{value:'1',label:'是'},{value:'0',label:'否'}]"
-											:key="index" :label="item.label" :name="item.value">
-										</u-radio>
-									</u-radio-group>
-								</view>
-								<view v-if="item.is_lesson>0">
-									<text>补课内容 :</text>
-									<text>{{item.lessons}}</text>
-								</view>
-								<view>
-									<text>备注 :</text>
-									<text>{{item.notes}}</text>
-								</view>
-							</view>
-						</view>
-						<view class="card_content" v-else>
-							<view class="right">
-								<view class="">
-									<text>年龄 :</text>
-									<text>{{item.age + '岁'}}</text>
-								</view>
+          <view class="cards" v-if="formData.child>0" v-for="(item,child_arr_index) in formData.child_arr"
+            :key="'child'+child_arr_index">
+            <view class="card_head">
+              <text>婴幼儿信息</text>
+            </view>
+            <view class="card_content" v-if='item.age>4'>
+              <view class="right">
+                <view class="">
+                  <text>年龄 :</text>
+                  <text>{{item.age + '岁'}}</text>
+                </view>
+                <view class="check_view_group">
+                  <text>年级 :</text>
+                  <text>{{item.grade}}</text>
+                </view>
+                <view class="check_view_group">
+                  <text>是否补课 :</text>
+                  <u-radio-group v-model="item.is_lesson" class="radio" :disabled="readonly">
+                    <u-radio :customStyle="{marginRight: '20px'}"
+                      v-for="(item, index) in [{value:'1',label:'是'},{value:'0',label:'否'}]" :key="index"
+                      :label="item.label" :name="item.value">
+                    </u-radio>
+                  </u-radio-group>
+                </view>
+                <view v-if="item.is_lesson>0">
+                  <text>补课内容 :</text>
+                  <text>{{item.lessons}}</text>
+                </view>
+                <view>
+                  <text>备注 :</text>
+                  <text>{{item.notes}}</text>
+                </view>
+              </view>
+            </view>
+            <view class="card_content" v-else>
+              <view class="right">
+                <view class="">
+                  <text>年龄 :</text>
+                  <text>{{item.age + '岁'}}</text>
+                </view>
 
-								<view class="check_view_group">
-									<text>喂养方式 :</text>
-									<u-radio-group v-model="item.feeding" :disabled="readonly"  class="radio">
-										<u-radio :customStyle="{marginRight: '20px'}"
-											v-for="(item, index) in [{value:'1',label:'母乳'},{value:'0',label:'奶粉'}]"
-											:key="index" :label="item.label" :name="item.value">
-										</u-radio>
-									</u-radio-group>
-								</view>
-								<view>
-									<text>备注 :</text>
-									<text>{{item.notes}}</text>
-								</view>
-							</view>
-						</view>
-					</view>
+                <view class="check_view_group">
+                  <text>喂养方式 :</text>
+                  <u-radio-group v-model="item.feeding" :disabled="readonly" class="radio">
+                    <u-radio :customStyle="{marginRight: '20px'}"
+                      v-for="(item, index) in [{value:'1',label:'母乳'},{value:'0',label:'奶粉'}]" :key="index"
+                      :label="item.label" :name="item.value">
+                    </u-radio>
+                  </u-radio-group>
+                </view>
+                <view>
+                  <text>备注 :</text>
+                  <text>{{item.notes}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
 
-				</view>
+        </view>
 
-			</u--form>
-			<!-- <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents> -->
-			<view v-show="current==1">
-				<block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
-					<!-- <view class="update_time">
+      </u--form>
+      <!-- <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents> -->
+      <view v-show="current==1">
+        <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
+          <!-- <view class="update_time">
 						<view>更新时间:{{item.update_time}}</view>
 						<view class="right">{{updateTo(item.update_time)}}</view>
 					</view> -->
-					<block>
-						<breeding v-if="item.id==32" ref="demandRef32" :update_time="item.update_time"
-							:datas="item.datas" :readonly="true"></breeding>
-						<plant v-if="item.id==7" ref="demandRef7" :update_time="item.update_time" :datas="item.datas"
-							:readonly="true"></plant>
-						<store v-if="item.id==8" ref="demandRef8" :update_time="item.update_time" :datas="item.datas"
-							:readonly="true"></store>
-						<deepProcessing v-if="item.id==9" ref="demandRef9" :datas="item.datas" :readonly="true">
-						</deepProcessing>
-						<thickProcessing v-if="item.id==10" ref="demandRef10" :datas="item.datas" :readonly="true">
-						</thickProcessing>
-					</block>
-					<block>
-						<houseRepair v-if="item.id==12" ref="demandRef12" :datas="item.datas" :readonly="true">
-						</houseRepair>
-						<houseDecoration v-if="item.id==13" ref="demandRef13" :datas="item.datas" :readonly="true">
-						</houseDecoration>
-						<houseRenovate v-if="item.id==14" ref="demandRef14" :datas="item.datas" :readonly="true">
-						</houseRenovate>
-						<houseTransaction v-if="item.id==15" ref="demandRef15" :datas="item.datas" :readonly="true">
-						</houseTransaction>
-					</block>
-					<block>
-						<banquetMarry v-if="item.id==17" ref="demandRef17" :datas="item.datas" :readonly="true">
-						</banquetMarry>
-						<banquetBirthday v-if="item.id==18" ref="demandRef18" :datas="item.datas" :readonly="true">
-						</banquetBirthday>
-						<banquetFullMoon v-if="item.id==19" ref="demandRef19" :datas="item.datas" :readonly="true">
-						</banquetFullMoon>
-						<banquetOther v-if="item.id==20" ref="demandRef20" :datas="item.datas" :readonly="true">
-						</banquetOther>
-						<banquetFuneral v-if="item.id==21" ref="demandRef21" :datas="item.datas" :readonly="true">
-						</banquetFuneral>
-					</block>
-				</block>
-				<u-empty v-if="formData.datas.length==0" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
-			</view>
-		</u-skeleton>
-	</view>
+          <block>
+            <breeding v-if="item.id==32" ref="demandRef32" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true"></breeding>
+            <plant v-if="item.id==7" ref="demandRef7" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true"></plant>
+            <store v-if="item.id==8" ref="demandRef8" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true"></store>
+            <deepProcessing v-if="item.id==9" ref="demandRef9" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </deepProcessing>
+            <thickProcessing v-if="item.id==10" ref="demandRef10" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </thickProcessing>
+          </block>
+          <block>
+            <houseRepair v-if="item.id==12" ref="demandRef12" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </houseRepair>
+            <houseDecoration v-if="item.id==13" ref="demandRef13" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </houseDecoration>
+            <houseRenovate v-if="item.id==14" ref="demandRef14" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </houseRenovate>
+            <houseTransaction v-if="item.id==15" ref="demandRef15" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </houseTransaction>
+          </block>
+          <block>
+            <banquetMarry v-if="item.id==17" ref="demandRef17" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </banquetMarry>
+            <banquetBirthday v-if="item.id==18" ref="demandRef18" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </banquetBirthday>
+            <banquetFullMoon v-if="item.id==19" ref="demandRef19" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </banquetFullMoon>
+            <banquetOther v-if="item.id==20" ref="demandRef20" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </banquetOther>
+            <banquetFuneral v-if="item.id==21" ref="demandRef21" :update_time="item.update_time" :datas="item.datas"
+              :readonly="true">
+            </banquetFuneral>
+          </block>
+        </block>
+        <u-empty v-if="formData.datas.length==0" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
+      </view>
+    </u-skeleton>
+  </view>
 </template>
 
 <script>
-	import {
-		Toast
-	} from "../../libs/uniApi"
-	import {
-		informationAdd,
-		informationDetails
-	} from "@/api/information.js"
-	import {
-		comonentList
-	} from '@/static/server/archives.js'
-	import {
-		getTimeAgo
-	} from "@/utils/time.js"
-	import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
-	import residents from "@/components/newArchives/residents.vue" // 常住人口
-	import breeding from "@/components/newArchives/breeding.vue" // 种养殖
-	import plant from "@/components/newArchives/plant.vue" // 种养殖
-	import store from "@/components/newArchives/store.vue" // 开设店铺
-	import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工
-	import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工
-	import houseRepair from "@/components/newArchives/houseRepair.vue" // 修房
-	import houseDecoration from "@/components/newArchives/houseDecoration.vue" // 装房
-	import houseRenovate from "@/components/newArchives/houseRenovate.vue" // 翻新
-	import houseTransaction from "@/components/newArchives/houseTransaction.vue" // 买卖房子
-	import banquetMarry from "@/components/newArchives/banquetMarry.vue" // 婚宴
-	import banquetBirthday from "@/components/newArchives/banquetBirthday.vue" // 寿宴
-	import banquetFullMoon from "@/components/newArchives/banquetFullMoon.vue" // 满月酒
-	import banquetOther from "@/components/newArchives/banquetOther.vue" // 其他庆祝宴
-	import banquetFuneral from "@/components/newArchives/banquetFuneral.vue" // 白事
-	export default {
-		components: {
-			districtSelector,
-			residents,
-			breeding,
-			plant,
-			store,
-			deepProcessing,
-			thickProcessing,
-			houseRepair,
-			houseDecoration,
-			houseRenovate,
-			houseTransaction,
-			banquetMarry,
-			banquetBirthday,
-			banquetFullMoon,
-			banquetOther,
-			banquetFuneral
-		},
-		data() {
-			return {
-				listMap: new Map(),
-        situationList: [ "做工地的","厂里打工","公司职员","政府上班","种地","在家赋闲","其他"],
-				tabLists: [{
-					name: '基本信息',
-				}, {
-					name: '商机信息'
-				}],
-				skeleton: true,
-				readonly: true,
-				current: 0,
-				showDemandList: [],
-				formData: {
-					id_card: '',
-					sex: '',
-					name: '',
-					phone: '', //电话
-					highway: '', //汽车是否能到家
-					smart_phone: '', //是否使用智能手机
-					wechat: '', //微信号
-					address: '', //家庭地址
-					age: '', //年龄
-					category_id: 1,
-					category_child: 1,
-					data_type: '1',
-					datas: []
-				},
+  import {
+    Toast
+  } from "../../libs/uniApi"
+  import {
+    informationAdd,
+    informationDetails
+  } from "@/api/information.js"
+  import {
+    comonentList
+  } from '@/static/server/archives.js'
+  import {
+    getTimeAgo
+  } from "@/utils/time.js"
+  import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
+  import residents from "@/components/newArchives/residents.vue" // 常住人口
+  import breeding from "@/components/newArchives/breeding.vue" // 种养殖
+  import plant from "@/components/newArchives/plant.vue" // 种养殖
+  import store from "@/components/newArchives/store.vue" // 开设店铺
+  import deepProcessing from "@/components/newArchives/deepProcessing.vue" // 深加工
+  import thickProcessing from "@/components/newArchives/thickProcessing.vue" // 粗加工
+  import houseRepair from "@/components/newArchives/houseRepair.vue" // 修房
+  import houseDecoration from "@/components/newArchives/houseDecoration.vue" // 装房
+  import houseRenovate from "@/components/newArchives/houseRenovate.vue" // 翻新
+  import houseTransaction from "@/components/newArchives/houseTransaction.vue" // 买卖房子
+  import banquetMarry from "@/components/newArchives/banquetMarry.vue" // 婚宴
+  import banquetBirthday from "@/components/newArchives/banquetBirthday.vue" // 寿宴
+  import banquetFullMoon from "@/components/newArchives/banquetFullMoon.vue" // 满月酒
+  import banquetOther from "@/components/newArchives/banquetOther.vue" // 其他庆祝宴
+  import banquetFuneral from "@/components/newArchives/banquetFuneral.vue" // 白事
+  export default {
+    components: {
+      districtSelector,
+      residents,
+      breeding,
+      plant,
+      store,
+      deepProcessing,
+      thickProcessing,
+      houseRepair,
+      houseDecoration,
+      houseRenovate,
+      houseTransaction,
+      banquetMarry,
+      banquetBirthday,
+      banquetFullMoon,
+      banquetOther,
+      banquetFuneral
+    },
+    data() {
+      return {
+        listMap: new Map(),
+        situationList: ["做工地的", "厂里打工", "公司职员", "政府上班", "种地", "在家赋闲", "其他"],
+        tabLists: [{
+          name: '基本信息',
+        }, {
+          name: '商机信息'
+        }],
+        skeleton: true,
+        readonly: true,
+        current: 0,
+        showDemandList: [],
+        formData: {
+          id_card: '',
+          sex: '',
+          name: '',
+          phone: '', //电话
+          highway: '', //汽车是否能到家
+          smart_phone: '', //是否使用智能手机
+          wechat: '', //微信号
+          address: '', //家庭地址
+          age: '', //年龄
+          category_id: 1,
+          category_child: 1,
+          data_type: '1',
+          datas: []
+        },
         datasList: [], //临时保存列表的
         listloging: true,
-			}
-		},
-		onLoad(options) {
-			this.initInformationDetails({
-				id: options.id
-			});
-			// this.initMap();
-		},
-		onShow() {},
-		computed: {
-			nowAddress() {
-				let address = this.$store.state.app.userInfo;
-				let str = '';
-				address.province_name ? str += address.province_name : null;
-				address.city_name ? str += address.city_name : null;
-				address.area_name ? str += address.area_name : null;
-				address.street_name ? str += address.street_name : null;
-				address.village_name ? str += address.village_name : null;
-				return str;
-			}
-		},
-		methods: {
-			initMap() {
-				comonentList.forEach(item => {
-					this.listMap.set(item.id, item.name);
-				})
-			},
-			async initInformationDetails(id) {
-				let res = await informationDetails(id);
-        Object.keys(res.data).forEach(key => {
-          if(key!='datas')this.formData[key] = res.data[key];
+      }
+    },
+    onLoad(options) {
+      this.initInformationDetails({
+        id: options.id
+      });
+      // this.initMap();
+    },
+    onShow() {},
+    computed: {
+      nowAddress() {
+        let address = this.$store.state.app.userInfo;
+        let str = '';
+        address.province_name ? str += address.province_name : null;
+        address.city_name ? str += address.city_name : null;
+        address.area_name ? str += address.area_name : null;
+        address.street_name ? str += address.street_name : null;
+        address.village_name ? str += address.village_name : null;
+        return str;
+      }
+    },
+    methods: {
+      initMap() {
+        comonentList.forEach(item => {
+          this.listMap.set(item.id, item.name);
         })
-				this.skeleton = false;
+      },
+      async initInformationDetails(id) {
+        let res = await informationDetails(id);
+        Object.keys(res.data).forEach(key => {
+          if (key != 'datas') this.formData[key] = res.data[key];
+        })
+        this.skeleton = false;
         this.datasList = [...res.data['datas']];
-			},
-			toastShow() {
-				Toast('不可修改')
-			},
-			changeCurrent(e) {
-				this.current = e.index;
-        if(e.index==1&&this.listloging){
+      },
+      toastShow() {
+        Toast('不可修改')
+      },
+      changeCurrent(e) {
+        this.current = e.index;
+        if (e.index == 1 && this.listloging) {
           uni.showLoading({
             title: '加载中'
           })
           this.formData.datas = [...this.datasList];
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             uni.hideLoading();
             this.listloging = false;
           })
         }
-			},
-			updateTo(time) {
-				return getTimeAgo(time)
-			}
-		},
-		onPullDownRefresh() {
-			uni.stopPullDownRefresh()
-		}
-	}
+      },
+      updateTo(time) {
+        return getTimeAgo(time)
+      }
+    },
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
 </script>
 
 <style lang="scss">
-	.top_box {
-		background-color: #fff;
-		display: flex;
+  .top_box {
+    background-color: #fff;
+    display: flex;
 
-		.item {
-			width: 175rpx;
-			height: 53rpx;
-			background: #F5F5F5FF;
-			color: #999999FF;
-			border-radius: 35rpx 35rpx 35rpx 35rpx;
-			opacity: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin: 28rpx;
-		}
+    .item {
+      width: 175rpx;
+      height: 53rpx;
+      background: #F5F5F5FF;
+      color: #999999FF;
+      border-radius: 35rpx 35rpx 35rpx 35rpx;
+      opacity: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 28rpx;
+    }
 
-		.active {
-			background: $theme-oa-color;
-			color: #fff;
-		}
-	}
+    .active {
+      background: $theme-oa-color;
+      color: #fff;
+    }
+  }
 
-	.cards {
-		margin: 30rpx auto;
-		margin-bottom: 28rpx;
-		width: 694rpx;
-		background: #FFFFFF;
-		border-radius: 30rpx;
-		opacity: 1;
-		overflow: hidden;
-		// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+  .cards {
+    margin: 30rpx auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #FFFFFF;
+    border-radius: 30rpx;
+    opacity: 1;
+    overflow: hidden;
+    // box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
 
-		.card_head {
-			padding: 28rpx;
-			background-color: $theme-oa-color;
-			color: white;
-			height: 100rpx;
+    .card_head {
+      padding: 28rpx;
+      background-color: $theme-oa-color;
+      color: white;
+      height: 100rpx;
 
-		}
+    }
 
-		.card_content {
-			padding: 28rpx;
-			display: flex;
-			// justify-content: space-between;
+    .card_content {
+      padding: 28rpx;
+      display: flex;
+      // justify-content: space-between;
 
 
-			.right {
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
+      .right {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
         flex: 1;
-				view {
-					margin-bottom: 10rpx;
 
-					text:nth-child(2) {
-						margin-left: 20rpx;
-					}
-				}
+        view {
+          margin-bottom: 10rpx;
 
-				.check_view_group {
+          text:nth-child(2) {
+            margin-left: 20rpx;
+          }
+        }
 
-					display: flex;
+        .check_view_group {
+
+          display: flex;
           margin-top: 4rpx;
-          &:last-child{
+
+          &:last-child {
             margin-top: 0;
           }
-					// line-height: 70rpx;
-          .radio{
+
+          // line-height: 70rpx;
+          .radio {
             margin-left: 16rpx;
-            uni-view[data-v-5dfbf8b1], uni-scroll-view[data-v-5dfbf8b1], uni-swiper-item[data-v-5dfbf8b1]{
+
+            uni-view[data-v-5dfbf8b1],
+            uni-scroll-view[data-v-5dfbf8b1],
+            uni-swiper-item[data-v-5dfbf8b1] {
               margin-bottom: 0 !important;
             }
           }
-        
-					// align-items: center;
 
-				}
-			}
+          // align-items: center;
 
-			.hr {
-				border-top: 1px dashed $theme-oa-color;
-				// display: block;
-				width: 100%;
-				margin-top: 20rpx;
+        }
+      }
+
+      .hr {
+        border-top: 1px dashed $theme-oa-color;
+        // display: block;
+        width: 100%;
+        margin-top: 20rpx;
         padding-bottom: 20rpx;
-			}
+      }
 
 
-		}
+    }
 
 
 
-	}
+  }
 
 
-	.update_time {
-		padding: 32rpx 28rpx 0 28rpx;
-		display: flex;
-		justify-content: space-between;
+  .update_time {
+    padding: 32rpx 28rpx 0 28rpx;
+    display: flex;
+    justify-content: space-between;
 
-		.right {
-			color: $theme-oa-color;
-		}
-	}
+    .right {
+      color: $theme-oa-color;
+    }
+  }
 
 
 
-	.card {
-		background-color: #fff;
-		margin: 28rpx;
-		padding: 28rpx;
-		border-radius: 14rpx;
+  .card {
+    background-color: #fff;
+    margin: 28rpx;
+    padding: 28rpx;
+    border-radius: 14rpx;
 
-		.item {
-			margin-top: 30rpx;
+    .item {
+      margin-top: 30rpx;
 
-			&:nth-child(1) {
-				margin-top: 0;
-			}
+      &:nth-child(1) {
+        margin-top: 0;
+      }
 
-			.title {
-				font-weight: 500;
-				font-size: 34rpx;
+      .title {
+        font-weight: 500;
+        font-size: 34rpx;
 
-				&::before {
-					width: 8rpx;
-					height: 26rpx;
-					border-radius: 4rpx;
-					background-color: #0122c7;
-					content: "";
-					display: inline-block;
-					margin-right: 8rpx;
-				}
-			}
-		}
+        &::before {
+          width: 8rpx;
+          height: 26rpx;
+          border-radius: 4rpx;
+          background-color: #0122c7;
+          content: "";
+          display: inline-block;
+          margin-right: 8rpx;
+        }
+      }
+    }
 
-		.btn {
-			margin-top: 32rpx;
-			// margin-bottom: 40rpx;
-			width: 100%;
-			height: 84rpx;
-			background: $theme-oa-color;
-			border-radius: 42rpx 42rpx 42rpx 42rpx;
-			color: #fff;
-			line-height: 80rpx;
-			text-align: center;
-		}
-	}
+    .btn {
+      margin-top: 32rpx;
+      // margin-bottom: 40rpx;
+      width: 100%;
+      height: 84rpx;
+      background: $theme-oa-color;
+      border-radius: 42rpx 42rpx 42rpx 42rpx;
+      color: #fff;
+      line-height: 80rpx;
+      text-align: center;
+    }
+  }
 
-	.delete {
+  .delete {
 
-		margin: 22rpx 0;
+    margin: 22rpx 0;
 
-		// margin-bottom: 40rpx;
+    // margin-bottom: 40rpx;
 
-		width: 100%;
+    width: 100%;
 
-		height: 64rpx;
+    height: 64rpx;
 
-		line-height: 64rpx;
+    line-height: 64rpx;
 
-		background: #f56c6c;
+    background: #f56c6c;
 
-		border-radius: 14rpx;
+    border-radius: 14rpx;
 
-		font-size: 28rpx;
+    font-size: 28rpx;
 
-		color: #fff;
+    color: #fff;
 
-		text-align: center;
+    text-align: center;
 
-	}
+  }
 
-	.plus {
-		margin: 22rpx 0;
-		// margin-bottom: 40rpx;
-		width: 100%;
-		height: 64rpx;
-		line-height: 64rpx;
-		background: $theme-oa-color;
-		border-radius: 14rpx;
-		font-size: 28rpx;
-		color: #fff;
-		text-align: center;
-	}
+  .plus {
+    margin: 22rpx 0;
+    // margin-bottom: 40rpx;
+    width: 100%;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: $theme-oa-color;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
 
-	.demand {
-		margin-top: 40rpx;
-		margin-bottom: 50rpx;
-	}
+  .demand {
+    margin-top: 40rpx;
+    margin-bottom: 50rpx;
+  }
 </style>
\ No newline at end of file
diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue
index 9d14fc4..ecb4349 100644
--- a/subpkg/buyShare/buyShare.vue
+++ b/subpkg/buyShare/buyShare.vue
@@ -1,5 +1,5 @@
 <template>
-  <view style="padding-top: 28rpx;">
+  <view style="padding-top: 28rpx;padding-bottom: 160rpx;">
     <view class="card">
       <view class="title">任务名称: {{task.title}}</view>
       <u-line style="margin: 14rpx 0;"></u-line>
@@ -9,7 +9,7 @@
     <view class="card">
       <view class="title">任务描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <view class="text">{{task.content}}</view>
+      <view class="text">{{task.content||'暂无任务描述'}}</view>
     </view>
     <view class="card">
       <view class="title">事件记录</view>
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 261b4e5..3de3487 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -93,7 +93,7 @@
 				<!-- <u-button class="btns" type="primary" icon="plus" text="新建签约"></u-button> -->
 			</view>
 			<view class="company_info" v-show="current==2">
-				<companyFinance></companyFinance>
+				<companyFinance ref="financeRef"></companyFinance>
 			</view>
 			<view v-show="current==3">
 				<task ref="taskRef" style="width: 100vw;"></task>
@@ -128,9 +128,11 @@
 					name: '签约公司'
 				}, {
 					name: '公司财务'
-				}, {
-					name: '任务情况'
-				}],
+				}, 
+    //     {
+				// 	name: '任务情况'
+				// },
+        ],
 				loadConfig: {
 					page: 1,
 					limit: 15,
@@ -153,6 +155,7 @@
 		},
 		onReachBottom() {
 			if (this.current == 1) this.loadCompanyList();
+      else if (this.current == 2) this.$refs.financeRef.loadList();
 			else if (this.current == 3) this.$refs.taskRef.loadList();
 		},
 		methods: {
@@ -212,6 +215,7 @@
 		},
 		onPullDownRefresh() {
 			if (this.current == 1) this.initLoad();
+      else if (this.current == 2) this.$refs.financeRef.initLoad();
 			else if (this.current == 3) this.$refs.taskRef.initLoadConfig();
 			this.$u.sleep(500).then(() => {
 				uni.stopPullDownRefresh()
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 752ab30..a15515c 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -54,7 +54,7 @@
       </view>
       <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
         <view class="item">
-          <view>履约保证金额(元)</view>
+          <view>押金(元)</view>
           <view class="num" v-show="eyeType">{{
             userInfo.deposit || 0.0
           }}</view>
@@ -444,6 +444,7 @@ page {
     align-items: center;
 
     .item {
+      flex: 1;
       text-align: center;
       font-size: 25rpx;
       font-weight: 400;
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index b721f90..a0c10ef 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -298,8 +298,8 @@
 		upLoadImage
 	} from "@/api/file.js"
 	import {
-		loginAdd
-	} from "@/api/oaUser.js"
+		loginAdd,
+  } from "@/api/oaUser.js"
 	import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
 	import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器
 	import {
diff --git a/subpkg/orderDetail/orderDetail.vue b/subpkg/orderDetail/orderDetail.vue
index dbb75b1..dcda432 100644
--- a/subpkg/orderDetail/orderDetail.vue
+++ b/subpkg/orderDetail/orderDetail.vue
@@ -75,7 +75,7 @@
         },
         loadConfig:{
           page: 1,
-          limit: 25,
+          limit: 15,
           loadingText: '努力加载中',
           loadmoreText: '轻轻上拉',
           nomoreText: '没有更多账单了~~',
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index cc06a34..619b262 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -203,6 +203,7 @@
 <style lang="scss">
 	.personnel {
     padding: 28rpx 0;
+    padding-bottom: 160rpx;
 		.new_btn {
 			position: fixed;
 			bottom: 30rpx;
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index da2ac07..2c028ae 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -62,7 +62,6 @@
         this.loadTask();
       }
     },
-    onShow() {},
     methods: {
       changePrice(index){
         if(this.changeMoney == index)this.changeMoney = -1;
@@ -87,7 +86,7 @@
       pay(){
         if(!this.payMoney.money)return Toast('请先填写充值金额!')
         if(this.payMoney.money<=0)return Toast('充值金额不能小于0!')
-        if(!this.payTimer){
+        if(this.payTimer==null){
           this.goRecharge();
           this.payTimer = setInterval(()=>{
             this.timeCount--;
@@ -175,7 +174,7 @@
                     })
                   },
                   complete: () => {
-                    this.payMoney.money = '';
+                    if(this.task_id<=0)this.payMoney.money = '';
                   },
                 });
               }
diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue
index 8ae0506..086344c 100644
--- a/subpkg/updateArchives/updateArchives.vue
+++ b/subpkg/updateArchives/updateArchives.vue
@@ -55,9 +55,11 @@
           keyName="name" @change="changeHandler" @cancel="demandShow = false" @confirm="changeDemand"></u-picker>
       </u--form>
       <!-- <button @click="addArchives" class="btn">完成更新</button> -->
-      <mybtn text="完成更新" @click="$u.throttle(addArchives, 2000)"></mybtn>
+      <mybtn text="完成更新" @click="updateShow=true"></mybtn>
       <u-modal :show="modelShow" title="警告" content='确定要删除该信息吗' closeOnClickOverlay showCancelButton
       	@close="modelShow=false" @cancel="modelShow=false" @confirm="deleteDemand(deleteIndex)"></u-modal>
+      <u-modal :show="updateShow" title="提示" content='确认信息无误后再更新' closeOnClickOverlay showCancelButton
+        @close="updateShow=false" @cancel="updateShow=false" @confirm="$u.throttle(addArchives, 1500)"></u-modal>
     </view>
   </view>
 </template>
@@ -105,7 +107,6 @@
     },
     data() {
       return {
-        listMap: new Map(),
         demandShow: false,
         demandLoading: false,
         demandList: [], //更多需求
@@ -114,6 +115,7 @@
         updateFlag: true,
         task_id: 0,
         modelShow: false, // 是否显示删除提示框
+        updateShow: false, // 是否显示完成提示框
         deleteIndex: -1, // 删除标记
         formData: {
           id_card: '',
@@ -135,24 +137,21 @@
       this.task_id = +options.task_id || 0;
       this.initInformationDetails({ id: options.id });
       this.initCategoryBusinessList();
-      this.initMap();
     },
     onShow() {},
     methods: {
-      initMap() {
-        comonentList.forEach(item => {
-          this.listMap.set(item.id, item.name);
-        })
-      },
       async initInformationDetails(id) {
         let res = await informationDetails(id);
         this.formData = res.data;
       },
       // 更新档案
       async addArchives() {
+        this.updateShow = false;
+        await this.$nextTick();
         if (this.showDemandList.length == 0) return Toast('请先添加需求!');
         let refsDatas = await this.loadRefsDatas();
         if (!this.updateFlag) return;
+        // return ;
         uni.showLoading({
           title: '正在更新...',
           mask: true
@@ -201,10 +200,13 @@
       // 初始化商机分类
       async initCategoryBusinessList() {
         let res = await categoryBusinessList();
-        // this.demandList = res.data;
-        this.demandList = res.data.filter(item => item.id == 6);
-        this.demandList[0].children = this.demandList[0].children.filter(item => item.id == 7 || item.id == 8 || item
-          .id == 32);
+        res.data = res.data.filter((item)=>{
+          return item.status!=0;
+        })
+        this.demandList = res.data;
+        // this.demandList = res.data.filter(item => item.id == 6);
+        // this.demandList[0].children = this.demandList[0].children.filter(item => item.id == 7 || item.id == 8 || item
+        //   .id == 32);
         this.demandListChild = this.demandList[0].children;
       },
       // 选择更多需求
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index 93374d0..2511eeb 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -11,7 +11,8 @@
         </view>
         <view class="item">
           <text>可用余额</text>
-          <text>{{$store.state.app.userInfo.user_money||'0.00'}}元</text>
+          <text>{{company_money||'0.00'}}元</text>
+          <!-- <text>{{$store.state.app.userInfo.user_money||'0.00'}}元</text> -->
         </view>
       </view>
     </view>
@@ -43,6 +44,7 @@
       return {
         priceList: ['10元','50元','100元','500元','1000元','5000元','全部', '自定义'],
         changeMoney: -1,
+        company_money: "0.00",
         payMoney: {
           money: ''
         },
@@ -58,8 +60,12 @@
         })
       }
     },
-    onLoad() {},
-    onShow() {},
+    onLoad() {
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.on('company_money', (e)=>{
+        this.company_money = e.company_money;
+      })
+    },
     methods: {
       copyPhone(str = "") {
         uni.setClipboardData({
diff --git a/utils/logistics.js b/utils/logistics.js
index 4e7c4ff..e94a501 100644
--- a/utils/logistics.js
+++ b/utils/logistics.js
@@ -1,5 +1,5 @@
 import {
-	HTTP_REQUEST_URL_THREE,
+	HTTP_REQUEST_URL_TWO,
 	HEADER,
 	TOKENNAME,
 } from '@/config/app';
@@ -21,8 +21,7 @@ function baseRequestTwo(url, method, data, {
 	noAuth = false,
 	noVerify = false
 }) {
-	// let Url = "https://logistics.lihaink.cn", //正式环境
-	let Url = "https://ceshi-logistics.lihaink.cn", //测试环境
+	let Url = HTTP_REQUEST_URL_TWO,
 		header = HEADER;
 	if (!noAuth) {
 		// 已经未登录了,禁止请求
@@ -41,6 +40,7 @@ function baseRequestTwo(url, method, data, {
 
 	// if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
 	if (store.state.app.token) header[TOKENNAME] = store.state.app.token;
+
 	// header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv';
 	return new Promise((reslove, reject) => {
 		// uni.showLoading({
@@ -52,6 +52,7 @@ function baseRequestTwo(url, method, data, {
 			method: method || 'GET',
 			header: {
 				...header
+
 			},
 			data: method != 'GET' ? data || {} : {},
 			params: method == 'GET' ? data : {},
@@ -66,10 +67,12 @@ function baseRequestTwo(url, method, data, {
 					reject(res.data);
 				} else if (res.data.code == 0) {
 					// uni.hideLoading();
-					uni.showToast({
-						title: res.data.msg || '请检查网络',
-						icon: 'none'
-					})
+					if (res.data.show != 1 && res.data.msg != '无登录信息') {
+						uni.showToast({
+							title: res.data.msg || '请检查网络',
+							icon: 'none',
+						})
+					}
 					reject(res.data);
 				} else if (res.data.code == 1) {
 					store.commit("SET_REQUEST");
diff --git a/utils/oahttp.js b/utils/oahttp.js
index 97c06bb..e83a1dc 100644
--- a/utils/oahttp.js
+++ b/utils/oahttp.js
@@ -67,10 +67,12 @@ function baseRequestTwo(url, method, data, {
 					reject(res.data);
 				} else if (res.data.code == 0) {
 					// uni.hideLoading();
-					uni.showToast({
-						title: res.data.msg || '请检查网络',
-						icon: 'none',
-					})
+          if(res.data.show!=1&&res.data.msg!='无登录信息'){
+            uni.showToast({
+            	title: res.data.msg || '请检查网络',
+            	icon: 'none',
+            })
+          }
 					reject(res.data);
 				} else if (res.data.code == 1) {
 					store.commit("SET_REQUEST");