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

src/views/billM/expenseCenter/index.vue

@@ -88,7 +88,8 @@
         </avue-text-ellipsis>
       </template>
       <template slot="menuLeft">
-        <el-button v-if="permission.feecenter_delete"
+<!--        v-if="permission.feecenter_delete"-->
+        <el-button
                    icon="el-icon-delete"
                    plain
                    size="small"
@@ -101,7 +102,7 @@
 </template>
 
 <script>
-import {add, feecenterList, getDetail, remove, update} from "@/api/iosBasicData/feecenter";
+import {feecenterList, feecenterRemove} from "@/api/iosBasicData/feecenter";
 import { getBcorpsList } from "@/api/iosBasicData/bcorps";
 import {mapGetters} from "vuex";
 
@@ -130,125 +131,58 @@ export default {
         selection: true,
         dialogClickModal: false,
         column: [
-
           {
             label: "客户名称",
             prop: "corpCnName",
-            width: "180",
-            type: 'select',
-            dicData:[],
-            props: {
-              label: 'cnName',
-              value: 'cnName'
-            },
-            rules: [{
-              required: true,
-              message: "",
-              trigger: "blur"
-            }]
+            width: "180"
           },
           {
             label: "费用简称",
             prop: "feeCnName",
-            width: "180",
-            rules: [{
-              required: true,
-              message: "",
-              trigger: "blur"
-            }]
+            width: "180"
           },
           {
             label: "预付/到付",
-            prop: "paymode",
-            rules: [{
-              required: true,
-              message: "",
-              trigger: "blur"
-            }]
+            prop: "paymode"
           },
           {
             label: "计量单位",
-            prop: "unitNo",
-            rules: [{
-              required: true,
-              message: "请输入单位",
-              trigger: "blur"
-            }]
+            prop: "unitNo"
           },
           {
             label: "币种",
-            prop: "curCode",
-            rules: [{
-              required: true,
-              message: "请输入币种",
-              trigger: "blur"
-            }]
+            prop: "curCode"
           },
           {
             label: "单价",
-            prop: "price",
-            rules: [{
-              required: true,
-              message: "请输入单价",
-              trigger: "blur"
-            }]
+            prop: "price"
           },
           {
             label: "数量",
-            prop: "quantity",
-            rules: [{
-              required: true,
-              message: "请输入数量",
-              trigger: "blur"
-            }]
+            prop: "quantity"
           },
           {
             label: "CNY(含税)",
-            prop: "rmbAmount",
-            rules: [{
-              required: true,
-              message: "请输入CNY(含税)",
-              trigger: "blur"
-            }]
+            prop: "rmbAmount"
           },
           {
             label: "USD(含税)",
-            prop: "usdAmount",
-            rules: [{
-              required: true,
-              message: "请输入USD(含税)",
-              trigger: "blur"
-            }]
+            prop: "usdAmount"
           },
           {
             label: "对CNY汇率",
             width: "100",
-            prop: "exrate",
-            rules: [{
-              required: true,
-              message: "请输入对CNY汇率",
-              trigger: "blur"
-            }]
+            prop: "exrate"
           },
           {
             label: "预付地址",
             prop: "payplace",
-            width: "180",
-            rules: [{
-              required: true,
-              message: "预付地址",
-              trigger: "blur"
-            }]
+            width: "180"
           },
           {
             label: "备注",
             prop: "remarks",
-            width: "180",
-            rules: [{
-              required: true,
-              message: "请输入备注",
-              trigger: "blur"
-            }]
+            width: "180"
           },
 
 
@@ -259,49 +193,24 @@ export default {
           {
             label: "MB/L NO",
             prop: "mblno",
-            width: "200",
-            rules: [{
-              required: true,
-              message: "请输入MB/L NO",
-              trigger: "blur"
-            }]
+            width: "200"
           },
           {
             label: "HB/L NO",
             prop: "hblno",
-            width: "240",
-            rules: [{
-              required: true,
-              message: "请输入HB/L NO",
-              trigger: "blur"
-            }]
+            width: "240"
           },
           {
             label: "船名",
-            prop: "vesselCnName",
-            rules: [{
-              required: true,
-              message: "请输入船名",
-              trigger: "blur"
-            }]
+            prop: "vesselCnName"
           },
           {
             label: "航次",
-            prop: "voyageNo",
-            rules: [{
-              required: true,
-              message: "请输入航次",
-              trigger: "blur"
-            }]
+            prop: "voyageNo"
           },
           {
             label: "ETD",
-            prop: "etd",
-            rules: [{
-              required: true,
-              message: "请输入ETD",
-              trigger: "blur"
-            }]
+            prop: "etd"
           },
 
 
@@ -1339,7 +1248,7 @@ export default {
       return {
         addBtn: this.vaildData(this.permission.feecenter_add, false),
         viewBtn: this.vaildData(this.permission.feecenter_view, false),
-        delBtn: this.vaildData(this.permission.feecenter_delete, false),
+        // delBtn: this.vaildData(this.permission.feecenter_delete, false),
         editBtn: this.vaildData(this.permission.feecenter_edit, false)
       };
     },
@@ -1399,7 +1308,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return remove(row.id);
+          return feecenterRemove(row.id);
         })
         .then(() => {
           this.onLoad(this.page);
@@ -1420,7 +1329,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          return remove(this.ids);
+          return feecenterRemove(this.ids);
         })
         .then(() => {
           this.onLoad(this.page);