|
@@ -60,7 +60,7 @@
|
|
|
<CityCascader v-model="form.city_arr_id" @update-city-id="update_city_arr_id"></CityCascader>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="行政职能:" class="custom-align-right" prop="">
|
|
|
- <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="选择导航池所属行政区划"
|
|
|
+ <el-cascader :key="searchDepartmentKey" v-model="form.department_arr_id" placeholder="请选择行政职能"
|
|
|
popper-class="my_cascader" :props="searchDepartmentData" filterable clearable></el-cascader>
|
|
|
</el-form-item>
|
|
|
<div v-if="creatNews_user_type == 10000">
|
|
@@ -624,8 +624,8 @@ export default {
|
|
|
if (this.checked) {
|
|
|
inputLists.push(allowList);
|
|
|
}
|
|
|
- if (inputLists.length <= 2) {
|
|
|
- this.$message.error('投票答案必须大于2条');
|
|
|
+ if (inputLists.length <= 1) {
|
|
|
+ this.$message.error('投票答案必须大于1条');
|
|
|
return;
|
|
|
}
|
|
|
this.form.suvey_array = JSON.stringify(inputLists);
|
|
@@ -640,10 +640,20 @@ export default {
|
|
|
//如果推荐等级为空,则设置为0
|
|
|
if (this.form.level == "") {
|
|
|
this.form.level = "[0]";
|
|
|
+ } else {
|
|
|
+ this.form.level = JSON.stringify(this.form.level);
|
|
|
}
|
|
|
//取出行政职能和行政区划数组的最后一个数字
|
|
|
- this.form.department_id = this.form.department_arr_id[this.form.department_arr_id.length - 1];
|
|
|
- this.form.city_id = this.form.city_arr_id[this.form.city_arr_id.length - 1];
|
|
|
+ if (JSON.parse(this.form.department_arr_id.length == 0)) {
|
|
|
+ this.form.department_id = 0;
|
|
|
+ } else {
|
|
|
+ this.form.department_id = this.form.department_arr_id[this.form.department_arr_id.length - 1];
|
|
|
+ }
|
|
|
+ if (JSON.parse(this.form.city_arr_id.length == 0)) {
|
|
|
+ this.form.city_id = 0;
|
|
|
+ } else {
|
|
|
+ this.form.city_id = this.form.city_arr_id[this.form.city_arr_id.length - 1];
|
|
|
+ }
|
|
|
//将department_id和city_id转换为字符串
|
|
|
this.form.department_arr_id = JSON.stringify(this.form.department_arr_id);
|
|
|
this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
|
|
@@ -778,7 +788,10 @@ export default {
|
|
|
if (res.data.level == "[0]") {
|
|
|
this.form.level = "";
|
|
|
} else {
|
|
|
- this.form.level = JSON.parse(res.data.level);
|
|
|
+ const arr = JSON.parse(res.data.level);
|
|
|
+ const elementToRemove = 0;
|
|
|
+ this.form.level = arr.filter(item => item !== elementToRemove);
|
|
|
+ // this.form.level = JSON.parse(res.data.level);
|
|
|
}
|
|
|
//回显站点名称
|
|
|
//判断web_site_id是否为字符串,如果是转换为数字
|
|
@@ -872,7 +885,7 @@ export default {
|
|
|
if (this.checked) {
|
|
|
inputLists.push(allowList);
|
|
|
}
|
|
|
- if (inputLists.length < 2) {
|
|
|
+ if (inputLists.length < 1) {
|
|
|
this.$message.error('投票答案必须大于2条');
|
|
|
return;
|
|
|
}
|
|
@@ -891,8 +904,16 @@ export default {
|
|
|
}
|
|
|
|
|
|
//取出行政职能和行政区划数组的最后一个数字
|
|
|
- this.form.department_id = this.form.department_arr_id[this.form.department_arr_id.length - 1];
|
|
|
- this.form.city_id = this.form.city_arr_id[this.form.city_arr_id.length - 1];
|
|
|
+ if (JSON.parse(this.form.department_arr_id.length == 0)) {
|
|
|
+ this.form.department_id = 0;
|
|
|
+ } else {
|
|
|
+ this.form.department_id = this.form.department_arr_id[this.form.department_arr_id.length - 1];
|
|
|
+ }
|
|
|
+ if (JSON.parse(this.form.city_arr_id.length == 0)) {
|
|
|
+ this.form.city_id = 0;
|
|
|
+ } else {
|
|
|
+ this.form.city_id = this.form.city_arr_id[this.form.city_arr_id.length - 1];
|
|
|
+ }
|
|
|
//将department_id和city_id转换为字符串
|
|
|
this.form.department_arr_id = JSON.stringify(this.form.department_arr_id);
|
|
|
this.form.city_arr_id = JSON.stringify(this.form.city_arr_id);
|