From cad8ac898ea4efb16e394d0be2e753a1b7f74a77 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 2 Aug 2023 17:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/information.js                           |   8 +-
 api/oaUser.js                                |  20 +
 components/newArchives/banquetBirthday.vue   | 313 +++++-----
 components/newArchives/banquetFullMoon.vue   | 313 +++++-----
 components/newArchives/banquetFuneral.vue    | 339 +++++------
 components/newArchives/banquetMarry.vue      | 329 +++++------
 components/newArchives/banquetOther.vue      | 319 +++++-----
 components/newArchives/breeding.vue          | 532 ++++++++---------
 components/newArchives/deepProcessing.vue    | 559 +++++++++---------
 components/newArchives/houseDecoration.vue   | 273 ++++-----
 components/newArchives/houseRenovate.vue     | 253 ++++----
 components/newArchives/houseRepair.vue       | 323 +++++------
 components/newArchives/houseTransaction.vue  | 305 +++++-----
 components/newArchives/residents.vue         | 576 ++++++++++---------
 components/newArchives/store.vue             | 440 +++++++-------
 components/newArchives/thickProcessing.vue   | 525 ++++++++---------
 pages/oaHome/oaHome.vue                      |  12 +-
 static/server/server.js                      |   5 +-
 subpkg/archives/archives.vue                 |  25 +-
 subpkg/archivesDetail/archivesDetail.vue     | 493 ++++++++--------
 subpkg/newArchives/newArchives.vue           |  50 +-
 subpkg/newPersonnel/newPersonnel.vue         |  32 +-
 subpkg/personnel/personnel.vue               |   3 +-
 subpkg/personnelDetails/personnelDetails.vue | 470 ++++++++++-----
 subpkg/updateArchives/updateArchives.vue     | 339 ++++++-----
 25 files changed, 3569 insertions(+), 3287 deletions(-)

diff --git a/api/information.js b/api/information.js
index 476cbd8..fedbdda 100644
--- a/api/information.js
+++ b/api/information.js
@@ -13,4 +13,10 @@ export const informationList = (data) => oahttp.get('/information/list', data)
 /**
  * 档案详情
  */
-export const informationDetails = (data) => oahttp.get('/information/details', data)
\ No newline at end of file
+export const informationDetails = (data) => oahttp.get('/information/details', data)
+
+/**
+ * 更新商机
+ */
+export const informationOpportunityUpdate = (data) => oahttp.post('/information/opportunity_update', data)
+
diff --git a/api/oaUser.js b/api/oaUser.js
index 1f721ed..703316b 100644
--- a/api/oaUser.js
+++ b/api/oaUser.js
@@ -25,3 +25,23 @@ export const userInfo = (data) => oahttp.get('/user/info', data)
  */
 export const loginAdd = (data) => oahttp.post('/login/add', data)
 
