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

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -444,7 +444,8 @@
             align="center"
             width="280">
           <template slot="header" slot-scope="{ column, $index }">
-            <e-crop-jump :label="column.label" corp-type="GC"></e-crop-jump><span style="color:#F56C6C">*</span>
+            <e-crop-jump :label="column.label" corp-type="GC"></e-crop-jump>
+            <span style="color:#F56C6C">*</span>
           </template>
           <template slot-scope="scope">
             <crop-select
@@ -671,7 +672,8 @@
             align="center"
             width="280">
           <template slot="header" slot-scope="{ column, $index }">
-            <e-crop-jump :label="column.label" corp-type="GC"></e-crop-jump><span style="color:#F56C6C">*</span>
+            <e-crop-jump :label="column.label" corp-type="GC"></e-crop-jump>
+            <span style="color:#F56C6C">*</span>
           </template>
           <template slot-scope="scope">
             <crop-select
@@ -866,10 +868,14 @@
     <trade-card title="杂费明细"
                 v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('车队') !== -1">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
-        <el-tab-pane label="应收" name="1"
-                     v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1"></el-tab-pane>
-        <el-tab-pane label="应付" name="2"
-                     v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('车队') !== -1"></el-tab-pane>
+        <el-tab-pane
+            label="应收" name="1"
+            v-if="(roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1) && !(roleName.indexOf('调度中心业务员') !== -1 || roleName.indexOf('调度中心经理') !== -1)"
+        ></el-tab-pane>
+        <el-tab-pane
+            label="应付" name="2"
+            v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1 || roleName.indexOf('车队') !== -1"
+        ></el-tab-pane>
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -1122,6 +1128,9 @@ export default {
             }
           }
         }
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          this.findObject(this.goodsOptionForm.column,'freightCollect').display = false
+        }
       }
     }
   },
@@ -2165,7 +2174,11 @@ export default {
     };
   },
   async created() {
-    this.activeIndex = this.roleName.indexOf('车队') !== -1 ? '2' : '1'
+    if (this.roleName.indexOf('调度中心业务员') === -1 || this.roleName.indexOf('调度中心经理') === -1) {
+      this.activeIndex = this.roleName.indexOf('调度中心业务员') === -1 ? '2' : this.roleName.indexOf('调度中心经理') === -1 ? '2' : '1'
+    } else {
+      this.activeIndex = this.roleName.indexOf('车队') !== -1 ? '2' : '1'
+    }
     console.log(this.activeIndex)
     if (this.roleName.indexOf('客户') !== -1) {
       this.findObject(this.goodsOptionFormTwo.column, "freightPay").display = false
@@ -2766,7 +2779,7 @@ export default {
         this.goodsForm.status = 0
         if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)) {
           // this.goodsOptionFormTwo.disabled = true
-          this.$set(this.goodsOptionFormTwo,'disabled',false)
+          this.$set(this.goodsOptionFormTwo, 'disabled', false)
         }
       } else {
         this.goodsOptionFormC.disabled = false
@@ -2776,7 +2789,7 @@ export default {
         this.goodsForm.status = 0
         if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)) {
           // this.goodsOptionFormTwo.disabled = false
-          this.$set(this.goodsOptionFormTwo,'disabled',false)
+          this.$set(this.goodsOptionFormTwo, 'disabled', false)
           this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
           this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
           this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false

src/views/landTransportation/bulkCargo/index.vue

@@ -364,6 +364,16 @@ export default {
   components: {
     detailPage
   },
+  watch:{
+    option:{
+      handler(newValue, oldValue) {
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          this.findObject(this.option.column, "freightCollect").hide = true
+          this.findObject(this.option.column, "freightCollect").showColumn = false
+        }
+      }
+    }
+  },
   data() {
     return {
       id: '',

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -989,6 +989,15 @@ export default {
         this.goodsOptionCrud.searchMenuSpan = 3 * 8;
         this.goodsOptionCrud.searchMenuPosition = "right";
       }
+      if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+        this.goodsOptionCrud.menu = false
+        this.findObject(this.goodsOptionCrud.column, "landAmountD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "landAmountD").showColumn = false
+        this.findObject(this.goodsOptionCrud.column, "extraAmountD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "extraAmountD").showColumn = false
+        this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").showColumn = false
+      }
     },
     openTrack(row) {
       gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {
@@ -1075,6 +1084,15 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+          this.goodsOptionCrud.menu = false
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").showColumn = false
+        }
       }
     },
     //行跳转

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -191,7 +191,7 @@
           @selection-change="selectionChange"
           :option="entrustOptionTwoT"
           ref="crudBoxTwo"
-          v-if="KeyBoxTwo>0"
+          :key="KeyBoxTwo"
           @resetColumn="resetColumnBoxTwo"
           @saveColumn="saveColumnBoxTwo"
           @row-save="(row,done,loading)=>{rowSaveT(row,0,done,loading)}"
@@ -364,7 +364,7 @@
     <containerTitle title="杂费明细"></containerTitle>
     <basic-container>
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
-        <el-tab-pane label="应收" name="1"></el-tab-pane>
+        <el-tab-pane label="应收" name="1" v-if="!(roleNameTwo.indexOf('调度中心业务员') !== -1 || roleNameTwo.indexOf('调度中心经理') !== -1)"></el-tab-pane>
         <el-tab-pane label="应付" name="2"></el-tab-pane>
       </el-tabs>
       <avue-crud
@@ -493,6 +493,7 @@
         <template slot="menuLeft">
           <el-button
               v-if="roleNameTwo.indexOf('总调度') === -1"
+              v-show="!(roleNameTwo.indexOf('调度中心业务员') !== -1 || roleNameTwo.indexOf('调度中心经理') !== -1)"
               type="primary" icon="el-icon-plus" @click="addRowPayment"
               size="small">录入明细
           </el-button>
@@ -683,7 +684,6 @@ export default {
           type: 'number',
         }]
       },
-      activeIndex: '1',
       dialogVisible: false,
       c_button: false,
       goodsForm: {},
@@ -691,7 +691,8 @@ export default {
       selectionList: [],
       roleName: localStorage.getItem("roleName").split(',')[0],
       roleNameTwo: localStorage.getItem("roleName").split(','),
-      batchDuling:true,
+      activeIndex: '1',
+      batchDuling: true,
       breakConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -1513,10 +1514,32 @@ export default {
       }
     };
   },
+  watch: {
+    goodsForm: {
+      handler(newValue, oldValue) {
+        if (this.roleNameTwo.indexOf('调度中心业务员') !== -1 || this.roleNameTwo.indexOf('调度中心经理') !== -1){
+          this.paymentOption.menu = false
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").showColumn = false
+        }
+      }
+    },
+    entrustOptionTwoT: {
+      handler(newValue, oldValue) {
+        if (this.roleNameTwo.indexOf('调度中心业务员') !== -1 || this.roleNameTwo.indexOf('调度中心经理') !== -1){
+          this.paymentOption.menu = false
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").showColumn = false
+        }
+      }
+    }
+  },
   async created() {
+    this.activeIndex = this.roleNameTwo.indexOf('调度中心业务员') !== -1?'2':this.roleNameTwo.indexOf('调度中心经理') !== -1?'2':'1'
     this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(86.1), this.entrustOptionTwoTBackup);
     this.collectionOption = await this.getColumnData(this.getColumnName(86.4), this.collectionOptionBackup);
     this.paymentOption = await this.getColumnData(this.getColumnName(86.5), this.paymentOptionBackup);
+    this.KeyBoxTwo++
     this.findObject(this.paymentOption.column, "fleetId").dicUrl = "/api/blade-land/order-fee/fleet?orderId=" + this.id
     this.findObject(this.paymentOption.column, "plateNo").dicUrl = "api/blade-land/order-fee/plate-no?orderId=" + this.id + '&fleetId={{key}}'
     this.findObject(this.paymentOption.column, "plateNo").dicFormatter = (data) => {
@@ -1577,8 +1600,9 @@ export default {
         }
       })
     }
