Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

Lou

2024-03-25 db567a246cda95a4080fddd242d1de22617287b1

 subPackage/workbench/views/reportAudit.vue

@@ -95,6 +95,7 @@


      <view class="footer flex a-i-c j-c-s-b" v-if="from == 'list' && confirmFlag == 1">

         <button class="footer-btn" @click="submit(0)">处置</button>

         <button class="footer-btn" @click="submit(2)">共享</button>

         <button class="footer-btn" @click="submit(1)">转办</button>

      </view>

      <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false"

@@ -105,7 +106,19 @@
         :show="isShowPeoplePicker" ref="pPicker" :columns="peopleList" keyName="name"

         @cancel="isShowPeoplePicker = false" @confirm="handlePeopleConfirm" @change="changePeople"></u-picker>



      <u-popup :show="show" mode="bottom" @close="close">

         <view style="margin-top: 20rpx 0rpx;">

            <u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">

               <u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radiolist1" :key="index"

                  :label="item.name" :name="item.id" @change="radioChange">

               </u-radio>

            </u-radio-group>



            <view class=" flex a-i-c j-c-s-b">

               <button class="footer-btn" @click="pushCircle">确认</button>

            </view>

         </view>

      </u-popup>

   </view>

</template>



@@ -119,6 +132,9 @@
   import {

      getPeopleType

   } from '@/api/user.js'

   import {

      handlePublish

   } from '@/api/circle/circle.js'

   import {

      minioBaseUrl

   } from "@/common/setting.js"

@@ -225,11 +241,26 @@
               ],

               []

            ],

            // 基本案列数据

            radiolist1: [{

                  name: '邻里圈',

                  disabled: false,

                  id: 0

               },

               {

                  name: '协同圈',

                  disabled: false,

                  id: 1

               }

            ],

            // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中

            radiovalue1: 1,

            peopleIndex: [0, 0],

            isShowPeoplePicker: false,

            transferUserId: "",

            content: "",

            confirmFlag: ""

            confirmFlag: "",

            show: false,



         }

      },

@@ -259,7 +290,30 @@
         this.setDefaultValue()

      },

      methods: {



         pushCircle() {

            handlePublish({

               houseCode: this.defaultData.addressCode,

               eventId: this.defaultData.id,

               evenType: 1,

               circleType: this.radiovalue1,

               communityCode: uni.getStorageSync("curHouseCode"),

               circleText: this.defaultData.remark,

               circleImages: this.defaultData.imgUrls

            }).then(res => {

               console.log(res);

               this.close()

               // this.$set(this.peopleList, 1, res.data);

            })

         },

         close() {

            this.show = false

         },

         groupChange(n) {

            console.log('groupChange', n);

         },

         radioChange(n) {

            console.log('radioChange', n);

         },

         getPeopleList(type) {

            getPeopleType({

               houseCode: this.defaultData.addressCode,

@@ -347,6 +401,8 @@
         submit(type) {

            if (type == 1) {

               this.isShowPeoplePicker = true;

            } else if (type == 2) {

               this.show = true

            } else {

               if (!this.form.confirmNotion) {

                  uni.showToast({

@@ -548,7 +604,7 @@
      box-shadow: 0rpx 0rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);



      .footer-btn {

         width: 300rpx;

         width: 150rpx;

         height: 78rpx;

         border-radius: 8rpx;

         font-size: 32rpx;