Merge remote-tracking branch 'origin/dev' into dev

src/components/fee-info/config/feeInfo.json

@@ -22,8 +22,7 @@
       "label": "费用名称",
       "prop": "feeName",
       "index": 2,
-      "minWidth": 100,
-      "overHidden": true
+      "minWidth": 100
     },
     {
       "label": "单价",

src/components/fee-info/main.vue

@@ -32,14 +32,16 @@
           >
         </template>
         <template slot="feeName" slot-scope="{ row, index }">
-          <span>{{ row.feeName }}</span>
-          <el-button
-            size="small"
-            type="text"
-            @click="rePick(row, index)"
-            :disabled="disabled"
-            >选择</el-button
-          >
+          <div class="feeName">
+            <span>{{ row.feeName }}</span>
+            <el-button
+              size="small"
+              type="text"
+              @click="rePick(row, index)"
+              :disabled="disabled"
+              >选择</el-button
+            >
+          </div>
         </template>
         <template slot="price" slot-scope="{ row }">
           <el-input
@@ -374,4 +376,10 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.feeName{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

src/views/exportTrade/customerInquiry/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -14,28 +14,28 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -49,7 +49,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 5,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "hide": true
     },
@@ -57,7 +57,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "cell": true
     },
@@ -65,20 +65,20 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 7,
-      "minWidth": 100
+      "width": 100
     },
     {
       "label": "单价",
       "prop": "price",
       "index": 8,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -92,14 +92,14 @@
       "label": "数量",
       "prop": "orderQuantity",
       "index": 10,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "价格条款",
       "prop": "tradeTerms",
       "index": 11,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -113,42 +113,42 @@
       "label": "金额",
       "prop": "amount",
       "index": 12,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
       "index": 13,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
       "index": 14,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
       "index": 15,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
       "index": 16,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "index": 17,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "cell": true
     }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -61,10 +61,11 @@
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
         <avue-crud
-          :ref="crud"
+          ref="crud"
           :data="data"
           :option="tableOption"
           @row-del="rowDel"
+          @saveColumn="saveColumn"
         >
           <template slot="menuLeft">
             <el-button
@@ -97,7 +98,7 @@
               >船务询价</el-button
             >
           </template>
-          <template slot="menu" slot-scope="{ row,index }">
+          <template slot="menu" slot-scope="{ row, index }">
             <el-button
               size="small"
               icon="el-icon-edit"
@@ -299,7 +300,7 @@ export default {
       form: {},
       disabled: false,
       dialogVisible: false,
-      tableOption: tableOption,
+      tableOption: {},
       option: {
         menuBtn: false,
         labelWidth: 100,
@@ -503,7 +504,11 @@ export default {
     reportDialog,
     feeInfo
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(1),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -774,6 +779,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(1),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/invoice/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/invoice/config/customerContact.json

@@ -16,35 +16,35 @@
       "label": "销售订单号",
       "prop": "orgOrderNo",
       "index": 1,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -58,7 +58,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "hide": true
     },
@@ -66,7 +66,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true
     },
@@ -74,27 +74,27 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 8,
-      "minWidth": 80
+      "width": 80
     },
     {
       "label": "包装要求",
       "prop": "packageRemarks",
       "index": 8,
-      "minWidth": 80,
+      "width": 80,
       "cell": true
     },
     {
       "label": "数量",
       "prop": "actualQuantity",
       "index": 8,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -108,28 +108,28 @@
       "label": "单价",
       "prop": "price",
       "index": 10,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "contractAmount",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "index": 13,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true,
       "cell": true
     }

src/views/exportTrade/invoice/config/mainList.json

