Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/agreement/agreementTask/index.vue

@@ -451,11 +451,11 @@ export default {
       tablefilter:false,
       // 计价单位
       jFeetunitOptions: [
-        { dictLabel: "件数", dictValue: "1" },
+        /*{ dictLabel: "件数", dictValue: "1" },
         { dictLabel: "毛重", dictValue: "2" },
         { dictLabel: "净重", dictValue: "3" },
         { dictLabel: "尺码", dictValue: "4" },
-        { dictLabel: "固定", dictValue: "5" },
+        { dictLabel: "固定", dictValue: "5" },*/
       ],
       goodsOptions:[],
       fTypeidOptions: [],
@@ -546,6 +546,9 @@ export default {
     this.getDicts("data_goods_category").then(response => {
       this.fTypeidOptions = response.data;
     });
+    this.getDicts("data_unitfees").then(response => {
+      this.jFeetunitOptions = response.data;
+    });
     this.register()
   },
   activated(){