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

src/views/ecw/region/index.vue

@@ -127,6 +127,7 @@
 // import { listDept, getDept, delDept, addDept, updateDept } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listSimpleUsers} from "@/api/system/user";
 
 import {CommonStatusEnum} from '@/utils/constants'
 import { getDictDatas, DICT_TYPE } from '@/utils/dict'
@@ -216,7 +217,7 @@ export default {
     },
     /** 转换部门数据结构 */
     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) {
         delete node.children;
       }
@@ -243,7 +244,8 @@ export default {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() {
         // 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(() => {
         this.$modal.msgSuccess(text + "成功");
@@ -289,9 +291,9 @@ export default {
       this.open = true;
       this.title = "添加区域";
       getRegionList().then(response => {
-        console.log("添加区域查询结果:"+JSON.stringify(response.data));
+        // console.log("添加区域查询结果:"+JSON.stringify(response.data));
         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 {
       this.reset();
       getRegion(row.id).then(response => {
         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
           this.form.parentId = undefined;
         }
@@ -315,9 +317,9 @@ export default {
         this.title = "修改区域";
       });
       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");
-        console.log("getRegionList("+row.id+"):  regionOptions"+JSON.stringify(this.regionOptions));
+        // console.log("getRegionList("+row.id+"):  regionOptions"+JSON.stringify(this.regionOptions));
 
       });
     },

src/views/ecw/warehouse/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      
+
       <el-form-item label="服务网点" prop="node" >
         <el-select v-model="queryParams.nodeId" placeholder="所属网点" :disabled="nodeId ? true : false" clearable>
           <el-option v-for="node in nodeList" :key="node.id" :label="node.titleZh" :value="node.id"/>
@@ -50,13 +50,13 @@
         </template>
       </el-table-column>
 
-      
+
      <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.status" :active-value="CommonStatusEnum.ENABLE" :inactive-value="CommonStatusEnum.DISABLE" @change="handleStatusChange(scope.row)" />
         </template>
       </el-table-column>
-      
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="toRouteList(scope.row, '2')" :disabled="scope.row.tradeType=='2'"
@@ -120,7 +120,7 @@
         <el-header>
            <el-button type="primary" @click="commitBind">提交</el-button>
         </el-header>
-       
+
       <el-table ref="multipleTable" v-if="refreshTable" :data="deptList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}"  @select="select" @select-all="selectAll" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55"></el-table-column>
@@ -176,7 +176,7 @@
         <el-form-item label="排序" prop="sort">
           <el-input v-model="form.sort" type="number" placeholder="请输入排序" />
         </el-form-item>
-        
+
         <el-form-item label="仓库编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入仓库编号" />
         </el-form-item>
@@ -206,9 +206,11 @@
         <el-form-item label="英文地址" prop="addressEn">
           <el-input v-model="form.addressEn" placeholder="请输入英文地址" />
         </el-form-item>
-        
+
         <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-select>
           </el-form-item>
@@ -217,8 +219,8 @@
           <el-checkbox-group v-model="form.checkList">
             <el-checkbox v-for="dict in transportDatas" :label="dict.value" :key="dict.value" name="freight"> {{dict.label}}</el-checkbox>
           </el-checkbox-group>
-        </el-form-item>  
-        
+        </el-form-item>
+
         <el-form-item label="img" prop="img">
           <el-col :span="8">
             <el-input v-model="form.img"  placeholder="请上传图片" disabled/>
@@ -236,7 +238,7 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -247,11 +249,11 @@
 </template>
 
 <script>
-import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage, 
+import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage,
 exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList } from "@/api/ecw/warehouse";
 import { getNodePage } from "@/api/ecw/node";
 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 { uploadFile } from "@/api/infra/file";
 import { listDept } from "@/api/system/dept";
@@ -426,6 +428,8 @@ export default {
     this.getList();
     this.getNodeList();
     this.getContinentsList();
+    console.log("regionTypeDatas:"+JSON.stringify(this.regionTypeDatas));
+    console.log("transportDatas:"+JSON.stringify(this.transportDatas));
   },
   methods: {
     /** 查询列表 */
@@ -570,7 +574,7 @@ export default {
       this.showRouteList = true;
       this.routeLoadig = true;
       this.getRouteList();
-      
+
     },
 
     getRouteList() {
@@ -620,7 +624,7 @@ export default {
       for(let index in this.cityList) {
         let city = this.cityList[index];
         if(city.id == cityId) {
-          
+
           return;
         }
       }
@@ -698,7 +702,7 @@ export default {
           this.form.tradeType = node.tradeType;
 
           this.form.checkList = node.freight.split(',');
-         
+
           this.changeContinents(this.form.zhou);
           this.changeCountry(this.form.guojia);
           this.changeProvince(this.form.sheng);
@@ -720,8 +724,8 @@ export default {
         this.changeCountry(response.data.guojia);
         this.changeProvince(response.data.sheng);
 
-      
-        
+
+
         this.isUpdate = true;
 
         this.open = true;
@@ -814,7 +818,7 @@ export default {
         // console.log(this.list);
         this.deptOpen = false;
       })
-      
+
     },
 
     handleSelectionChange(value) {
@@ -890,7 +894,7 @@ export default {
         })
       }
     }
-    
+
   }
 };
 </script>