linwe
2024-06-20 a2e1e1220c500f73936fc8a0a24859114c421807
代码优化
10 files modified
443 ■■■■ changed files
api/placeExp/placeExp.js 7 ●●●●● patch | view | raw | blame | history
manifest.json 1 ●●●● patch | view | raw | blame | history
pages/home/index.vue 25 ●●●● patch | view | raw | blame | history
subPackage/counterfraud/add.vue 71 ●●●● patch | view | raw | blame | history
subPackage/house/components/userInfo.vue 91 ●●●●● patch | view | raw | blame | history
subPackage/house/member/add.vue 163 ●●●●● patch | view | raw | blame | history
subPackage/label/form.vue 26 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/cshw.vue 24 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/examine.vue 30 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/labelReportDetail.vue 5 ●●●● patch | view | raw | blame | history
api/placeExp/placeExp.js
@@ -7,6 +7,13 @@
        params
    })
}
export const getPlacePractitionerPage = (params) => {
    return http.request({
        url: 'blade-placePractitioner/placePractitioner/page',
        method: 'GET',
        params
    })
}
manifest.json
@@ -252,3 +252,4 @@
}
// #endif
//必填
pages/home/index.vue
@@ -188,16 +188,6 @@
                                </view>
                            </u-grid-item>
                            <u-grid-item v-if="roleName == 'xyzt'"
                                @click="navigatorPage('/subPackage/school/troubleTaskList')">
                                <view class="nav-item flex f-d-c a-i-c">
                                    <u-icon
                                        name="https://srgdjczzxtpt.com:2080/gminio/jczz/upload/20240514/d3ee77e6e13eca4ca5bfccff27020553.png"
                                        width="80rpx" height="80rpx"></u-icon>
                                    <text class="nav-item-text f-26  mt-10">校园任务</text>
                                </view>
                            </u-grid-item>
                            <u-grid-item v-if="roleName == 'xyzt'"
                                @click="navigatorPage('/subPackage/workbench/views/editExamine')">
                                <view class="nav-item flex f-d-c a-i-c">
                                    <u-icon name="/static/icon/nav-02.png" width="80rpx" height="80rpx"></u-icon>
@@ -219,6 +209,17 @@
                                    <text class="nav-item-text f-26  mt-10">护学打卡</text>
                                </view>
                            </u-grid-item>
                            <u-grid-item v-if="roleName == 'xyzt'"
                                @click="navigatorPage('/subPackage/school/troubleTaskList')">
                                <view class="nav-item flex f-d-c a-i-c">
                                    <u-icon
                                        name="https://srgdjczzxtpt.com:2080/gminio/jczz/upload/20240514/d3ee77e6e13eca4ca5bfccff27020553.png"
                                        width="80rpx" height="80rpx"></u-icon>
                                    <text class="nav-item-text f-26  mt-10">问题处理与反馈</text>
                                </view>
                            </u-grid-item>
                        </u-grid>
                    </view>
                </view>
@@ -282,7 +283,7 @@
                                @click="navigatorPage('/subPackage/school/troubleTaskList')">
                                <view class="nav-item flex f-d-c a-i-c">
                                    <u-icon name="/static/icon/nav-29.png" width="80rpx" height="80rpx"></u-icon>
                                    <text class="nav-item-text f-26  mt-10">校园任务</text>
                                    <text class="nav-item-text f-26  mt-10">问题处理与反馈</text>
                                </view>
                            </u-grid-item>
                            </block>
@@ -724,7 +725,7 @@
                tabs4: [{
                    name: '校园服务',
                    name: '校园主体责任',
                    list: [{
                            text: "安全隐患上报",
                            icon: "https://srgdjczzxtpt.com:2080/gminio/jczz/upload/20240514/3ce08aa9862b9f1bd8f8a1494c987b45.png",
subPackage/counterfraud/add.vue
@@ -129,6 +129,18 @@
            <view class="info mt-20 bgc-ff">
                <caption-row title="宣防对象" />
                <view class="mt-40">
                    <u-checkbox-group v-model="checkboxValue1" :borderBottom="true" iconPlacement="right"
                        placement="column" @change="checkboxChangeHold">
                        <!-- <view class="" v-for="(item, index) in houseHold" :key="index"> -->
                        <u-checkbox :customStyle="{marginBottom: '8px'}" v-for="(item, index) in houseHold" :key="index"
                            :label="item.relationship == 18?item.name+' -- 租户':item.name+' -- 住户'" :name="item.id">
                        </u-checkbox>
                        <!-- </view> -->
                    </u-checkbox-group>
                </view>
                <view v-for="(item, index) in info.backblastPubPersonEntityList" :key="index">
                    <view class="flex a-i-c j-c-s-b" style="padding:20rpx;">
                        <view class="flex j-c-s-b a-i-c">
@@ -143,13 +155,10 @@
                            </ocr-navigator>
                            <!-- #endif -->
                        </view>
                        <view>
                            <u-icon name="trash-fill" color="#ff0000" size="20" @click="delPerson(index)" />
                        </view>
                    </view>
                    <u-form-item label="姓名" borderBottom required>
                        <u-input v-model="info.backblastPubPersonEntityList[index].name" border="none"
                            placeholderClass="f-28 c-99" inputAlign="right" placeholder="请输入姓名"></u-input>
@@ -244,6 +253,7 @@
                form: {
                    images: []
                },
                notSwindleTypeIndex: [],
                currentId: "",
                showNotSwindleTypePicker: false,
                notSwindleValue: '',
@@ -291,6 +301,8 @@
                id: "",
                isScan: false, //是否扫码
                houseHoldInfo: {},
                houseHold: [],
                checkboxValue1: [],
                statusList: [{
                        name: "是",
                        id: 1
@@ -325,6 +337,9 @@
            //反诈类别
            this.getAllBizDict();
        },
        onShow() {
            // this.getFetchHousehold("F32042A1A0804E47A859A239849FF8C5")
        },
        onReady() {
            //onReady 为uni-app支持的生命周期之一
@@ -334,6 +349,25 @@
        methods: {
            checkboxChange(n) {
                console.log('change', n);
            },
            checkboxChangeHold(n) {
                console.log('change', n);
                this.info.backblastPubPersonEntityList = []
                for (var i = 0; i < n.length; i++) {
                    console.log('change1', n[i]);
                    this.houseHold.forEach(item => {
                        if (item.id === n[i]) {
                            let data = {
                                name: item.name,
                                telephone: item.phoneNumber,
                                idCard: item.idCard,
                                address: item.address,
                                occupation: item.occupation
                            }
                            this.info.backblastPubPersonEntityList.push(data)
                        }
                    })
                }
            },
            radioChange(n) {
                if (n == 1) {
@@ -397,8 +431,10 @@
                    console.log(res);
                    if (res.code == 200) {
                        let data = res.data
                        this.tyepIndex = this.$getIndex(this.typeList[0], data.type, "dictKey", "dictValue").index;
                        this.typeName = this.$getIndex(this.typeList[0], data.type, "dictKey", "dictValue").name;
                        this.tyepIndex = this.$getIndex(this.typeList[0], data.type, "dictKey",
                            "dictValue").index;
                        this.typeName = this.$getIndex(this.typeList[0], data.type, "dictKey",
                            "dictValue").name;
                        if (data.workTime) {
                            this.workTime = Number(new Date(data.workTime))
                        }
@@ -408,8 +444,10 @@
                        // this.info.householdId = data.householdId;
                        // this.info.personType = data.personType;
                        console.log(typeof data.personType)
                        this.labelIndex = this.$getIndex(this.labelList[0], data.personType, "id", "name").index;
                        this.labelName = this.$getIndex(this.labelList[0], data.personType, "id", "name").name;
                        this.labelIndex = this.$getIndex(this.labelList[0], data.personType, "id",
                            "name").index;
                        this.labelName = this.$getIndex(this.labelList[0], data.personType, "id",
                            "name").name;
                        this.getHouseholdList();
                        this.getHousehold(data.householdId);
                        this.form.images = this.$setImageUrl(data.url, 2);
@@ -556,6 +594,8 @@
            //扫一扫  
            onScan() {
                this.checkboxValue1 = []
                this.info.backblastPubPersonEntityList = []
                uni.scanCode({
                    success: (res) => {
                        let obj = this.getUrlParams(res.result);
@@ -574,8 +614,21 @@
                }
                return obj
            },
            // 查询住户
            getFetchHousehold(houseCode) {
                fetchHousehold({
                    houseCode: houseCode
                }).then((res) => {
                    if (res.data.length > 0) {
                        this.houseHold = res.data
                    }
                })
            },
            getHouseType(code) {
                // 获取住户
                this.getFetchHousehold(code);
                // 获取详情
                getQrCodeDetail({
                    roleName: uni.getStorageSync("activeRole").roleName,
                    addressCode: code
@@ -607,6 +660,7 @@
                                        idCard: res.data.householdList[0].idCard,
                                        address: res.data.householdList[0].currentAddress
                                    }
                                    this.checkboxValue1.push(res.data.householdList[0].id)
                                    this.info.backblastPubPersonEntityList.push(data);
                                } else {
                                    this.houseHoldInfo = {}
@@ -662,7 +716,6 @@
                    address: "",
                    occupation: ""
                }
                this.info.backblastPubPersonEntityList.push(data)
            },
@@ -777,7 +830,7 @@
    .address-content {
        flex: 1;
        // background-color: #F5F5F5;
        font-size: 28rpx;
        font-size: 24rpx;
        padding: 2rpx 10rpx;
        text-align: right;
    }
subPackage/house/components/userInfo.vue
@@ -10,8 +10,8 @@
                        </u-form-item>
                        <u-form-item @click="showSelectBus('性别','gender')" class="form-item" labelWidth="110" label="性别"
                            prop="gender">
                            <u--input border="none" v-model="selectDefaultName.gender" disabled disabledColor="#ffffff"
                                placeholder="请选择性别">
                            <u--input border="none" v-model="selectDefaultName.genderValue" disabled
                                disabledColor="#ffffff" placeholder="请选择性别">
                            </u--input>
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
@@ -51,7 +51,7 @@
                        </u-form-item>
                        <u-form-item @click="showSelectBus('民族','ethnicity')" class="form-item" labelWidth="110"
                            label="民族" prop="ethnicity">
                            <u--input border="none" v-model="selectDefaultName.ethnicity" disabled
                            <u--input border="none" v-model="selectDefaultName.ethnicityValue" disabled
                                disabledColor="#ffffff" placeholder="请选择民族">
                            </u--input>
                            <u-icon slot="right" name="arrow-right"></u-icon>
@@ -108,6 +108,27 @@
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东名称" prop="landlordName">
                            <u--input border="none" v-model="form.landlordName" placeholder="请输入房东名称">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东电话" prop="landlordPhone">
                            <u--input border="none" v-model="form.landlordPhone" placeholder="请输入房东电话">
                            </u--input>
                        </u-form-item>
                        <u-form-item class="form-item"
                            v-if="selectDefaultName.relationship && selectDefaultName.relationship =='租户'"
                            labelWidth="110" label="房东身份证" prop="landlordIdCard">
                            <u--input border="none" v-model="form.landlordIdCard" placeholder="请输入房东身份证">
                            </u--input>
                        </u-form-item>
                        <u-form-item v-if="form.cardType && form.cardType != 111" class="form-item" labelWidth="120"
                            label="出生日期" prop="birthday" @click="showSelectBirthday = true">
                            <u--input border="none" v-model="form.birthday" disabled disabledColor="#ffffff"
@@ -115,9 +136,6 @@
                            </u--input>
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item class="form-item" labelWidth="110" label="其它联系方式" prop="otherContact">
                            <u--input border="none" v-model="form.otherContact" placeholder="请输入其它联系方式">
@@ -321,7 +339,8 @@
    import {
        getHouseholdDetail,
        saveOrUpdateHousehold,
        removeHousehold
        removeHousehold,
        fetchHousehold
    } from '@/api/house/household.js'
    import {
        bizDictionary
@@ -348,14 +367,7 @@
            return {
                addOrUpdateTitle: "添加",
                houseCode: "",
                form: {
                    // roleName: "",
                    // relationName: '',
                    // location: "",
                    // title: "",
                    // roleType:null,
                    // description: "",
                },
                form: {},
                rules: {
                    'selectDefaultName.relationship': {
                        required: true,
@@ -374,23 +386,6 @@
                        message: '请输入其他志愿者组织',
                        trigger: ['change', 'blur'],
                    },
                    // 'idCard': [{
                    //         type: 'string',
                    //         required: false,
                    //         message: '请输入身份证号码',
                    //         trigger: ['change', 'blur']
                    //     },
                    //     {
                    //         validator: (rule, value, callback) => {
                    //             const idCardRegex =
                    //                 /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
                    //             return idCardRegex.test(value)
                    //         },
                    //         message: '身份证号码有误',
                    //         trigger: ['change', 'blur']
                    //     }
                    // ],
                    'phoneNumber': [{
                            required: true,
                            message: '请输入手机号码',
@@ -484,9 +479,9 @@
                selectDefaultName: {
                    roleType: "",
                    relationship: "",
                    gender: "",
                    genderValue: "",
                    isPrimaryContact: "",
                    ethnicity: "",
                    ethnicityValue: "",
                    education: "",
                    partyEmber: "",
                    workStatus: "",
@@ -520,7 +515,8 @@
                volunteerOrgTypeIndex: [0],
                volunteerOrg: "",
                showVolunteerOrg: false,
                houseTag: "" //房屋标签
                houseTag: "", //房屋标签
                houseHoldInfo: {},
            }
        },
        created() {
@@ -821,12 +817,13 @@
            // 显示选择弹框
            showSelectBus(title, key) {
                console.log("************" + JSON.stringify(this.dataList))
                // console.log("************" + JSON.stringify(this.dataList))
                this.selectBusList = this.dataList[key]
                console.log("************" + JSON.stringify(this.selectBusList))
                // console.log("************" + JSON.stringify(this.selectBusList))
                this.selectBusTitle = title
                // this.selectBusModel = model
                this.selectBusKey = key
                this.getFetchHousehold(uni.getStorageSync("crnHosueCode"))
                this.typeShow = true
            },
            //类型选择确认
@@ -837,12 +834,30 @@
                this.selectDefaultName[this.selectBusKey] = result.name;
                this.selectDefaultIndex[this.selectBusKey] = item.indexs[0];
                this.typeShow = !this.typeShow
                if (this.selectBusKey === 'relationship') {
                    if (uni.getStorageSync("crnHosueCode")) {
                        this.form.landlordName = this.houseHoldInfo.name
                        this.form.landlordPhone = this.houseHoldInfo.phoneNumber
                        this.form.landlordIdCard = this.houseHoldInfo.idCard
                    }
                }
            },
            // 查询住户
            getFetchHousehold(houseCode) {
                fetchHousehold({
                    houseCode: houseCode,
                    relationship: 1
                }).then((res) => {
                    if (res.data.length > 0) {
                        this.houseHoldInfo = res.data[0]
                    }
                })
            },
            //表单提交
            checks() {
                // console.log("************************************")
                this.$refs.form.validate().then(res => {
                    console.log("*****1111**" + res)
                    // console.log("*****1111**" + res)
                    // 调用回调函数并返回结果
                    this.$emit('getDataCallback', res);
                })
subPackage/house/member/add.vue
@@ -10,18 +10,7 @@
                        </view>
                        <!-- <u-icon name="arrow-right" size="20"></u-icon> -->
                    </view>
                    <!-- #ifdef MP-WEIXIN -->
                    <ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false"
                        style="width:48%;">
                        <view class="top-item flex j-c-s-b a-i-c bgc-ff" style="width:100%;">
                            <view class="flex a-i-c">
                                <u-icon name="/static/icon/nav-05.png" width="90rpx" height="90rpx"></u-icon>
                                <text class="f-28 ml-10">身份证信息识别</text>
                            </view>
                            <!-- <u-icon name="arrow-right" size="20"></u-icon> -->
                        </view>
                    </ocr-navigator>
                    <!-- #endif -->
                </view>
                <u-form labelWidth="70" :model="form" :rules="rules" ref="form">
@@ -45,18 +34,6 @@
                            <u-icon slot="right" name="arrow-right"></u-icon>
                        </u-form-item>
                        <u-form-item v-if="form.currentAddress" class="form-item" labelWidth="110" label="业主名称"
                            prop="gender">
                            <u--input border="none" v-model="form.houseName" disabled disabledColor="#ffffff">
                            </u--input>
                        </u-form-item>
                        <u-form-item v-if="form.currentAddress" class="form-item" labelWidth="110" label="业主电话"
                            prop="gender">
                            <u--input border="none" v-model="form.housePhone" disabled disabledColor="#ffffff">
                            </u--input>
                        </u-form-item>
                    </view>
                </u-form>
@@ -68,7 +45,23 @@
                            </view>
                            <u-icon name="trash-fill" color="#ff0000" size="20" @click="deletePerson(index)" />
                        </view>
                        <userInfo @getDataCallback="handleData" id="formRef" ref="formRef"></userInfo>
                        <view class="">
                            <!-- #ifdef MP-WEIXIN -->
                            <ocr-navigator @onSuccess="recognizeSuccess($event,index)" certificateType="idCard"
                                :opposite="false" style="width:48%;">
                                <view class="top-item flex j-c-s-b a-i-c bgc-ff" style="width:100%;">
                                    <view class="flex a-i-c">
                                        <u-icon name="/static/icon/nav-05.png" width="90rpx" height="90rpx"></u-icon>
                                        <text class="f-28 ml-10">身份证信息识别</text>
                                    </view>
                                    <!-- <u-icon name="arrow-right" size="20"></u-icon> -->
                                </view>
                            </ocr-navigator>
                            <!-- #endif -->
                        </view>
                        <userInfo @getDataCallback="handleData" id="formRef" ref="formRef">
                        </userInfo>
                    </view>
                </view>
@@ -152,14 +145,7 @@
            return {
                addOrUpdateTitle: "添加",
                houseCode: "",
                form: {
                    // roleName: "",
                    // relationName: '',
                    // location: "",
                    // title: "",
                    // roleType:null,
                    // description: "",
                },
                form: {},
                rules: {
                    'selectDefaultName.relationship': {
                        required: true,
@@ -184,23 +170,6 @@
                        message: '请输入其他志愿者组织',
                        trigger: ['change', 'blur'],
                    },
                    // 'idCard': [{
                    //         type: 'string',
                    //         required: false,
                    //         message: '请输入身份证号码',
                    //         trigger: ['change', 'blur']
                    //     },
                    //     {
                    //         validator: (rule, value, callback) => {
                    //             const idCardRegex =
                    //                 /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
                    //             return idCardRegex.test(value)
                    //         },
                    //         message: '身份证号码有误',
                    //         trigger: ['change', 'blur']
                    //     }
                    // ],
                    'phoneNumber': [{
                            required: true,
                            message: '请输入手机号码',
@@ -344,40 +313,11 @@
        },
        async onLoad(option) {
            this.personNum++;
            // this.personNumArr.push(1);
            this.minDate = Number(new Date('1900-01-01')); //设置出生日期选择器最小值
            this.goOutMinDate = Number(new Date('1970-01-01')); //设置外出时间选择器最小值
            // const data = JSON.parse(option.data)
            // this.houseCode = data.houseCode;
            await this.getRegionList()
            // await this.getAllBizDict()
            this.setCardTypeDefault()
            this.homeRegion = uni.getStorageSync("curStreet")
            // this.form.homeAdcode = this.getHouseRegion(uni.getStorageSync("curStreet")).code;
            // this.homeIndex = this.getHouseRegion(uni.getStorageSync("curStreet")).index;
            // this.getHouseDetail();
            // this.type = data.type;
            // if (data.id) {
            //     this.id = data.id;
            // }
            // if (data.type == 1) {
            //     uni.setNavigationBarTitle({
            //         title: "添加成员"
            //     })
            //     this.isEdit = false;
            //     this.addOrUpdateTitle = "保存"
            //     await this.getAllBizDict()
            //     this.setCardTypeDefault()
            //     this.getHouseDetail();
            // }
            // if (data.type == 2) {
            //     this.isEdit = true;
            //     this.addOrUpdateTitle = "修改"
            //     uni.setNavigationBarTitle({
            //         title: "编辑成员资料"
            //     })
            //     this.getHouseholdInfo(data)
            // }
            if (option.from) {
                this.from = option.from;
                if (data.type == 1) {
@@ -387,8 +327,9 @@
            this.form.roleName = uni.getStorageSync("activeRole").roleName;
        },
        onShow() {
        async onShow() {
            // console.log(this.form);
            await this.getAllBizDict()
            if (this.id) {
                // this.getHouseholdInfo()
                this.getHoldLabel();
@@ -670,16 +611,17 @@
            },
            // 查询住户
            getFetchHousehold(houseCode) {
                uni.setStorageSync("crnHosueCode", houseCode)
                fetchHousehold({
                    houseCode: houseCode,
                    relationship: 1
                }).then((res) => {
                    // console.log("********************" + JSON.stringify(res))
                    if (res.data.length > 0) {
                        let datas = res.data[0]
                        console.log("********************" + JSON.stringify(datas))
                        this.form.houseName = datas.name
                        this.form.housePhone = datas.phoneNumber
                        this.form.houseIdCard = datas.idCard
                    }
                })
            },
@@ -924,41 +866,36 @@
                        nationality
                    }
                } = e;
                this.$set(this.form, "name", name.text);
                this.$set(this.form, "idCard", id.text);
                this.selectDefaultName.gender = gender.text; //性别
                this.selectDefaultName.ethnicity = `${nationality.text}族`; //民族
                this.form.gender = this.getValue(this.dataList.gender, gender.text).value;
                this.form.ethnicity = this.getValue(this.dataList.ethnicity, `${nationality.text}族`)
                console.log("******sfz*******" + JSON.stringify(e))
                // this.$set(this.form[index], "name", name.text);
                // this.$set(this.form[index], "idCard", id.text);
                // this.selectDefaultName.gender = gender.text; //性别
                // this.selectDefaultName.ethnicity = `${nationality.text}族`; //民族
                // this.form[index].gender = this.getValue(this.dataList.gender, gender.text).value;
                // this.form[index].ethnicity = this.getValue(this.dataList.ethnicity, `${nationality.text}族`).value;
                // this.selectDefaultIndex.gender = [this.getValue(this.dataList.gender, gender.text).index];
                // this.selectDefaultIndex.ethnicity = [this.getValue(this.dataList.ethnicity, `${nationality.text}族`).index];
                this.$refs.formRef[index].form.name = name.text; //姓名
                this.$refs.formRef[index].form.idCard = id.text; //身份证号
                this.$refs.formRef[index].selectDefaultName.genderValue = gender.text; //性别
                this.$refs.formRef[index].selectDefaultName.ethnicityValue = `${nationality.text}族`; //民族
                this.$refs.formRef[index].form.gender = this.getValue(this.dataList.gender, gender.text).value;
                this.$refs.formRef[index].form.ethnicity = this.getValue(this.dataList.ethnicity, `${nationality.text}族`)
                    .value;
                this.selectDefaultIndex.gender = [this.getValue(this.dataList.gender, gender.text).index];
                this.selectDefaultIndex.ethnicity = [this.getValue(this.dataList.ethnicity, `${nationality.text}族`)
                this.$refs.formRef[index].selectDefaultName.gender = [this.getValue(this.dataList.gender, gender.text)
                    .index
                ];
                let {
                    province,
                    city,
                    district
                } = this.extractAddressComponents(address.text);
                // this.residentadDefault = [province, city, district]; //户籍地区
                // this.residentad = `${province}-${city}-${district}`;
                this.$set(this.form, "hukouRegistration", address.text);
                // this.getRegionTree(data => {
                //     for (let i = 0, ii = data.length; i < ii; i++) {
                //         if (data[i].name == province) {
                //             for (let j = 0, jj = data[i].children.length; j < jj; j++) {
                //                 for (let k = 0, kk = data[i].children[j].children.length; k < kk; k++) {
                //                     if (data[i].children[j].children[k].name == district) {
                //                         this.$set(this.form, "residentAdcode", data[i].children[j].children[k].id);
                //                         break;
                //                     }
                //                 }
                //             }
                //         }
                //     }
                // })
                this.$refs.formRef[index].selectDefaultName.nationType = [this.getValue(this.dataList.ethnicity,
                        `${nationality.text}族`)
                    .index
                ];
                // let {
                //     province,
                //     city,
                //     district
                // } = this.extractAddressComponents(address.text);
                // this.$set(this.form[index], "hukouRegistration", address.text);
            },
@@ -1171,7 +1108,7 @@
    }
    .top-item {
        width: 48%;
        width: 100%;
        padding: 20rpx;
        border-radius: 8rpx;
        box-sizing: border-box;
subPackage/label/form.vue
@@ -1,7 +1,7 @@
<template>
    <view class="">
        <u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="100"
        <u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="120"
            :labelStyle="{fontSize:'28rpx'}">
            <view class="content">
                <u-form-item label="场所名称" prop="districtName" borderBottom required>
@@ -134,14 +134,12 @@
                        message: '请输入交易人姓名',
                        trigger: ['blur', 'change']
                    },
                    goodsNums:[
                        {
                    goodsNums: [{
                                type: 'number',
                                required: true,
                                message: '请输入物品数量',
                                trigger: ['blur', 'change']
                            }
                    ],
                    }],
                    phoneNumber: [{
                            type: 'number',
                            required: true,
@@ -157,23 +155,21 @@
                        }
                    ],
                    idCard: [{
                            type: 'string',
                            // type: 'string',
                            required: false,
                            message: '请输入身份证号码',
                            trigger: ['change', 'blur']
                        },
                        {
                            validator: (rule, value, callback) => {
                                const idCardRegex =
                                    /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
                                return idCardRegex.test(value)
                                // const idCardRegex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
                                return uni.$u.test.idCard(value)
                                // return idCardRegex.test(value)
                            },
                            message: '身份证号码有误',
                            trigger: ['change', 'blur']
                        }
                    ],
                    transactionMoney: {
                        required: true,
                        message: '请输入交易金额',
@@ -202,7 +198,9 @@
        },
        onLoad(option) {
            console.log(option,99999);
            const {houseCode} = option;
            const {
                houseCode
            } = option;
            if (option.id) {
                this.isEdit = true;
                this.id = option.id;
@@ -235,6 +233,10 @@
                this.getPlaceDetail(houseCode)
            }
        },
        onReady() {
            //如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
            this.$refs.form.setRules(this.rules)
        },
        methods: {
            getPlaceDetail(houseCode){
                getPlaceDetail({
subPackage/workbench/views/cshw.vue
@@ -34,7 +34,7 @@
                    <text class="f-28">地址</text>
                    <text class="address f-28 c-66">{{ item.location ? item.location : '未完善' }}</text>
                </view>
                <view class="item-row flex a-i-c j-c-s-b">
                <view class="item-row flex a-i-c j-c-s-b" v-if="type == 2">
                    <text class="f-28">法人信息</text>
                    <text class="f-28 c-66">{{ item.legalPerson  ? item.legalPerson : '未完善'}}</text>
                </view>
@@ -57,7 +57,8 @@
<script>
    import {
        getSiteMaintenanceData
        getSiteMaintenanceData,
        getPlacePractitionerPage
    } from '@/api/placeExp/placeExp.js'
    import dateRangeModal from '@/components/dateRangeModal/modal.vue';
@@ -115,6 +116,11 @@
            }
            if (option.type) {
                this.type = option.type;
                if (option.type == 1) {
                    uni.setNavigationBarTitle({
                        title: '从业人员审核' // 设置为你想要显示的标题
                    });
                }
            }
@@ -157,12 +163,22 @@
                } = this.currentRole
                // 过滤掉待完善状态的
                const isApp = 1;
                const res = await getSiteMaintenanceData({
                let res = ""
                if (this.type == 2) {
                    res = await getSiteMaintenanceData({
                    ...params,
                    roleName,
                    isApp,
                    ...this.pagingParams
                })
                } else {
                    res = await getPlacePractitionerPage({
                        ...params,
                        roleName,
                        isApp,
                        ...this.pagingParams
                    })
                }
                console.log(res);
                const {
                    code,
@@ -221,7 +237,7 @@
                if (roleAlias === "inhabitant") {
                    return
                }
                if (this.type) {
                if (this.type == 1) {
                    this.$u.func.globalNavigator(
                        `/subPackage/workbench/views/examine?id=${id}&placeId=${placeId}&type=${this.type}`)
                } else {
subPackage/workbench/views/examine.vue
@@ -270,35 +270,16 @@
                placeId,
                id
            }
            if (option.type) {
                this.type = option.type;
            }
        },
        onShow() {
            this.setDefaultValue()
        },
        methods: {
            // 获取业务字典
            getBizDict(callback) {
                // const param = {
                //     code: "nationType"
                // }
                // const res = await bizDictionary(param)
                // res.data.forEach(e => {
                //     list.push({
                //         name: e.dictValue,
                //         value: Number(e.dictKey)
                //     })
                // })
                bizDictionary({
                    code: "nationType"
                }).then(res => {
@@ -343,16 +324,12 @@
                if (data.planImageUrls) {
                    this.imageObj.planImageUrls = this.$setImageUrl(data.planImageUrls)
                }
                this.basicData.forEach(item => {
                    item.value = data[item.name] || '未完善'
                })
                this.landlordData.forEach(item => {
                    item.value = data[item.name] || '未完善'
                })
                console.log(data);
                let columns = this.columns[0]
                this.defaultColumns = columns.findIndex(item => item.status == data.confirmFlag)
@@ -379,8 +356,9 @@
                            i.ethnicity = name;
                        })
                    }
                    if (this.type) {
                        this.confirmFlag = i.confirmFlag;
                    }
                }
                this.placePersonList = placePractitioner
@@ -423,11 +401,9 @@
                    placeId: this.currentData.placeId,
                    confirmFlag: this.form.confirmFlag
                }
                if (this.form.confirmNotion) {
                    data.confirmNotion = this.form.confirmNotion;
                }
                const res = await auditPlacePeople(data)
                if (res.code !== 200) {
                    uni.showToast({
subPackage/workbench/views/labelReportDetail.vue
@@ -51,7 +51,7 @@
            <u-button type="primary" @click="submit">提交审核</u-button>
        </view> -->
        <footer-btn v-if="roleType ==2 && status == 3" text="重新编辑" @click="navToEdit"></footer-btn>
        <audit-action @handle="submit" v-if="roleType == 1 && status == 1"></audit-action>
        <audit-action :dataItem="info" @handle="submit" v-if="roleType == 1 && status == 1"></audit-action>
        <u-picker :defaultIndex="defaultIndex" :closeOnClickOverlay="true" @close="isPickerShow = false"
            :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false"
@@ -77,6 +77,9 @@
        },
        data() {
            return {
                info: {
                    type: 1
                },
                basicData: [{
                        label: '物品名称',
                        name: "transactionObject",