@@ -15,7 +15,7 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -23,7 +23,7 @@
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -31,7 +31,7 @@
       "prop": "orderNo",
       "search": true,
       "index": 3,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -39,7 +39,7 @@
       "prop": "deliveryStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -53,7 +53,7 @@
       "prop": "storageId",
       "search": true,
       "index": 5,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -61,7 +61,7 @@
       "prop": "warehouseType",
       "search": true,
       "index": 6,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -69,7 +69,7 @@
       "prop": "businessDate",
       "search": true,
       "index": 7,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -80,7 +80,7 @@
       "prop": "createTime",
       "search": true,
       "index": 8,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -91,7 +91,7 @@
       "prop": "deliveryAmount",
       "search": false,
       "index": 9,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -99,7 +99,7 @@
       "prop": "totalQuantity",
       "search": false,
       "index": 10,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -107,7 +107,7 @@
       "prop": "totalCost",
       "search": false,
       "index": 11,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -115,7 +115,7 @@
       "prop": "arrivalContact",
       "search": false,
       "index": 12,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -123,7 +123,7 @@
       "prop": "arrivalTel",
       "search": false,
       "index": 13,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -131,7 +131,7 @@
       "prop": "arrivalAddress",
       "search": false,
       "index": 14,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -139,7 +139,7 @@
       "prop": "deliveryRemarks",
       "search": false,
       "index": 15,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     }
   ]

src/views/exportTrade/invoice/detailsPage.vue

@@ -38,10 +38,11 @@
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
         <avue-crud
-          :ref="crud"
+          ref="crud"
           :data="data"
           :option="tableOption"
           @row-del="rowDel"
+          @saveColumn="saveColumn"
         >
           <template slot="menuLeft">
             <el-button
@@ -257,7 +258,7 @@ export default {
       form: {},
       disabled: false,
       dialogVisible: false,
-      tableOption: tableOption,
+      tableOption: {},
       option: {
         menuBtn: false,
         labelWidth: 100,
@@ -396,7 +397,7 @@ export default {
       treeDeptId: null,
       orderFeesList: [],
       orderFilesList: [],
-      itemtypeList:[]
+      itemtypeList: []
     };
   },
   props: {
@@ -409,7 +410,11 @@ export default {
     feeInfo,
     uploadFile
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(9),
+      tableOption
+    );
     if (this.$route.query.pageType == "Generate") {
       this.getGenerate(JSON.parse(this.$route.query.data));
     }
@@ -623,6 +628,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(9),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/invoice/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         :table-loading="loading"
+        @saveColumn="saveColumn"
       >
         <template slot-scope="scope" slot="corpId">
           {{ scope.row.corpsName }}
@@ -106,7 +107,7 @@ export default {
       },
       search: {},
       form: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -120,7 +121,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(8), option);
     if (this.$route.query.pageType == "Generate") {
       this.newAdd();
     }
@@ -242,6 +244,17 @@ export default {
       }
       this.show = true;
       this.$store.commit("OUT_OUT_DETAIL");
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(8),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/purchaseContract/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/purchaseContract/config/customerContact.json

@@ -16,28 +16,28 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -51,7 +51,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "hide":true
     },
