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

src/enums/column-name.js

@@ -287,6 +287,10 @@ const columnName = [{
     code: 83,
     name: '采购订单(D)商品导入'
   },
+  {
+    code: 84,
+    name: '经销商(D)附件'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -2029,6 +2029,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -2041,6 +2044,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -2054,6 +2060,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -2066,6 +2075,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/customerInquiry/index.vue

@@ -450,6 +450,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -459,6 +462,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(0), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/invoice/detailsPage.vue

@@ -1010,6 +1010,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -1022,6 +1025,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -1035,6 +1041,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -1047,6 +1056,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/invoice/index.vue

@@ -343,6 +343,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -352,6 +355,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(8), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -1220,6 +1220,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -1232,6 +1235,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -1245,6 +1251,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -1257,6 +1266,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/purchaseContract/index.vue

@@ -295,6 +295,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -304,6 +307,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(2), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -981,6 +981,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -993,6 +996,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -1006,6 +1012,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -1018,6 +1027,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/purchaseInquiry/index.vue

@@ -315,6 +315,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -324,6 +327,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(10), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/receipt/detailsPage.vue

@@ -1016,6 +1016,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -1028,6 +1031,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -1041,6 +1047,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -1053,6 +1062,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/receipt/index.vue

@@ -327,6 +327,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -336,6 +339,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(6), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2237,6 +2237,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -2249,6 +2252,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
@@ -2284,6 +2290,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -2296,6 +2305,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/salesContract/index.vue

@@ -487,6 +487,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -496,6 +499,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(4), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -700,6 +700,9 @@ export default {
         this.tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -712,6 +715,9 @@ export default {
         tableOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {
@@ -725,6 +731,9 @@ export default {
         this.goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.goodsCrud.$refs.dialogColumn.columnBox = false;
@@ -737,6 +746,9 @@ export default {
         goodsOption
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.goodsCrud.doLayout()
+        })
         this.$message.success("重置成功");
         //关闭窗口
         setTimeout(() => {

src/views/exportTrade/shippingInquiry/index.vue

@@ -198,6 +198,9 @@ export default {
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -207,6 +210,9 @@ export default {
       this.option = option;
       const inSave = await this.delColumnData(this.getColumnName(12), option);
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout()
+        })
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }