caojunjie 3 anni fa
parent
commit
298c851792

+ 1 - 7
src/views/landTransportation/bulkCargo/detailPage.vue

@@ -1677,13 +1677,7 @@ export default {
           type: 'number',
           controls:false,
           precision:2,
-          prop: 'freightCollect',
-          change:(data)=>{
-            this.goodsForm.freightCollect = data.value
-            this.goodsForm.pricingUnit = ''
-            this.goodsForm.loadingUnloading = ''
-            this.goodsForm.unitPrice = ''
-          }
+          prop: 'freightCollect'
         }
           // , {
           //   label: '场站',

+ 16 - 16
src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -948,22 +948,22 @@ export default {
       }
     }
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.3), this.optionList);
-    if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1){
-      this.goodsOptionCrud.column.push({
-        label: '利润',
-        width: 80,
-        precision: 2,
-        index: 17,
-        type: 'number',
-        prop: 'profit'
-      })
-    }else {
-      for (let item in this.goodsOptionCrud.column){
-        if (this.goodsOptionCrud.column[item].prop == 'profit'){
-          this.goodsOptionCrud.column.splice(item, 1);
-        }
-      }
-    }
+    // if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1){
+    //   this.goodsOptionCrud.column.push({
+    //     label: '利润',
+    //     width: 80,
+    //     precision: 2,
+    //     index: 17,
+    //     type: 'number',
+    //     prop: 'profit'
+    //   })
+    // }else {
+    //   for (let item in this.goodsOptionCrud.column){
+    //     if (this.goodsOptionCrud.column[item].prop == 'profit'){
+    //       this.goodsOptionCrud.column.splice(item, 1);
+    //     }
+    //   }
+    // }
     this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
     getSalesman().then(res=>{
       this.findObject(this.goodsOptionCrud.column, "salesmanName").dicData = res.data.data