@@ -59,7 +59,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -67,20 +67,20 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 7,
-      "minWidth": 80
+      "width": 80
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "index": 8,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -94,7 +94,7 @@
       "label": "是否含税",
       "prop": "ifTax",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -102,7 +102,7 @@
       "label": "汇率",
       "prop": "taxRate",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -110,21 +110,21 @@
       "label": "单价",
       "prop": "price",
       "index": 10,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "金额",
       "prop": "amount",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     }

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -15,14 +15,14 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     }, {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -30,14 +30,14 @@
       "prop": "orderNo",
       "search": true,
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "订单状态",
       "prop": "orderStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -49,20 +49,20 @@
       "label": "联系人",
       "prop": "corpAttn",
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "电话",
       "prop": "corpTel",
       "index": 8,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "采购日期",
       "prop": "businesDate",
       "search": true,
       "index": 9,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -71,7 +71,7 @@
       "label": "预计交货日期",
       "prop": "plannedDeliveryDate",
       "index": 10,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -81,7 +81,7 @@
       "prop": "requiredDeliveryDate",
       "search": true,
       "index": 11,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -90,14 +90,14 @@
       "label": "是否开票",
       "prop": "ifInvoice",
       "index": 12,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "收款方式",
       "prop": "paymentType",
       "index": 13,
-      "minWidth": 80,
+      "width": 80,
       "search": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=payment_term",
@@ -111,21 +111,21 @@
       "label": "币别",
       "prop": "currency",
       "index": 14,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "汇率",
       "prop": "exchangeRate",
       "index": 15,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "orderRemark",
       "index": 16,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -49,11 +49,12 @@
         <containerTitle title="商品信息"></containerTitle>
         <basic-container>
           <avue-crud
-            :ref="crud"
+            ref="crud"
             :data="data"
             :option="tableOption"
             @row-del="rowDel"
             @selection-change="goodsSelectionChange"
+            @saveColumn="saveColumn"
           >
             <template slot="price" slot-scope="{ row }">
               <el-input
@@ -493,7 +494,11 @@ export default {
     feeInfo,
     uploadFile
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(3),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -712,6 +717,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(3),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/purchaseContract/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         :table-loading="loading"
+        @saveColumn="saveColumn"
       >
         <template slot="menuLeft">
           <el-button
@@ -106,7 +107,7 @@ export default {
       },
       search: {},
       form: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -120,7 +121,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+    async created() {
+    this.option = await this.getColumnData(this.getColumnName(2), option);
     let _this = this;
     this.option.column.forEach(e => {
       if (e.prop == "exchangeRate") {
@@ -224,6 +226,17 @@ export default {
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(2),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/purchaseInquiry/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/purchaseInquiry/config/customerContact.json

@@ -14,28 +14,28 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -49,7 +49,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "hide":true
     },
@@ -57,7 +57,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -65,20 +65,20 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 7,
-      "minWidth": 80
+      "width": 80
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "index": 8,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -92,7 +92,7 @@
       "label": "价格条款",
       "prop": "tradeTerms",
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -106,21 +106,21 @@
       "label": "单价",
       "prop": "price",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "金额",
       "prop": "amount",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "税率",
       "prop": "taxRate",
       "index": 13,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     },
@@ -128,7 +128,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 14,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     }

src/views/exportTrade/purchaseInquiry/config/mainList.json

@@ -14,14 +14,14 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     }, {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -29,7 +29,7 @@
       "prop": "orderStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -41,20 +41,20 @@
       "label": "联系人",
       "prop": "corpAttn",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "电话",
       "prop": "corpTel",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable":true,
@@ -68,7 +68,7 @@
       "prop": "portOfDestination",
       "search": true,
       "index": 8,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable":true,
@@ -81,20 +81,20 @@
       "label": "运输方式",
       "prop": "transport",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "价格条款",
       "prop": "priceTerms",
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,
       "index": 12,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -103,7 +103,7 @@
       "label": "有效日期",
       "prop": "dateValidity",
       "index": 13,
-      "minWidth": 80,
+      "width": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -112,25 +112,25 @@
       "label": "收款方式",
       "prop": "paymentType",
       "index": 14,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "币别",
       "prop": "currency",
       "index": 15,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "汇率",
       "prop": "exchangeRate",
       "index": 16,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "备注",
       "prop": "orderRemark",
       "index": 20,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -56,10 +56,11 @@
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
         <avue-crud
-          :ref="crud"
+          ref="crud"
           :data="data"
           :option="tableOption"
           @row-del="rowDel"
+          @saveColumn="saveColumn"
         >
           <template slot="price" slot-scope="{ row }">
             <el-input
@@ -452,7 +453,11 @@ export default {
   components: {
     reportDialog
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(11),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -632,6 +637,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(11),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/purchaseInquiry/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         :table-loading="loading"
+        @saveColumn="saveColumn"
       >
         <template slot="menuLeft">
           <el-button type="info" size="small">报表</el-button>
@@ -38,7 +39,7 @@
             type="text"
             icon="el-icon-view"
             size="small"
-            @click.stop="beforeOpenPage(scope.row,1)"
+            @click.stop="beforeOpenPage(scope.row, 1)"
             >查看
           </el-button>
           <el-button
@@ -79,7 +80,7 @@ export default {
         dicData: []
       },
       search: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -93,7 +94,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+    async created() {
+    this.option = await this.getColumnData(this.getColumnName(10), option);
     let _this = this;
     this.option.column.forEach(e => {
       if (e.prop == "exchangeRate") {
@@ -137,14 +139,14 @@ export default {
       });
     },
     //查看跳转页面
-    beforeOpenPage(row,status) {
+    beforeOpenPage(row, status) {
       this.detailData = {
         id: row.id,
         status: status
       };
       this.show = false;
     },
-    editOpen(row,status) {
+    editOpen(row, status) {
       this.detailData = {
         id: row.id,
         status: status
@@ -189,6 +191,17 @@ export default {
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(10),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/receipt/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/receipt/config/customerContact.json

@@ -16,35 +16,35 @@
       "label": "销售订单号",
       "prop": "orgOrderNo",
       "index": 1,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "产品属性",
       "prop": "packageRemarks",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -58,7 +58,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "hide": true
     },
@@ -66,7 +66,7 @@
       "label": "产品描述",
       "prop": "productDesc",
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true
     },
@@ -74,20 +74,20 @@
       "label": "产品型号",
       "prop": "specificationAndModel",
       "index": 8,
-      "minWidth": 80
+      "width": 80
     },
     {
       "label": "数量",
       "prop": "actualQuantity",
       "index": 9,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "cell": true,
       "type": "select",
@@ -101,28 +101,28 @@
       "label": "单价",
       "prop": "price",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "contractAmount",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
       "index": 13,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "index": 14,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true,
       "cell": true
     }

src/views/exportTrade/receipt/config/mainList.json

@@ -15,7 +15,7 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -23,7 +23,7 @@
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -31,7 +31,7 @@
       "prop": "orderNo",
       "search": true,
       "index": 3,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -39,7 +39,7 @@
       "prop": "deliveryStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -53,7 +53,7 @@
       "prop": "storageId",
       "search": true,
       "index": 5,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -61,7 +61,7 @@
       "prop": "warehouseType",
       "search": true,
       "index": 6,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -69,7 +69,7 @@
       "prop": "businessDate",
       "search": true,
       "index": 7,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -80,7 +80,7 @@
       "prop": "createTime",
       "search": true,
       "index": 8,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true,
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -91,7 +91,7 @@
       "prop": "deliveryAmount",
       "search": false,
       "index": 9,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -99,7 +99,7 @@
       "prop": "totalQuantity",
       "search": false,
       "index": 10,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -107,7 +107,7 @@
       "prop": "totalCost",
       "search": false,
       "index": 11,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     },
     {
@@ -115,7 +115,7 @@
       "prop": "deliveryRemarks",
       "search": false,
       "index": 12,
-      "minWidth": 100,
+      "width": 100,
       "overHidden": true
     }
   ]

src/views/exportTrade/receipt/detailsPage.vue

@@ -38,10 +38,11 @@
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
         <avue-crud
-          :ref="crud"
+          ref="crud"
           :data="data"
           :option="tableOption"
           @row-del="rowDel"
+          @saveColumn="saveColumn"
         >
           <template slot="menuLeft">
             <el-button
@@ -379,7 +380,7 @@ export default {
       treeDeptId: null,
       orderFeesList: [],
       orderFilesList: [],
-      itemtypeList:[]
+      itemtypeList: []
     };
   },
   props: {
@@ -392,7 +393,11 @@ export default {
     feeInfo,
     uploadFile
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(7),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -593,6 +598,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(7),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/receipt/index.vue

@@ -14,6 +14,7 @@
         @refresh-change="refreshChange"
         @on-load="onLoad"
         :table-loading="loading"
+        @saveColumn="saveColumn"
       >
         <template slot="menuLeft">
           <el-button
@@ -79,7 +80,7 @@ export default {
       },
       search: {},
       form: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -93,7 +94,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(6), option);
     let _this = this;
     this.option.column.forEach(e => {
       if (e.prop == "exchangeRate") {
@@ -183,6 +185,17 @@ export default {
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(6),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/salesContract/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/salesContract/config/customerContact.json

@@ -16,28 +16,28 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -51,7 +51,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "hide":true
     },
@@ -59,7 +59,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -67,20 +67,20 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 7,
-      "minWidth": 80
+      "width": 80
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "index": 8,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -94,21 +94,21 @@
       "label": "单价",
       "prop": "price",
       "index": 10,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "金额",
       "prop": "amount",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true
     },
     {
       "label": "备注",
       "prop": "remarks",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     }

src/views/exportTrade/salesContract/config/mainList.json

@@ -14,14 +14,14 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     }, {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -29,7 +29,7 @@
       "prop": "orderStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -41,32 +41,32 @@
       "label": "业务员",
       "prop": "salesName",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "提成标准",
       "prop": "commissionRate",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "联系人",
       "prop": "corpAttn",
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "电话",
       "prop": "corpTel",
       "index": 8,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable":true,
@@ -80,7 +80,7 @@
       "prop": "portOfDestination",
       "search": true,
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable":true,
@@ -93,20 +93,20 @@
       "label": "运输方式",
       "prop": "transport",
       "index": 11,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "价格条款",
       "prop": "priceTerms",
       "index": 12,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },{
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,
       "index": 14,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -115,7 +115,7 @@
       "label": "有效日期",
       "prop": "dateValidity",
       "index": 15,
-      "minWidth": 80,
+      "width": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -124,26 +124,26 @@
       "label": "收款方式",
       "prop": "paymentType",
       "index": 16,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "币别",
       "prop": "currency",
       "index": 17,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "汇率",
       "prop": "exchangeRate",
       "index": 18,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "orderRemark",
       "index": 19,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/salesContract/detailsPage.vue

@@ -61,11 +61,12 @@
         <containerTitle title="商品信息"></containerTitle>
         <basic-container>
           <avue-crud
-            :ref="crud"
+            ref="crud"
             :data="data"
             :option="tableOption"
             @row-del="rowDel"
             @selection-change="goodsSelectionChange"
+            @saveColumn="saveColumn"
           >
             <template slot="price" slot-scope="{ row }">
               <el-input
@@ -564,7 +565,11 @@ export default {
     feeInfo,
     uploadFile
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(5),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -838,6 +843,17 @@ export default {
           }
         }
       });
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(5),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/salesContract/index.vue

@@ -13,6 +13,7 @@
         @size-change="sizeChange"
         @refresh-change="refreshChange"
         @on-load="onLoad"
+        @saveColumn="saveColumn"
       >
         <template slot="menuLeft">
           <el-button
@@ -99,7 +100,7 @@ export default {
       },
       search: {},
       form: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -113,7 +114,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(4), option);
     let _this = this;
     this.option.column.forEach(e => {
       if (e.prop == "exchangeRate") {
@@ -212,6 +214,17 @@ export default {
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(4),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/shippingInquiry/config/commodity.json

@@ -17,7 +17,7 @@
       "label": "商品编码",
       "prop": "code",
       "search": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,
@@ -30,7 +30,7 @@
       "label": "商品名称",
       "prop": "cname",
       "slot": true,
-      "minWidth": 100,
+      "width": 100,
       "rules": [
         {
           "required": true,

src/views/exportTrade/shippingInquiry/config/customerContact.json

@@ -14,28 +14,28 @@
       "label": "产品类别",
       "prop": "priceCategory",
       "index": 1,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品编号",
       "prop": "code",
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品名称",
       "prop": "cname",
       "index": 3,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true
     },
     {
       "label": "产品属性",
       "prop": "itemProp",
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -49,7 +49,7 @@
       "label": "产品照片",
       "prop": "itemUrl",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "hide":true
     },
@@ -57,7 +57,7 @@
       "label": "产品描述",
       "prop": "itemDescription",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true
     },
@@ -65,14 +65,14 @@
       "label": "产品型号",
       "prop": "itemType",
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "cell": true
     },
     {
       "label": "数量",
       "prop": "orderQuantity",
       "index": 8,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     },
@@ -80,7 +80,7 @@
       "label": "计价单位",
       "prop": "unit",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -94,7 +94,7 @@
       "label": "价格条款",
       "prop": "tradeTerms",
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden":true,
       "cell": true,
       "type": "select",
@@ -108,7 +108,7 @@
       "label": "单价",
       "prop": "price",
       "index": 11,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     },
@@ -116,7 +116,7 @@
       "label": "金额",
       "prop": "amount",
       "index": 12,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     },
@@ -124,7 +124,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 13,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     },
@@ -132,7 +132,7 @@
       "label": "备注",
       "prop": "remarks",
       "index": 14,
-      "minWidth": 60,
+      "width": 60,
       "overHidden":true,
       "cell": true
     }

src/views/exportTrade/shippingInquiry/config/mainList.json

@@ -14,14 +14,14 @@
       "prop": "sysNo",
       "search": true,
       "index": 1,
-      "minWidth": 60,
+      "width": 60,
       "overHidden": true
     }, {
       "label": "客户名称",
       "prop": "corpId",
       "search": true,
       "index": 2,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     },
     {
@@ -29,7 +29,7 @@
       "prop": "orderStatus",
       "search": true,
       "index": 4,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "dicUrl": "/api/blade-system/dict-biz/dictionary?code=order_status",
@@ -41,20 +41,20 @@
       "label": "联系人",
       "prop": "corpAttn",
       "index": 5,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "电话",
       "prop": "corpTel",
       "index": 6,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "起运港",
       "prop": "portOfLoad",
       "search": true,
       "index": 7,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable": true,
@@ -68,7 +68,7 @@
       "prop": "portOfDestination",
       "search": true,
       "index": 8,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true,
       "type": "select",
       "filterable": true,
@@ -81,20 +81,20 @@
       "label": "运输方式",
       "prop": "transport",
       "index": 9,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "价格条款",
       "prop": "priceTerms",
       "index": 10,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,
       "index": 12,
-      "minWidth": 100,
+      "width": 100,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -103,7 +103,7 @@
       "label": "有效日期",
       "prop": "dateValidity",
       "index": 13,
-      "minWidth": 80,
+      "width": 80,
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd 00:00:00",
@@ -112,25 +112,25 @@
       "label": "收款方式",
       "prop": "paymentType",
       "index": 14,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "币别",
       "prop": "currency",
       "index": 15,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "汇率",
       "prop": "exchangeRate",
       "index": 16,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }, {
       "label": "备注",
       "prop": "orderRemark",
       "index": 20,
-      "minWidth": 80,
+      "width": 80,
       "overHidden": true
     }
   ]

src/views/exportTrade/shippingInquiry/detailsPage.vue

@@ -46,10 +46,11 @@
       <containerTitle title="商品信息"></containerTitle>
       <basic-container>
         <avue-crud
-          :ref="crud"
+          ref="crud"
           :data="data"
           :option="tableOption"
           @row-del="rowDel"
+          @saveColumn="saveColumn"
         >
           <!-- <template slot="menuLeft">
             <el-button
@@ -382,7 +383,11 @@ export default {
     reportDialog,
     feeInfo
   },
-  created() {
+  async created() {
+    this.tableOption = await this.getColumnData(
+      this.getColumnName(13),
+      tableOption
+    );
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
@@ -516,6 +521,17 @@ export default {
     },
     onClose(val) {
       this.switchDialog = val;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(13),
+        this.tableOption
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/exportTrade/shippingInquiry/index.vue

@@ -13,6 +13,7 @@
         @size-change="sizeChange"
         @refresh-change="refreshChange"
         @on-load="onLoad"
+        @saveColumn="saveColumn"
       >
         <template slot="menuLeft">
           <el-button type="info" size="small">报表</el-button>
@@ -71,7 +72,7 @@ export default {
         dicData: []
       },
       search: {},
-      option: option,
+      option:{},
       parentId: 0,
       dataList: [],
       page: {
@@ -85,7 +86,8 @@ export default {
     };
   },
   components: { detailPage },
-  created() {
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(12), option);
     let _this = this;
     this.option.column.forEach(e => {
       if (e.prop == "exchangeRate") {
@@ -157,6 +159,17 @@ export default {
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.show = true;
+    },
+    async saveColumn() {
+      const inSave = await this.saveColumnData(
+        this.getColumnName(12),
+        this.option
+      );
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };