Lou
2024-03-18 50c5c40611257d6f523d6af8aa66b395a5b53b33
Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app
6 files modified
88 ■■■■■ changed files
subPackage/house/houseNumber/index.vue 10 ●●●●● patch | view | raw | blame | history
subPackage/house/roomControl/index.vue 3 ●●●● patch | view | raw | blame | history
subPackage/house/roomControl/myHouse.vue 4 ●●●● patch | view | raw | blame | history
subPackage/workbench/components/formItem.vue 18 ●●●●● patch | view | raw | blame | history
subPackage/workbench/views/cscj.vue 10 ●●●● patch | view | raw | blame | history
subPackage/workbench/views/editCscj.vue 43 ●●●● patch | view | raw | blame | history
subPackage/house/houseNumber/index.vue
@@ -188,7 +188,11 @@
                        name: 'frontType',
                        value: '未完善'
                    },
                    {
                        title: '三级消防单位',
                        name: 'threeFireProtection',
                        value: '未完善'
                    },
                    {
                        title: '场所负责人',
                        name: 'principal',
@@ -476,6 +480,10 @@
                            item.value = data.isFront == 1 ? "是" : "否"
                        }
                        if (item.name == 'threeFireProtection') {
                            item.value = data.threeFireProtection == 1 ? "是" : "否"
                        }
                        if (data.isFront == 1 && item.name == "frontType") {
                            this.getBizDict('frontType', (list) => {
                                item.value = this.$getIndex(list, data.frontType, 'dictKey',
subPackage/house/roomControl/index.vue
@@ -387,8 +387,7 @@
                    })
                    this.form.propertyCertificateImg = urls.join(",")
                }
                this.form.propertyCertificateImg = JSON.stringify(this.form.propertyCertificateImg)
                const {
                    code,
                    data
subPackage/house/roomControl/myHouse.vue
@@ -333,6 +333,8 @@
                        urls.push(e.name)
                    })
                    this.form.imageUrls = urls.join(",")
                }else{
                    this.form.imageUrls = '';
                }
                if (this.form.propertyCertificateImg.length) {
@@ -341,6 +343,8 @@
                        urls.push(e.name)
                    })
                    this.form.propertyCertificateImg = urls.join(",")
                }else{
                    this.form.propertyCertificateImg = '';
                }
subPackage/workbench/components/formItem.vue
@@ -35,13 +35,15 @@
            </u-form-item>
            <u-form-item v-if="addressType == 2" @click="showEmploymentTime = true" class="form-item" label="入职时间"
                prop="ethnicity">
                <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择入职时间">
                <u--input border="none" v-model="form.employmentTime" disabled disabledColor="#ffffff"
                    placeholder="请选择入职时间">
                </u--input>
                <u-icon slot="right" name="arrow-right"></u-icon>
            </u-form-item>
            <u-form-item v-if="addressType == 2" @click="showResignationTime = true" class="form-item" label="离职时间"
                prop="ethnicity">
                <u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择离职时间">
                <u--input border="none" v-model="form.resignationTime" disabled disabledColor="#ffffff"
                    placeholder="请选择离职时间">
                </u--input>
                <u-icon slot="right" name="arrow-right"></u-icon>
            </u-form-item>
@@ -61,12 +63,12 @@
            </u-form-item>
        </u-form>
        <u-datetime-picker ref="datetimePicker" :show="showEmploymentTime" v-model="workTime" mode="datetime"
            :formatter="formatter" @confirm="confirmResignationTime"
        <u-datetime-picker ref="datetimePicker" :show="showEmploymentTime" v-model="workTime" mode="date"
            :formatter="formatter" @confirm="confirmEmploymentTime"
            @cancel="showEmploymentTime = false"></u-datetime-picker>
        <u-datetime-picker ref="datetimePicker" :show="showResignationTime" v-model="workTime" mode="datetime"
            :formatter="formatter" @confirm="confirmEmploymentTime"
        <u-datetime-picker ref="datetimePicker" :show="showResignationTime" v-model="workTime" mode="date"
            :formatter="formatter" @confirm="confirmResignationTime"
            @cancel="showResignationTime = false"></u-datetime-picker>
        <u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
@@ -202,13 +204,13 @@
            },
            confirmResignationTime(e) {
                this.form.resignationTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
                this.showResignationTime = false;
                this.form.resignationTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
            },
            confirmEmploymentTime(e) {
                this.form.employmentTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
                this.showEmploymentTime = false;
                this.form.employmentTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
            },
subPackage/workbench/views/cscj.vue
@@ -97,7 +97,7 @@
                            </u-radio>
                        </u-radio-group>
                        <view class="f-30" v-if="currentId">
                            {{form.threeFireProtection == 1?"是":"否"}}
                            {{form.threeFireProtection == 1?"否":"是"}}
                        </view>
                    </u-form-item>
@@ -655,7 +655,7 @@
                showGenderPicker: false,
                personNum: 1,
                personNumArr: [1],
                isLegalSame: "" //法人信息是否与负责人一致  1是  2否
                isLegalSame: 1 //法人信息是否与负责人一致  1是  2否
            }
        },
@@ -1092,9 +1092,9 @@
                }
                if (this.isLegalSame == 1) {
                    this.form.placeExtEntity.legalPerson = this.form.principal;
                    this.form.placeExtEntity.legalTel = this.form.principalPhone;
                    this.form.placeExtEntity.legalIdCard = this.form.principalIdCard;
                    this.form.principal = this.form.placeExtEntity.legalPerson;
                    this.form.principalPhone = this.form.placeExtEntity.legalTel;
                    this.form.principalIdCard = this.form.placeExtEntity.legalIdCard;
                }
                add(this.form).then(res => {
subPackage/workbench/views/editCscj.vue
@@ -109,6 +109,28 @@
                    </u-form-item>
                </view>
                <view class="item">
                    <view class="box-title">
                        <box-title title="法人信息"></box-title>
                    </view>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="姓名:" prop="legalPerson">
                        <u--input border="none" v-model="form.placeExtEntity.legalPerson" placeholder="请输入">
                        </u--input>
                    </u-form-item>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="身份证号:" prop="legalIdCard">
                        <u--input border="none" type="idcard" v-model="form.placeExtEntity.legalIdCard"
                            placeholder="请输入">
                        </u--input>
                    </u-form-item>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="手机号:" prop="legalTel">
                        <u--input border="none" type="number" v-model="form.placeExtEntity.legalTel" placeholder="请输入">
                        </u--input>
                    </u-form-item>
                </view>
                <view class="item">
                    <view class="box-title">
@@ -160,28 +182,7 @@
                    </u-form-item>
                </view>
                <view class="item">
                    <view class="box-title">
                        <box-title title="法人信息"></box-title>
                    </view>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="姓名:" prop="legalPerson">
                        <u--input border="none" v-model="form.placeExtEntity.legalPerson" placeholder="请输入">
                        </u--input>
                    </u-form-item>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="身份证号:" prop="legalIdCard">
                        <u--input border="none" type="idcard" v-model="form.placeExtEntity.legalIdCard"
                            placeholder="请输入">
                        </u--input>
                    </u-form-item>
                    <u-form-item class="form-item" labelWidth="100" :required="isRequired" :disabled="isDisabled"
                        label="手机号:" prop="legalTel">
                        <u--input border="none" type="number" v-model="form.placeExtEntity.legalTel" placeholder="请输入">
                        </u--input>
                    </u-form-item>
                </view>
                <view class="item pic">