|
|
@@ -17,7 +17,8 @@
|
|
|
<span @click="changeQueryType" v-if="queryParams.deptName == 1">只查询本级</span>
|
|
|
</template>
|
|
|
<treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
|
|
|
- placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
|
|
|
+ placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"
|
|
|
+ style="width: 240px"/>
|
|
|
<el-input v-model="queryParams.deptName" v-if="false"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -121,7 +122,7 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改农村集体耕地对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="1200px" class="form-style">
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="1200px" class="form-style">
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="240px">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
@@ -181,7 +182,8 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="其他集体耕地面积合计（亩）" prop="otherCollectiveFarmland">
|
|
|
- <el-input v-model="form.otherCollectiveFarmland" placeholder="请输入其他集体耕地面积合计（亩）" maxlength="13"/>
|
|
|
+ <el-input v-model="form.otherCollectiveFarmland" placeholder="请输入其他集体耕地面积合计（亩）"
|
|
|
+ maxlength="13"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -244,15 +246,16 @@
|
|
|
<el-input v-model="form.dicallyLand" placeholder="请输入切割地（亩）" maxlength="13"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="所属部门" prop="deptId">
|
|
|
- <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
|
|
|
+ <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
|
|
|
+ :noResultsText="'空'" :noOptionsText="'空'"
|
|
|
placeholder="请选择部门" @select="hx"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="12">
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="24">
|
|
|
<el-form-item label="绑定设备" prop="deviceList">
|
|
|
<el-select v-model="form.deviceList" filterable placeholder="请选择设备" multiple filterable>
|
|
|
<el-option
|
|
|
@@ -431,7 +434,7 @@ export default {
|
|
|
forestArea: [
|
|
|
{validator: checkPositiveDecimal, trigger: 'blur'}
|
|
|
],
|
|
|
- dicallyLand:[
|
|
|
+ dicallyLand: [
|
|
|
{validator: checkPositiveDecimal, trigger: 'blur'}
|
|
|
]
|
|
|
}
|
|
|
@@ -455,7 +458,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
send(val) {
|
|
|
- if (val===true){
|
|
|
+ if (val === true) {
|
|
|
this.ISuperMapvisible = false;
|
|
|
return;
|
|
|
}
|
hanfucheng