Merge branch 'main' of https://gitee.com/people_3/hmy_farmer

xuxy

2024-07-21 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2

 sub_pages/supplier/supplier-info/supplier-info.vue

@@ -72,14 +72,6 @@
               <view>{{dto.stationName || '请选择'}}</view>

               <u-icon class="m-l-a" name="arrow-right"></u-icon>

            </view>

            <!--          <view class="m-l-a m-r-0 flex " :class="[!dto.stationId?'desc-gray':'']">

               <uni-data-picker @change="(e)=>{PickData('stationId','stationStr',e)}" placeholder="请选择"

                  :localdata="columns_station">

                  {{dto.typeStr || '请选择'}}

               </uni-data-picker>

               <u-icon class="m-l-a" name="arrow-right"></u-icon>

            </view> -->



         </view>

         <view class="form-item before-line">

            <view class="label required">地区</view>

@@ -291,13 +283,6 @@
            }).then(res => {

               var data = res.data

               this.columns_station = [data || []]

               // this.columns_station = (data || []).map(item => {

               //    return {

               //       ...item,

               //       code: item.id,

               //       text: item.name,

               //    }

               // })

            })

            //类型和集火站

            this.$http.request('get', '/api/supplier/type/list', {