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

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -72,7 +72,7 @@
               || (roleName.indexOf('车队') !== -1 && goodsForm.status === 2)
               || (roleName.indexOf('司机') !== -1 && goodsForm.status === 3)
               || (roleName.indexOf('司机') !== -1 && goodsForm.status === 4)
-              || (roleName.indexOf('司机') !== -1 && goodsForm.status === 6)"
+              || (roleName.indexOf('司机') !== -1 && goodsForm.status === 6) || roleName.indexOf('admin') !== -1"
               @click="modifyState"
           >
             {{
@@ -81,21 +81,21 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 2 && roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1 "
+              v-if="goodsForm.status === 2 && ((roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)||roleName.indexOf('admin') !== -1) "
               size="small"
               @click="cancelScheduling(false)"
           >取消调度
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 3 && roleName.indexOf('车队') !== -1"
+              v-if="goodsForm.status === 3 && (roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1)"
               size="small"
               @click="cancelScheduling(true)"
           >取消派车
           </el-button>
           <el-button
               type="success"
-              v-if="goodsForm.status === 1 && roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1"
+              v-if="goodsForm.status === 1 && ((roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('admin') !== -1)"
               size="small"
               @click="submit(false)"
           >取消提交

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

@@ -526,7 +526,7 @@ export default {
     this.key++
     await this.getsalesTrend()
     this.init()
-    if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1) {
+    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
       }