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

src/api/basicdata/warehouse.js

@@ -29,7 +29,7 @@ export function addWarehouse(data) {
 // 修改仓库
 export function updateWarehouse(data) {
   return request({
-    url: '/basicdata/warehouse',
+    url: '/basicdata/area',
     method: 'put',
     data: data
   })

src/views/basicdata/dept/index.vue

@@ -272,7 +272,7 @@ export default {
     },
     // 字典状态字典翻译
     statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.fStatus);
     },
     // 取消按钮
     cancel() {

src/views/basicdata/warehouse/index.vue

@@ -232,7 +232,7 @@
 </template>
 
 <script>
-import { listWarehouse, getWarehouse, delWarehouse, addWarehouse,changeWareStatus, exportWarehouse,delCusCon,treeselect } from "@/api/basicdata/warehouse";
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse,changeWareStatus, exportWarehouse,delCusCon,treeselect,updateWarehouse } from "@/api/basicdata/warehouse";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {addUser, updateUser} from "@/api/system/user";
@@ -451,8 +451,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+          if (this.form.fId != undefined) {
+            updateWarehouse(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();