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

---
 subpkg/archivesDetail/archivesDetail.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index fabb0f1..659ce6d 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -127,7 +127,6 @@
     },
     data() {
       return {
-        listMap: new Map(),
         tabLists: [{
           name: '基本信息',
         }, {
@@ -157,7 +156,6 @@
     },
     onLoad(options) {
       this.initInformationDetails({ id: options.id });
-      this.initMap();
     },
     onShow() {},
     computed: {
@@ -168,11 +166,6 @@
       }
     },
     methods: {
-      initMap() {
-        comonentList.forEach(item => {
-          this.listMap.set(item.id, item.name);
-        })
-      },
       async initInformationDetails(id) {
         let res = await informationDetails(id);
         this.$u.sleep(500).then(()=>{

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

This reverts commit 5e0689edea4e2b468e559bd371b17665a2171b9e.
---
 subpkg/archivesDetail/archivesDetail.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 659ce6d..fabb0f1 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -127,6 +127,7 @@
     },
     data() {
       return {
+        listMap: new Map(),
         tabLists: [{
           name: '基本信息',
         }, {
@@ -156,6 +157,7 @@
     },
     onLoad(options) {
       this.initInformationDetails({ id: options.id });
+      this.initMap();
     },
     onShow() {},
     computed: {
@@ -166,6 +168,11 @@
       }
     },
     methods: {
+      initMap() {
+        comonentList.forEach(item => {
+          this.listMap.set(item.id, item.name);
+        })
+      },
       async initInformationDetails(id) {
         let res = await informationDetails(id);
         this.$u.sleep(500).then(()=>{

From 1785aaa4a23afc6a60c37a69f628689dcf7569d5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 8 Aug 2023 21:11:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=E6=8F=90=E7=8E=B0=E5=8A=9F=E8=83=BD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a93d662ce5ed140dfada02b41b632fd0b555f0e5.

# Conflicts:
#	subpkg/topUp/topUp.vue
---
 components/companyFinance/companyFinance.vue  |   6 +-
 .../districtSelector/districtSelectorTow.vue  | 157 ++++++++++++++++++
 subpkg/archivesDetail/archivesDetail.vue      |  21 ++-
 subpkg/contract/contract.vue                  |  14 +-
 subpkg/newPersonnel/newPersonnel.vue          |   6 +-
 subpkg/topUp/topUp.vue                        |   4 -
 subpkg/updateArchives/updateArchives.vue      |  50 ++----
 subpkg/withdrawDeposit/withdrawDeposit.vue    |  20 +--
 8 files changed, 208 insertions(+), 70 deletions(-)
 create mode 100644 components/districtSelector/districtSelectorTow.vue

diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b341599..b8271b4 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="c_card">
-    <view class="f_card">
-      <view class="item" @click="naviTo('/subpkg/topUp/topUp')">
+    <view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
+      <view class="item">
         <view>公司账户余额(元)</view>
         <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
         <view class="price" v-else>0.00</view>
       </view>
-      <view class="item" @click="naviTo(`/subpkg/withdrawDeposit/withdrawDeposit?balance=${cCount(company.company_money)||-1}&company=${true}`)">
+      <view class="item">
         <view>公司收益金额(元)</view>
         <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
         <view class="price" v-else>0.00</view>
diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue
new file mode 100644
index 0000000..d9a9830
--- /dev/null
+++ b/components/districtSelector/districtSelectorTow.vue
@@ -0,0 +1,157 @@
+<template>
+  <view class="component">
+    <view class="title">地区信息</view>
+    <u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm">
+      <u-form-item v-if="datas && datas.street" label="村社" :required="!readonly" prop="village" @click="changeCity()" borderBottom>
+        <u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input>
+        <u-icon slot="right" name="arrow-right"></u-icon>
+      </u-form-item>
+      <u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom>
+        <u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
+        <u-icon slot="right" name="arrow-right"></u-icon>
+      </u-form-item>
+    </u--form>
+    <u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm"
+      @cancel="showProvince = false" @close="showProvince = false"></u-picker>
+  </view>
+</template>
+
+<script>
+  import { commonProvince, commonCity, commonArea, commonStreet, commonVillage, commonBrigade } from "@/api/oaPbulic.js"
+  import { Toast } from "../../libs/uniApi"
+  export default {
+    name:"districtSelector",
+    props:{
+      readonly: {
+        type: Boolean,
+        default: false
+      },
+      datas:{
+        type: Object,
+        default: null
+      }
+    },
+    data() {
+      return {
+        showProvince: false,
+        formData: {
+          village: '',
+          brigade: '',
+        },
+        formDataText: {
+          village: '',
+          brigade: '',
+        },
+        rules:{
+          village: {
+            required: true,
+            message: '不能为空',
+            trigger: ['change', 'blur']
+          },
+          brigade: {
+            validator: (rule, value, callback )=>{
+              value?callback():callback('不能为空')
+            },
+            trigger: ['change', 'blur']
+          },
+        },
+        villageList: [],
+        brigadeList: [],
+        changeType: '', //当前选择的城市类型
+      };
+    },
+    created() {
+      if(!this.$props.readonly) {
+        this.initProvinceAndCity();
+      }else{
+        this.rules = {};
+      }
+    },
+    methods:{
+      async validate(){
+        return await this.$refs.districtForm.validate();
+      },
+      // 初始化
+      async initProvinceAndCity() {
+        if(this.$store.state.app.userInfo.village)this.loadBrigade(this.$store.state.app.userInfo.village);
+        else if(this.$store.state.app.userInfo?.street)this.loadVillage(this.$store.state.app.userInfo.street);
+      },
+      // 选择城市
+      changeCity(type) {
+        if(this.$props.readonly)return ;
+        if (type&&this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
+        this.changeType = type;
+        this.showProvince = true;
+      },
+      // 选择列表
+      changeList() {
+        return this[this.changeType + 'List'];
+      },
+      // 选中城市
+      confirm(e) {
+        let flag = false;//清空所选标记
+        if(this.formData[this.changeType] != e.value[0][this.changeType + '_code'])flag = true;
+        if (this.changeType == 'brigade') {
+          this.formData.brigade = e.value[0].id;
+          this.formDataText.brigade = e.value[0].brigade_name;
+          this.showProvince = false;
+          return ;
+        }
+        this.formData[this.changeType] = e.value[0][this.changeType + '_code'];
+        this.formDataText[this.changeType] = e.value[0][this.changeType + '_name'];
+        // 清空之前所选信息
+        if(flag) switch (this.changeType) {
+          case 'province':
+            this.formData.city = '';
+            this.formDataText.city = ''
+          case 'city':
+            this.formData.area = '';
+            this.formDataText.area = ''
+          case 'area':
+            this.formData.street = '';
+            this.formDataText.street = ''
+          case 'street':
+            this.formData.village = '';
+            this.formDataText.village = ''
+          case 'village':
+            this.formData.brigade = '';
+            this.formDataText.brigade = ''
+        }
+        this.showProvince = false;
+      },
+      loadVillage(code) {
+        commonVillage({
+          village: code
+        }).then(res => {
+          this.villageList = res.data;
+        })
+      },
+      loadBrigade(code) {
+        commonBrigade({
+          brigade: code
+        }).then(res => {
+          this.brigadeList = res.data;
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+.component{
+  .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;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index fabb0f1..2c843dd 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -78,7 +78,26 @@
           <view class="update_time">
             更新时间:{{item.update_time}}
           </view>
-          <component :is="listMap.get(item.id)" :datas="item.datas" :readonly="true"></component>
+          <block>
+            <breeding v-if="item.id==32" ref="demandRef32" :datas="item.datas" :readonly="true"></breeding>
+            <plant v-if="item.id==7" ref="demandRef7" :datas="item.datas" :readonly="true"></plant>
+            <store v-if="item.id==8" ref="demandRef8" :datas="item.datas" :readonly="true"></store>
+            <deepProcessing v-if="item.id==9" ref="demandRef9" :datas="item.datas" :readonly="true"></deepProcessing>
+            <thickProcessing v-if="item.id==10" ref="demandRef10" :datas="item.datas" :readonly="true"></thickProcessing>
+          </block>
+          <block>
+            <houseRepair v-if="item.id==12" ref="demandRef12" :datas="item.datas" :readonly="true"></houseRepair>
+            <houseDecoration v-if="item.id==13" ref="demandRef13" :datas="item.datas" :readonly="true"></houseDecoration>
+            <houseRenovate v-if="item.id==14" ref="demandRef14" :datas="item.datas" :readonly="true"></houseRenovate>
+            <houseTransaction v-if="item.id==15" ref="demandRef15" :datas="item.datas" :readonly="true"></houseTransaction>
+          </block>
+          <block>
+            <banquetMarry v-if="item.id==17" ref="demandRef17" :datas="item.datas" :readonly="true"></banquetMarry>
+            <banquetBirthday v-if="item.id==18" ref="demandRef18" :datas="item.datas" :readonly="true"></banquetBirthday>
+            <banquetFullMoon v-if="item.id==19" ref="demandRef19" :datas="item.datas" :readonly="true"></banquetFullMoon>
+            <banquetOther v-if="item.id==20" ref="demandRef20" :datas="item.datas" :readonly="true"></banquetOther>
+            <banquetFuneral v-if="item.id==21" ref="demandRef21" :datas="item.datas" :readonly="true"></banquetFuneral>
+          </block>
         </block>
         <u-empty v-if="formData.datas.length==0" icon="/static/img/empty/data.png" text="没有数据"></u-empty>
       </view>
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index f85bc39..9404598 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -157,7 +157,7 @@
 
     .item {
       width: 694rpx;
-      height: 263rpx;
+      min-height: 263rpx;
       padding: 28rpx;
       margin-bottom: 28rpx;
       background: #FFFFFF;
@@ -168,11 +168,12 @@
 
       .top {
         display: flex;
-		margin-bottom: 10rpx;
+        margin-bottom: 10rpx;
         image {
           width: 87.6rpx;
           height: 87.6rpx;
           margin-right: 28rpx;
+          flex-shrink: 0;
         }
 
         .text {
@@ -190,15 +191,6 @@
               font-weight: 400;
               color: #333333;
               margin-right: 17.5rpx;
-              white-space: nowrap;
-              /* 禁止换行 */
-              overflow: hidden;
-              /* 溢出隐藏 */
-              text-overflow: ellipsis;
-              /* 使用省略号代表被截断的文本 */
-              // width: 100rpx;
-              flex: 1;
-              /* 设置元素宽度，根据需要进行调整 */
             }
 
             .number {
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 3586486..ed2aa23 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -42,7 +42,8 @@
           <u--input v-model="formData.password_confirm" placeholder="不输入密码则默认为手机号" password></u--input>
         </u-form-item> -->
         <!-- <view class="title">地区信息</view> -->
-        <districtSelector style="margin-top: 30rpx;" ref="districtSelectorRef"></districtSelector>
+        <!-- <districtSelector style="margin-top: 30rpx;" ref="districtSelectorRef"></districtSelector> -->
+        <districtSelectorTow style="margin-top: 30rpx;" ref="districtSelectorRef"></districtSelectorTow>
         <view class="title">资质信息</view>
         <u-form-item label="身份证正面" required labelPosition="top" labelWidth="200rpx" prop="qualification.id_card"
           borderBottom>
@@ -96,8 +97,9 @@
   import { upLoadImage } from "@/api/file.js"
   import { loginAdd } from "@/api/oaUser.js"
   import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器
+  import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器
   export default {
-    components: { districtSelector },
+    components: { districtSelector, districtSelectorTow },
     data() {
       return {
         formData: {
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index b752580..392d1f2 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -213,10 +213,6 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
-        text:nth-child(1){
-          flex-shrink: 0;
-          margin-right: 28rpx;
-        }
       }
     }
   }
diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue
index baed906..eed6f47 100644
--- a/subpkg/updateArchives/updateArchives.vue
+++ b/subpkg/updateArchives/updateArchives.vue
@@ -27,8 +27,7 @@
         </view> -->
 
         <u-empty v-if="showDemandList.length==0" text="暂无更新内容,点击下方按钮添加" icon="/static/img/empty/list.png"></u-empty>
-        <component v-for="(item, index) in showDemandList" ref="componentRef" :key="'demand'+index" :is="listMap.get(item.id)"></component>
-        <!-- <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==32" ref="demandRef32"></breeding>
             <plant v-if="item.id==7" ref="demandRef7"></plant>
@@ -50,7 +49,7 @@
             <banquetFuneral v-if="item.id==21" ref="demandRef21"></banquetFuneral>
           </block>
           <button class="delete" @click="removeShowDemand(index)">删除以上信息</button>
-        </block> -->
+        </block>
         <button class="plus demand" style="margin-bottom: 150rpx;" @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>
@@ -171,38 +170,23 @@
       async loadRefsDatas() {
         this.updateFlag = true;
         let datas = [];
-        let i = 0;
-        for(let c of this.$refs.componentRef){
+        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 c.validate();
-              if (!!res) datas.push({
-                card_id: this.showDemandList[i].id,
-                datas: { ...c.formData }
-              })
-              i++;
-            } catch (e) {
-              console.log('err', e);
-              this.updateFlag = false;
-              Toast('请完整填写以上数据!')
-            }
+            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;
+            Toast('请完整填写以上数据!')
+          }
         }
-        // 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;
-        //     Toast('请完整填写以上数据!')
-        //   }
-        // }
         return datas;
       },
       // 初始化商机分类
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index 80862f0..40dfb43 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -6,13 +6,11 @@
         <view class="title">提现信息</view>
         <view class="item">
           <text>提现账户</text>
-          <text v-if="company && balance!=-1">{{$store.state.app.userInfo.company.company_name||''}}</text>
-          <text v-else>{{$store.state.app.userInfo.account||''}}</text>
+          <text>{{$store.state.app.userInfo.account||''}}</text>
         </view>
         <view class="item">
           <text>可用余额</text>
-          <text v-if="company && balance!=-1">{{balance.toFixed(2)||'0.00'}}元</text>
-          <text v-else>{{$store.state.app.userInfo.user_money||'0.00'}}元</text>
+          <text>{{$store.state.app.userInfo.user_money||'0.00'}}元</text>
         </view>
       </view>
     </view>
@@ -42,8 +40,6 @@
   export default {
     data() {
       return {
-        company: false,
-        balance: -1,
         priceList: ['10元','50元','100元','500元','1000元','5000元','全部', '自定义'],
         changeMoney: -1,
         payMoney: {
@@ -61,12 +57,7 @@
         })
       }
     },
-    onLoad(options) {
-      if(options.company&&options.balance>=0){
-        this.company = options.company;
-        this.balance = +options.balance;
-      }
-    },
+    onLoad() {},
     onShow() {},
     methods: {
       copyPhone(str = "") {
@@ -150,6 +141,7 @@
 
     .card {
       width: 694rpx;
+      height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -175,10 +167,6 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
-        text:nth-child(1){
-          flex-shrink: 0;
-          margin-right: 28rpx;
-        }
       }
     }
   }