Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/enums/management-type.js

@@ -1,15 +1,33 @@
 //客户管理
 export const customerParameter = {
-  code:"KH",
-  name:"客户"
+  code: "KH",
+  name: "客户"
 }
 //客户管理
 export const supplierParameter = {
-  code:"GYS",
-  name:"供应商"
+  code: "GYS",
+  name: "供应商"
 }
 //客户管理
 export const companyParameter = {
-  code:"GS",
-  name:"公司主体"
-}
+  code: "GS",
+  name: "公司主体"
+}
+
+export const getCustomerCode = (row) => {
+  let code = null;
+  switch (row) {
+    case 'KH':
+      code = customerParameter.code
+      break;
+    case 'GYS':
+      code = supplierParameter.code
+      break;
+    case 'GS':
+      code = companyParameter.code
+      break;
+    default:
+      code = customerParameter.code
+  }
+  return code
+}

src/views/basicData/customerCategory/index.vue

@@ -181,7 +181,7 @@ export default {
       const { createTimeA } = this.query;
       let values = {
         ...params,
-        corpType: customerParameter,
+        corpType: customerParameter.code,
         size: this.page.pageSize,
         current: this.page.currentPage
       };

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -523,7 +523,7 @@ export default {
     flowDialog
   },
   created() {
-    corpstypeTree({ corpType: customerParameter }).then(res => {
+    corpstypeTree({ corpType: customerParameter.code }).then(res => {
       this.dic = res.data.data;
     });
     areaTypeTree().then(res => {
@@ -682,7 +682,7 @@ export default {
           if (this.form.belongtoarea) {
             this.form.belongtoarea = this.form.belongtoarea.toString();
           }
-          this.form.corpType = customerParameter;
+          this.form.corpType = customerParameter.code;
           typeSave(this.form).then(res => {
             if (res.data.data === "error") {
               this.disabled = false;

src/views/basicData/customerInformation/index.vue

@@ -138,7 +138,7 @@ export default {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree({
             parentId: parentId,
-            corpType: customerParameter
+            corpType: customerParameter.code
           }).then(res => {
             resolve(
               res.data.data.map(item => {
@@ -278,7 +278,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({ corpType: customerParameter }).then(res => {
+      customerList({ corpType: customerParameter.code}).then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
@@ -349,7 +349,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         corpsTypeId: this.treeDeptId,
-        corpType: customerParameter
+        corpType: customerParameter.code
       });
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
@@ -359,7 +359,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({ parentId: parentId, corpType: customerParameter }).then(
+      customerList({ parentId: parentId, corpType: customerParameter.code }).then(
         res => {
           resolve(res.data.data.records);
         }

src/views/basicData/customerManagement/companyMaterial/detailsPageEdit.vue

@@ -523,7 +523,7 @@ export default {
     flowDialog
   },
   created() {
-    corpstypeTree({ corpType: companyParameter }).then(res => {
+    corpstypeTree({ corpType: companyParameter.code }).then(res => {
       this.dic = res.data.data;
     });
     areaTypeTree().then(res => {
@@ -682,7 +682,7 @@ export default {
           if (this.form.belongtoarea) {
             this.form.belongtoarea = this.form.belongtoarea.toString();
           }
-          this.form.corpType = companyParameter;
+          this.form.corpType = companyParameter.code;
           typeSave(this.form).then(res => {
             if (res.data.data === "error") {
               this.disabled = false;

src/views/basicData/customerManagement/companyMaterial/index.vue

@@ -119,7 +119,7 @@ import {
 } from "@/api/basicData/customerInformation";
 import { getToken } from "@/util/auth";
 import reportDialog from "@/components/report-dialog/main";
-import { companyParameter } from "@/enums/management-type";
+import { companyParameter} from "@/enums/management-type";
 export default {
   name: "customerInformation",
   data() {
@@ -138,7 +138,7 @@ export default {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree({
             parentId: parentId,
-            corpType: companyParameter
+            corpType: companyParameter.code
           }).then(res => {
             resolve(
               res.data.data.map(item => {
@@ -278,7 +278,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({ corpType: companyParameter }).then(res => {
+      customerList({ corpType: companyParameter.code }).then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
@@ -349,7 +349,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         corpsTypeId: this.treeDeptId,
-        corpType: companyParameter
+        corpType: companyParameter.code
       });
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
@@ -359,7 +359,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({ parentId: parentId, corpType: companyParameter }).then(
+      customerList({ parentId: parentId, corpType: companyParameter.code }).then(
         res => {
           resolve(res.data.data.records);
         }

src/views/basicData/customerManagement/companyType/index.vue

@@ -83,7 +83,7 @@ export default {
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      row.corpType = companyParameter;
+      row.corpType = companyParameter.code;
       typeSave(row).then(
         () => {
           this.$message({
@@ -102,7 +102,7 @@ export default {
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      row.corpType = companyParameter;
+      row.corpType = companyParameter.code;
       typeSave(row).then(
         res => {
           this.$message({
@@ -120,7 +120,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({corpType: companyParameter}).then(res => {
+      customerList({corpType: companyParameter.code}).then(res => {
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -181,7 +181,7 @@ export default {
       const { createTimeA } = this.query;
       let values = {
         ...params,
-        corpType: companyParameter,
+        corpType: companyParameter.code,
         size: this.page.pageSize,
         current: this.page.currentPage
       };

src/views/basicData/customerManagement/supplierMaterial/detailsPageEdit.vue

@@ -208,7 +208,7 @@ import customerContact from "./configuration/customerContact.json";
 import advantageProject from "./configuration/advantageProject.json";
 import bankOfDeposit from "./configuration/bankOfDeposit.json";
 import flowDialog from "@/components/flow-dialog/main";
-import { supplierParameter } from "@/enums/management-type";
+import { supplierParameter} from "@/enums/management-type";
 export default {
   name: "detailsPage",
   data() {
@@ -523,7 +523,7 @@ export default {
     flowDialog
   },
   created() {
-    corpstypeTree({ corpType: supplierParameter }).then(res => {
+    corpstypeTree({ corpType: supplierParameter.code }).then(res => {
       this.dic = res.data.data;
     });
     areaTypeTree().then(res => {
@@ -682,7 +682,7 @@ export default {
           if (this.form.belongtoarea) {
             this.form.belongtoarea = this.form.belongtoarea.toString();
           }
-          this.form.corpType = supplierParameter;
+          this.form.corpType = supplierParameter.code;
           typeSave(this.form).then(res => {
             if (res.data.data === "error") {
               this.disabled = false;

src/views/basicData/customerManagement/supplierMaterial/index.vue

@@ -138,7 +138,7 @@ export default {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree({
             parentId: parentId,
-            corpType: supplierParameter
+            corpType: supplierParameter.code
           }).then(res => {
             resolve(
               res.data.data.map(item => {
@@ -278,7 +278,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({ corpType: supplierParameter }).then(res => {
+      customerList({ corpType: supplierParameter.code }).then(res => {
         console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
@@ -349,7 +349,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         corpsTypeId: this.treeDeptId,
-        corpType: supplierParameter
+        corpType: supplierParameter.code
       });
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records;
@@ -359,7 +359,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({ parentId: parentId, corpType: supplierParameter }).then(
+      customerList({ parentId: parentId, corpType: supplierParameter.code }).then(
         res => {
           resolve(res.data.data.records);
         }

src/views/basicData/customerManagement/supplierType/index.vue

@@ -83,7 +83,7 @@ export default {
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
-      row.corpType = supplierParameter;
+      row.corpType = supplierParameter.code;
       typeSave(row).then(
         () => {
           this.$message({
@@ -102,7 +102,7 @@ export default {
     },
     //新增修改时保存触发
     rowSave(row, done, loading) {
-      row.corpType = supplierParameter;
+      row.corpType = supplierParameter.code;
       typeSave(row).then(
         res => {
           this.$message({
@@ -120,7 +120,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({corpType: supplierParameter}).then(res => {
+      customerList({corpType: supplierParameter.code}).then(res => {
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -181,7 +181,7 @@ export default {
       const { createTimeA } = this.query;
       let values = {
         ...params,
-        corpType: supplierParameter,
+        corpType: supplierParameter.code,
         size: this.page.pageSize,
         current: this.page.currentPage
       };