+    this.KeyBoxTwo++
     this.findObject(this.entrustOptionTwoT.column, "plateNo").change = (data) => {
-      fleetList({fleetId:data.row.fleetId}).then(res => {
+      fleetList({fleetId: data.row.fleetId}).then(res => {
         for (let item in res.data.data) {
           if (data.value === res.data.data[item].plateNo) {
             this.entrustList[data.index].driverId = res.data.data[item].driverId
@@ -1613,6 +1637,8 @@ export default {
     } else {
       this.initData();
     }
+
+    this.KeyBoxTwo++
   },
   methods: {
     schedulingFileSaving() {
@@ -1721,13 +1747,13 @@ export default {
     },
     //打开附件
     annexOpen(row, index) {
-      if(row.id){
+      if (row.id) {
         this.enclosure = true
         this.formAnnex = row
         getFee({id: row.id}).then(res => {
           this.orderList = res.data.data
         })
-      }else {
+      } else {
         this.$message.error('请保存后再上传附件');
       }
     },
@@ -1767,11 +1793,11 @@ export default {
     //多选触发
     selectionChange(list) {
       this.selectionList = list
-      if(this.selectionList.length === 0){
+      if (this.selectionList.length === 0) {
         return this.batchDuling = true
-      }else {
-        for(let item in this.selectionList){
-          if(this.selectionList[item].status > 0){
+      } else {
+        for (let item in this.selectionList) {
+          if (this.selectionList[item].status > 0) {
             return this.batchDuling = true
           }
         }
@@ -2012,7 +2038,7 @@ export default {
             incidentalSubmit(row).then(res => {
               row = {
                 ...res.data.data,
-                $cellEdit:true
+                $cellEdit: true
               }
               this.$message.success("保存成功");
               this.$refs.payment.rowCell(row, index)

src/views/landTransportation/dispatchingCars/index.vue

@@ -300,6 +300,7 @@ export default {
       },
       home: false,
       dispatchTimer: null,
+      roleName: localStorage.getItem("roleName").split(','),
       screen:{}
     }
   },
@@ -325,6 +326,10 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
+    if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+      this.findObject(this.option.column, "freight").hide = true
+      this.findObject(this.option.column, "freight").showColumn = false
+    }
   },
   mounted() {
     businessStatisticsFrequency().then(res=>{
@@ -366,6 +371,11 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          console.log('11111')
+          this.findObject(this.option.column, "freight").hide = true
+          this.findObject(this.option.column, "freight").showColumn = false
+        }
       }
     },
     // 获得高度

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -42,10 +42,7 @@
               size="small"
               v-if="goodsForm.status > 0"
               :disabled="
-            (this.roleName.indexOf('平台') !== -1
-            ||this.roleName.indexOf('经理') !== -1
-            ||this.roleName.indexOf('部门经理') !== -1
-            ||this.roleName.indexOf('总经理') !== -1) && !(this.roleName.indexOf('admin') !== -1)"
+            !((this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)||this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
@@ -94,12 +91,12 @@
           <e-crop-jump label="公司名称" corp-type="KH" :value="goodsForm.corpName"></e-crop-jump>
         </template>
         <template slot-scope="scope" slot="corpId">
-<!--          <crop-select-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--              v-model="goodsForm.corpId"-->
-<!--              @getCorpData="getCorpData"-->
-<!--              :corpType="'KH'"-->
-<!--          ></crop-select>-->
+          <!--          <crop-select-->
+          <!--              :disabled="goodsForm.status !== 0"-->
+          <!--              v-model="goodsForm.corpId"-->
+          <!--              @getCorpData="getCorpData"-->
+          <!--              :corpType="'KH'"-->
+          <!--          ></crop-select>-->
           <e-crop-select
               v-model="goodsForm.corpId"
               :name.sync="goodsForm.corpName"
@@ -112,10 +109,10 @@
           <e-crop-jump label="场站" corp-type="DD" :value="goodsForm.station"></e-crop-jump>
         </template>
         <template slot-scope="scope" slot="station">
-<!--          <port-info-->
-<!--              v-model="goodsForm.station"-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--          />-->
+          <!--          <port-info-->
+          <!--              v-model="goodsForm.station"-->
+          <!--              :disabled="goodsForm.status !== 0"-->
+          <!--          />-->
           <e-crop-select
               v-model="goodsForm.station"
               corp-type="DD"
@@ -204,13 +201,13 @@
               @getCropId="getCropId"
           />
         </template>
-<!--        <template slot-scope="scope" slot="polId">-->
-<!--          <port-info-->
-<!--              :type="'id'"-->
-<!--              v-model="goodsForm.polId"-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--          />-->
-<!--        </template>-->
+        <!--        <template slot-scope="scope" slot="polId">-->
+        <!--          <port-info-->
+        <!--              :type="'id'"-->
+        <!--              v-model="goodsForm.polId"-->
+        <!--              :disabled="goodsForm.status !== 0"-->
+        <!--          />-->
+        <!--        </template>-->
         <template slot-scope="{}" slot="polIdLabel">
           <e-crop-jump label="起运港" corp-type="DD" :value="goodsForm.polName"></e-crop-jump>
         </template>
@@ -234,13 +231,13 @@
               :disabled="goodsForm.status !== 0"
           />
         </template>
-<!--        <template slot-scope="scope" slot="podId">-->
-<!--          <port-info-->
-<!--              :type="'id'"-->
-<!--              v-model="goodsForm.podId"-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--          />-->
-<!--        </template>-->
+        <!--        <template slot-scope="scope" slot="podId">-->
+        <!--          <port-info-->
+        <!--              :type="'id'"-->
+        <!--              v-model="goodsForm.podId"-->
+        <!--              :disabled="goodsForm.status !== 0"-->
+        <!--          />-->
+        <!--        </template>-->
       </avue-form>
     </trade-card>
     <trade-card title="箱信息" v-if="goodsForm.status === 0 || !goodsForm.status">
@@ -418,12 +415,15 @@
             <div v-if="scope.$index !== tableData.length-1" style="margin: -5px auto">
               <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 1">
                 <div class="single" style="margin-bottom: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini" @click="moveUp(scope.row,scope.$index)"></el-button>
+                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini"
+                             @click="moveUp(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="向下移动" placement="right" v-if="scope.$index > 0 && scope.$index < tableData.length-2">
+              <el-tooltip class="item" effect="dark" content="向下移动" placement="right"
+                          v-if="scope.$index > 0 && scope.$index < tableData.length-2">
                 <div class="single" style="margin-top: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini" @click="moveDown(scope.row,scope.$index)"></el-button>
+                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini"
+                             @click="moveDown(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
             </div>
@@ -447,8 +447,9 @@
     </trade-card>
     <trade-card title="杂费明细">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
-        <el-tab-pane label="应收" name="1"></el-tab-pane>
-        <!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
+        <el-tab-pane label="应收" name="1"
+                     v-if="!(roleName.indexOf('调度中心业务员') !== -1 || roleName.indexOf('调度中心经理') !== -1)"></el-tab-pane>
+        <el-tab-pane label="应付" name="2" v-else></el-tab-pane>
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -544,32 +545,32 @@
           </breakdown-select>
           <span v-else>{{ row.feeName }}</span>
         </template>
-        <template slot-scope="{row,index}" slot="menu">
-          <el-button
-              type="text"
-              size="small"
-              :disabled="goodsForm.status === 1"
-              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
-              @click="paymentRowCell(row,index)"
-          >{{ row.$cellEdit ? '保存' : '编辑' }}
-          </el-button>
-          <el-button type="text"
-                     icon="el-icon-delete"
-                     size="small"
-                     :disabled="goodsForm.status === 1"
-                     @click="$refs.payment.rowDel(row,index)"
-          >删除
-          </el-button>
-        </template>
-        <template slot="menuLeft">
-          <el-button
-              type="primary"
-              icon="el-icon-plus"
-              :disabled="goodsForm.status === 1"
-              @click="addRowPayment"
-              size="small">录入明细
-          </el-button>
-        </template>
+        <!--        <template slot-scope="{row,index}" slot="menu">-->
+        <!--          <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              :disabled="goodsForm.status === 1"-->
+        <!--              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
+        <!--              @click="paymentRowCell(row,index)"-->
+        <!--          >{{ row.$cellEdit ? '保存' : '编辑' }}-->
+        <!--          </el-button>-->
+        <!--          <el-button type="text"-->
+        <!--                     icon="el-icon-delete"-->
+        <!--                     size="small"-->
+        <!--                     :disabled="goodsForm.status === 1"-->
+        <!--                     @click="$refs.payment.rowDel(row,index)"-->
+        <!--          >删除-->
+        <!--          </el-button>-->
+        <!--        </template>-->
+        <!--        <template slot="menuLeft">-->
+        <!--          <el-button-->
+        <!--              type="primary"-->
+        <!--              icon="el-icon-plus"-->
+        <!--              :disabled="goodsForm.status === 1"-->
+        <!--              @click="addRowPayment"-->
+        <!--              size="small">录入明细-->
+        <!--          </el-button>-->
+        <!--        </template>-->
       </avue-crud>
     </trade-card>
     <containerTitle title="上传附件"></containerTitle>
@@ -1465,6 +1466,7 @@ export default {
         align: 'center',
         menuAlign: 'center',
         index: true,
+        menu: false,
         cancelBtn: false,
         refreshBtn: false,
         editBtn: false,
@@ -1540,6 +1542,7 @@ export default {
     };
   },
   async created() {
+    this.activeIndex = this.roleName.indexOf('调度中心业务员') !== -1 ? '2' : this.roleName.indexOf('调度中心经理') !== -1 ? '2' : '1'
     this.entrustOptionTwo = await this.getColumnData(this.getColumnName(85.1), this.entrustOptionTwoBackup);
     this.KeyBox++
     this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(85.2), this.entrustOptionTwoTBackup);
@@ -1648,7 +1651,7 @@ export default {
           // })
           //查询业务员
           this.salesmanQuery()
-          if (this.goodsForm.status == 2){
+          if (this.goodsForm.status == 2) {
             if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1) {
               this.goodsForm.status = 2
             }
@@ -1677,6 +1680,13 @@ export default {
     } else {
       this.initData();
     }
+
+    if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+      this.findObject(this.entrustOptionTwoT.column, "landAmountD").hide = true
+      this.findObject(this.entrustOptionTwoT.column, "landAmountD").showColumn = false
+      this.findObject(this.entrustOptionTwo.column, "landAmountD").hide = true
+      this.findObject(this.entrustOptionTwo.column, "landAmountD").showColumn = false
+    }
     this.$refs.other.show = false
   },
   methods: {
@@ -1694,8 +1704,8 @@ export default {
       //   // console.log(this.lineArr[this.lineArr.length - 1])
       // })
     },
-    getCropId(row){
-      if (row){
+    getCropId(row) {
+      if (row) {
         this.goodsForm.corpId = row.id
         this.goodsForm.corpName = row.cname
         this.goodsForm.belongCompany = row.belongCompany
@@ -1794,6 +1804,12 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crudBox.$refs.dialogColumn.columnBox = false;
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").showColumn = false
+          this.findObject(this.entrustOptionTwo.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwo.column, "landAmountD").showColumn = false
+        }
       }
     },
     //自定义列保存
@@ -1817,6 +1833,12 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crudBoxTwo.$refs.dialogColumn.columnBox = false;
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwoT.column, "landAmountD").showColumn = false
+          this.findObject(this.entrustOptionTwo.column, "landAmountD").hide = true
+          this.findObject(this.entrustOptionTwo.column, "landAmountD").showColumn = false
+        }
       }
     },
     //自定义列保存
@@ -1845,9 +1867,9 @@ export default {
     //刷新数据
     refreshData(id) {
       let ids = ''
-      if (id){
+      if (id) {
         ids = id
-      }else {
+      } else {
         ids = this.id
       }
       detailDelegationList({id: ids, kind: '1'}).then(res => {
@@ -1900,11 +1922,11 @@ export default {
     addAddress() {
       this.tableData.splice(this.tableData.length - 1, 0, {})
     },
-    moveUp(row,index){
-      this.tableData[index] = this.tableData.splice(index -1 ,1,row)[0]
+    moveUp(row, index) {
+      this.tableData[index] = this.tableData.splice(index - 1, 1, row)[0]
     },
-    moveDown(row,index){
-      this.tableData[index] = this.tableData.splice(index +1 ,1,row)[0]
+    moveDown(row, index) {
+      this.tableData[index] = this.tableData.splice(index + 1, 1, row)[0]
     },
     //返回主列表
     backToList(value) {
@@ -1993,14 +2015,14 @@ export default {
     confirmChange() {
       // validChange({id:this.id}).then(res => {
       //   if (res.data.data){
-          this.goodsForm.status = 0
-          this.goodsOptionFormC.disabled = false
-          this.goodsOptionForm.disabled = false
-          this.goodsOptionFormTwo.disabled = false
-          this.typeTwo = true
-        // }else {
-        //   this.$message.error('不允许变更')
-        // }
+      this.goodsForm.status = 0
+      this.goodsOptionFormC.disabled = false
+      this.goodsOptionForm.disabled = false
+      this.goodsOptionFormTwo.disabled = false
+      this.typeTwo = true
+      // }else {
+      //   this.$message.error('不允许变更')
+      // }
       // })
     },
     //变更保存
@@ -2115,7 +2137,7 @@ export default {
                     this.type = false
                     this.$message.success('提交成功');
                     this.refreshData(res.data.data)
-                  }).finally(()=>{
+                  }).finally(() => {
                     this.type = false
                   })
                 })
@@ -2263,7 +2285,8 @@ export default {
   padding: 10px 15px;
   font-size: 14px;
 }
-.single ::v-deep .el-button--mini{
+
+.single ::v-deep .el-button--mini {
   padding: 0 0 !important;
 }
 </style>

src/views/landTransportation/placeAnOrder/index.vue

@@ -191,6 +191,16 @@ export default {
   components: {
     detailPage
   },
+  watch:{
+    option:{
+      handler(newValue, oldValue) {
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1) {
+          this.findObject(this.option.column, "freight").hide = true
+          this.findObject(this.option.column, "freight").showColumn = false
+        }
+      }
+    }
+  },
   data() {
     return {
       id: '',

src/views/landTransportation/reportAnalysis/index.vue

@@ -183,6 +183,34 @@ import {gaude} from "@/api/gaude";
 
 export default {
   name: "index",
+  watch: {
+    goodsOptionCrud: {
+      handler(newValue, oldValue) {
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+          this.goodsOptionCrud.menu = false
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").showColumn = false
+        }
+      }
+    },
+    collectionOption:{
+      handler(newValue, oldValue) {
+        if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+          this.goodsOptionCrud.menu = false
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "landAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountD").showColumn = false
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").hide = true
+          this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").showColumn = false
+        }
+      }
+    }
+  },
   data() {
     return {
       key: 0,
@@ -753,6 +781,15 @@ export default {
         this.goodsOptionCrud.searchMenuSpan = 3 * 8;
         this.goodsOptionCrud.searchMenuPosition = "right";
       }
+      if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+        this.goodsOptionCrud.menu = false
+        this.findObject(this.goodsOptionCrud.column, "landAmountD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "landAmountD").showColumn = false
+        this.findObject(this.goodsOptionCrud.column, "extraAmountD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "extraAmountD").showColumn = false
+        this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").hide = true
+        this.findObject(this.goodsOptionCrud.column, "extraAmountItemD").showColumn = false
+      }
     },
     openTrack(row) {
       gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557', color: '2'}).then(res => {

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -102,6 +102,13 @@ export default {
   props: {
     sysType: Number
   },
+  watch:{
+    mold:{
+      handler(newValue, oldValue){
+        this.reset()
+      }
+    }
+  },
   data() {
     return {
       entrustTimer: null,
@@ -408,21 +415,27 @@ export default {
           width: 100,
           overHidden: true,
         }, {
+          label: '应付运费',
+          prop: 'landAmountC',
+          index: 14,
+          width: 100,
+          overHidden: true,
+        }, {
           label: '应收杂费',
           prop: 'extraAmountD',
-          index: 14,
+          index: 15,
           width: 100,
           overHidden: true,
         },{
           label: '应付杂费',
           prop: 'extraAmountC',
-          index: 15,
+          index: 16,
           width: 100,
           overHidden: true
         }, {
           label: '备注',
           prop: 'remarks',
-          index: 16,
+          index: 17,
           width: 130,
           overHidden: true,
         }]
@@ -545,9 +558,10 @@ export default {
     this.key++
     await this.getsalesTrend()
     this.init()
+
     if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('admin') !== -1) {
       for (let item of this.option.column) {
-        if (item.prop === 'extraAmountC') return
+        if (item.prop === 'extraAmountC') return this.reset()
       }
       this.option.column.push(
           {
@@ -568,6 +582,12 @@ export default {
             overHidden: true,
             index: 4,
             width: 100,
+          },{
+            label: '应付运费',
+            prop: 'landAmountC',
+            index: 14,
+            width: 100,
+            overHidden: true
           }, {
             label: '应付杂费',
             prop: 'extraAmountC',
@@ -588,8 +608,8 @@ export default {
             index: 13,
             width: 100,
             overHidden: true,
-          }
-      )
+          })
+      this.reset()
     }
     if (this.roleName.indexOf('车队') !== -1) {
       for (let item of this.option.column) {
@@ -669,6 +689,27 @@ export default {
     clearInterval(this.entrustTimer); //关闭
   },
   methods: {
+    reset(){
+      if (this.roleName.indexOf('调度中心业务员') !== -1 || this.roleName.indexOf('调度中心经理') !== -1){
+        if (this.findObject(this.option.column, "landAmountD")){
+          this.findObject(this.option.column, "landAmountD").hide = true
+          this.findObject(this.option.column, "landAmountD").showColumn = false
+        }
+        if (this.findObject(this.option.column, "extraAmountD")){
+          this.findObject(this.option.column, "extraAmountD").hide = true
+          this.findObject(this.option.column, "extraAmountD").showColumn = false
+        }
+        if(this.findObject(this.optionTwo.column, "freightCollect")) {
+          this.findObject(this.optionTwo.column, "freightCollect").hide = true
+          this.findObject(this.optionTwo.column, "freightCollect").showColumn = false
+        }
+        if (this.findObject(this.optionTwo.column, "extraAmountD")){
+          this.findObject(this.optionTwo.column, "extraAmountD").hide = true
+          this.findObject(this.optionTwo.column, "extraAmountD").showColumn = false
+        }
+        this.key++
+      }
+    },
     //自定义列保存
     async saveColumn() {
       /**
@@ -694,7 +735,7 @@ export default {
         this.key++
         if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1) {
           for (let item of this.option.column) {
-            if (item.prop === 'extraAmountC') return
+            if (item.prop === 'extraAmountC') return this.reset()
           }
           this.option.column.push(
               {
@@ -738,6 +779,7 @@ export default {
                 overHidden: true,
               }
           )
+          this.reset()
         }
         if (this.roleName.indexOf('车队') !== -1) {
           for (let item of this.option.column) {
@@ -835,6 +877,7 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
+        this.reset()
       }
     },
     openTrackTwo(row, index){