Commit 3e18992f authored by houjn@hikoon.cn's avatar houjn@hikoon.cn

贸易属性、运输方式不显示bug

parent 10dbfed5
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
// import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept"; // import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {listSimpleUsers} from "@/api/system/user";
import {CommonStatusEnum} from '@/utils/constants' import {CommonStatusEnum} from '@/utils/constants'
import { getDictDatas, DICT_TYPE } from '@/utils/dict' import { getDictDatas, DICT_TYPE } from '@/utils/dict'
...@@ -216,7 +217,7 @@ export default { ...@@ -216,7 +217,7 @@ export default {
}, },
/** 转换部门数据结构 */ /** 转换部门数据结构 */
normalizer(node) { normalizer(node) {
console.log("normalizer:"+JSON.stringify(node)+" node.children:"+JSON.stringify(node.children)); // console.log("normalizer:"+JSON.stringify(node)+" node.children:"+JSON.stringify(node.children));
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children;
} }
...@@ -243,7 +244,8 @@ export default { ...@@ -243,7 +244,8 @@ export default {
let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用"; let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() { this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() {
// return changeUserStatus(row.id, row.status); // return changeUserStatus(row.id, row.status);
return updateRegionStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE}); console.log("row.status:"+row.status);
return updateRegionStatus({id:row.id,status:row.status});
}).then(() => { }).then(() => {
this.$modal.msgSuccess(text + "成功"); this.$modal.msgSuccess(text + "成功");
...@@ -289,9 +291,9 @@ export default { ...@@ -289,9 +291,9 @@ export default {
this.open = true; this.open = true;
this.title = "添加区域"; this.title = "添加区域";
getRegionList().then(response => { getRegionList().then(response => {
console.log("添加区域查询结果:"+JSON.stringify(response.data)); // console.log("添加区域查询结果:"+JSON.stringify(response.data));
this.regionOptions = this.handleTree(response.data, "id"); this.regionOptions = this.handleTree(response.data, "id");
console.log("regionOptions:"+JSON.stringify(this.regionOptions)); // console.log("regionOptions:"+JSON.stringify(this.regionOptions));
}); });
}, },
/** 展开/折叠操作 */ /** 展开/折叠操作 */
...@@ -307,7 +309,7 @@ export default { ...@@ -307,7 +309,7 @@ export default {
this.reset(); this.reset();
getRegion(row.id).then(response => { getRegion(row.id).then(response => {
this.form = response.data; this.form = response.data;
console.log("getRegion("+row.id+"):"+JSON.stringify(this.form)); // console.log("getRegion("+row.id+"):"+JSON.stringify(this.form));
if (this.form.parentId === 0) { // 无父部门时,标记为 undefined,避免展示为 Unknown if (this.form.parentId === 0) { // 无父部门时,标记为 undefined,避免展示为 Unknown
this.form.parentId = undefined; this.form.parentId = undefined;
} }
...@@ -315,9 +317,9 @@ export default { ...@@ -315,9 +317,9 @@ export default {
this.title = "修改区域"; this.title = "修改区域";
}); });
getRegionList(row.id).then(response => { getRegionList(row.id).then(response => {
console.log("getRegionList("+row.id+"):"+JSON.stringify(response.data)); // console.log("getRegionList("+row.id+"):"+JSON.stringify(response.data));
this.regionOptions = this.handleTree(response.data, "id"); this.regionOptions = this.handleTree(response.data, "id");
console.log("getRegionList("+row.id+"): regionOptions"+JSON.stringify(this.regionOptions)); // console.log("getRegionList("+row.id+"): regionOptions"+JSON.stringify(this.regionOptions));
}); });
}, },
......
...@@ -208,7 +208,9 @@ ...@@ -208,7 +208,9 @@
</el-form-item> </el-form-item>
<el-form-item label="贸易属性" prop="tradeType" > <el-form-item label="贸易属性" prop="tradeType" >
<el-select v-model="form.tradeType" placeholder="请选择" :disabled="(nodeId || isUpdate) ? true : false"> <el-select v-model="form.tradeType" placeholder="请选择"
>
<!-- :disabled="(nodeId || isUpdate) ? true : false"-->
<el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/> <el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -251,7 +253,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar ...@@ -251,7 +253,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar
exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList } from "@/api/ecw/warehouse"; exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList } from "@/api/ecw/warehouse";
import { getNodePage } from "@/api/ecw/node"; import { getNodePage } from "@/api/ecw/node";
import { getListTree } from "@/api/ecw/region"; import { getListTree } from "@/api/ecw/region";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'; import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import {CommonStatusEnum} from '@/utils/constants' import {CommonStatusEnum} from '@/utils/constants'
import { uploadFile } from "@/api/infra/file"; import { uploadFile } from "@/api/infra/file";
import { listDept } from "@/api/system/dept"; import { listDept } from "@/api/system/dept";
...@@ -426,6 +428,8 @@ export default { ...@@ -426,6 +428,8 @@ export default {
this.getList(); this.getList();
this.getNodeList(); this.getNodeList();
this.getContinentsList(); this.getContinentsList();
console.log("regionTypeDatas:"+JSON.stringify(this.regionTypeDatas));
console.log("transportDatas:"+JSON.stringify(this.transportDatas));
}, },
methods: { methods: {
/** 查询列表 */ /** 查询列表 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment