Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouRes...

董国庆

2025-04-03 d78f3a32f32a94dc0a5024d5aa768740c323b9a9

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/chongzhouResettle

 src/views/relocatablePersonnel/add.vue

@@ -108,8 +108,7 @@
                    </div>
                    <div class="form-col">
                        <el-form-item label="安置方式" prop="ways">
                            <el-select v-model="form.ways" placeholder="请选择" :disabled="isView"
                                style="width: 100%">
                            <el-select v-model="form.ways" placeholder="请选择" :disabled="isView" style="width: 100%">
                                <el-option label="统规统建" value="统规统建" />
                            </el-select>
                        </el-form-item>
@@ -345,6 +344,10 @@
            this.$refs.form.validate(valid => {
                if (valid) {
                    const submitMethod = this.form.id ? update : add
                    this.form.startTime = this.parseTime(this.form.startTime, '{y}-{m}-{d}')
                    this.form.lastBeginTime = this.parseTime(this.form.lastBeginTime, '{y}-{m}-{d}')
                    this.form.lastEndTime = this.parseTime(this.form.lastEndTime, '{y}-{m}-{d}')
                    this.form.originCollectionTime = this.parseTime(this.form.originCollectionTime, '{y}-{m}-{d}')
                    submitMethod(this.form).then(() => {
                        this.$modal.msgSuccess('操作成功')
                        this.goBack()

 src/views/relocatablePersonnel/edit.vue

@@ -108,8 +108,7 @@
                    </div>
                    <div class="form-col">
                        <el-form-item label="安置方式" prop="ways">
                            <el-select v-model="form.ways" placeholder="请选择" :disabled="isView"
                                style="width: 100%">
                            <el-select v-model="form.ways" placeholder="请选择" :disabled="isView" style="width: 100%">
                                <el-option label="统规统建" value="统规统建" />
                            </el-select>
                        </el-form-item>
@@ -345,6 +344,10 @@
            this.$refs.form.validate(valid => {
                if (valid) {
                    const submitMethod = this.form.id ? update : add
                    this.form.startTime = this.parseTime(this.form.startTime, '{y}-{m}-{d}')
                    this.form.lastBeginTime = this.parseTime(this.form.lastBeginTime, '{y}-{m}-{d}')
                    this.form.lastEndTime = this.parseTime(this.form.lastEndTime, '{y}-{m}-{d}')
                    this.form.originCollectionTime = this.parseTime(this.form.originCollectionTime, '{y}-{m}-{d}')
                    submitMethod(this.form).then(() => {
                        this.$modal.msgSuccess('操作成功')
                        this.goBack()