Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/basicdata/dept/index.vue

@@ -47,6 +47,23 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="fName" label="仓库名称" width="260"></el-table-column>
+      <el-table-column prop="fTotalgross" label="库容（吨）" width="200"></el-table-column>
+      <el-table-column prop="fLocation" label="库位" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fLocation === 0">否</span>
+          <span v-else>是</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fAddr" label="地址" width="260"></el-table-column>
+      <el-table-column prop="fContacts" label="联系人" width="100"></el-table-column>
+      <el-table-column prop="fTel" label="电话" width="150"></el-table-column>
+      <el-table-column prop="fCharg" label="计费" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fCharg === 0">否</span>
+          <span v-else>是</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="100"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
@@ -220,7 +237,7 @@ export default {
       },
       // 表单参数
       form: {
-        fLocation:'0'
+        fLocation: 0
       },
       // 表单校验
       rules: {
@@ -328,6 +345,8 @@ export default {
       this.reset();
       getDept(row.fId).then(response => {
         this.form = response.data;
+        this.form.fLocation = this.form.fLocation + ''
+        this.form.fCharg = this.form.fCharg + ''
         this.open = true;
         this.title = "修改仓库";
       });