+/**
+ * 修改人员
+ */
+export const userSetInfo = (data) => oahttp.post('/user/setInfo', data)
+
+
+/**
+ * 设置是否为队长
+ */
+export const loginSetInfo = (data) => oahttp.post('/login/setInfo', data)
+
+/**
+ * 生成合同
+ */
+export const userDraftingcontracts = (data) => oahttp.post('/user/Draftingcontracts', data)
+
+/**
+ * 发起合同
+ */
+export const userInitiateContract = (data) => oahttp.post('/user/initiate_contract', data)
\ No newline at end of file
diff --git a/components/newArchives/banquetBirthday.vue b/components/newArchives/banquetBirthday.vue
index 0a47d65..b10e235 100644
--- a/components/newArchives/banquetBirthday.vue
+++ b/components/newArchives/banquetBirthday.vue
@@ -1,157 +1,158 @@
-
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/banquetFullMoon.vue b/components/newArchives/banquetFullMoon.vue
index 9f21599..9861e97 100644
--- a/components/newArchives/banquetFullMoon.vue
+++ b/components/newArchives/banquetFullMoon.vue
@@ -1,157 +1,158 @@
-
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/banquetFuneral.vue b/components/newArchives/banquetFuneral.vue
index dcbc40b..867d333 100644
--- a/components/newArchives/banquetFuneral.vue
+++ b/components/newArchives/banquetFuneral.vue
@@ -1,170 +1,171 @@
-
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/banquetMarry.vue b/components/newArchives/banquetMarry.vue
index 2e69180..421c64c 100644
--- a/components/newArchives/banquetMarry.vue
+++ b/components/newArchives/banquetMarry.vue
@@ -1,165 +1,166 @@
-
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/banquetOther.vue b/components/newArchives/banquetOther.vue
index b3e1b2d..461b971 100644
--- a/components/newArchives/banquetOther.vue
+++ b/components/newArchives/banquetOther.vue
@@ -1,160 +1,161 @@
-
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/breeding.vue b/components/newArchives/breeding.vue
index d6881fa..3c3e9e5 100644
--- a/components/newArchives/breeding.vue
+++ b/components/newArchives/breeding.vue
@@ -1,264 +1,270 @@
-<template>
-  <view class="">
-    <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 :readonly="readonly" v-model="formData.cultivated_area" placeholder="请输入耕地总面积"></u--input>
-      </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 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="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="planting_company" borderBottom>
-        <u-radio-group :disabled="readonly" 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="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>
-      <u-form-item labelWidth="auto" label="面积" required prop="area" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.area" 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="请输入产量"></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="请输入预计收益"></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="请输入现代化程度"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="预售卖价格" 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="种养殖需求描述" required 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="政策补助" required 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>
-</template>
-
-<script>
-  export default {
-    props:{
-      readonly: {
-        type: Boolean,
-        default: false
-      },
-      datas:{
-        type: Object,
-        default: null
-      }
-    },
-    data() {
-      return {
-        landPlanList: ['自己种养', '出租', '代种养', '租更多地扩大种植'],
-        formData: {
-          "cultivated_area": "20", //耕地总面积
-          "planning": 1, //土地规划
-          "breeding_training": 1, //有无种养殖培训
-          "planting_company": 0, //有无注册成立种殖公司
-          "notes": "试试备注", //备注
-          "breeding_type": 22, //种养殖类型
-          "area": 20, //面积
-          "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": "无补助" //政策补助
-        },
-        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];
-        })
-      }
-    },
-    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];
-          })
-        }
-      }
-    },
-    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;
-      },
-    },
-  }
-</script>
-
-<style lang="scss">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-  
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<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 :readonly="readonly" v-model="formData.cultivated_area" placeholder="请输入耕地总面积"></u--input>
+      </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 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="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="planting_company" borderBottom>
+        <u-radio-group :disabled="readonly" 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="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>
+      <u-form-item labelWidth="auto" label="面积" required prop="area" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.area" 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="请输入产量"></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="请输入预计收益"></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="请输入现代化程度"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="预售卖价格" 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="种养殖需求描述" required 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="政策补助" required 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>
+</template>
+
+<script>
+  export default {
+    props:{
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas:{
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        landPlanList: ['自己种养', '出租', '代种养', '租更多地扩大种植'],
+        formData: {
+          "cultivated_area": "20", //耕地总面积
+          "planning": 1, //土地规划
+          "breeding_training": 1, //有无种养殖培训
+          "planting_company": 0, //有无注册成立种殖公司
+          "notes": "试试备注", //备注
+          "breeding_type": 22, //种养殖类型
+          "area": 20, //面积
+          "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": "无补助" //政策补助
+        },
+        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];
+        })
+      }
+    },
+    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];
+          })
+        }
+      }
+    },
+    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;
+      },
+    },
+  }
+</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: #3175f9;
+      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/deepProcessing.vue b/components/newArchives/deepProcessing.vue
index 249600e..6d6ab96 100644
--- a/components/newArchives/deepProcessing.vue
+++ b/components/newArchives/deepProcessing.vue
@@ -1,280 +1,281 @@
-<!-- 深加工 -->
-<template>
-  <view class="">
-    <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;">
-            <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="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>
-          </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>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    props:{
-      readonly: {
-        type: Boolean,
-        default: false
-      },
-      datas:{
-        type: Object,
-        default: null
-      }
-    },
-    data() {
-      return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
-        formData: {
-          shop_front: '', //有无门面
-          manage: '',
-          // construction_land
-          // type
-          // area
-          // count
-          // canteen
-          
-        },
-        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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<!-- 深加工 -->
+<template>
+  <view class="">
+    <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;">
+            <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="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>
+          </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>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    props:{
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas:{
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
+        formData: {
+          shop_front: '', //有无门面
+          manage: '',
+          // construction_land
+          // type
+          // area
+          // count
+          // canteen
+          
+        },
+        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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/houseDecoration.vue b/components/newArchives/houseDecoration.vue
index ea6f20a..38bed92 100644
--- a/components/newArchives/houseDecoration.vue
+++ b/components/newArchives/houseDecoration.vue
@@ -1,137 +1,138 @@
-<template>
-  <view class="">
-    <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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view class="">
+    <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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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 97f51a1..b30269a 100644
--- a/components/newArchives/houseRenovate.vue
+++ b/components/newArchives/houseRenovate.vue
@@ -1,127 +1,128 @@
-<template>
-  <view class="">
-    <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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view class="">
+    <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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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 c7a3787..f73b7fb 100644
--- a/components/newArchives/houseRepair.vue
+++ b/components/newArchives/houseRepair.vue
@@ -1,162 +1,163 @@
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/houseTransaction.vue b/components/newArchives/houseTransaction.vue
index 370e05c..0a88c9e 100644
--- a/components/newArchives/houseTransaction.vue
+++ b/components/newArchives/houseTransaction.vue
@@ -1,153 +1,154 @@
-<template>
-  <view class="">
-    <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>
-</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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<template>
+  <view class="">
+    <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>
+</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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/residents.vue b/components/newArchives/residents.vue
index ef963bf..018a3be 100644
--- a/components/newArchives/residents.vue
+++ b/components/newArchives/residents.vue
@@ -1,286 +1,292 @@
-<!-- 常住人口 -->
-<template>
-  <view class="">
-    <view class="title">常住人口</view>
-    <u--form labelPosition="left" :model="residents" :rules="rules" ref="residentsForm">
-      <block value="人口">
-        <block value="人员信息" v-for="(item, index) in residents.family" :key="'user'+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="请选择出生日期" disabled disabledColor="#fff"></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="请选择就业情况" 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="family" borderBottom>
-            <u--input v-model="item.skills" :readonly="readonly" placeholder="请输入技能特长"></u--input>
-          </u-form-item>
-          <button v-if="residents.family.length>1&&!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,index) in residents.child_arr" :key="'child'+index">
-          <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
-            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number"></u--input>
-          </u-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>
-  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]) {
-                      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;
-          })
-        }
-      }
-    },
-    methods: {
-      async validate() {
-        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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-  
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    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, index) in residents.family" :key="'user'+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="请选择出生日期" disabled disabledColor="#fff"></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="请选择就业情况" 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="family" borderBottom>
+            <u--input v-model="item.skills" :readonly="readonly" placeholder="请输入技能特长"></u--input>
+          </u-form-item>
+          <button v-if="residents.family.length>1&&!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,index) in residents.child_arr" :key="'child'+index">
+          <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
+            <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number"></u--input>
+          </u-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>
+  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]) {
+                      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;
+          })
+        }
+      }
+    },
+    methods: {
+      async validate() {
+        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: #3175f9;
+      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 aeda544..c0ad487 100644
--- a/components/newArchives/store.vue
+++ b/components/newArchives/store.vue
@@ -1,218 +1,224 @@
-<template>
-  <view class="">
-    <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 :disabled="readonly" 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="area" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.area" placeholder="请输入门面面积"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="经营地点" required prop="place" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.place" placeholder="请输入经营地点"></u--input>
-      </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
-            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="environment" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.environment" placeholder="请输入门面环境"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="服务对象" required prop="service" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.service" placeholder="请输入服务对象"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无营业资质" required prop="qualification" borderBottom>
-        <u-radio-group :disabled="readonly" v-model="formData.qualification" 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="stock" borderBottom>
-        <u-radio-group :disabled="readonly" v-model="formData.stock" 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="scale" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.scale" placeholder="请输入店铺规模"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="商品来源" required prop="source" borderBottom>
-        <u--input :readonly="readonly" v-model="formData.source" placeholder="请输入商品来源"></u--input>
-      </u-form-item>
-      <u-form-item labelWidth="auto" label="有无线上展示" required prop="online_display" borderBottom>
-        <u-radio-group :disabled="readonly" v-model="formData.online_display" 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 :disabled="readonly" 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="repertory" borderBottom>
-        <u-radio-group :disabled="readonly" v-model="formData.repertory" 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="appeal" borderBottom>
-        <u--textarea :disabled="readonly" v-model="formData.appeal" autoHeight placeholder="请输入经营诉求" border="surround"
-          count></u--textarea>
-      </u-form-item>
-    </u--form>
-
-  </view>
-</template>
-
-<script>
-  export default {
-    props: {
-      readonly: {
-        type: Boolean,
-        default: false
-      },
-      datas: {
-        type: Object,
-        default: null
-      }
-    },
-    data() {
-      return {
-        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
-        formData: {
-          shop_front: '', //有无门面
-          area: '',
-          place: '',
-          type: '',
-          environment: '',
-          service: '',
-          qualification: '',
-          stock: '',
-          scale: '',
-          online_display: '',
-          brand: '',
-          repertory: '',
-          appeal: '',
-        },
-        rules: {
-
-        }
-      }
-    },
-    created() {
-      this.initRules();
-      if (this.$props.readonly && this.$props.datas) {
-        this.formData = this.$props.datas;
-        console.log(this.formData);
-        let keys = Object.keys(this.formData);
-        keys.forEach(item => {
-          if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
-        })
-        console.log(this.formData);
-      }
-    },
-    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];
-          })
-        }
-      }
-    },
-    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();;
-      },
-      // 选择经营类型
-      changeType(e) {
-        let index = e.currentTarget.dataset.index;
-        this.formData.type = e.detail.value;
-      },
-      // 选择时间
-      changeDate(e) {
-        let data = e.currentTarget.dataset;
-        this.formData[data.value] = e.detail.value;
-      },
-    },
-  }
-</script>
-
-<style lang="scss">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<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 :disabled="readonly" 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="area" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.area" placeholder="请输入门面面积"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="经营地点" required prop="place" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.place" placeholder="请输入经营地点"></u--input>
+      </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
+            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="environment" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.environment" placeholder="请输入门面环境"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="服务对象" required prop="service" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.service" placeholder="请输入服务对象"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="有无营业资质" required prop="qualification" borderBottom>
+        <u-radio-group :disabled="readonly" v-model="formData.qualification" 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="stock" borderBottom>
+        <u-radio-group :disabled="readonly" v-model="formData.stock" 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="scale" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.scale" placeholder="请输入店铺规模"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="商品来源" required prop="source" borderBottom>
+        <u--input :readonly="readonly" v-model="formData.source" placeholder="请输入商品来源"></u--input>
+      </u-form-item>
+      <u-form-item labelWidth="auto" label="有无线上展示" required prop="online_display" borderBottom>
+        <u-radio-group :disabled="readonly" v-model="formData.online_display" 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 :disabled="readonly" 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="repertory" borderBottom>
+        <u-radio-group :disabled="readonly" v-model="formData.repertory" 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="appeal" borderBottom>
+        <u--textarea :disabled="readonly" v-model="formData.appeal" autoHeight placeholder="请输入经营诉求" border="surround"
+          count></u--textarea>
+      </u-form-item>
+    </u--form>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas: {
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        storeTypeList: ['超市', '生鲜', '饭店', '五金', '杂货', '服装', '文具', '其他'],
+        formData: {
+          shop_front: '', //有无门面
+          area: '',
+          place: '',
+          type: '',
+          environment: '',
+          service: '',
+          qualification: '',
+          stock: '',
+          scale: '',
+          online_display: '',
+          brand: '',
+          repertory: '',
+          appeal: '',
+        },
+        rules: {
+
+        }
+      }
+    },
+    created() {
+      this.initRules();
+      if (this.$props.readonly && this.$props.datas) {
+        this.formData = this.$props.datas;
+        console.log(this.formData);
+        let keys = Object.keys(this.formData);
+        keys.forEach(item => {
+          if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item];
+        })
+        console.log(this.formData);
+      }
+    },
+    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];
+          })
+        }
+      }
+    },
+    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();
+      },
+      // 选择经营类型
+      changeType(e) {
+        let index = e.currentTarget.dataset.index;
+        this.formData.type = 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;
+    border-radius: 14rpx;
+  }
+  .title {
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/thickProcessing.vue b/components/newArchives/thickProcessing.vue
index e6e1a00..1f7eb8f 100644
--- a/components/newArchives/thickProcessing.vue
+++ b/components/newArchives/thickProcessing.vue
@@ -1,263 +1,264 @@
-<!-- 深加工 -->
-<template>
-  <view class="">
-    <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;">
-            <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="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>
-          </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>
-
-  </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">
-  .title {
-    margin-top: 30rpx;
-    font-weight: 500;
-    font-size: 34rpx;
-
-    &::before {
-      width: 8rpx;
-      height: 26rpx;
-      border-radius: 4rpx;
-      background-color: #3175f9;
-      content: "";
-      display: inline-block;
-      margin-right: 8rpx;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
+<!-- 深加工 -->
+<template>
+  <view class="">
+    <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;">
+            <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="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>
+          </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>
+
+  </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">
+  .title {
+    margin-top: 30rpx;
+    font-weight: 500;
+    font-size: 34rpx;
+
+    &::before {
+      width: 8rpx;
+      height: 26rpx;
+      border-radius: 4rpx;
+      background-color: #3175f9;
+      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/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 392e4be..38b9d9e 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -212,9 +212,15 @@
           let arr = oaHomeData.filter(item => !item.admin); //过滤掉管理员专属页面
           this.oaHomeData = arr;
         } else {
-          this.oaHomeData = oaHomeData;
-          // let arr = oaHomeData.filter(item=>!item.personnel);//过滤掉普通用户专属页面
-          // this.oaHomeData = arr;
+          // this.oaHomeData = oaHomeData;
+          let arr = oaHomeData.filter(item=>!item.captain);//过滤掉普通用户专属页面
+          this.oaHomeData = arr;
+        }
+        // 判断是否需要显示更多按钮
+        if(this.oaHomeData>=8){
+          this.oaHomeData[7] = this.oaHomeData[this.oaHomeData.length-1];
+        }else {
+          this.oaHomeData.splice(this.oaHomeData.length-1,1)
         }
       },
       async getApproveList() {
diff --git a/static/server/server.js b/static/server/server.js
index 7749bee..cadc5d7 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -207,7 +207,8 @@ export const oaHomeData = [
   {
     text: '固定资产',
     icon: prefix + 'oa/wcsq@2x.png',
-    // url: '/subpkg/fixedAssets/fixedAssets'
+    // url: '/subpkg/fixedAssets/fixedAssets',
+    admin: true
   },
   {
     text: '合同管理',
@@ -229,7 +230,7 @@ export const oaHomeData = [
     text: '档案管理',
     icon: prefix + 'oa/bxsq@2x.png',
     url: '/subpkg/archives/archives',
-    personnel: true
+    captain: true
   },
   // {
   //   text: '片区经理',
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 7afc748..78de1b3 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -10,18 +10,17 @@
           <view class="text">
             <view class="name">{{item.name}}</view>
             <view class="mobile">
-              <uni-icons type="phone" color="#999999FF"></uni-icons><text
-                @click="copyPhone(item.phone)">{{item.phone}}</text>
+              <uni-icons type="phone" color="#999999FF"></uni-icons><text>{{item.phone}}</text>
             </view>
             <view class="mobile">
               <uni-icons type="calendar" color="#999999FF"></uni-icons><text>{{item.create_time}}</text>
             </view>
           </view>
-          <view class="right">
-            <view class="top">
+          <view class="right" v-if="showView">
+            <view class="top" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
               查看
             </view>
-            <view class="bottom" @click="callUp(item.account)">
+            <view class="bottom" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
               更新
             </view>
           </view>
@@ -29,13 +28,13 @@
         <view class="bottom">
           <view class="circle"></view>
           <view class="green">所属片区</view>
-          <view>{{item.area_name+item.street_name}}</view>
+          <view>{{item.address}}</view>
         </view>
       </view>
       <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
     </view>
-    <button class="new_btn" v-if="$store.state.app.userInfo.admin_id==0"
+    <button class="new_btn" v-if="showView"
       @click="navTo('/subpkg/newArchives/newArchives')">信息登记</button>
     <!-- <button class="new_btn" @click="navTo('/subpkg/updateArchives/updateArchives')">信息更新(测试中)</button> -->
   </view>
@@ -47,7 +46,7 @@
   export default {
     data() {
       return {
-        user_id: 0,
+        user_id: -1,
         list: [],
         loadConfig: {
           page: 1,
@@ -60,8 +59,10 @@
       }
     },
     onLoad(options) {
-      this.user_id = options.id
-      console.log(options);
+      if(options.id)this.user_id = options.id;
+      else if(this.$store.state.app.userInfo.admin_id==0){ //如果用户是小队长,将带上自己的id
+        this.user_id = this.$store.state.app.userInfo.id;
+      }
     },
     onShow() {
       this.initLoadconfig();
@@ -70,7 +71,7 @@
     computed: {
       // 是否显示查看和更新按钮
       showView() {
-        return this.$store.state.app.userInfo.admin_id ? false : true;
+        return !this.$store.state.app.userInfo.admin_id&&this.$store.state.app.userInfo.is_captain;
       }
     },
     onReachBottom() {
@@ -131,7 +132,7 @@
 
   .personnel_list {
     padding: 28rpx 0;
-    margin-bottom: 100rpx;
+    margin-bottom: 130rpx;
 
     .item {
       margin: 0 auto;
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index bf208f1..185a1f0 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -1,247 +1,248 @@
-<template>
-  <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>
-    <view class="card" v-show="current==0">
-      <u--form labelPosition="left" :model="formData" ref="archives">
-        <view class="item">
-          <view class="title">基本信息</view>
-          <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
-            <u--input v-model="formData.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
-          </u-form-item>
-          <u-form-item label="性别" required prop="sex" borderBottom>
-            <u-radio-group v-model="formData.sex" :disabled="readonly" style="margin: 16rpx;">
-              <u-radio :customStyle="{marginRight: '16px'}"
-                v-for="(item, index) in [{value:1,label:'男'},{value:2,label:'女'}]" :key="index" :label="item.label"
-                :name="item.value">
-              </u-radio>
-            </u-radio-group>
-          </u-form-item>
-          <u-form-item label="年龄" required prop="age" borderBottom>
-            <u--input v-model="formData.age" :readonly="readonly" placeholder="请输入年龄"></u--input>
-          </u-form-item>
-          <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
-            <u--input v-model="formData.id_card" :readonly="readonly" placeholder="请输入身份证号" type="idcard"></u--input>
-          </u-form-item>
-          <u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
-            <u--input v-model="formData.phone" :readonly="readonly" placeholder="请输入手机号" type="number"></u--input>
-          </u-form-item>
-        </view>
-        <view class="item">
-          <districtSelector ref="districtSelectorRef" :datas="formData" :readonly="true"></districtSelector>
-          <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
-            <u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
-          </u-form-item>
-          <u-form-item labelWidth="auto" label="汽车是否能到家" required prop="highway" borderBottom>
-            <u-radio-group v-model="formData.highway" :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="智能手机">
-            <u-form-item labelWidth="auto" label="是否使用智能手机" required prop="smart_phone" borderBottom>
-              <u-radio-group v-model="formData.smart_phone" :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 v-if="formData.smart_phone>0">
-              <u-form-item labelWidth="auto" label="微信号" required borderBottom>
-                <u--input v-model="formData.wechat" :readonly="readonly" placeholder="请输入微信号"></u--input>
-              </u-form-item>
-            </block>
-          </block>
-        </view>
-        <residents ref="residentsRef" :readonly="true" :datas="formData"></residents>
-        <!-- <breeding ref="breedingRef"></breeding> -->
-        
-      </u--form>
-      <!-- <button @click="addArchives" type="primary" class="btn">完成登记</button> -->
-    </view>
-    <view class="card" style="padding-top: 1rpx;" v-show="current==1">
-      <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
-        <block>
-          <breeding v-if="item.id==7" :datas="item.datas" :readonly="true" ref="demandRef7"></breeding>
-          <store v-if="item.id==8" :datas="item.datas" :readonly="true" ref="demandRef8"></store>
-          <deepProcessing v-if="item.id==9" :datas="item.datas" :readonly="true" ref="demandRef9"></deepProcessing>
-          <thickProcessing v-if="item.id==10" :datas="item.datas" :readonly="true" ref="demandRef10"></thickProcessing>
-        </block>
-        <block>
-          <houseRepair v-if="item.id==12" :datas="item.datas" :readonly="true" ref="demandRef12"></houseRepair>
-          <houseDecoration v-if="item.id==13" :datas="item.datas" :readonly="true" ref="demandRef13"></houseDecoration>
-          <houseRenovate v-if="item.id==14" :datas="item.datas" :readonly="true" ref="demandRef14"></houseRenovate>
-          <houseTransaction v-if="item.id==15" :datas="item.datas" :readonly="true" ref="demandRef15"></houseTransaction>
-        </block>
-        <block>
-          <banquetMarry v-if="item.id==17" :datas="item.datas" :readonly="true" ref="demandRef17"></banquetMarry>
-          <banquetBirthday v-if="item.id==18" :datas="item.datas" :readonly="true" ref="demandRef18"></banquetBirthday>
-          <banquetFullMoon v-if="item.id==19" :datas="item.datas" :readonly="true" ref="demandRef19"></banquetFullMoon>
-          <banquetOther v-if="item.id==20" :datas="item.datas" :readonly="true" ref="demandRef20"></banquetOther>
-          <banquetFuneral v-if="item.id==21" :datas="item.datas" :readonly="true" ref="demandRef21"></banquetFuneral>
-        </block>
-      </block>
-    </view>
-  </view>
-</template>
-
-<script>
-  import { Toast } from "../../libs/uniApi"
-  import { informationAdd, informationDetails } from "@/api/information.js"
-  import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
-  import residents from "@/components/newArchives/residents.vue" // 常住人口
-  import breeding from "@/components/newArchives/breeding.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, store, deepProcessing, thickProcessing, houseRepair, houseDecoration, houseRenovate,houseTransaction, banquetMarry, banquetBirthday,banquetFullMoon, banquetOther, banquetFuneral },
-    data() {
-      return {
-        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',
-        },
-        
-      }
-    },
-    onLoad(options) {
-      this.initInformationDetails({id:options.id})
-    },
-    onShow() {},
-    methods: {
-      async initInformationDetails(id){
-        let res = await informationDetails(id);
-        this.formData = res.data;
-      },
-      toastShow(){
-        Toast('不可修改')
-      },
-    },
-    onPullDownRefresh() {
-      uni.stopPullDownRefresh()
-    }
-  }
-</script>
-
-<style lang="scss">
-  .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;
-    }
-    .active{
-      background: $theme-oa-color;
-      color: #fff;
-    }
-  }
-  .card {
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
-
-    .item {
-      margin-top: 30rpx;
-
-      &:nth-child(1) {
-        margin-top: 0;
-      }
-
-      .title {
-        font-weight: 500;
-        font-size: 34rpx;
-
-        &::before {
-          width: 8rpx;
-          height: 26rpx;
-          border-radius: 4rpx;
-          background-color: #3175f9;
-          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;
-    }
-  }
-
-  .delete {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: #f56c6c;
-    border-radius: 14rpx;
-    font-size: 28rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .plus {
-    margin: 22rpx 0;
-    // margin-bottom: 40rpx;
-    width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
-    background: $theme-oa-color;
-    border-radius: 14rpx;
-    color: #fff;
-    text-align: center;
-  }
-
-  .demand {
-    margin-top: 40rpx;
-    margin-bottom: 50rpx;
-  }
+<template>
+  <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>
+    <view class="card" v-show="current==0">
+      <u--form labelPosition="left" :model="formData" ref="archives">
+        <view class="item">
+          <view class="title">基本信息</view>
+          <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
+            <u--input v-model="formData.name" :readonly="readonly" placeholder="请输入姓名"></u--input>
+          </u-form-item>
+          <u-form-item label="性别" required prop="sex" borderBottom>
+            <u-radio-group v-model="formData.sex" :disabled="readonly" style="margin: 16rpx;">
+              <u-radio :customStyle="{marginRight: '16px'}"
+                v-for="(item, index) in [{value:1,label:'男'},{value:2,label:'女'}]" :key="index" :label="item.label"
+                :name="item.value">
+              </u-radio>
+            </u-radio-group>
+          </u-form-item>
+          <u-form-item label="年龄" required prop="age" borderBottom>
+            <u--input v-model="formData.age" :readonly="readonly" placeholder="请输入年龄"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
+            <u--input v-model="formData.id_card" :readonly="readonly" placeholder="请输入身份证号" type="idcard"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
+            <u--input v-model="formData.phone" :readonly="readonly" placeholder="请输入手机号" type="number"></u--input>
+          </u-form-item>
+        </view>
+        <view class="item">
+          <districtSelector ref="districtSelectorRef" :datas="formData" :readonly="true"></districtSelector>
+          <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
+            <u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
+          </u-form-item>
+          <u-form-item labelWidth="auto" label="汽车是否能到家" required prop="highway" borderBottom>
+            <u-radio-group v-model="formData.highway" :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="智能手机">
+            <u-form-item labelWidth="auto" label="是否使用智能手机" required prop="smart_phone" borderBottom>
+              <u-radio-group v-model="formData.smart_phone" :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 v-if="formData.smart_phone>0">
+              <u-form-item labelWidth="auto" label="微信号" required borderBottom>
+                <u--input v-model="formData.wechat" :readonly="readonly" placeholder="请输入微信号"></u--input>
+              </u-form-item>
+            </block>
+          </block>
+        </view>
+        <residents ref="residentsRef" :readonly="true" :datas="formData"></residents>
+        <!-- <breeding ref="breedingRef"></breeding> -->
+        
+      </u--form>
+      <!-- <button @click="addArchives" type="primary" class="btn">完成登记</button> -->
+    </view>
+    <view class="card" style="padding-top: 1rpx;" v-show="current==1">
+      <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
+        <block>
+          <breeding v-if="item.id==7" :datas="item.datas" :readonly="true" ref="demandRef7"></breeding>
+          <store v-if="item.id==8" :datas="item.datas" :readonly="true" ref="demandRef8"></store>
+          <deepProcessing v-if="item.id==9" :datas="item.datas" :readonly="true" ref="demandRef9"></deepProcessing>
+          <thickProcessing v-if="item.id==10" :datas="item.datas" :readonly="true" ref="demandRef10"></thickProcessing>
+        </block>
+        <block>
+          <houseRepair v-if="item.id==12" :datas="item.datas" :readonly="true" ref="demandRef12"></houseRepair>
+          <houseDecoration v-if="item.id==13" :datas="item.datas" :readonly="true" ref="demandRef13"></houseDecoration>
+          <houseRenovate v-if="item.id==14" :datas="item.datas" :readonly="true" ref="demandRef14"></houseRenovate>
+          <houseTransaction v-if="item.id==15" :datas="item.datas" :readonly="true" ref="demandRef15"></houseTransaction>
+        </block>
+        <block>
+          <banquetMarry v-if="item.id==17" :datas="item.datas" :readonly="true" ref="demandRef17"></banquetMarry>
+          <banquetBirthday v-if="item.id==18" :datas="item.datas" :readonly="true" ref="demandRef18"></banquetBirthday>
+          <banquetFullMoon v-if="item.id==19" :datas="item.datas" :readonly="true" ref="demandRef19"></banquetFullMoon>
+          <banquetOther v-if="item.id==20" :datas="item.datas" :readonly="true" ref="demandRef20"></banquetOther>
+          <banquetFuneral v-if="item.id==21" :datas="item.datas" :readonly="true" ref="demandRef21"></banquetFuneral>
+        </block>
+      </block>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { Toast } from "../../libs/uniApi"
+  import { informationAdd, informationDetails } from "@/api/information.js"
+  import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
+  import residents from "@/components/newArchives/residents.vue" // 常住人口
+  import breeding from "@/components/newArchives/breeding.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, store, deepProcessing, thickProcessing, houseRepair, houseDecoration, houseRenovate,houseTransaction, banquetMarry, banquetBirthday,banquetFullMoon, banquetOther, banquetFuneral },
+    data() {
+      return {
+        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',
+        },
+        
+      }
+    },
+    onLoad(options) {
+      this.initInformationDetails({id:options.id})
+    },
+    onShow() {},
+    methods: {
+      async initInformationDetails(id){
+        let res = await informationDetails(id);
+        this.formData = res.data;
+      },
+      toastShow(){
+        Toast('不可修改')
+      },
+    },
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .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;
+    }
+    .active{
+      background: $theme-oa-color;
+      color: #fff;
+    }
+  }
+  .card {
+    background-color: #fff;
+    margin: 28rpx;
+    padding: 28rpx;
+    border-radius: 14rpx;
+
+    .item {
+      margin-top: 30rpx;
+
+      &:nth-child(1) {
+        margin-top: 0;
+      }
+
+      .title {
+        font-weight: 500;
+        font-size: 34rpx;
+
+        &::before {
+          width: 8rpx;
+          height: 26rpx;
+          border-radius: 4rpx;
+          background-color: #3175f9;
+          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;
+    }
+  }
+
+  .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;
+  }
+
+  .demand {
+    margin-top: 40rpx;
+    margin-bottom: 50rpx;
+  }
 </style>
\ No newline at end of file
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 1563844..e7cd493 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -57,8 +57,8 @@
         <residents ref="residentsRef"></residents>
         <breeding ref="breedingRef"></breeding>
 
-
-        <block v-for="(item, index) in showDemandList" :key="'demand'+index">
+        <!-- 更多内容 -->
+        <!-- <block v-for="(item, index) in showDemandList" :key="'demand'+index">
           <block>
             <breeding v-if="item.id==7" ref="demandRef7"></breeding>
             <store v-if="item.id==8" ref="demandRef8"></store>
@@ -82,7 +82,7 @@
         </block>
         <button class="plus demand" @click="demandShow=true">点击添加更多需求</button>
         <u-picker :show="demandShow" ref="demandRef" :loading="demandLoading" :columns="[demandList, demandListChild]" keyName="name"
-          @change="changeHandler" @cancel="demandShow = false" @confirm="changeDemand"></u-picker>
+          @change="changeHandler" @cancel="demandShow = false" @confirm="changeDemand"></u-picker> -->
 
       </u--form>
       <button @click="addArchives" class="btn">完成登记</button>
@@ -135,13 +135,13 @@
           // category_child: '2',
           // data_type: '1',
           id_card: '324234234353454343',
-          sex: 1,
+          sex: 2,
           name: '测试的',
           phone: 14332323444, //电话
           highway: 1, //汽车是否能到家
           smart_phone: 1, //是否使用智能手机
           wechat: 21313132, //微信号
-          address: '大师傅大师傅但是', //家庭地址
+          address: '张家村', //家庭地址
           age: 33, //年龄
           category_id: '1',
           category_child: '2',
@@ -161,11 +161,10 @@
             trigger: ['change', 'blur']
           },
           sex: {
-            type: 'number',
-            max: 1,
-            required: true,
-            message: '请选择男或女',
-            trigger: ['blur', 'change']
+            validator: (rule, value, callback) => {
+              typeof value === 'number' ? callback() : callback('请选择男或女')
+            },
+            trigger: ['change', 'blur']
           },
           age: {
             type: 'number',
@@ -207,7 +206,7 @@
     methods: {
       // 新增档案
       async addArchives() {
-        Toast('开发中')
+        // Toast('开发中')
         let refsDatas = this.loadRefsDatas();
         let flag1 = await this.$refs.districtSelectorRef.validate();
         let flag2 = await this.$refs.residentsRef.validate();
@@ -215,7 +214,6 @@
         // return console.log(flag1);
         this.$refs.archives.validate().then(async (e) => {
           if (e==true && flag1==true && flag2==true && flag3==true) {
-            console.log('提交');
             uni.showLoading()
             let districtForm = {
               area_id: this.$refs.districtSelectorRef.formData.area,
@@ -241,9 +239,9 @@
               icon: "none",
               title: "添加成功",
               success: () => {
-                // setTimeout(() => {
-                //   uni.navigateBack()
-                // }, 1000)
+                setTimeout(() => {
+                  uni.navigateBack()
+                }, 1000)
               }
             })
           }
@@ -302,13 +300,13 @@
 
 <style lang="scss">
   .card {
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
+    padding-top: 30rpx;
 
     .item {
-      margin-top: 30rpx;
+      background-color: #fff;
+      margin: 28rpx;
+      padding: 28rpx;
+      border-radius: 14rpx;
 
       &:nth-child(1) {
         margin-top: 0;
@@ -331,9 +329,9 @@
     }
 
     .btn {
-      margin-top: 32rpx;
+      margin: 32rpx auto;
       // margin-bottom: 40rpx;
-      width: 100%;
+      width: 694rpx;
       height: 84rpx;
       background: $theme-oa-color;
       border-radius: 42rpx 42rpx 42rpx 42rpx;
@@ -347,8 +345,8 @@
     margin: 22rpx 0;
     // margin-bottom: 40rpx;
     width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
+    height: 64rpx;
+    line-height: 64rpx;
     background: #f56c6c;
     border-radius: 14rpx;
     font-size: 28rpx;
@@ -360,8 +358,8 @@
     margin: 22rpx 0;
     // margin-bottom: 40rpx;
     width: 100%;
-    height: 54rpx;
-    line-height: 54rpx;
+    height: 64rpx;
+    line-height: 64rpx;
     background: $theme-oa-color;
     border-radius: 14rpx;
     color: #fff;
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 11e3aa5..f1d63cb 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -12,7 +12,7 @@
         <u-form-item label="性别" required prop="sex" borderBottom>
           <u-radio-group v-model="formData.sex" 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:2,label:'女'}]" :key="index" :label="item.label"
               :name="item.value">
             </u-radio>
           </u-radio-group>
@@ -26,6 +26,15 @@
         <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
           <u--input v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
         </u-form-item>
+        <view class="title">身份信息</view>
+        <u-form-item labelWidth="auto" label="是否为小队长" required prop="is_captain" borderBottom>
+          <u-radio-group v-model="formData.is_captain" 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="登录密码" prop="formData.name" borderBottom>
           <u--input v-model="formData.password" placeholder="不输入密码则默认为手机号" password></u--input>
         </u-form-item>
@@ -125,11 +134,10 @@
             trigger: ['change', 'blur']
           },
           sex: {
-            type: 'number',
-            max: 1,
-            required: true,
-            message: '请选择男或女',
-            trigger: ['blur', 'change']
+            validator: (rule, value, callback) => {
+              typeof value === 'number' ? callback() : callback('请选择男或女')
+            },
+            trigger: ['change', 'blur']
           },
           avatar: {
             type: 'string',
@@ -143,6 +151,12 @@
             message: '姓名不能为空',
             trigger: ['change', 'blur']
           },
+          is_captain:{
+            validator: (rule, value, callback) => {
+              typeof value === 'number' ? callback() : callback('不能为空')
+            },
+            trigger: ['change', 'blur']
+          },
           'qualification.id_card': {
             type: 'string',
             required: true,
@@ -211,9 +225,9 @@
               icon: "none",
               title: "添加成功",
               success: () => {
-                setTimeout(() => {
-                  uni.navigateBack()
-                }, 1000)
+                // setTimeout(() => {
+                //   uni.navigateBack()
+                // }, 1000)
               }
             })
           }
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index f4775f7..3417379 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -42,7 +42,7 @@
           </view>
           <u-line color="#999999FF"></u-line>
           <view class="bottom" style="margin-top: 28rpx;">
-            <button class="look" @click="navTo('/subpkg/archives/archives?id='+item.id)">片区档案</button>
+            <button v-if="item.is_captain" class="look" @click="navTo('/subpkg/archives/archives?id='+item.id)">片区档案</button>
             <button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">查看</button>
           </view>
         </view>
@@ -129,6 +129,7 @@ export default {
     flex-direction: column;
     align-items: center;
     padding-top: 32rpx;
+    padding-bottom: 130rpx;
     .personnel_item{
       width: 694rpx;
       // height: 407rpx;
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index c5a1ce1..35d1899 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -10,7 +10,8 @@
             <view class="text">
               <view class="basic_name">
                 <view class="name">{{userInfo.name}}</view>
-                <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'"></image>
+                <image class="icon" :src="userInfo.sex==1?'../../static/icons/man.png':'../../static/icons/woman.png'">
+                </image>
                 <!-- <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
               </view>
               <view class="id_card">
@@ -21,9 +22,39 @@
               </view>
             </view>
           </view>
-          <view class="bottom">
-            负责区域: {{userInfo.city_name+userInfo.area_name+userInfo.street_name}}{{userInfo.city_name+userInfo.area_name+userInfo.street_name}}
+          <view class="bottom" style="margin-bottom: 10rpx;display: flex;align-items: center;">
+            是否为小队长:
+            <u-radio-group v-model="userInfo.is_captain" style="margin-left: 16rpx;" disabled>
+              <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>
+            <view class="update" @click="updateShow(userInfo.is_captain)"><uni-icons type="compose"
+                color="#F9AA32"></uni-icons></view>
           </view>
+          <view class="bottom">
+            负责区域:
+            {{userInfo.city_name+userInfo.area_name+userInfo.street_name}}{{userInfo.city_name+userInfo.area_name+userInfo.street_name}}
+          </view>
+          <u-popup :show="show" :round="10" mode="center">
+            <view class="popup">
+              <view class="p_title">修改信息</view>
+              <view class="p_body">
+                是否为小队长:
+                <u-radio-group v-model="updateForm.is_captain" 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>
+              </view>
+              <view class="p_button">
+                <view @click="show=false">取消</view>
+                <view @click="updateInfo">确认</view>
+              </view>
+            </view>
+          </u-popup>
         </view>
       </block>
     </view>
@@ -32,31 +63,39 @@
       <block v-if="!skeleton">
         <view class="title">资质信息</view>
         <view class="c_item">
-          <uni-section style="background-color: transparent;" title="身份证" titleFontSize="32rpx" type="line"></uni-section>
+          <uni-section style="background-color: transparent;" title="身份证" titleFontSize="32rpx"
+            type="line"></uni-section>
           <view class="card_box">
-            <image :src="userInfo.qualification&&userInfo.qualification.id_card" 
+            <image :src="userInfo.qualification&&userInfo.qualification.id_card"
               @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 0)">
             </image>
             <image :src="userInfo.qualification&&userInfo.qualification.id_card_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 1)"></image>
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 1)">
+            </image>
           </view>
         </view>
         <view class="c_item">
-          <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line"></uni-section>
+          <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx"
+            type="line"></uni-section>
           <view class="card_box">
             <image :src="userInfo.qualification&&userInfo.qualification.car_card"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)"></image>
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)">
+            </image>
             <image :src="userInfo.qualification&&userInfo.qualification.car_card_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 1)"></image>
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 1)">
+            </image>
           </view>
         </view>
         <view class="c_item">
-          <uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx" type="line"></uni-section>
+          <uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx"
+            type="line"></uni-section>
           <view class="card_box">
             <image :src="userInfo.qualification&&userInfo.qualification.bank_account"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)"></image>
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)">
+            </image>
             <image :src="userInfo.qualification&&userInfo.qualification.bank_account_b"
-              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 1)"></image>
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 1)">
+            </image>
           </view>
         </view>
       </block>
@@ -65,8 +104,9 @@
       <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
       <block v-if="!skeleton">
         <view class="title">电子合同</view>
-        <view class="card">
-          <uni-section style="background-color: transparent;" :title="userInfo.name" titleFontSize="32rpx" type="line"></uni-section>
+        <view v-if="userInfo.contract&&userInfo.contract.check_status==2" class="card">
+          <uni-section style="background-color: transparent;" :title="userInfo.name" titleFontSize="32rpx"
+            type="line"></uni-section>
           <view class="c_text">性别：{{userInfo.sex==1?'男':'女'}}</view>
           <view class="c_text">身份证号码：{{userInfo.id_card}}</view>
           <view class="c_text">联系电话：{{userInfo.phone}}</view>
@@ -85,169 +125,269 @@
             </view>
           </view>
         </view>
+        <button v-if="!userInfo.is_contract&&!userInfo.contract" class="btn" @click="createContract">发起合同</button>
+        <view v-if="userInfo.contract&&userInfo.contract.check_status==1" class="card">
+          <view  class="contract_box">
+            <view class="left">
+              <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+              <view class="text">
+                <view class="name">合同</view>
+                <view>
+                  <text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <u-line  color="#999999FF" style="margin: 31rpx 0;"></u-line>
+          <button>发送合同</button>
+        </view>
       </block>
     </view>
   </view>
 </template>
 
 <script>
-import { Toast } from '@/libs/uniApi.js'
-import {companyUserDetail} from "@/api/company.js"
-export default {
-  onReady() {
-    uni.setNavigationBarColor({
-      frontColor: '#ffffff',
-      backgroundColor: '#3175f9'
-    })
-  },
-  data() {
-    return {
-      id:'',
-      skeleton: true,
-      userInfo: {
-        qualification:{},
-        contract:{},
-        roles:{}
+  import { Toast } from '@/libs/uniApi.js'
+  import { companyUserDetail } from "@/api/company.js"
+  import { loginSetInfo, userDraftingcontracts, userInitiateContract } from "@/api/oaUser.js"
+  export default {
+    onReady() {
+      uni.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#3175f9'
+      })
+    },
+    data() {
+      return {
+        id: '',
+        skeleton: true,
+        show: false,
+        updateForm:{
+          is_captain: 0,
+        },
+        userInfo: {
+          qualification: {},
+          contract: {},
+          roles: {}
+        }
       }
-    }
-  },
-  onLoad(options) {
-    if(options.id)this.id=options.id;
-  },
-  onShow() {
-    this.loadUserDetail();
-  },
-  methods: {
-    naviTo(url) {
-      url ?
-        uni.navigateTo({
-          url: url,
-        }) : Toast('暂未开放')
     },
-    loadUserDetail(){
-      if(!this.id) return;
-      companyUserDetail({
-        id: this.id
-      }).then(res=>{
-        this.userInfo = res.data;
-        this.skeleton = false;
-      })
+    onLoad(options) {
+      if (options.id) this.id = options.id;
     },
-    previewImg(urls, index=0){
-      uni.previewImage({
-        urls:urls,
-        current:index
-      })
-    }
-  },
-  onPullDownRefresh() {
+    onShow() {
+      this.loadUserDetail();
+    },
+    methods: {
+      naviTo(url) {
+        url ?
+          uni.navigateTo({
+            url: url,
+          }) : Toast('暂未开放')
+      },
+      updateShow(value) {
+        this.updateForm.is_captain = value;
+        this.show = true;
+      },
+      // 更新信息
+      async updateInfo(){
+        let res = await loginSetInfo({
+          user_id: this.userInfo.id,
+          is_captain: this.updateForm.is_captain
+        });
+        this.userInfo.is_captain = this.updateForm.is_captain;
+        Toast('更新成功');
+        this.show = false;
+      },
+      // 生成合同
+      async createContract(){
+        let res = await userInitiateContract({
+          party_b:'',
+          contract_type:'',
+          type:''
+        })
+        Toast('合同已生成')
+      },
+      loadUserDetail() {
+        if (!this.id) return;
+        companyUserDetail({
+          id: this.id
+        }).then(res => {
+          this.userInfo = res.data;
+          this.skeleton = false;
+        })
+      },
+      previewImg(urls, index = 0) {
+        uni.previewImage({
+          urls: urls,
+          current: index
+        })
+      }
+    },
+    onPullDownRefresh() {
       uni.stopPullDownRefresh()
     }
   }
 </script>
 
 <style lang="scss">
-.page{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.title{
-  font-size: 35rpx;
-  font-weight: 500;
-  color: #333333;
-  margin-bottom: 21rpx;
-}
-.card{
-  width: 694rpx;
-  background: #FFFFFF;
-  border-radius: 14rpx 14rpx 14rpx 14rpx;
-  padding: 28rpx;
-}
-.basic{
-  margin: 28rpx 0;
-  .card{
-    font-size: 28rpx;
-    color: #666666;
-    .basic_top{
-      display: flex;
-      margin-bottom: 28rpx;
-      .avatar{
-        width: 154rpx;
-        height: 154rpx;
-        background: #CCCCCC;
-        border-radius: 7rpx 7rpx 7rpx 7rpx;
-        margin-right: 28rpx;
+  .page {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
+  .title {
+    font-size: 35rpx;
+    font-weight: 500;
+    color: #333333;
+    margin-bottom: 21rpx;
+  }
+
+  .card {
+    width: 694rpx;
+    background: #FFFFFF;
+    border-radius: 14rpx 14rpx 14rpx 14rpx;
+    padding: 28rpx;
+  }
+
+  .basic {
+    margin: 28rpx 0;
+
+    .card {
+      font-size: 28rpx;
+      color: #666666;
+
+      .basic_top {
+        display: flex;
+        margin-bottom: 28rpx;
+
+        .avatar {
+          width: 154rpx;
+          height: 154rpx;
+          background: #CCCCCC;
+          border-radius: 7rpx 7rpx 7rpx 7rpx;
+          margin-right: 28rpx;
+        }
+
+        .text {
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+
+          .basic_name {
+            display: flex;
+            align-items: center;
+
+            .icon {
+              width: 21rpx;
+              height: 21rpx;
+              margin-left: 18rpx;
+              margin-right: 36rpx;
+            }
+
+            .name {
+              font-size: 32rpx;
+              font-weight: 500;
+              color: #000000CC;
+            }
+
+            .role {
+              width: 284rpx;
+              font-size: 28rpx;
+              font-weight: 500;
+              color: #3274F9;
+              // white-space: nowrap; /* 不换行 */
+              // overflow: hidden; /* 将超出文本隐藏 */
+              // text-overflow: ellipsis; /* 使用省略号表示被隐藏的文本 */
+            }
+          }
+
+        }
       }
-      .text{
+
+      .bottom {
+        .update {
+          display: flex;
+          align-items: center;
+          color: #F9AA32;
+        }
+      }
+      .popup{
+        width: 500rpx;
+        height: 300rpx;
+        // padding: 28rpx;
+        overflow: hidden;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        .basic_name{
+        .p_title{
+          margin-top: 20rpx;
+          text-align: center;
+          font-weight: bold;
+          font-size: 33rpx;
+        }
+        .p_body{
+          margin: 28rpx;
+        }
+        .p_button{
           display: flex;
-          align-items: center;
-          .icon{
-            width: 21rpx;
-            height: 21rpx;
-            margin-left: 18rpx;
-            margin-right: 36rpx;
-          }
-          .name{
-            font-size: 32rpx;
-            font-weight: 500;
-            color: #000000CC;
-          }
-          .role{
-            width: 284rpx;
-            font-size: 28rpx;
-            font-weight: 500;
+          border-top: 1rpx solid #ccc;
+          view{
+            flex: 1;
+            height: 80rpx;
+            line-height: 80rpx;
+            text-align: center;
+            border-left: 1rpx solid #ccc;
             color: #3274F9;
-            // white-space: nowrap; /* 不换行 */
-            // overflow: hidden; /* 将超出文本隐藏 */
-            // text-overflow: ellipsis; /* 使用省略号表示被隐藏的文本 */
+            &:nth-child(1){
+              border-left: none;
+              color: #333;
+            }
           }
         }
-        
-      }
-    }
-    .bottom{
-      // width: 640rpx;
-      // white-space: nowrap; /* 不换行 */
-      // overflow: hidden; /* 将超出文本隐藏 */
-      // text-overflow: ellipsis; /* 使用省略号表示被隐藏的文本 */
-    }
-  }
-}
-.certification{
-  margin-bottom: 28rpx;
-  .title{
-    margin-bottom: 0;
-  }
-  .c_item{
-    width: 694rpx;
-    .card_box{
-      display: flex;
-      justify-content: space-between;
-      image{
-        width: 336rpx;
-        height: 238rpx;
-        background: #FFFFFF;
-        border-radius: 14rpx 14rpx 14rpx 14rpx;
-        border: 2rpx solid #CCCCCC;
       }
     }
   }
-}
-.contract{
-  margin-bottom: 28rpx;
-  .card{
-    padding-top: 0;
-    .contract_box{
-      display: flex;
-      justify-content: space-between;
-      .left {
+
+  .certification {
+    margin-bottom: 28rpx;
+
+    .title {
+      margin-bottom: 0;
+    }
+
+    .c_item {
+      width: 694rpx;
+
+      .card_box {
+        display: flex;
+        justify-content: space-between;
+
+        image {
+          width: 336rpx;
+          height: 238rpx;
+          background: #FFFFFF;
+          border-radius: 14rpx 14rpx 14rpx 14rpx;
+          border: 2rpx solid #CCCCCC;
+        }
+      }
+    }
+  }
+
+  .contract {
+    margin-bottom: 28rpx;
+
+    .card {
+      padding-top: 0;
+
+      .contract_box {
+        display: flex;
+        justify-content: space-between;
+
+        .left {
           display: flex;
-        
+
           .contract_img {
             width: 102rpx;
             height: 102rpx;
@@ -255,12 +395,12 @@ export default {
             border-radius: 14rpx 14rpx 14rpx 14rpx;
             margin-right: 21rpx;
           }
-        
+
           .text {
             display: flex;
             flex-direction: column;
             justify-content: space-between;
-        
+
             .name {
               font-size: 32rpx;
               ;
@@ -268,11 +408,11 @@ export default {
               color: rgba(0, 0, 0, 0.8);
               line-height: 35rpx;
             }
-        
+
             .nickname {
               margin-right: 35rpx;
             }
-        
+
             text {
               height: 39rpx;
               font-size: 28rpx;
@@ -282,7 +422,7 @@ export default {
             }
           }
         }
-        
+
         .right {
           font-size: 28rpx;
           font-weight: 500;
@@ -291,7 +431,7 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
-        
+
           .icon {
             width: 35rpx;
             height: 39rpx;
@@ -300,8 +440,20 @@ export default {
             margin-right: 10rpx
           }
         }
-      
+
+      }
+    }
+
+    .btn {
+      margin-top: 32rpx;
+      // margin-bottom: 40rpx;
+      width: 694rpx;
+      height: 84rpx;
+      background: $theme-oa-color;
+      border-radius: 42rpx 42rpx 42rpx 42rpx;
+      color: #fff;
+      line-height: 80rpx;
+      text-align: center;
     }
   }
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue
index 571c189..4df62f1 100644
--- a/subpkg/updateArchives/updateArchives.vue
+++ b/subpkg/updateArchives/updateArchives.vue
@@ -1,185 +1,207 @@
 <template>
   <view class="">
     <view class="card">
-      <u--form labelPosition="left" :model="formData" :rules="rules" ref="archives">
+      <u--form labelPosition="left" :model="formData" ref="archives">
         <view class="item">
           <view class="title">基本信息</view>
           <u-form-item labelWidth="auto" label="户主姓名" required prop="name" borderBottom>
-            <u--input v-model="formData.name" placeholder="请输入姓名"></u--input>
+            <u--input readonly v-model="formData.name" placeholder="请输入姓名"></u--input>
           </u-form-item>
           <u-form-item label="性别" required prop="sex" borderBottom>
-            <u-radio-group v-model="formData.sex" style="margin: 16rpx;">
+            <u-radio-group v-model="formData.sex" disabled 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:2,label:'女'}]" :key="index" :label="item.label"
                 :name="item.value">
               </u-radio>
             </u-radio-group>
           </u-form-item>
           <u-form-item label="年龄" required prop="age" borderBottom>
-            <u--input v-model="formData.age" placeholder="请输入年龄"></u--input>
+            <u--input readonly v-model="formData.age" placeholder="请输入年龄"></u--input>
           </u-form-item>
           <u-form-item labelWidth="auto" label="身份证号" required prop="id_card" borderBottom>
-            <u--input v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
+            <u--input readonly v-model="formData.id_card" placeholder="请输入身份证号" type="idcard"></u--input>
           </u-form-item>
           <u-form-item labelWidth="auto" label="联系方式" required prop="phone" borderBottom>
-            <u--input v-model="formData.phone" placeholder="请输入手机号" type="number"></u--input>
+            <u--input readonly v-model="formData.phone" placeholder="请输入手机号" type="number"></u--input>
           </u-form-item>
         </view>
-        <view class="item">
-          <districtSelector ref="districtSelectorRef"></districtSelector>
-          <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="highway" borderBottom>
-            <u-radio-group v-model="formData.highway" 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="智能手机">
-            <u-form-item labelWidth="auto" label="是否使用智能手机" required prop="smart_phone" borderBottom>
-              <u-radio-group v-model="formData.smart_phone" 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.smart_phone>0">
-              <u-form-item labelWidth="auto" label="微信号" required borderBottom>
-                <u--input v-model="formData.wechat" placeholder="请输入微信号"></u--input>
-              </u-form-item>
-            </block>
+
+        <block v-for="(item, index) in showDemandList" :key="'demand'+index">
+          <block>
+            <breeding v-if="item.id==7" ref="demandRef7"></breeding>
+            <store v-if="item.id==8" ref="demandRef8"></store>
+            <deepProcessing v-if="item.id==9" ref="demandRef9"></deepProcessing>
+            <thickProcessing v-if="item.id==10" ref="demandRef10"></thickProcessing>
           </block>
-        </view>
-        <residents ref="residentsRef"></residents>
-        <!-- <breeding ref="breedingRef"></breeding> -->
-        <store></store>
+          <block>
+            <houseRepair v-if="item.id==12" ref="demandRef12"></houseRepair>
+            <houseDecoration v-if="item.id==13" ref="demandRef13"></houseDecoration>
+            <houseRenovate v-if="item.id==14" ref="demandRef14"></houseRenovate>
+            <houseTransaction v-if="item.id==15" ref="demandRef15"></houseTransaction>
+          </block>
+          <block>
+            <banquetMarry v-if="item.id==17" ref="demandRef17"></banquetMarry>
+            <banquetBirthday v-if="item.id==18" ref="demandRef18"></banquetBirthday>
+            <banquetFullMoon v-if="item.id==19" ref="demandRef19"></banquetFullMoon>
+            <banquetOther v-if="item.id==20" ref="demandRef20"></banquetOther>
+            <banquetFuneral v-if="item.id==21" ref="demandRef21"></banquetFuneral>
+          </block>
+          <button class="delete" @click="removeShowDemand(index)">删除以上信息</button>
+        </block>
+        <button class="plus demand" @click="demandShow=true">点击添加更多需求</button>
+        <u-picker :show="demandShow" ref="demandRef" :loading="demandLoading" :columns="[demandList, demandListChild]"
+          keyName="name" @change="changeHandler" @cancel="demandShow = false" @confirm="changeDemand"></u-picker>
       </u--form>
-      <button @click="addArchives" type="primary" class="btn">完成更新</button>
+      <button @click="addArchives" class="btn">完成更新</button>
     </view>
   </view>
 </template>
 
 <script>
   import { Toast } from "../../libs/uniApi"
-  import { informationAdd } from "@/api/information.js"
+  import { informationDetails, informationOpportunityUpdate } from "@/api/information.js"
+  import { debounce, throttle } from "lodash"
+  import { categoryBusinessList } from "@/api/oaPbulic.js"
   import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
   import residents from "@/components/newArchives/residents.vue" // 常住人口
   import breeding from "@/components/newArchives/breeding.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, store},
+    components: {
+      districtSelector,
+      residents,
+      breeding,
+      store,
+      deepProcessing,
+      thickProcessing,
+      houseRepair,
+      houseDecoration,
+      houseRenovate,
+      houseTransaction,
+      banquetMarry,
+      banquetBirthday,
+      banquetFullMoon,
+      banquetOther,
+      banquetFuneral
+    },
     data() {
       return {
+        demandShow: false,
+        demandLoading: false,
+        demandList: [], //更多需求
+        demandListChild: [], //更多二级需求
+        showDemandList: [], //更多需求展示列表
+        updateFlag: true,
         formData: {
-          id_card: '254566198003032255',
-          sex: 0,
-          name: '方法',
-          phone: '18555555555', //电话
-          highway: 1,//汽车是否能到家
-          smart_phone: 1,//是否使用智能手机
-          wechat: '15434535', //微信号
-          address: '十分士大夫但是',//家庭地址
-          age: '23',//年龄
+          id_card: '',
+          sex: '',
+          name: '',
+          phone: '', //电话
+          highway: '', //汽车是否能到家
+          smart_phone: '', //是否使用智能手机
+          wechat: '', //微信号
+          address: '', //家庭地址
+          age: '', //年龄
           category_id: '1',
           category_child: '2',
-        },
-        rules: {
-          phone: {
-            required: true,
-            pattern: /^(1[3456789]\d{9})$/,
-            message: '请输入正确的手机号码',
-            trigger: ['change', 'blur']
-          },
-          id_card: {
-            required: true,
-            pattern: /^\d{17}[\dX]$|^\d{15}[\dX]$/,
-            message: '请输入正确的身份证号',
-            trigger: ['change', 'blur']
-          },
-          sex: {
-            type: 'number',
-            max: 1,
-            required: true,
-            message: '请选择男或女',
-            trigger: ['blur', 'change']
-          },
-          age: {
-            type: 'number',
-            required: true,
-            message: '请输入年龄',
-            trigger: ['blur', 'change']
-          },
-          name: {
-            type: 'string',
-            required: true,
-            message: '姓名不能为空',
-            trigger: ['change', 'blur']
-          },
-          address: {
-            type: 'string',
-            required: true,
-            message: '地址不能为空',
-            trigger: ['change', 'blur']
-          },
-          highway: {
-            validator: (rule, value, callback )=>{
-              typeof value==='number'?callback():callback('不能为空')
-            },
-            trigger: ['change', 'blur']
-          },
-          smart_phone: {
-            validator: (rule, value, callback )=>{
-              typeof value==='number'?callback():callback('不能为空')
-            },
-            trigger: ['change', 'blur']
-          },
+          data_type: '1',
         },
       }
     },
-    onLoad() {},
+    onLoad(options) {
+      this.initInformationDetails({ id: options.id })
+      this.initCategoryBusinessList();
+    },
     onShow() {},
     methods: {
-      // 新增档案
-      async addArchives() {
-        return Toast('开发中')
-        let flag1 = this.$refs.districtSelectorRef.validate();
-        let flag2 = this.$refs.residentsRef.validate();
-        let flag3 = this.$refs.breedingRef.validate();
-        this.$refs.archives.validate().then(async (e) => {
-          if (e&&flag1&&flag2&&flag3) {
-            uni.showLoading()
-            let districtForm = {
-              area_id:this.$refs.districtSelectorRef.formData.area,
-              street_id:this.$refs.districtSelectorRef.formData.street,
-              village_id:this.$refs.districtSelectorRef.formData.village,
-              brigade_id:this.$refs.districtSelectorRef.formData.brigade,
-            }
-            let res = await informationAdd({
-              ...this.formData,
-              ...districtForm,
-              ...this.$refs.residentsRef.residents,
-              datas:{
-                ...this.$refs.breedingRef.formData
-              }
-            });
-            uni.hideLoading()
-            uni.showToast({
-              icon: "none",
-              title: "添加成功",
-              success: () => {
-                setTimeout(() => {
-                  uni.navigateBack()
-                }, 1000)
-              }
-            })
+      async initInformationDetails(id) {
+        let res = await informationDetails(id);
+        this.formData = res.data;
+      },
+      // 更新档案
+      addArchives: throttle(async function() {
+        let refsDatas = await this.loadRefsDatas();
+        if (!this.updateFlag) return;
+        uni.showLoading({
+          title: '正在更新...'
+        });
+        let res = await informationOpportunityUpdate({
+          id: this.formData.id,
+          datas: [...refsDatas]
+        });
+        uni.hideLoading();
+        uni.showToast({
+          icon: 'none',
+          title: '更新成功',
+          success() {
+            setTimeout(()=>{
+              uni.navigateBack()
+            },1000)
           }
         })
-
+      }, 1000),
+      // 获取组件数据
+      async loadRefsDatas() {
+        this.updateFlag = true;
+        let datas = [];
+        let map = new Map(); // 使用map存储当前ref是第几位
+        for (let demand of this.showDemandList) {
+          if(map.get(demand.id)>=0) map.set(demand.id, map.get(demand.id)+1);
+          else map.set(demand.id, 0);
+          let now = map.get(demand.id);
+          try {
+            let res = await this.$refs['demandRef' + demand.id][now].validate();
+            if (!!res) datas.push({
+              card_id: demand.id,
+              datas: { ...this.$refs['demandRef' + demand.id][now]['formData'] }
+            })
+          } catch (e) {
+            console.log('err', e);
+            this.updateFlag = false;
+          }
+        }
+        return datas;
       },
+      // 初始化商机分类
+      async initCategoryBusinessList() {
+        let res = await categoryBusinessList();
+        this.demandList = res.data;
+      },
+      // 选择更多需求
+      changeHandler(e) {
+        if (e.columnIndex == 0) { //滑动左侧时才加载,右侧不加载
+          this.demandListChild = this.demandList[e.indexs[0]].children || [];
+        }
+      },
+      // 确认添加需求
+      changeDemand: throttle(function(e) {
+        this.demandShow = false;
+        if (e.value[1]) {
+          this.showDemandList.push(e.value[1]);
+        } else {
+          this.showDemandList.push(e.value[0]);
+        }
+      }, 3000),
+      // 删除需求
+      removeShowDemand(index) {
+        uni.showModal({
+          title: '确定删除这一部分内容吗',
+          success: (res) => {
+            if (res.confirm) this.showDemandList.splice(index, 1);
+          }
+        })
+      }
     },
     onPullDownRefresh() {
       uni.stopPullDownRefresh()
@@ -189,13 +211,13 @@
 
 <style lang="scss">
   .card {
-    background-color: #fff;
-    margin: 28rpx;
-    padding: 28rpx;
-    border-radius: 14rpx;
+    padding-top: 30rpx;
 
     .item {
-      margin-top: 30rpx;
+      background-color: #fff;
+      margin: 28rpx;
+      padding: 28rpx;
+      border-radius: 14rpx;
 
       &:nth-child(1) {
         margin-top: 0;
@@ -218,9 +240,9 @@
     }
 
     .btn {
-      margin-top: 32rpx;
+      margin: 32rpx auto;
       // margin-bottom: 40rpx;
-      width: 100%;
+      width: 694rpx;
       height: 84rpx;
       background: $theme-oa-color;
       border-radius: 42rpx 42rpx 42rpx 42rpx;
@@ -229,4 +251,35 @@
       text-align: center;
     }
   }
+
+  .delete {
+    margin: 22rpx auto;
+    // margin-bottom: 40rpx;
+    width: 694rpx;
+    height: 64rpx;
+    line-height: 64rpx;
+    background: #f56c6c;
+    border-radius: 14rpx;
+    font-size: 28rpx;
+    color: #fff;
+    text-align: center;
+  }
+
+  .plus {
+    margin: 22rpx auto;
+    // margin-bottom: 40rpx;
+    width: 694rpx;
+    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;
+  }
 </style>
\ No newline at end of file