修改部分显示问题

src/api/basicData/basicFeesDesc.js

@@ -17,6 +17,15 @@ export const getDeptLazyTree = (parentId) => {
         }
     })
 }
+export const getDeptTree = (tenantId) => {
+    return request({
+        url: '/api/blade-client/feestype/tree',
+        method: 'get',
+        params: {
+            tenantId,
+        }
+    })
+}
 //客户类别列表修改和新增
 export function typeSave(data) {
     return request({

src/api/basicData/basicStorageDesc.js

@@ -0,0 +1,55 @@
+import request from '@/router/axios';
+
+//客户类别列表查询
+export function customerList(data) {
+    return request({
+        url: '/api/blade-client/storagedesc/page',
+        method: 'get',
+        params: data
+    })
+}
+export const getDeptLazyTree = (parentId) => {
+    return request({
+        url: '/api/blade-client/storagetype/lazy-tree',
+        method: 'get',
+        params: {
+            parentId
+        }
+    })
+}
+
+export const getDeptTree = (parentId) => {
+    return request({
+        url: '/api/blade-client/storagetype/tree',
+        method: 'get',
+        params: {
+            parentId
+        }
+    })
+}
+
+//客户类别列表修改和新增
+export function typeSave(data) {
+    return request({
+        url: '/api/blade-client/storagedesc/submit',
+        method: 'post',
+        data: data
+    })
+}
+//客户类别列表查看明细
+export function detail(data) {
+    return request({
+        url: '/api/blade-client/storagedesc/detail?id='+data,
+        method: 'get'
+    })
+}
+//客户类别列表修改和新增
+export function deleteDetails(data) {
+    return request({
+        url: '/api/blade-client/storagedesc/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}

src/api/basicData/commodityType.js

@@ -131,7 +131,7 @@ export const getDeptLazyTree = (parentId) => {
 
 export const getDeptTree = (tenantId) => {
     return request({
-        url: '/api/blade-system/goodstype/tree',
+        url: '/api/blade-client/goodstype/tree',
         method: 'get',
         params: {
             tenantId,

src/views/basicData/basicFeesDesc/index.vue

@@ -36,7 +36,7 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave,detail,deleteDetails,getDeptLazyTree} from "@/api/basicData/basicFeesDesc"
+import {customerList, typeSave,detail,deleteDetails,getDeptLazyTree,getDeptTree} from "@/api/basicData/basicFeesDesc"
 
 export default {
   name: "customerInformation",
@@ -133,7 +133,7 @@ export default {
     },
     //查询全部
     initData(){
-      getDeptLazyTree(0).then(res => {
+      getDeptTree().then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "feesTypeId");
         column.dicData = res.data.data;

src/views/basicData/basicFeesType/configuration/mainList.json

@@ -34,6 +34,7 @@
       "format": "yyyy-MM-dd hh:mm:ss",
       "valueFormat": "yyyy-MM-dd hh:mm:ss",
       "search": true,
+      "editDisplay":false,
       "index": 2,
       "width": 100,
       "rules": [

src/views/basicData/basicFeesType/index.vue

@@ -136,6 +136,7 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
+      params.parentId = 0
       this.onLoad(this.page, params);
       done()
     },

src/views/basicData/basicStorageDesc/configuration/mainList.json

@@ -0,0 +1,136 @@
+{
+  "headerAlign": "center",
+  "align": "center",
+  "border": true,
+  "index": true,
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "tree": true,
+  "selection": true,
+  "viewBtn": true,
+  "menuWidth": 300,
+  "column": [
+    {
+      "label": "库区编码",
+      "prop": "code",
+      "search": true,
+      "index": 1,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入库区编码",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "库区",
+      "prop": "cname",
+      "search": true,
+      "index": 2,
+      "width": 100,
+      "rules": [
+        {
+          "required": true,
+          "message": "请输入商品库区",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "地址",
+      "prop": "addr",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入地址",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "联系人",
+      "prop": "attn",
+      "search": true,
+      "index": 4,
+      "width": 100,
+      "rules": [{
+        "required": false,
+        "message": "请输入联系人",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "电话",
+      "prop": "tel",
+      "search": true,
+      "index": 5,
+      "width": 100,
+      "rules": [{
+        "required": false,
+        "message": "请输入电话",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "是否计费",
+      "prop": "iffee",
+      "search": true,
+      "index": 6,
+      "width": 100,
+      "rules": [{
+        "required": false,
+        "message": "请输入是否计费",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "库容",
+      "prop": "storageCapacity",
+      "search": true,
+      "index": 7,
+      "width": 100,
+      "rules": [{
+        "required": false,
+        "message": "请输入库容",
+        "trigger": "blur"
+      }]
+    },
+    {
+      "label": "仓库",
+      "prop": "storageTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "addDisabled": false,
+      "multiple": true,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },{
+      "label": "备注",
+      "prop": "remarks",
+      "index": 8,
+      "width":100,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入备注",
+          "trigger": "blur"
+        }
+      ]
+    }
+  ]
+}

src/views/basicData/basicStorageDesc/detailsPage.vue

@@ -0,0 +1,13 @@
+<template>
+<div>1</div>
+</template>
+
+<script>
+export default {
+name: "detailsPage"
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/basicData/basicStorageDesc/index.vue

@@ -0,0 +1,216 @@
+<template>
+  <el-row>
+    <el-col :span="5">
+      <div class="box">
+        <el-scrollbar>
+          <basic-container>
+            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+          </basic-container>
+        </el-scrollbar>
+      </div>
+    </el-col>
+    <el-col :span="19">
+      <basic-container>
+        <avue-crud :option="option"
+                   :data="dataList"
+                   ref="crud"
+                   v-model="form"
+                   @row-del="rowDel"
+                   @row-update="rowUpdate"
+                   :before-open="beforeOpen"
+                   :before-close="beforeClose"
+                   @row-save="rowSave"
+                   @search-change="searchChange"
+                   @search-reset="searchReset"
+                   @selection-change="selectionChange"
+                   @current-change="currentChange"
+                   @size-change="sizeChange"
+                   @refresh-change="refreshChange"
+                   @on-load="onLoad"
+                   @tree-load="treeLoad">
+        </avue-crud>
+      </basic-container>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import option from "./configuration/mainList.json";
+import {customerList, typeSave,detail,deleteDetails,getDeptLazyTree,getDeptTree} from "@/api/basicData/basicStorageDesc"
+
+export default {
+  name: "customerInformation",
+  data() {
+    return {
+      form: {},
+      option: option,
+      treeOption: {
+        nodeKey: 'id',
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          const parentId = (node.level === 0) ? 0 : node.data.id;
+          getDeptLazyTree(parentId).then(res => {
+            resolve(res.data.data.map(item => {
+              return {
+                ...item,
+                leaf: !item.hasChildren
+              }
+            }))
+          });
+        },
+        addBtn: false,
+        menu: false,
+        size: 'small',
+        props: {
+          labelText: '标题',
+          label: 'title',
+          value: 'value',
+          children: 'children'
+        }
+      },
+      parentId:0,
+      dataList: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
+      },
+      treeDeptId:'',
+    }
+  },
+  created() {
+    // customerList({parentId:0}).then(res => {
+    //   console.log(res.data.data.records)
+    //   this.dataList = res.data.data.records
+    // })
+  },
+  methods: {
+    //展开主页左边类型
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    //删除列表后面的删除按钮触发触发(row, index, done)
+    rowDel(row, index, done) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+            return deleteDetails(row.id);
+          }).then(() => {
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            // 数据回调进行刷新
+            done(row);
+          });
+    },
+    //修改时的修改按钮点击触发
+    rowUpdate(row, index, done, loading) {
+      typeSave(row).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        // 数据回调进行刷新
+        done(row);
+      }, error => {
+        window.console.log(error);
+        loading();
+      });
+    },
+    //新增修改时保存触发
+    rowSave(row, done, loading) {
+      console.log(row)
+      row.storageTypeId = row.storageTypeId.join(',')
+      typeSave(row).then(res => {
+        console.log(res)
+        this.page.currentPage = 1;
+        this.onLoad(this.page, {});
+        done()
+      })
+    },
+    //查询全部
+    initData(){
+      getDeptTree().then(res => {
+        console.log(this.form);
+        const column = this.findObject(this.option.column, "storageTypeId");
+        column.dicData = res.data.data;
+      });
+    },
+    //新增子项触发
+    handleAdd(row) {
+      this.parentId = row.id;
+      // const column = this.findObject(this.option.column, "parentId");
+      // column.value = row.id;
+      // column.addDisabled = true;
+      this.$refs.crud.rowAdd();
+    },
+    //新增子项和新增触发查询所有
+    beforeOpen(done, type) {
+      console.log('1111')
+      if (["add", "edit"].includes(type)) {
+        this.initData();
+      }
+      if (["edit", "view"].includes(type)) {
+        detail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    //点击新增时触发
+    beforeClose(done) {
+      this.parentId = "";
+      // const column = this.findObject(this.option.column, "parentId");
+      // column.value = "";
+      // column.addDisabled = false;
+      done();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done()
+    },
+    searchReset() {
+      this.query = {};
+      this.treeDeptId = '';
+      this.onLoad(this.page);
+    },
+    selectionChange() {
+      console.log('1')
+    },
+    currentChange() {
+      console.log('1')
+    },
+    sizeChange() {
+      console.log('1')
+    },
+    refreshChange() {
+      console.log('1')
+    },
+    onLoad(page, params = {parentId:0}) {
+      let queryParams = Object.assign({}, params, {pageSize: page.pageSize, pageNum: page.currentPage,parentId:0,storageTypeId:this.treeDeptId})
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records
+        this.page.total = res.data.data.total
+      })
+    },
+    //树桩列点击展开触发
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      customerList({parentId:parentId}).then(res => {
+        resolve(res.data.data.records);
+      });
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/basicData/basicStorageType/configuration/mainList.json

@@ -121,7 +121,7 @@
       "index": 7,
       "width": 60,
       "rules": [{
-        "required": false,
+        "required": true,
         "message": "请输入排序",
         "trigger": "blur"
       }]

src/views/basicData/basicStorageType/index.vue

@@ -92,7 +92,7 @@ export default {
       typeSave(row).then(res => {
         console.log(res)
         this.page.currentPage = 1;
-        this.onLoad(this.page, {});
+        this.onLoad(this.page, {parentId: 0});
         done()
       }, error => {
         window.console.log(error);
@@ -139,6 +139,7 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
+      params.parentId = 0
       this.onLoad(this.page, params);
       done()
     },

src/views/basicData/commodityCategory/configuration/mainList.json

@@ -14,7 +14,7 @@
   "menuWidth": 300,
   "column": [
     {
-      "label": "商品名称",
+      "label": "类别名称",
       "prop": "cname",
       "search": true,
       "index": 1,
@@ -22,7 +22,7 @@
       "rules": [
         {
           "required": true,
-          "message": "请输入商品名称",
+          "message": "请输入类别名称",
           "trigger": "blur"
         }
       ]
@@ -34,6 +34,7 @@
       "format": "yyyy-MM-dd hh:mm:ss",
       "valueFormat": "yyyy-MM-dd hh:mm:ss",
       "search": true,
+      "editDisplay":false,
       "index": 2,
       "width": 100,
       "rules": [

src/views/basicData/commodityType/index.vue

@@ -392,7 +392,7 @@ export default {
       //   const column = this.findObject(this.option.group, "roleId");
       //   column.dicData = res.data.data;
       // });
-      getDeptLazyTree(0).then(res => {
+      getDeptTree().then(res => {
         const column = this.findObject(this.option.column, "goodsTypeId");
         column.dicData = res.data.data;
       });
@@ -413,9 +413,7 @@ export default {
       });
     },
     rowSave(row, done, loading) {
-      // row.deptId = row.deptId.join(",");
-      // row.roleId = row.roleId.join(",");
-      // row.postId = row.postId.join(",");
+      row.goodsTypeId = row.goodsTypeId.join(",");
       add(row).then(() => {
         this.initFlag = false;
         this.onLoad(this.page);
@@ -531,28 +529,24 @@ export default {
       this.refreshChange();
       done();
     },
-    handleExport() {
-      this.$confirm("是否导出用户数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
-      });
-    },
     handleTemplate() {
       window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
     },
+    //新增编辑查看触发
     async beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
         await getUser(this.form.id).then(res => {
           this.form = res.data.data;
           // this.form.goodsTypeId = [this.form.goodsTypeId.replace(/\"/g,"")]
+          console.log(this.form.hasOwnProperty("goodsTypeId"))
           if(this.form.hasOwnProperty("goodsTypeId")){
             this.form.goodsTypeId = this.form.goodsTypeId.split(",");
           }
         });
       }
+      if (["add", "edit"].includes(type)) {
+        this.initData(0);
+      }
       this.initFlag = true;
       done();
     },

src/views/basicData/customerCategory/configuration/mainList.json

@@ -31,9 +31,10 @@
       "label": "创建时间",
       "prop": "createTime",
       "type": "date",
-      "format": "yyyy-MM-dd hh:mm:ss",
-      "valueFormat": "yyyy-MM-dd hh:mm:ss",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "search": true,
+      "editDisplay":false,
       "index": 2,
       "width": 100,
       "rules": [

src/views/basicData/customerCategory/index.vue

@@ -111,7 +111,6 @@ export default {
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
-      console.log('1111')
       if (["add", "edit"].includes(type)) {
         this.initData();
       }
@@ -133,6 +132,7 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       this.page.currentPage = 1;
+      params.parentId = 0
       this.onLoad(this.page, params);
       done()
     },

src/views/basicData/customerInformation/configuration/mainList.json

@@ -42,19 +42,6 @@
                 }
             ]
         },{
-            "label": "客户简称",
-            "prop": "name",
-            "search": true,
-            "index": 3,
-            "width":100,
-            "rules": [
-                {
-                    "required": true,
-                    "message": "请输入菜单名称",
-                    "trigger": "blur"
-                }
-            ]
-        },{
             "label": "区域",
             "prop": "belongtoarea",
             "search": true,
@@ -107,23 +94,10 @@
                 }
             ]
         },{
-            "label": "是否金融客户",
-            "prop": "name",
-            "search": true,
-            "index": 8,
-            "width":100,
-            "rules": [
-                {
-                    "required": true,
-                    "message": "请输入菜单名称",
-                    "trigger": "blur"
-                }
-            ]
-        },{
             "label": "客户等级 ",
             "prop": "creditLevel",
             "search": true,
-            "index": 9,
+            "index": 8,
             "width":100,
             "rules": [
                 {

src/views/basicData/customerInformation/detailsPage.vue

@@ -333,16 +333,6 @@ export default {
             label: '客户名称',
             prop: 'cname',
           }, {
-            label: '客户简称',
-            prop: 'goodtypes',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
             label: '企业类型',
             prop: 'companytype',
             rules: [

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -21,7 +21,8 @@
           <el-row>
             <el-col v-for="item in basicData.column" :span="item.span?item.span:8">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <avue-input-tree v-if="item.prop === 'corpsTypeId'" leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"></avue-input-tree>
+                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"
+                ></avue-input-tree>
                 <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
@@ -375,7 +376,6 @@ export default {
   created() {
     corpstypeTree().then(res=>{
       this.dic = res.data.data
-
     })
     if (this.$route.query.id){
       let id = this.$route.query.id.replace(/\"/g, "")
@@ -530,6 +530,11 @@ export default {
               type: "success",
               message: this.form.id ? "修改成功!" : "新增成功!"
             });
+            this.$router.$avueRouter.closeTag();
+            this.$router.push({
+              path: '/basicData/customerInformation/index',
+              query: {}
+            });
           })
         } else {
           return false;

src/views/basicData/customerInformation/index.vue

@@ -124,8 +124,8 @@ export default {
           type: "success",
           message: "操作成功!"
         });
-        // 数据回调进行刷新
-        done(row);
+        this.page.currentPage = 1;
+        this.onLoad(this.page, {parentId:0});
       });
     },
     //修改时的修改按钮点击触发